- reverted r18808 as it breaks some tests and make some tests run for…

…ever even if we have ulimit -t git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18809 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 27, 2014 · 24c7c44 · 24c7c44
1 parent 7bde9cb
commit 24c7c44
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/Compiler/Template/CodegenC.tpl b/Compiler/Template/CodegenC.tpl
@@ -10417,8 +10417,9 @@ 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)              
         <<
             /* objectiveFunction */
@@ -10443,7 +10444,12 @@ template optimizationComponents1(ClassAttributes classAttribute, SimCode simCode
             /* constraints */
             int <%symbolName(modelNamePrefixStr,"pathConstraints")%>(DATA* data, modelica_real* res, long int* N)
             {
-              <%constraints%>
+              if(*N < 0)
+              {
+                *N = <%listConstraintsLength%>;
+                return 1;
+              }
+               <%constraints%>
               return 0;
             }
         >>
@@ -10467,17 +10473,14 @@ template pathConstraint(Constraint cons)
       let constrain = (constraintLst |> constraint =>
          daeExp(constraint, contextOptimization, &preExp /*BUFC*/, &varDecls /*BUFD*/)
           ;separator="\n")
-     let listConstraintsLength = listLength(constraintLst)
       <<
-      if(*N < 0){
-        *N = <%listConstraintsLength%>;
-        return 1;
-      }else{
-        int i = 0;
-        <%varDecls%>
-        <%preExp%>
-        <%constrain%>
-      }
+        else
+        {
+          int i = 0;
+          <%varDecls%>
+          <%preExp%>
+          <%constrain%>
+        }
       >>
     else error(sourceInfo(), 'Unknown Constraint List')
 end pathConstraint;

diff --git a/SimulationRuntime/c/optimization/initialOptimizer/allocate_ipopt.c b/SimulationRuntime/c/optimization/initialOptimizer/allocate_ipopt.c
@@ -460,14 +460,12 @@ static int local_jac_struct(IPOPT_DATA_ *iData, int * nng)
 
   iData->nlocalJac = 0;
   iData->knowedJ = (int**) malloc( nJ* sizeof(int*));
-
-  for(i = 0; i < nJ; i++){
+  for(i = 0; i < nJ; i++)
     iData->knowedJ[i] = (int*) calloc(iData->nv, sizeof(int));
-  }
 
-  iData->Hg = (short**) malloc(iData->nv * sizeof(short*));
+  iData->Hg = (short**) malloc(iData->nv * sizeof(int*));
   for(i = 0; i < iData->nv; i++)
-    iData->Hg[i] = (short*) calloc(iData->nv, sizeof(short));
+    iData->Hg[i] = (short*) calloc(iData->nv, sizeof(int));
 
   J = iData->knowedJ;
   Hg = iData->Hg;