- Bugfix Initialisation Method leastSquare

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@6248 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: Jens Frenkel

c_runtime/simulation_init.cpp

@@ -39,14 +39,27 @@
 void leastSquare(long *nz, double *z, double *funcValue)
 {
   int ind, indAct, indz;
+  int startIndPar = 2*globalData->nStates+globalData->nAlgebraic+globalData->intVariables.nAlgebraic+globalData->boolVariables.nAlgebraic;
   for (ind=0, indAct=0, indz=0; ind<globalData->nStates; ind++)
   	if (globalData->initFixed[indAct++]==0)
           globalData->states[ind] = z[indz++];
-
-  for (ind=0,indAct=2*globalData->nStates+globalData->nAlgebraic; ind<globalData->nParameters; ind++)
+  // for real parameters 
+  for (ind=0,indAct=startIndPar; ind<globalData->nParameters; ind++)
     if (globalData->initFixed[indAct++]==0)
       globalData->parameters[ind] = z[indz++];
 
+  // for int parameters
+  for (ind=0,indAct=startIndPar+globalData->nParameters; ind<globalData->intVariables.nParameters; ind++) {
+    if (globalData->initFixed[indAct++]==0)
+      globalData->intVariables.parameters[ind] = (modelica_integer)z[indz++];
+  }
+
+  // for bool parameters
+  for (ind=0,indAct=startIndPar+globalData->nParameters+globalData->intVariables.nParameters; ind<globalData->boolVariables.nParameters; ind++) {
+    if (globalData->initFixed[indAct++]==0)
+      globalData->boolVariables.parameters[ind] = (modelica_boolean)z[indz++];
+  }
+
   functionODE();
   functionDAE_output();
   functionDAE_output2();