Skip to content

Commit

Permalink
[Janitor mode] Fix tabs
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19062 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Feb 11, 2014
1 parent 87bb6b3 commit 16aeaf9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion SimulationRuntime/c/optimization/constraints/evalfDiffG.c
Expand Up @@ -73,7 +73,7 @@ Bool evalfDiffG(Index n, double * x, Bool new_x, Index m, Index njac, Index *iRo
*/

}else{
int i,j,k,l;
int i,j,k,l;
long double tmp[3];
int id;
int nng = iData->nJ;
Expand Down
12 changes: 6 additions & 6 deletions SimulationRuntime/c/optimization/constraints/evalfG.c
Expand Up @@ -65,9 +65,9 @@ Bool evalfG(Index n, double * v, Bool new_x, int m, Number *g, void * useData)

iData = (IPOPT_DATA_ *) useData;
for(i=0, k=0, x0=v; i<1; ++i, x0=iData->x3){
iData->x1 = x0 + iData->nv; /* 0 + 3 = 3;2*/
iData->x2 = iData->x1 + iData->nv; /*3 + 3 = 6;5*/
iData->x3 = iData->x2 + iData->nv; /*6 + 3 = 9*/
iData->x1 = x0 + iData->nv; /* 0 + 3 = 3;2*/
iData->x2 = iData->x1 + iData->nv; /*3 + 3 = 6;5*/
iData->x3 = iData->x2 + iData->nv; /*6 + 3 = 9*/

iData->u1 = iData->x1 + iData->nx; /*3 + 2 = 5*/
iData->u2 = iData->x2 + iData->nx; /*6 + 2 = 8*/
Expand All @@ -91,9 +91,9 @@ Bool evalfG(Index n, double * v, Bool new_x, int m, Number *g, void * useData)
}

for(; i<iData->nsi; ++i, x0=iData->x3){
iData->x1 = x0 + iData->nv; /* 0 + 3 = 3;2*/
iData->x2 = iData->x1 + iData->nv; /*3 + 3 = 6;5*/
iData->x3 = iData->x2 + iData->nv; /*6 + 3 = 9*/
iData->x1 = x0 + iData->nv; /* 0 + 3 = 3;2*/
iData->x2 = iData->x1 + iData->nv; /*3 + 3 = 6;5*/
iData->x3 = iData->x2 + iData->nv; /*6 + 3 = 9*/

iData->u1 = iData->x1 + iData->nx; /*3 + 2 = 5*/
iData->u2 = iData->x2 + iData->nx; /*6 + 2 = 8*/
Expand Down

0 comments on commit 16aeaf9

Please sign in to comment.