- improved optimization order 1

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21241 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jun 23, 2014 · cd39767 · cd39767
1 parent a984893
commit cd39767
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/SimulationRuntime/c/optimization/eval_all/EvalG.c b/SimulationRuntime/c/optimization/eval_all/EvalG.c
@@ -249,22 +249,36 @@ Bool evalfDiffG(Index n, double * vopt, Bool new_x, Index m, Index njac, Index *
     }else if(np == 1){
       /*****************************/
       for(j = 0, k = 0; j < np; ++j){
-        for(l = 0; l < nJ; ++l){
+        for(l = 0; l < nx; ++l){
+          for(ii = 0; ii < nv; ++ii)
+            if(J[l][ii]){
+              values[k++] = (modelica_real)((ii == l) ? optData->J[0][j][l][ii] - 1.0 : optData->J[0][j][l][ii]);
+            }
+          }
+        for(; l < nJ; ++l){
           for(ii = 0; ii < nv; ++ii)
             if(J[l][ii]){
-              values[k++] = (modelica_real)((ii == l && l < nx) ? optData->J[0][j][l][ii] - 1.0 : optData->J[0][j][l][ii]);
+              values[k++] = (modelica_real)(optData->J[0][j][l][ii]);
             }
           }
+
         }
       /*****************************/
       for(i = 1; i < nsi; ++i){
         for(j = 0; j < np; ++j){
-          for(l = 0; l < nJ; ++l){
+          for(l = 0; l < nx; ++l){
             if(l < nx)
               values[k++] = 1.0;
             for(ii = 0; ii < nv; ++ii){
               if(J[l][ii]){
-                values[k++] = (modelica_real)((ii == l && l < nx) ? optData->J[i][j][l][ii] - 1.0 : optData->J[i][j][l][ii]);
+                values[k++] = (modelica_real)((ii == l) ? optData->J[i][j][l][ii] - 1.0 : optData->J[i][j][l][ii]);
+              }
+            }
+          }
+          for(; l < nJ; ++l){
+            for(ii = 0; ii < nv; ++ii){
+              if(J[l][ii]){
+                values[k++] = (modelica_real)(optData->J[i][j][l][ii]);
               }
             }
           }