- fixed constraints size

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18810 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 28, 2014 · 0e141ac · 0e141ac
1 parent 24c7c44
commit 0e141ac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/Compiler/Template/CodegenC.tpl b/Compiler/Template/CodegenC.tpl
@@ -10418,7 +10418,6 @@ template optimizationComponents1(ClassAttributes classAttribute, SimCode simCode
          *res =  $P$TMP_lagrangeTerm;
          return 0;
         >>
-      let listConstraintsLength = match simCode case SIMCODE(modelInfo = MODELINFO(__)) then listLength(constraints)  
 
       let constraints = match simCode case SIMCODE(modelInfo = MODELINFO(__)) then pathConstraints(constraints)              
         <<
@@ -10444,12 +10443,7 @@ template optimizationComponents1(ClassAttributes classAttribute, SimCode simCode
             /* constraints */
             int <%symbolName(modelNamePrefixStr,"pathConstraints")%>(DATA* data, modelica_real* res, long int* N)
             {
-              if(*N < 0)
-              {
-                *N = <%listConstraintsLength%>;
-                return 1;
-              }
-               <%constraints%>
+              <%constraints%>
               return 0;
             }
         >>
@@ -10473,9 +10467,12 @@ template pathConstraint(Constraint cons)
       let constrain = (constraintLst |> constraint =>
          daeExp(constraint, contextOptimization, &preExp /*BUFC*/, &varDecls /*BUFD*/)
           ;separator="\n")
+      let listConstraintsLength = listLength(constraintLst)  
       <<
-        else
-        {
+        if(*N<=0){
+         *N = <%listConstraintsLength%>;
+         return 1;
+        }else{
           int i = 0;
           <%varDecls%>
           <%preExp%>

diff --git a/SimulationRuntime/c/optimization/initialOptimizer/allocate_ipopt.c b/SimulationRuntime/c/optimization/initialOptimizer/allocate_ipopt.c
@@ -230,7 +230,7 @@ int loadDAEmodel(DATA *data, IPOPT_DATA_ *iData)
 
   iData->nx = data->modelData.nStates;
   iData->nu = data->modelData.nInputVars;
-  iData->nc = -1;
+  iData->nc = 0;
   iData->data->callback->pathConstraints(data,u0,&iData->nc);
 
   iData->deg = 3;