Changeset 55f44362 in OpenModelica

Timestamp:

2013-12-13T13:18:21+01:00 (10 years ago)

Author:

Vitalij Ruge <vitalij.ruge@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

265602c

Parents:

8b157b09

Message:

• fixed time table for optimization
• fixed setting of input-vars in optimization

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

Location:

SimulationRuntime/c/optimization

Files:

• goal/evalF.c (modified) (5 diffs)
• lagrangeFun/ipopt_hessian.c (modified) (1 diff)
• mainOptimizer/ipoptODE.c (modified) (3 diffs)

SimulationRuntime/c/optimization/goal/evalF.c

@@ -106 +106 @@
 {  
   refreshSimData(vn, vn + iData->nx, iData->tf, iData);
-  iData->data->callback->functionAlgebraics(iData->data);
+  /*iData->data->callback->functionAlgebraics(iData->data);*/
   mayer(iData->data, obj_value);
   
@@ -119 +119 @@
 {  
   refreshSimData(vn, vn + iData->nx, iData->tf, iData);
-  iData->data->callback->functionAlgebraics(iData->data);
+  /*iData->data->callback->functionAlgebraics(iData->data);*/
   lagrange(iData->data, obj_value);
   
@@ -151 +151 @@
         {
           refreshSimData(x,x+ iData->nx,iData->time[i*iData->deg+k],iData);
-          iData->data->callback->functionAlgebraics(iData->data);
+          /*iData->data->callback->functionAlgebraics(iData->data);*/
           diff_symColoredObject(iData, iData->gradF, iData->lagrange_index);
           for(j = 0; j<iData->nv; ++j)
@@ -165 +165 @@
         {
           refreshSimData(x,x+ iData->nx,iData->time[i*iData->deg+k],iData);
-          iData->data->callback->functionAlgebraics(iData->data);
+          /*iData->data->callback->functionAlgebraics(iData->data);*/
           diff_symColoredObject(iData, iData->gradF,iData->lagrange_index);
           for(j=0; j<iData->nv; ++j)
@@ -183 +183 @@
 
     refreshSimData(x, x +iData->nx, iData->tf, iData);
-    iData->data->callback->functionAlgebraics(iData->data);
+    /*iData->data->callback->functionAlgebraics(iData->data);*/
     diff_symColoredObject(iData, iData->gradF, iData->mayer_index);
     for(j=0; j<iData->nv; ++j)

SimulationRuntime/c/optimization/lagrangeFun/ipopt_hessian.c

@@ -264 +264 @@
 static int updateCost(double *v, double t, IPOPT_DATA_ *iData, short lagrange_yes, short mayer_yes, double *F1, double *F2)
 {
-  iData->data->callback->functionAlgebraics(iData->data);
+  /*iData->data->callback->functionAlgebraics(iData->data);*/
   if(lagrange_yes)
     diff_symColoredObject(iData, F1, iData->lagrange_index);

SimulationRuntime/c/optimization/mainOptimizer/ipoptODE.c

@@ -174 +174 @@
   }
 
-  for(i = 0, k = iData->index_u; i<iData->nu;++i,++j,++k)
-    sData->realVars[k] = u[i]*iData->vnom[j];
-
+  for(i = 0, k = iData->index_u; i<iData->nu;++i,++j,++k){
+    data->simulationInfo.inputVars[i] = u[i]*iData->vnom[j];
+  }
+  data->callback->input_function(data);
   sData->timeValue = t;
   /* updateContinuousSystem(iData->data); */
   data->simulationInfo.discreteCall=1;
-  data->callback->functionODE(data);
+  /*data->callback->functionODE(data);*/
+  data->callback->functionDAE(data);
 
   return 0;
@@ -242 +244 @@
     }
     
-    for(i=0,j=iData->nx; i< iData->nu; ++i,++j)
-      sData->realVars[iData->index_u + i] = iData->v[k++]*iData->vnom[j];
+    for(i=0,j=iData->nx; i< iData->nu; ++i,++j){
+      data->simulationInfo.inputVars[i] = iData->v[k++]*iData->vnom[j];
+    }
 
     solverInfo->currentTime = iData->time[iData->current_time++];
@@ -249 +252 @@
 
     data->simulationInfo.terminal = 1;
+    data->callback->input_function(data);
     data->callback->functionDAE(data);
     sim_result.emit(&sim_result,data);