- restructure data for optimization (continuing)

  - quadrature weight


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

Author: Vitalij Ruge

SimulationRuntime/c/optimization/goal/evalF.c

@@ -76,7 +76,7 @@ Bool evalfF(Index n, double * v, Bool new_x, Number *objValue, void * useData)
       for(j=0; j<iData->dim.deg+1; ++j, x+=iData->dim.nv, ++k)
       {
         goal_func_lagrange(x, &tmp,iData->time[k], iData);
-        erg += mbase->bl[j]*tmp;
+        erg += mbase->b[0][j]*tmp;
       }
       erg_+= erg*iData->dt[i];
     }
@@ -87,7 +87,7 @@ Bool evalfF(Index n, double * v, Bool new_x, Number *objValue, void * useData)
       for(j=0; j<iData->dim.deg; ++j, x+=iData->dim.nv, ++k)
       {
         goal_func_lagrange(x, &tmp, iData->time[k], iData);
-        erg += mbase->br[j]*tmp;
+        erg += mbase->b[1][j]*tmp;
       }
 
       erg_ += erg*iData->dt[i];
@@ -143,32 +143,30 @@ Bool evalfDiffF(Index n, double * v, Bool new_x, Number *gradF, void * useData)
     x = v;
     id = 0;
 
-    for(i=0; i<iData->dim.nsi; ++i){
-      if(i){
-        for(k=0; k<iData->dim.deg; ++k, x+=iData->dim.nv){
-          refreshSimData(x,x+ iData->dim.nx,iData->time[i*iData->dim.deg+k+1],iData);
-          iData->cv = x;
-          /*iData->data->callback->functionAlgebraics(iData->data);*/
-          diff_symColoredObject(iData, iData->gradF, iData->lagrange_index);
-          for(j = 0; j<iData->dim.nv; ++j){
-            gradF[id++] =  iData->dt[i]*mbase->br[k]*iData->gradF[j]*iData->vnom[j];
-            /* printf("\n gradF(%i) = %g, %s, %g", id-1, gradF[id-1], iData->data->modelData.realVarsData[j].info.name, x[j]*iData->vnom[j]); */
-          }
-        }
-      }else{
-        for(k=0; k<iData->dim.deg+1; ++k, x+=iData->dim.nv){
-          refreshSimData(x,x+ iData->dim.nx,iData->time[i*iData->dim.deg+k],iData);
-          iData->cv = x;
-          /*iData->data->callback->functionAlgebraics(iData->data);*/
-          diff_symColoredObject(iData, iData->gradF,iData->lagrange_index);
-          for(j=0; j<iData->dim.nv; ++j){
-            gradF[id++] = iData->dt[i]*mbase->bl[k]*iData->gradF[j]*iData->vnom[j];
-            /* printf("\n gradF(%i) = %g, %s, %g", id-1, gradF[id-1], iData->data->modelData.realVarsData[j].info.name, x[j]*iData->vnom[j]); */
-          }
-        }
+    for(i=0; i<1; ++i){
+      for(k=0; k<iData->dim.deg+1; ++k, x+=iData->dim.nv){
+        refreshSimData(x,x+ iData->dim.nx,iData->time[i*iData->dim.deg+k],iData);
+        iData->cv = x;
+        /*iData->data->callback->functionAlgebraics(iData->data);*/
+        diff_symColoredObject(iData, iData->gradF,iData->lagrange_index);
+        for(j=0; j<iData->dim.nv; ++j)
+          gradF[id++] = iData->dt[i]*mbase->b[0][k]*iData->gradF[j]*iData->vnom[j];
       }
     }
+
+    for(; i<iData->dim.nsi; ++i){
+      for(k=0; k<iData->dim.deg; ++k, x+=iData->dim.nv){
+        refreshSimData(x,x+ iData->dim.nx,iData->time[i*iData->dim.deg+k+1],iData);
+        iData->cv = x;
+        /*iData->data->callback->functionAlgebraics(iData->data);*/
+        diff_symColoredObject(iData, iData->gradF, iData->lagrange_index);
+        for(j = 0; j<iData->dim.nv; ++j)
+          gradF[id++] =  iData->dt[i]*mbase->b[1][k]*iData->gradF[j]*iData->vnom[j];
+      }
+    }
+
   } else {
+    /*ToDo */
     for(i=0; i<iData->endN; ++i)
       gradF[i] = 0.0;
   }

SimulationRuntime/c/optimization/initialOptimizer/allocate_ipopt.c

@@ -431,14 +431,14 @@ static int optimizer_coeff_setings(IPOPT_DATA_ *iData)
   mbase->d3[3] = 7.0;
   mbase->d3[4] = 1.0;
 
-  mbase->bl[0] = 0.083333333333333333333333333333333333333333333333333;
-  mbase->bl[1] = 0.41666666666666666666666666666666666666666666666667;
-  mbase->bl[2] = mbase->bl[1];
-  mbase->bl[3] = 1.0 - (mbase->bl[0]+mbase->bl[1]+mbase->bl[2]);
-
-  mbase->br[2] = 0.11111111111111111111111111111111111111111111111111;
-  mbase->br[1] = 0.51248582618842161383881344651960809422127631890713;
-  mbase->br[0] = 1.0 - (mbase->br[1] + mbase->br[2]);
+  mbase->b[0][0] = 0.083333333333333333333333333333333333333333333333333;
+  mbase->b[0][1] = 0.41666666666666666666666666666666666666666666666667;
+  mbase->b[0][2] = mbase->b[0][1];
+  mbase->b[0][3] = 1.0 - (mbase->b[0][0]+mbase->b[0][1]+mbase->b[0][2]);
+
+  mbase->b[1][2] = 0.11111111111111111111111111111111111111111111111111;
+  mbase->b[1][1] = 0.51248582618842161383881344651960809422127631890713;
+  mbase->b[1][0] = 1.0 - (mbase->b[1][1] + mbase->b[1][2]);
 
   return 0;
 }

