- fixed Makefile

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17589 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 7, 2013 · e98e46e · e98e46e
1 parent d684cd7
commit e98e46e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/SimulationRuntime/c/optimization/constraints/evalfG.c b/SimulationRuntime/c/optimization/constraints/evalfG.c
@@ -120,19 +120,16 @@ Bool evalfG(Index n, double * v, Bool new_x, int m, Number *g, void * useData)
       for(j=0; j<iData->nx; ++j)
       {
         g[k++] = (scaldf[j]*dt[i]*(dotx1[j] + d1[4][j]*dotx0[j]) + d1[0][j]*x0[j] + d1[3][j]*x3[j]) - (d1[1][j]*x1[j] + d1[2][j]*x2[j]);
-        //g[k-1] *= 10.0;
       }
 
       for(j=0; j<iData->nx; ++j)
       {
         g[k++] = (scaldf[j]*dt[i]*dotx2[j] + d2[1][j]*x1[j]) - (scaldf[j]*dt[i]*d2[4][j]*dotx0[j] + d2[0][j]*x0[j] + d2[2][j]*x2[j] + d2[3][j]*x3[j]);
-        //g[k-1] *= 10.0;
       }
 
       for(j=0; j<iData->nx; ++j)
       {
         g[k++] = (scaldf[j]*dt[i]*(d3[4][j]*dotx0[j] + dotx3[j]) + d3[0][j]*x0[j] + d3[2][j]*x2[j]) - (d3[1][j]*x1[j] + d3[3][j]*x3[j]);
-        //g[k-1] *= 10.0;
       }
     }
   }

diff --git a/SimulationRuntime/c/optimization/goal/evalF.c b/SimulationRuntime/c/optimization/goal/evalF.c
@@ -38,6 +38,7 @@
 
 #include "../ipoptODEstruct.h"
 #include "../OptimizationFlags.h"
+#include "../localFunction.h"
 
 #ifdef WITH_IPOPT
 

diff --git a/SimulationRuntime/c/optimization/mainOptimizer/ipoptODE.c b/SimulationRuntime/c/optimization/mainOptimizer/ipoptODE.c
@@ -82,19 +82,21 @@ int startIpopt(DATA* data, SOLVER_INFO* solverInfo, int flag)
   iData->index_debug_next=0;
 
   /*ToDo*/
-  for(i=0; i<(*iData).nx; i++)
+  for(i=0; i<iData->nx; i++)
   {
-    iData->Vmin[i] = (*iData).Vmax[i] = (*iData).x0[i]*iData->scalVar[i];
+    iData->Vmax[i] = iData->x0[i]*iData->scalVar[i];
+    iData->Vmin[i] = iData->Vmax[i];
     iData->v[i] = iData->Vmin[i];
   }
 
   initial_guess_ipopt(iData,solverInfo);
 
   if(ACTIVE_STREAM(LOG_IPOPT)){
-  for(i=0; i<iData->nx; i++)
-    printf("\nx[%i] = %s = %g",i, iData->data->modelData.realVarsData[i].info.name,iData->v[i]);
+	printf("\nInitial point:");
+    for(i=0; i<iData->nx; i++)
+      printf("\nx[%i] = %s = %g",i, iData->data->modelData.realVarsData[i].info.name,iData->v[i]*iData->scalVar[i]);
     for(; i<iData->nv; ++i)
-      printf("\nu[%i] = %s = %g",i, iData->data->modelData.realVarsData[iData->index_u + i-iData->nx].info.name,iData->v[i]);
+      printf("\nu[%i] = %s = %g",i, iData->data->modelData.realVarsData[iData->index_u + i-iData->nx].info.name,iData->v[i]*iData->scalVar[i]);
   }
 
   ipoptDebuge(iData,iData->v);
@@ -114,8 +116,8 @@ int startIpopt(DATA* data, SOLVER_INFO* solverInfo, int flag)
     } else {
       AddIpoptIntOption(nlp, "print_level", 2);
     }
-    AddIpoptIntOption(nlp, "file_print_level", 0);
 
+    AddIpoptIntOption(nlp, "file_print_level", 0);
     AddIpoptStrOption(nlp, "mu_strategy", "adaptive");
     /*AddIpoptStrOption(nlp, "hessian_approximation", "limited-memory");*/
 
@@ -131,7 +133,7 @@ int startIpopt(DATA* data, SOLVER_INFO* solverInfo, int flag)
     /* AddIpoptNumOption(nlp,"derivative_test_perturbation",1e-6); */
     AddIpoptIntOption(nlp, "max_iter", 5000);
 
-    res = IpoptSolve(nlp, (*iData).v, NULL, &obj, (*iData).mult_g, (*iData).mult_x_L, (*iData).mult_x_U, (void*)iData);
+    res = IpoptSolve(nlp, iData->v, NULL, &obj, iData->mult_g, iData->mult_x_L, iData->mult_x_U, (void*)iData);
     FreeIpoptProblem(nlp);
 
     if(ACTIVE_STREAM(LOG_IPOPT))
@@ -229,9 +231,7 @@ static int res2file(IPOPT_DATA_ *iData,SOLVER_INFO* solverInfo)
   while(solverInfo->currentTime < simInfo->stopTime)
   {
     for(i=0; i< iData->nx; ++i)
-    {
       sData->realVars[i] = iData->v[k++]*iData->vnom[i];
-    }
 
     for(i=0,j=iData->nx; i< iData->nu; ++i,++j)
       sData->realVars[iData->index_u + i] = iData->v[k++]*iData->vnom[j];