- improved gradient evaluation

Vitalij Ruge · Vitalij Ruge · commit a56005df47d2 · 2014-05-16T13:55:05.000Z
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20652 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
diff --git a/SimulationRuntime/c/optimization/eval_all/EvalF.c b/SimulationRuntime/c/optimization/eval_all/EvalF.c
@@ -133,8 +133,11 @@ Bool evalfDiffF(Index n, double * vopt, Bool new_x, Number *gradF, void * useDat
 
     int i, ii;
 
-    for(i = 0, ii = n - nv; i < nv; ++i, ++ii){
-      gradF[ii] += gradM[i];
+    if(la){
+      for(i = 0, ii = n - nv; i < nv; ++i, ++ii)
+        gradF[ii] += gradM[i];
+    }else{
+      memcpy(gradF + n - nv, gradM, nv*sizeof(modelica_real));
     }
 
   }

Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,11 @@ Bool evalfDiffF(Index n, double * vopt, Bool new_x, Number gradF, void useDat`
`133`	`133`
`134`	`134`	`int i, ii;`
`135`	`135`
`136`		`- for(i = 0, ii = n - nv; i < nv; ++i, ++ii){`
`137`		`- gradF[ii] += gradM[i];`
	`136`	`+ if(la){`
	`137`	`+ for(i = 0, ii = n - nv; i < nv; ++i, ++ii)`
	`138`	`+ gradF[ii] += gradM[i];`
	`139`	`+ }else{`
	`140`	`+ memcpy(gradF + n - nv, gradM, nv*sizeof(modelica_real));`
`138`	`141`	`}`
`139`	`142`
`140`	`143`	`}`