@@ -1556,7 +1556,7 @@ algorithm
15561556 Option<SimCode.FmiModelStructure> modelStruct;
15571557 list<SimCodeVar.SimVar> mixedArrayVars;
15581558 HashTableCrIListArray.HashTable varToArrayIndexMapping; //maps each variable to an array position
1559-
1559+
15601560 case (dlow, class_, _, fileDir, _,_, _, _, _, _, _, _, _) equation
15611561 System.tmpTickReset(0);
15621562 uniqueEqIndex = 1;
@@ -1720,7 +1720,7 @@ algorithm
17201720 //print("HASHTABLE MAPPING\n\n");
17211721 //BaseHashTable.dumpHashTable(varToArrayIndexMapping);
17221722 //print("\n\n");
1723-
1723+
17241724 simCode = SimCode.SIMCODE(modelInfo,
17251725 {}, // Set by the traversal below...
17261726 recordDecls,
@@ -12530,16 +12530,16 @@ algorithm
1253012530 ((currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable)) = List.fold(boolParamVars, function createVarToArrayIndexMapping1(iVarType=3), (currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable));
1253112531 ((currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable)) = List.fold(inputVars, function createVarToArrayIndexMapping1(iVarType=1), (currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable));
1253212532 ((currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable)) = List.fold(outputVars, function createVarToArrayIndexMapping1(iVarType=1), (currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable));
12533- ((currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable)) = List.fold(constVars, function createVarToArrayIndexMapping1(iVarType=1), (currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable));
12533+ ((currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable)) = List.fold(constVars, function createVarToArrayIndexMapping1(iVarType=1), (currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable));
1253412534 ((currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable)) = List.fold(realOptimizeConstraintsVars, function createVarToArrayIndexMapping1(iVarType=1), (currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable));
1253512535 ((currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable)) = List.fold(realOptimizeFinalConstraintsVars, function createVarToArrayIndexMapping1(iVarType=1), (currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable));
12536-
12536+
1253712537 ((currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable)) = List.fold(aliasVars, function createVarToArrayIndexMapping1(iVarType=1), (currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable));
1253812538 ((currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable)) = List.fold(intAliasVars, function createVarToArrayIndexMapping1(iVarType=2), (currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable));
1253912539 ((currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable)) = List.fold(boolAliasVars, function createVarToArrayIndexMapping1(iVarType=3), (currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable));
1254012540 then varArrayIndexMappingHashTable;
1254112541 else
12542- then HashTableCrIListArray.emptyHashTable();
12542+ then HashTableCrIListArray.emptyHashTable();
1254312543 end match;
1254412544end createVarToArrayIndexMapping;
1254512545
@@ -12554,7 +12554,7 @@ protected
1255412554 DAE.ComponentRef arrayCref, varName, name, arrayName;
1255512555 Integer varIdx, arrayIndex;
1255612556 array<Integer> varIndices;
12557- list<Integer> arrayDimensions;
12557+ list<Integer> arrayDimensions;
1255812558 list<String> numArrayElement;
1255912559 list<DAE.ComponentRef> expandedCrefs;
1256012560 list<String> numArrayElement;
@@ -12569,9 +12569,9 @@ algorithm
1256912569 (tmpCurrentVarIndices,varIdx) = getArrayIdxByVar(iVar, iVarType, tmpVarToIndexMapping, tmpCurrentVarIndices);
1257012570 //print("Adding variable " + ComponentReference.printComponentRefStr(name) + " to map with index " + intString(varIdx) + "\n");
1257112571 tmpVarToIndexMapping = BaseHashTable.add((name, {varIdx}), tmpVarToIndexMapping);
12572- arraySubscripts = ComponentReference.crefLastSubs(name);
12572+ arraySubscripts = ComponentReference.crefLastSubs(name);
1257312573 arrayName = ComponentReference.crefStripLastSubs(name); // removeSubscripts(name);
12574-
12574+
1257512575 if(ComponentReference.crefEqual(arrayName, name)) then
1257612576 //print("Array not found\n");
1257712577 varIndices = arrayCreate(1, varIdx);
@@ -12619,20 +12619,20 @@ algorithm
1261912619 then (tmpCurrentVarIndices, varIdx);
1262012620 case(SimCodeVar.SIMVAR(name=name, aliasvar=SimCodeVar.NEGATEDALIAS(varName)),_,_)
1262112621 equation
12622- if(BaseHashTable.hasKey(varName, iVarToIndexMapping)) then
12622+ if(BaseHashTable.hasKey(varName, iVarToIndexMapping)) then
1262312623 varIdx::_ = BaseHashTable.get(varName, iVarToIndexMapping);
1262412624 varIdx = intMul(varIdx,-1);
1262512625 else
1262612626 Error.addMessage(Error.INTERNAL_ERROR, {"Negated alias to unknown variable given."});
12627- end if;
12627+ end if;
1262812628 then (iCurrentVarIndices, varIdx);
1262912629 case(SimCodeVar.SIMVAR(name=name, aliasvar=SimCodeVar.ALIAS(varName)),_,_)
1263012630 equation
1263112631 if(BaseHashTable.hasKey(varName, iVarToIndexMapping)) then
1263212632 varIdx::_ = BaseHashTable.get(varName, iVarToIndexMapping);
1263312633 else
1263412634 Error.addMessage(Error.INTERNAL_ERROR, {"Alias to unknown variable given."});
12635- end if;
12635+ end if;
1263612636 then (iCurrentVarIndices, varIdx);
1263712637 end match;
1263812638end getArrayIdxByVar;
@@ -12674,7 +12674,7 @@ protected
1267412674algorithm
1267512675 varName := ComponentReference.crefStripLastSubs(varName);//removeSubscripts(varName);
1267612676 if(BaseHashTable.hasKey(varName, iVarToArrayIndexMapping)) then
12677- ((_,varIndices)) := BaseHashTable.get(varName, iVarToArrayIndexMapping);
12677+ ((_,varIndices)) := BaseHashTable.get(varName, iVarToArrayIndexMapping);
1267812678 arraySize := arrayLength(varIndices);
1267912679 for arrayIdx in 0:(arraySize-1) loop
1268012680 idx := arrayGet(varIndices, arraySize-arrayIdx);
0 commit comments