fix integer connections to enumerations

src/OMSimulatorLib/System.cpp

@@ -1087,7 +1087,7 @@ oms_status_enu_t oms::System::addConnection(const oms::ComRef& crefA, const oms:
   {
     // allow non-real connections to tables
   }
-  else if(conA->getType() == oms_signal_type_integer && conB->getType() == oms_signal_type_enum)
+  else if((conA->getType() == oms_signal_type_integer || conA->getType() == oms_signal_type_enum)  && (conB->getType() == oms_signal_type_enum || conB->getType() == oms_signal_type_integer))
   {
     // allow integer connection to enum types
   }

testsuite/OMSimulator/Enumeration2.lua

@@ -0,0 +1,52 @@
+-- status: correct
+-- linux: yes
+-- mingw: yes
+-- win: no
+-- mac: no
+
+oms_setCommandLineOption("--suppressPath=true")
+oms_setTempDirectory("./temp-Enumeration2/")
+
+oms_newModel("test")
+oms_addSystem("test.root", oms_system_sc)
+oms_addSubModel("test.root.A", "../resources/Int1.fmu")
+oms_addSubModel("test.root.B", "../resources/Enum1.fmu")
+
+-- valid connection
+oms_addConnection("test.root.B.u", "test.root.A.y")
+
+oms_setResultFile("test", "enumeration2.mat")
+
+oms_instantiate("test")
+print("info:    Instantiation")
+print("info:      test.root.A.y     : " .. oms_getInteger("test.root.A.y"))
+print("info:      test.root.B.u     : " .. oms_getInteger("test.root.B.u"))
+
+oms_initialize("test")
+print("info:    Initialization")
+print("info:      test.root.A.y     : " .. oms_getInteger("test.root.A.y"))
+print("info:      test.root.B.u     : " .. oms_getInteger("test.root.B.u"))
+
+oms_simulate("test")
+print("info:    Simulation")
+print("info:      test.root.A.y     : " .. oms_getInteger("test.root.A.y"))
+print("info:      test.root.B.u     : " .. oms_getInteger("test.root.B.u"))
+
+oms_terminate("test")
+oms_delete("test")
+
+
+
+-- Result:
+-- info:    model doesn't contain any continuous state
+-- info:    Instantiation
+-- info:      test.root.A.y     : 2
+-- info:      test.root.B.u     : 0
+-- info:    Result file: enumeration2.mat (bufferSize=1)
+-- info:    Initialization
+-- info:      test.root.A.y     : 2
+-- info:      test.root.B.u     : 2
+-- info:    Simulation
+-- info:      test.root.A.y     : 2
+-- info:      test.root.B.u     : 2
+-- endResult

testsuite/OMSimulator/Makefile

@@ -6,6 +6,7 @@ deleteStartValues.lua \
 deleteStartValuesInSSV.lua \
 DualMassOscillator.lua \
 Enumeration.lua \
+Enumeration2.lua \
 exportConnectorsToResultFile.lua \
 exportSSMTemplate.lua \
 exportSSMTemplate.py \