Changeset 18452

Timestamp:

2013-12-10T11:35:10+01:00 (10 years ago)

Author:

vitalij

Message:

• partial fix for gradient

File:

• trunk/SimulationRuntime/c/optimization/mainOptimizer/ipoptODE.c (modified) (2 diffs)

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

@@ -67 +67 @@
   iData->current_time = 0;
   iData->data = data;
-  iData->mayer_index = 0;
-  iData->lagrange_index = 1;
-
   iData->mayer = (short) (mayer(data, &obj) >= 0);
   iData->lagrange = (short) (lagrange(data, &obj) >= 0);
+
+  iData->mayer_index = 0;
+  iData->lagrange_index = (iData->mayer)? 1 : 0;
 
   iData->matrixA = data->callback->initialAnalyticJacobianA((void*) iData->data);
@@ -136 +136 @@
     AddIpoptIntOption(nlp, "max_iter", 5000);
 
-    for(i=0, tmp = 1;i<=4;++i){
-        res = IpoptSolve(nlp, (*iData).v, NULL, &obj, (*iData).mult_g, (*iData).mult_x_L, (*iData).mult_x_U, (void*)iData);
-        if(res!= Solve_Succeeded)
-          {
-            AddIpoptNumOption(nlp,"mu_init",tmp);
-            tmp *=10.0;
-            AddIpoptIntOption(nlp, "max_iter", 500);
-          }else {break;}
-    }
-    
+    res = IpoptSolve(nlp, (*iData).v, NULL, &obj, (*iData).mult_g, (*iData).mult_x_L, (*iData).mult_x_U, (void*)iData);
+
     FreeIpoptProblem(nlp);