Changeset 6217b6d in OpenModelica

Timestamp:

2013-12-10T11:35:10+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:

a3798cb

Parents:

1fb2652

Message:

• partial fix for gradient

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

File:

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

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);