- improve evaluation jacobian,gradient in optimization

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

Author: Vitalij Ruge

SimulationRuntime/c/optimization/constraints/evalfDiffG.c

@@ -181,7 +181,7 @@ static  int radauJac1(long double *a, long double *J, long double dt, double * v
   /*1*/
   for(l=0; l<nv; ++l){
     if(iData->sopt.knowedJ[j][l]){
-      values[(*k)++] = (j == l) ? dt*J[l]-a[1] : dt*J[l];
+      values[(*k)++] = (j == l) ? dt*J[l] - a[1] : dt*J[l];
     }
   }
 
@@ -201,19 +201,15 @@ static  int lobattoJac1(long double *a, long double *J, long double *J0, long do
 {
   int l;
   /*0*/
-  for(l = 0; l< nv; ++l){
-    if(j == l) {
-      values[(*k)++] = tmp*J0[l] + a[0];
-    } else if(iData->sopt.knowedJ[j][l]) {
-      values[(*k)++] = tmp*J0[l];
-    }
-  }
+  for(l = 0; l< nv; ++l)
+    if(iData->sopt.knowedJ[j][l])
+      values[(*k)++] = (j == l) ? tmp*J0[l] + a[0] : tmp*J0[l];
+
   /*1*/
-  for(l = 0; l< nv; ++l){
-    if(iData->sopt.knowedJ[j][l]){
+  for(l = 0; l< nv; ++l)
+    if(iData->sopt.knowedJ[j][l])
       values[(*k)++] = ((j == l)? dt*J[l] - a[1] : dt*J[l]);
-    }
-  }
+
   /*2*/
   values[(*k)++] = -a[2];
 
@@ -256,22 +252,17 @@ static  int lobattoJac2(long double *a, long double *J, long double *J0, long do
 {
   int l;
   /*0*/
-  for(l = 0; l< nv; ++l){
-    if( j==l){
-      values[(*k)++] = -(tmp*J0[l] + a[0]);
-    } else if(iData->sopt.knowedJ[j][l]) {
-      values[(*k)++] = -tmp*J0[l];
-    }
-  }
+  for(l = 0; l< nv; ++l)
+    if(iData->sopt.knowedJ[j][l])
+      values[(*k)++]  = ( j==l)? -(tmp*J0[l] + a[0]) : -tmp*J0[l];
   /*1*/
   values[(*k)++] = a[1];
 
   /*2*/
-  for(l = 0; l< nv; ++l){
-    if(iData->sopt.knowedJ[j][l]){
+  for(l = 0; l< nv; ++l)
+    if(iData->sopt.knowedJ[j][l])
       values[(*k)++] = ((j == l)? dt*J[l]-a[2] : dt*J[l]);
-    }
-  }
+
   /*3*/
   values[(*k)++] = -a[3];
   return 0;
@@ -291,11 +282,10 @@ static  int radauJac3(long double *a, long double *J, long double dt, double * v
   /*2*/
   values[(*k)++] = a[2];
   /*3*/
-  for(l = 0; l< nv; ++l){
-    if(iData->sopt.knowedJ[j][l]){
+  for(l = 0; l< nv; ++l)
+    if(iData->sopt.knowedJ[j][l])
       values[(*k)++] = ((j == l)? dt*J[l] - a[3] : dt*J[l]);
-    }
-  }
+
   return 0;
 }
 
@@ -307,23 +297,19 @@ static  int lobattoJac3(long double *a, long double *J, long double *J0, long do
 {
   int l;
   /*0*/
-  for(l=0; l<nv; ++l){
-    if(j==l){
-      values[(*k)++] = tmp*J0[l] + a[0];
-    }else if(iData->sopt.knowedJ[j][l]) {
-      values[(*k)++] = tmp*J0[l];
-    }
-  }
+  for(l=0; l<nv; ++l)
+    if(iData->sopt.knowedJ[j][l])
+      values[(*k)++] = (j==l) ? tmp*J0[l] + a[0]: tmp*J0[l];
+
   /*1*/
   values[(*k)++] = -a[1];
   /*2*/
   values[(*k)++] = a[2];
   /*3*/
-  for(l=0; l<nv; ++l){
-    if(iData->sopt.knowedJ[j][l]){
+  for(l=0; l<nv; ++l)
+    if(iData->sopt.knowedJ[j][l])
       values[(*k)++] = ((j == l)? dt*J[l] - a[3] : dt*J[l]);
-    }
-  }
+
   return 0;
 }
 

SimulationRuntime/c/optimization/goal/evalF.c

@@ -51,7 +51,7 @@ Bool evalfF(Index n, double * v, Bool new_x, Number *objValue, void * useData)
 {
   IPOPT_DATA_ *iData = (IPOPT_DATA_*) useData;
   double mayer = 0.0;
-  double lagrange = 0.0;
+  long double lagrange = 0.0;
   OPTIMIZER_MBASE *mbase = &iData->mbase;
 
   if(iData->sopt.mayer){
@@ -89,10 +89,10 @@ Bool evalfF(Index n, double * v, Bool new_x, Number *objValue, void * useData)
       erg_ += erg*iData->dtime.dt[i];
     }
 
-    lagrange = (double) erg_;
+    lagrange = erg_;
   }
 
-  *objValue = mayer + lagrange;
+  *objValue = mayer + (double)lagrange;
   return TRUE;
 }
 
@@ -167,9 +167,7 @@ Bool evalfDiffF(Index n, double * v, Bool new_x, Number *gradF, void * useData)
     }
 
   } else {
-    /*ToDo */
-    for(i=0; i<iData->dim.endN; ++i)
-      gradF[i] = 0.0;
+    memcpy(gradF, iData->evalf.f, iData->dim.NV* sizeof(double));
   }
   if(iData->sopt.mayer){
     x = v + iData->dim.endN;
@@ -185,10 +183,6 @@ Bool evalfDiffF(Index n, double * v, Bool new_x, Number *gradF, void * useData)
         gradF[iData->dim.endN + j] = iData->df.dMayer[j];
       }
     }
-  }else if(!iData->sopt.lagrange){
-    /*ToDo */
-    for(j=0; j<iData->dim.nv; ++j)
-      gradF[iData->dim.endN + j] = 0.0;
   }
   return TRUE;
 }

SimulationRuntime/c/optimization/initialOptimizer/allocate_optimizer_vars.c

@@ -169,7 +169,7 @@ int allocateIpoptData(IPOPT_DATA_ *iData)
   iData->input_name = (char**)malloc(dim->nv*sizeof(char*));
 
   evalf->g = (double*)malloc((dim->NRes) *sizeof(double));
-  evalf->f = (double*)malloc((dim->NV) *sizeof(double));
+  evalf->f = (double*)calloc((dim->NV), sizeof(double));
   evalf->v = (double**)malloc((dim->nt+1) *sizeof(double*));
 
   for(i =0; i< dim->nt+1; ++i)