Draft: Performance improvements

src/components/comp_fmu.c

@@ -871,19 +871,19 @@ static McxStatus Fmu2Initialize(Component * comp, size_t group, double startTime
     McxStatus retVal = RETURN_OK;
 
     // Set variables
-    retVal = Fmu2SetVariableArray(fmu2, fmu2->params);
+    retVal = Fmu2SetVariableArrayInitialize(fmu2, fmu2->params);
     if (RETURN_OK != retVal) {
         ComponentLog(comp, LOG_ERROR, "Setting params failed");
         return RETURN_ERROR;
     }
 
-    retVal = Fmu2SetVariableArray(fmu2, fmu2->initialValues);
+    retVal = Fmu2SetVariableArrayInitialize(fmu2, fmu2->initialValues);
     if (RETURN_OK != retVal) {
         ComponentLog(comp, LOG_ERROR, "Setting initialValues failed");
         return RETURN_ERROR;
     }
 
-    retVal = Fmu2SetVariableArray(fmu2, fmu2->in);
+    retVal = Fmu2SetVariableArrayInitialize(fmu2, fmu2->in);
     if (RETURN_OK != retVal) {
         ComponentLog(comp, LOG_ERROR, "Setting inChannels failed");
         return RETURN_ERROR;
@@ -916,13 +916,13 @@ static McxStatus Fmu2Initialize(Component * comp, size_t group, double startTime
     }
 
     // Set variables
-    retVal = Fmu2SetVariableArray(fmu2, fmu2->initialValues);
+    retVal = Fmu2SetVariableArrayInitialize(fmu2, fmu2->initialValues);
     if (RETURN_OK != retVal) {
         ComponentLog(comp, LOG_ERROR, "Setting initialValues failed");
         return RETURN_ERROR;
     }
 
-    retVal = Fmu2SetVariableArray(fmu2, fmu2->in);
+    retVal = Fmu2SetVariableArrayInitialize(fmu2, fmu2->in);
     if (RETURN_OK != retVal) {
         ComponentLog(comp, LOG_ERROR, "Setting inChannels failed");
         return RETURN_ERROR;

src/core/Component.c

@@ -851,7 +851,7 @@ Vector * GetInConnectionInfos(const Component * comp, size_t channelID) {
     return NULL;
 }
 
-ObjectContainer * GetInConnections(const Component * comp, size_t channelID) {
+ConnectionList * GetInConnections(const Component * comp, size_t channelID) {
     size_t channelNum = DatabusInfoGetChannelNum(DatabusGetInInfo(comp->data->databus));
     if (channelID < channelNum) {
         ChannelIn * in = DatabusGetInChannel(comp->data->databus, channelID);
@@ -972,11 +972,10 @@ static ObjectList * ComponentGetConnections(Component * fromComp, Component * to
 
     for (i = 0; i < DatabusGetOutChannelsNum(db); i++) {
         ChannelOut * out = DatabusGetOutChannel(db, i);
-        ObjectList * conns = out->GetConnections(out);
-        size_t connSize = conns->Size(conns);
+        ConnectionList * conns = out->GetConnections(out);
 
-        for (j = 0; j < connSize; j++) {
-            Connection * conn = (Connection *) conns->At(conns, j);
+        for (j = 0; j < conns->numConnections; j++) {
+            Connection * conn = conns->connections[j];
             ConnectionInfo * info = conn->GetInfo(conn);
 
             if (info->targetComponent == toComp) {
@@ -1014,11 +1013,10 @@ McxStatus ComponentOutConnectionsEnterInitMode(Component * comp) {
 
     for (i = 0; i < numOutChannels; i++) {
         ChannelOut * out = DatabusGetOutChannel(db, i);
-        ObjectList * conns = out->GetConnections(out);
-        size_t connSize = conns->Size(conns);
+        ConnectionList * conns = out->GetConnections(out);
 
-        for (j = 0; j < connSize; j++) {
-            Connection * connection = (Connection *) conns->At(conns, j);
+        for (j = 0; j < conns->numConnections; j++) {
+            Connection * connection = conns->connections[j];
             retVal = connection->EnterInitializationMode(connection);
             if (RETURN_OK != retVal) { // error message in calling function
                 return RETURN_ERROR;
@@ -1035,11 +1033,10 @@ McxStatus ComponentDoOutConnectionsInitialization(Component * comp, int onlyIfDe
 
     for (i = 0; i < numOutChannels; i++) {
         ChannelOut * out = DatabusGetOutChannel(db, i);
-        ObjectList * conns = out->GetConnections(out);
-        size_t connSize = conns->Size(conns);
+        ConnectionList * conns = out->GetConnections(out);
 
-        for (j = 0; j < connSize; j++) {
-            Connection * connection = (Connection *) conns->At(conns, j);
+        for (j = 0; j < conns->numConnections; j++) {
+            Connection * connection = conns->connections[j];
 
             if (!onlyIfDecoupled || connection->IsDecoupled(connection)) {
                 McxStatus retVal = connection->UpdateInitialValue(connection);
@@ -1063,11 +1060,10 @@ McxStatus ComponentOutConnectionsExitInitMode(Component * comp, double time) {
 
     for (i = 0; i < numOutChannels; i++) {
         ChannelOut * out = DatabusGetOutChannel(db, i);
-        ObjectList * conns = out->GetConnections(out);
-        size_t connSize = conns->Size(conns);
+        ConnectionList * conns = out->GetConnections(out);
 
-        for (j = 0; j < connSize; j++) {
-            Connection * connection = (Connection *) conns->At(conns, j);
+        for (j = 0; j < conns->numConnections; j++) {
+            Connection * connection = conns->connections[j];
             retVal = connection->ExitInitializationMode(connection, time);
             if (RETURN_OK != retVal) { // error message in calling function
                 return RETURN_ERROR;

src/core/Component.h

@@ -255,7 +255,7 @@ McxStatus ComponentEnterCommunicationPoint(Component * comp, TimeInterval * time
 McxStatus ComponentEnterCommunicationPointForConnections(Component * comp, ObjectList * connections, TimeInterval * time);
 
 Vector * GetInConnectionInfos(const Component * comp, size_t channelID);
-struct ObjectContainer * GetInConnections(const Component * comp, size_t channelID);
+struct ConnectionList * GetInConnections(const Component * comp, size_t channelID);
 
 size_t ComponentGetNumOutGroups(const Component * comp);
 size_t ComponentGetNumInitialOutGroups(const Component * comp);

src/core/Conversion.c

@@ -99,23 +99,22 @@ McxStatus RangeConversionMinValueRefConversion(void * element, size_t idx, Chann
     ChannelValue * min = (ChannelValue *) ctx;
     void * minElem = mcx_array_get_elem_reference(&min->value.a, idx);
     if (RangeConversionElemwiseLeq(element, minElem, type)) {
-        switch (type->con)
-        {
+        switch (type->con) {
             case CHANNEL_DOUBLE:
             {
                 double * elem = (double *) element;
-                *elem = *((double *)minElem);
+                *elem = *((double *) minElem);
                 break;
             }
-        case CHANNEL_INTEGER:
+            case CHANNEL_INTEGER:
             {
                 int * elem = (int *) element;
-                *elem = *((int *)minElem);
+                *elem = *((int *) minElem);
                 break;
             }
-        default:
-            mcx_log(LOG_ERROR, "RangeConversion: Unsupported type");
-            return RETURN_ERROR;
+            default:
+                mcx_log(LOG_ERROR, "RangeConversion: Unsupported type");
+                return RETURN_ERROR;
         }
     }
 

src/core/Databus.c

@@ -1303,8 +1303,8 @@ McxStatus DatabusCollectModeSwitchData(Databus * db) {
     // determine cache size
     for (i = 0; i < size; i++) {
         ChannelOut * out = db->data->out[i];
-        ObjectList * conns = out->GetConnections(out);
-        db->modeSwitchDataSize += conns->Size(conns);
+        ConnectionList * conns = out->GetConnections(out);
+        db->modeSwitchDataSize += conns->numConnections;
     }
 
     // allocate cache
@@ -1316,11 +1316,11 @@ McxStatus DatabusCollectModeSwitchData(Databus * db) {
     // fill up the cache
     for (i = 0, idx = 0; i < size; i++) {
         ChannelOut * out = db->data->out[i];
-        ObjectList * conns = out->GetConnections(out);
-        size_t connSize = conns->Size(conns);
+        ConnectionList * conns = out->GetConnections(out);
+        size_t connSize = conns->numConnections;
 
         for (j = 0; j < connSize; j++, idx++) {
-            Connection * connection = (Connection*)conns->At(conns, j);
+            Connection * connection = conns->connections[j];
             ConnectionInfo * info = connection->GetInfo(connection);
             Component * target = info->targetComponent;
             Component * source = info->sourceComponent;

src/core/Model.c

@@ -447,10 +447,10 @@ static McxStatus ModelInsertAllFilters(Model * model) {
 
         for (j = 0; j < numOutChannels; j++) {
             ChannelOut * out = DatabusGetOutChannel(db, j);
-            ObjectList * conns = out->GetConnections(out);
+            ConnectionList * conns = out->GetConnections(out);
 
-            for (k = 0; k < conns->Size(conns); k++) {
-                Connection * connection = (Connection *) conns->At(conns, k);
+            for (k = 0; k < conns->numConnections; k++) {
+                Connection * connection = conns->connections[k];
                 ConnectionInfo * info = connection->GetInfo(connection);
                     if (connection->AddFilter) {
                         char * connStr = ConnectionInfoConnectionString(info);
@@ -700,10 +700,10 @@ static Connection * ModelGetConnectionFromInfo(Model * model, ConnectionInfo * i
 
         for (j = 0; j < numOutChannels; j++) {
             ChannelOut * out = DatabusGetOutChannel(db, j);
-            ObjectList * conns = out->GetConnections(out);
+            ConnectionList * conns = out->GetConnections(out);
 
-            for (k = 0; k < conns->Size(conns); k++) {
-                Connection * connection = (Connection *) conns->At(conns, k);
+            for (k = 0; k < conns->numConnections; k++) {
+                Connection * connection = conns->connections[k];
                 if (connection->GetInfo(connection) == info) {
                     return connection;
                 }
@@ -1263,6 +1263,38 @@ static McxStatus ModelSetup(void * self) {
     }
     mcx_log(LOG_DEBUG, " ");
 
+    // Set isFullyConnected status on all channels
+    size_t i = 0;
+    size_t j = 0;
+    Component * comp = NULL;
+    Databus * db = NULL;
+    size_t inNum = 0;
+    size_t outNum = 0;
+    Channel * channel = NULL;
+    ObjectContainer * comps = model->components;
+    for (i = 0; i < comps->Size(comps); i++) {
+        comp = (Component *)comps->At(comps, i);
+        db = comp->GetDatabus(comp);
+        inNum = DatabusGetInChannelsNum(db);
+        for (j = 0; j < inNum; j++) {
+            channel = (Channel *) DatabusGetInChannel(db, j);
+            retVal = channel->SetIsFullyConnected(channel);
+            if (RETURN_OK != retVal) {
+                mcx_log(LOG_ERROR, "Model: Setting IsFullyConnected state for input %s failed", channel->info.name);
+                return RETURN_ERROR;
+            }
+        }
+        outNum = DatabusGetOutChannelsNum(db);
+        for (j = 0; j < outNum; j++) {
+            channel = (Channel *) DatabusGetOutChannel(db, j);
+            retVal = channel->SetIsFullyConnected(channel);
+            if (RETURN_OK != retVal) {
+                mcx_log(LOG_ERROR, "Model: Setting IsFullyConnected state for output %s failed", channel->info.name);
+                return RETURN_ERROR;
+            }
+        }
+    }
+
     if (model->config->outputModel) {
         retVal = ModelPrint(model);
         if (RETURN_OK != retVal) {

src/core/SubModel.c

@@ -716,12 +716,12 @@ static struct Dependencies * SubModelGeneratorCreateDependencyMatrix(SubModelGen
 
             if (DEP_INDEPENDENT != dependency) {
                 Vector * infos = GetInConnectionInfos(targetComp, targetInChannelID);
-                ObjectContainer * conns = GetInConnections(targetComp, targetInChannelID);
+                ConnectionList * conns = GetInConnections(targetComp, targetInChannelID);
                 size_t i = 0;
 
                 for (i = 0; i < infos->Size(infos); i++) {
                     ConnectionInfo * info = *(ConnectionInfo**) infos->At(infos, i);
-                    Connection * conn = conns->At(conns, i);
+                    Connection * conn = conns->connections[i];
 
                     if (info && (info->decoupleType & (DECOUPLE_NEVER | DECOUPLE_IFNEEDED)) && (!ConnectionInfoIsDecoupled(info)) &&
                         conn && conn->IsActiveDependency(conn))