- improve output

- modefiy example final parameter in parameter git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19250 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 22, 2014 · 1a8e0b5 · 1a8e0b5
1 parent f0f56a3
commit 1a8e0b5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/SimulationRuntime/c/optimization/initialOptimizer/allocate_ipopt.c b/SimulationRuntime/c/optimization/initialOptimizer/allocate_ipopt.c
@@ -580,23 +580,26 @@ static int local_jac_struct_print(IPOPT_DATA_ *iData)
   Hg = iData->Hg;
   dF = iData->gradFs;
 
-  printf("\n*****JAC******");
+  printf("\nJacabian Structure");
+  printf("\n========================================================");
   for(ii = 0; ii < nJ; ++ii){
     printf("\n");
     for(j =0;j<iData->nv;++j)
       printf("%i \t",J[ii][j]);
     printf("\n");
   }
-
-  printf("\n*****GRAD******");
+  printf("\n========================================================");
+  printf("\nGradient Structure");
+  printf("\n========================================================");
   for(ii = 0; ii < 2; ++ii){
     printf("\n");
     for(j =0;j<iData->nv;++j)
       printf("%i \t",dF[ii][j]);
     printf("\n");
   }
-
-  printf("\n*****HESSE******");
+  printf("\n========================================================");
+  printf("\nHessian Structure");
+  printf("\n========================================================");
   for(ii = 0; ii < iData->nv; ++ii){
     printf("\n");
     for(j =0;j<iData->nv;++j)
@@ -722,6 +725,8 @@ static int optimizer_bounds_setings(DATA *data, IPOPT_DATA_ *iData)
 
   if(ACTIVE_STREAM(LOG_IPOPT)){
   char buffer[200];
+    printf("Optimizer Variables");
+    printf("\n========================================================");
     for(i=0; i<iData->nx; ++i){
 
       if (iData->xmin[i] > -1e20)
@@ -756,9 +761,10 @@ static int optimizer_bounds_setings(DATA *data, IPOPT_DATA_ *iData)
 
       printf("%s)",buffer);
     }
-
+    printf("\n--------------------------------------------------------");
     if(iData->nc > 0)
       printf("\nnumber of constraints: %ld", iData->nc);
+    printf("\n========================================================\n");
   }
 
   for(i =0,j = iData->nx;i<iData->nu;++i,++j){

diff --git a/SimulationRuntime/c/optimization/initialOptimizer/initial_guess.c b/SimulationRuntime/c/optimization/initialOptimizer/initial_guess.c
@@ -108,7 +108,7 @@ static int initial_guess_ipopt_sim(IPOPT_DATA_ *iData,SOLVER_INFO* solverInfo)
   SIMULATION_DATA *sData = (SIMULATION_DATA*)data->localData[0];
   SIMULATION_INFO *sInfo = &(data->simulationInfo);
 
-   if(!data->simulationInfo.external_input.active)
+  if(!data->simulationInfo.external_input.active)
      externalInputallocate(data);
 
    /* Initial DASSL solver */

diff --git a/SimulationRuntime/c/simulation/solver/external_input.c b/SimulationRuntime/c/simulation/solver/external_input.c
@@ -83,12 +83,12 @@ int externalInputallocate(DATA* data)
       if(c<0)
         data->simulationInfo.external_input.n = i;
     }
-
+  printf("\nExternal Input");
   printf("\n========================================================");
     for(i = 0; i < data->simulationInfo.external_input.n; ++i){
-      printf("\nInput t=%f   \t", data->simulationInfo.external_input.t[i]);
+      printf("\nInput: t=%f   \t", data->simulationInfo.external_input.t[i]);
       for(j = 0; j < m; ++j){
-        printf("u[%d][%d]= %f \t", i,j,data->simulationInfo.external_input.u[i][j]);
+        printf("u%d(t)= %f \t",j+1,data->simulationInfo.external_input.u[i][j]);
       }
     }
   printf("\n========================================================\n");