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@18658 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Jan 16, 2014
1 parent 08bac50 commit dc089bb
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
Expand Up @@ -540,12 +540,12 @@ static int local_jac_struct(IPOPT_DATA_ *iData)


for(i = 0; i <iData->nv; ++i)
for(j = 0; j < iData->nv; ++j)
{
for(ii = 0; ii < iData->nx; ++ii)
if(J[ii][i]+J[ii][j]> 1)
Hg[i][j] += 1;
}
for(j = 0; j < iData->nv; ++j)
{
for(ii = 0; ii < iData->nx; ++ii)
if(J[ii][i]+J[ii][j]> 1)
Hg[i][j] += 1;
}

if(ACTIVE_STREAM(LOG_IPOPT))
{
Expand Down
18 changes: 9 additions & 9 deletions SimulationRuntime/c/optimization/lagrangeFun/ipopt_hessian.c
Expand Up @@ -238,15 +238,15 @@ static int num_hessian(double *v, double t, IPOPT_DATA_ *iData, double *lambda,
for(j = i; j < iData->nv; ++j)
{
if(iData->Hg[i][j]){
for(l = 0; l< iData->nx; ++l)
{
if(iData->knowedJ[l][j] + iData->knowedJ[l][i] >= 2)
iData->H[l][i][j] = (long double)lambda[l]*(iData->J[l][j] - iData->J0[l][j])/h;
else
iData->H[l][i][j] = (long double) 0.0;

iData->H[l][j][i] = iData->H[l][i][j];
}
for(l = 0; l< iData->nx; ++l)
{
if(iData->knowedJ[l][j] + iData->knowedJ[l][i] >= 2)
iData->H[l][i][j] = (long double)lambda[l]*(iData->J[l][j] - iData->J0[l][j])/h;
else
iData->H[l][i][j] = (long double) 0.0;

iData->H[l][j][i] = iData->H[l][i][j];
}
}
}
h = obj_factor/h;
Expand Down

0 comments on commit dc089bb

Please sign in to comment.