SimulationRuntime/c/optimization/ipoptODEstruct.h

@@ -81,8 +81,7 @@ typedef struct OPTIMIZER_DIM_VARS{
 
 typedef struct OPTIMIZER_MBASE{
 
-  long double bl[10];
-  long double br[10];
+  long double b[3][10];
 
   long double c1;
   long double c2;

SimulationRuntime/c/optimization/lagrangeFun/ipopt_hessian.c

@@ -40,7 +40,7 @@
 #include "../localFunction.h"
 
 #ifdef WITH_IPOPT
-#define DF_STEP(x,s) ( (fmin(fmax(1e-4*fabs(s*x),1e-8),1e-3)))
+#define DF_STEP(x,s) ( (fmin(fmax(1e-4*fabs(s*x),1e-8),1e0)))
 
 static int num_hessian(double *v, double t, IPOPT_DATA_ *iData, double *lambda, short lagrange_yes, short mayer_yes, double obj_factor);
 static int updateCost(double *v, double t, IPOPT_DATA_ *iData, short lagrange_yes, short mayer_yes,double *F1, double *F2);
@@ -213,9 +213,9 @@ static int sumLagrange(IPOPT_DATA_ *iData, double * erg,int ii, int i, int j, in
 
   if(iData->lagrange && iData->gradFomc[iData->lagrange_index][i]* iData->gradFomc[iData->lagrange_index][j]){
     if(ii)
-      sum += mbase->br[p-1]*iData->oH[i][j];
+      sum += mbase->b[1][p-1]*iData->oH[i][j];
     else
-      sum += mbase->bl[p]*iData->oH[i][j];
+      sum += mbase->b[0][p]*iData->oH[i][j];
   }
 
   sum = iData->dt[ii]*sum;