Changeset 18458

Timestamp:

2013-12-11T01:33:41+01:00 (10 years ago)

Author:

vitalij

Message:

• fixed handling of time in optimization

Location:

trunk/SimulationRuntime/c/optimization

Files:

• lagrangeFun/ipopt_hessian.c (modified) (1 diff)
• mainOptimizer/ipoptODE.c (modified) (1 diff)

trunk/SimulationRuntime/c/optimization/lagrangeFun/ipopt_hessian.c

@@ -150 +150 @@
       {
         mayer_yes = iData->mayer && ii+1 == iData->nsi && p == iData->deg;
-        num_hessian(x, iData->time[p], iData,ll,iData->lagrange,mayer_yes,obj_factor);
+        num_hessian(x, iData->time[ii*iData->deg + p], iData,ll,iData->lagrange,mayer_yes,obj_factor);
 
         for(i=0;i< iData->nv;++i)

trunk/SimulationRuntime/c/optimization/mainOptimizer/ipoptODE.c

@@ -179 +179 @@
   sData->timeValue = t;
   /* updateContinuousSystem(iData->data); */
+  data->simulationInfo.discreteCall=1;
   data->callback->functionODE(data);