Skip to content

Commit

Permalink
add dense_{qp,qcqp}_ipm_get_obj
Browse files Browse the repository at this point in the history
  • Loading branch information
@giaf
giaf committed Aug 12, 2022
1 parent b140f36 commit 04152e3
Show file tree
Hide file tree
Showing 15 changed files with 75 additions and 32 deletions.
1 change: 1 addition & 0 deletions dense_qp/d_dense_qcqp_ipm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
#define DENSE_QCQP_IPM_GET_MAX_RES_EQ d_dense_qcqp_ipm_get_max_res_eq
#define DENSE_QCQP_IPM_GET_MAX_RES_INEQ d_dense_qcqp_ipm_get_max_res_ineq
#define DENSE_QCQP_IPM_GET_MAX_RES_COMP d_dense_qcqp_ipm_get_max_res_comp
#define DENSE_QCQP_IPM_GET_OBJ d_dense_qcqp_ipm_get_obj
#define DENSE_QCQP_IPM_GET_STAT d_dense_qcqp_ipm_get_stat
#define DENSE_QCQP_IPM_GET_STAT_M d_dense_qcqp_ipm_get_stat_m
#define DENSE_QCQP_INIT_VAR d_dense_qcqp_init_var
Expand Down
1 change: 1 addition & 0 deletions dense_qp/d_dense_qp_ipm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
#define DENSE_QP_IPM_GET_MAX_RES_EQ d_dense_qp_ipm_get_max_res_eq
#define DENSE_QP_IPM_GET_MAX_RES_INEQ d_dense_qp_ipm_get_max_res_ineq
#define DENSE_QP_IPM_GET_MAX_RES_COMP d_dense_qp_ipm_get_max_res_comp
#define DENSE_QP_IPM_GET_OBJ d_dense_qp_ipm_get_obj
#define DENSE_QP_IPM_GET_STAT d_dense_qp_ipm_get_stat
#define DENSE_QP_IPM_GET_STAT_M d_dense_qp_ipm_get_stat_m
#define DENSE_QP_INIT_VAR d_dense_qp_init_var
Expand Down
1 change: 1 addition & 0 deletions dense_qp/s_dense_qcqp_ipm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
#define DENSE_QCQP_IPM_GET_MAX_RES_EQ s_dense_qcqp_ipm_get_max_res_eq
#define DENSE_QCQP_IPM_GET_MAX_RES_INEQ s_dense_qcqp_ipm_get_max_res_ineq
#define DENSE_QCQP_IPM_GET_MAX_RES_COMP s_dense_qcqp_ipm_get_max_res_comp
#define DENSE_QCQP_IPM_GET_OBJ s_dense_qcqp_ipm_get_obj
#define DENSE_QCQP_IPM_GET_STAT s_dense_qcqp_ipm_get_stat
#define DENSE_QCQP_IPM_GET_STAT_M s_dense_qcqp_ipm_get_stat_m
#define DENSE_QCQP_INIT_VAR s_dense_qcqp_init_var
Expand Down
1 change: 1 addition & 0 deletions dense_qp/s_dense_qp_ipm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
#define DENSE_QP_IPM_GET_MAX_RES_EQ s_dense_qp_ipm_get_max_res_eq
#define DENSE_QP_IPM_GET_MAX_RES_INEQ s_dense_qp_ipm_get_max_res_ineq
#define DENSE_QP_IPM_GET_MAX_RES_COMP s_dense_qp_ipm_get_max_res_comp
#define DENSE_QP_IPM_GET_OBJ s_dense_qp_ipm_get_obj
#define DENSE_QP_IPM_GET_STAT s_dense_qp_ipm_get_stat
#define DENSE_QP_IPM_GET_STAT_M s_dense_qp_ipm_get_stat_m
#define DENSE_QP_INIT_VAR s_dense_qp_init_var
Expand Down
16 changes: 16 additions & 0 deletions dense_qp/x_dense_qcqp_ipm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,10 @@ void DENSE_QCQP_IPM_GET(char *field, struct DENSE_QCQP_IPM_WS *ws, void *value)
{
DENSE_QCQP_IPM_GET_MAX_RES_COMP(ws, value);
}
else if(hpipm_strcmp(field, "obj"))
{
DENSE_QCQP_IPM_GET_OBJ(ws, value);
}
else if(hpipm_strcmp(field, "stat"))
{
DENSE_QCQP_IPM_GET_STAT(ws, value);
Expand Down Expand Up @@ -709,6 +713,14 @@ void DENSE_QCQP_IPM_GET_MAX_RES_COMP(struct DENSE_QCQP_IPM_WS *ws, REAL *res_com



void DENSE_QCQP_IPM_GET_OBJ(struct DENSE_QCQP_IPM_WS *ws, REAL *obj)
{
*obj = ws->qcqp_res->obj;
return;
}



void DENSE_QCQP_IPM_GET_STAT(struct DENSE_QCQP_IPM_WS *ws, REAL **stat)
{
DENSE_QP_IPM_GET_STAT(ws->qp_ws, stat);
Expand Down Expand Up @@ -1281,6 +1293,7 @@ void DENSE_QCQP_IPM_SOLVE(struct DENSE_QCQP *qcqp, struct DENSE_QCQP_SOL *qcqp_s
stat[7] = qcqp_res_max[1];
stat[8] = qcqp_res_max[2];
stat[9] = qcqp_res_max[3];
stat[10] = qcqp_res->obj;
}
cws->mu = qcqp_res->res_mu;
}
Expand Down Expand Up @@ -1383,6 +1396,7 @@ void DENSE_QCQP_IPM_SOLVE(struct DENSE_QCQP *qcqp, struct DENSE_QCQP_SOL *qcqp_s
stat[stat_m*(kk+0)+7] = qcqp_res_max[1];
stat[stat_m*(kk+0)+8] = qcqp_res_max[2];
stat[stat_m*(kk+0)+9] = qcqp_res_max[3];
stat[stat_m*(kk+0)+10] = qcqp_res->obj;
}
}

Expand Down Expand Up @@ -1410,6 +1424,7 @@ void DENSE_QCQP_IPM_SOLVE(struct DENSE_QCQP *qcqp, struct DENSE_QCQP_SOL *qcqp_s
stat[stat_m*(0)+7] = qcqp_res_max[1];
stat[stat_m*(0)+8] = qcqp_res_max[2];
stat[stat_m*(0)+9] = qcqp_res_max[3];
stat[stat_m*(0)+10] = qcqp_res->obj;
}


Expand Down Expand Up @@ -1460,6 +1475,7 @@ void DENSE_QCQP_IPM_SOLVE(struct DENSE_QCQP *qcqp, struct DENSE_QCQP_SOL *qcqp_s
stat[stat_m*(kk+1)+7] = qcqp_res_max[1];
stat[stat_m*(kk+1)+8] = qcqp_res_max[2];
stat[stat_m*(kk+1)+9] = qcqp_res_max[3];
stat[stat_m*(kk+1)+10] = qcqp_res->obj;
}

}
Expand Down
69 changes: 42 additions & 27 deletions dense_qp/x_dense_qp_ipm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ hpipm_size_t DENSE_QP_IPM_WS_MEMSIZE(struct DENSE_QP_DIM *dim, struct DENSE_QP_I
if(arg->stat_max<arg->iter_max)
arg->stat_max = arg->iter_max;

int stat_m = 17;
int stat_m = 18;
size += stat_m*(1+arg->stat_max)*sizeof(REAL); // stat

size += nv*sizeof(int); // ipiv_v
Expand Down Expand Up @@ -810,7 +810,7 @@ void DENSE_QP_IPM_WS_CREATE(struct DENSE_QP_DIM *dim, struct DENSE_QP_IPM_ARG *a
REAL *d_ptr = (REAL *) sv_ptr;

workspace->stat = d_ptr;
int stat_m = 17;
int stat_m = 18;
d_ptr += stat_m*(1+arg->stat_max);


Expand Down Expand Up @@ -1091,6 +1091,10 @@ void DENSE_QP_IPM_GET(char *field, struct DENSE_QP_IPM_WS *ws, void *value)
{
DENSE_QP_IPM_GET_MAX_RES_COMP(ws, value);
}
else if(hpipm_strcmp(field, "obj"))
{
DENSE_QP_IPM_GET_OBJ(ws, value);
}
else if(hpipm_strcmp(field, "stat"))
{
DENSE_QP_IPM_GET_STAT(ws, value);
Expand Down Expand Up @@ -1157,6 +1161,13 @@ void DENSE_QP_IPM_GET_MAX_RES_COMP(struct DENSE_QP_IPM_WS *ws, REAL *res_comp)



void DENSE_QP_IPM_GET_OBJ(struct DENSE_QP_IPM_WS *ws, REAL *obj)
{
*obj = ws->res->obj;
}



void DENSE_QP_IPM_GET_STAT(struct DENSE_QP_IPM_WS *ws, REAL **stat)
{
*stat = ws->stat;
Expand Down Expand Up @@ -1500,7 +1511,7 @@ void DENSE_QP_IPM_DELTA_STEP(int kk, struct DENSE_QP *qp, struct DENSE_QP_SOL *q
VECMUL(cws->nc, qp->d_mask, 0, ws->sol_step->lam, 0, ws->sol_step->lam, 0);
}
if(kk+1<ws->stat_max)
ws->stat[ws->stat_m*(kk+1)+10] = 0;
ws->stat[ws->stat_m*(kk+1)+11] = 0;
}
else if(ws->lq_fact==1 & force_lq==0)
{
Expand Down Expand Up @@ -1531,7 +1542,7 @@ void DENSE_QP_IPM_DELTA_STEP(int kk, struct DENSE_QP *qp, struct DENSE_QP_SOL *q
itref_qp_norm[3] = ws->res_itref->res_max[3];

if(kk+1<ws->stat_max)
ws->stat[ws->stat_m*(kk+1)+10] = 0;
ws->stat[ws->stat_m*(kk+1)+11] = 0;

//printf("\n%e\t%e\t%e\t%e\n", itref_qp_norm[0], itref_qp_norm[1], itref_qp_norm[2], itref_qp_norm[3]);

Expand Down Expand Up @@ -1562,7 +1573,7 @@ void DENSE_QP_IPM_DELTA_STEP(int kk, struct DENSE_QP *qp, struct DENSE_QP_SOL *q
force_lq = 1;

if(kk+1<ws->stat_max)
ws->stat[ws->stat_m*(kk+1)+10] = 1;
ws->stat[ws->stat_m*(kk+1)+11] = 1;

}
}
Expand All @@ -1586,10 +1597,10 @@ void DENSE_QP_IPM_DELTA_STEP(int kk, struct DENSE_QP *qp, struct DENSE_QP_SOL *q
{
if(kk+1<ws->stat_max)
{
ws->stat[ws->stat_m*(kk+1)+13] = 0.0;
ws->stat[ws->stat_m*(kk+1)+14] = 0.0;
ws->stat[ws->stat_m*(kk+1)+15] = 0.0;
ws->stat[ws->stat_m*(kk+1)+16] = 0.0;
ws->stat[ws->stat_m*(kk+1)+17] = 0.0;
}
}
else
Expand All @@ -1612,10 +1623,10 @@ void DENSE_QP_IPM_DELTA_STEP(int kk, struct DENSE_QP *qp, struct DENSE_QP_SOL *q
itref_qp_norm[3] = ws->res_itref->res_max[3];
if(kk+1<ws->stat_max)
{
ws->stat[ws->stat_m*(kk+1)+13] = itref_qp_norm[0];
ws->stat[ws->stat_m*(kk+1)+14] = itref_qp_norm[1];
ws->stat[ws->stat_m*(kk+1)+15] = itref_qp_norm[2];
ws->stat[ws->stat_m*(kk+1)+16] = itref_qp_norm[3];
ws->stat[ws->stat_m*(kk+1)+14] = itref_qp_norm[0];
ws->stat[ws->stat_m*(kk+1)+15] = itref_qp_norm[1];
ws->stat[ws->stat_m*(kk+1)+16] = itref_qp_norm[2];
ws->stat[ws->stat_m*(kk+1)+17] = itref_qp_norm[3];
}

if(itref0==0)
Expand Down Expand Up @@ -1667,16 +1678,16 @@ void DENSE_QP_IPM_DELTA_STEP(int kk, struct DENSE_QP *qp, struct DENSE_QP_SOL *q
itref_qp_norm[3] = ws->res_itref->res_max[3];
if(kk+1<ws->stat_max)
{
ws->stat[ws->stat_m*(kk+1)+13] = itref_qp_norm[0];
ws->stat[ws->stat_m*(kk+1)+14] = itref_qp_norm[1];
ws->stat[ws->stat_m*(kk+1)+15] = itref_qp_norm[2];
ws->stat[ws->stat_m*(kk+1)+16] = itref_qp_norm[3];
ws->stat[ws->stat_m*(kk+1)+14] = itref_qp_norm[0];
ws->stat[ws->stat_m*(kk+1)+15] = itref_qp_norm[1];
ws->stat[ws->stat_m*(kk+1)+16] = itref_qp_norm[2];
ws->stat[ws->stat_m*(kk+1)+17] = itref_qp_norm[3];
}
}
}

if(kk+1<ws->stat_max)
ws->stat[ws->stat_m*(kk+1)+11] = itref0;
ws->stat[ws->stat_m*(kk+1)+12] = itref0;

#if 0
ndp0 = 0;
Expand Down Expand Up @@ -1808,10 +1819,10 @@ void DENSE_QP_IPM_DELTA_STEP(int kk, struct DENSE_QP *qp, struct DENSE_QP_SOL *q
itref_qp_norm[3] = ws->res_itref->res_max[3];
if(kk+1<ws->stat_max)
{
ws->stat[ws->stat_m*(kk+1)+13] = itref_qp_norm[0];
ws->stat[ws->stat_m*(kk+1)+14] = itref_qp_norm[1];
ws->stat[ws->stat_m*(kk+1)+15] = itref_qp_norm[2];
ws->stat[ws->stat_m*(kk+1)+16] = itref_qp_norm[3];
ws->stat[ws->stat_m*(kk+1)+14] = itref_qp_norm[0];
ws->stat[ws->stat_m*(kk+1)+15] = itref_qp_norm[1];
ws->stat[ws->stat_m*(kk+1)+16] = itref_qp_norm[2];
ws->stat[ws->stat_m*(kk+1)+17] = itref_qp_norm[3];
}

if(itref1==0)
Expand Down Expand Up @@ -1864,10 +1875,10 @@ void DENSE_QP_IPM_DELTA_STEP(int kk, struct DENSE_QP *qp, struct DENSE_QP_SOL *q
itref_qp_norm[3] = ws->res_itref->res_max[3];
if(kk+1<ws->stat_max)
{
ws->stat[ws->stat_m*(kk+1)+13] = itref_qp_norm[0];
ws->stat[ws->stat_m*(kk+1)+14] = itref_qp_norm[1];
ws->stat[ws->stat_m*(kk+1)+15] = itref_qp_norm[2];
ws->stat[ws->stat_m*(kk+1)+16] = itref_qp_norm[3];
ws->stat[ws->stat_m*(kk+1)+14] = itref_qp_norm[0];
ws->stat[ws->stat_m*(kk+1)+15] = itref_qp_norm[1];
ws->stat[ws->stat_m*(kk+1)+16] = itref_qp_norm[2];
ws->stat[ws->stat_m*(kk+1)+17] = itref_qp_norm[3];
}
}
}
Expand All @@ -1888,14 +1899,14 @@ void DENSE_QP_IPM_DELTA_STEP(int kk, struct DENSE_QP *qp, struct DENSE_QP_SOL *q
{
if(kk+1<ws->stat_max)
{
ws->stat[ws->stat_m*(kk+1)+13] = 0.0;
ws->stat[ws->stat_m*(kk+1)+14] = 0.0;
ws->stat[ws->stat_m*(kk+1)+15] = 0.0;
ws->stat[ws->stat_m*(kk+1)+16] = 0.0;
ws->stat[ws->stat_m*(kk+1)+17] = 0.0;
}
}
if(kk+1<ws->stat_max)
ws->stat[ws->stat_m*(kk+1)+12] = itref1;
ws->stat[ws->stat_m*(kk+1)+13] = itref1;

// TODO check for step length computation
if(1)
Expand Down Expand Up @@ -2067,6 +2078,7 @@ exit(1);
stat[7] = qp_res_max[1];
stat[8] = qp_res_max[2];
stat[9] = qp_res_max[3];
stat[10] = ws->res->obj;
}
cws->mu = ws->res->res_mu;
}
Expand Down Expand Up @@ -2170,6 +2182,7 @@ exit(1);
stat[stat_m*(kk+0)+7] = qp_res_max[1];
stat[stat_m*(kk+0)+8] = qp_res_max[2];
stat[stat_m*(kk+0)+9] = qp_res_max[3];
stat[stat_m*(kk+0)+10] = ws->res->obj;
}
}

Expand All @@ -2196,6 +2209,7 @@ exit(1);
stat[stat_m*(0)+7] = qp_res_max[1];
stat[stat_m*(0)+8] = qp_res_max[2];
stat[stat_m*(0)+9] = qp_res_max[3];
stat[stat_m*(0)+10] = ws->res->obj;
}


Expand Down Expand Up @@ -2227,14 +2241,15 @@ exit(1);
}
DENSE_QP_RES_COMPUTE_INF_NORM(ws->res);
cws->mu = ws->res->res_mu;
// save infinity norm of residuals
if(kk+1<ws->stat_max)
{
ws->stat[ws->stat_m*(kk+1)+5] = ws->res->res_mu;
// save infinity norm of residuals
stat[ws->stat_m*(kk+1)+5] = ws->res->res_mu;
stat[stat_m*(kk+1)+6] = qp_res_max[0];
stat[stat_m*(kk+1)+7] = qp_res_max[1];
stat[stat_m*(kk+1)+8] = qp_res_max[2];
stat[stat_m*(kk+1)+9] = qp_res_max[3];
stat[stat_m*(kk+1)+10] = ws->res->obj;
}

}
Expand Down
2 changes: 2 additions & 0 deletions include/hpipm_d_dense_qcqp_ipm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ void d_dense_qcqp_ipm_get_max_res_ineq(struct d_dense_qcqp_ipm_ws *ws, double *r
//
void d_dense_qcqp_ipm_get_max_res_comp(struct d_dense_qcqp_ipm_ws *ws, double *res_comp);
//
void d_dense_qcqp_ipm_get_obj(struct d_dense_qcqp_ipm_ws *ws, double *obj);
//
void d_dense_qcqp_ipm_get_stat(struct d_dense_qcqp_ipm_ws *ws, double **stat);
//
void d_dense_qcqp_ipm_get_stat_m(struct d_dense_qcqp_ipm_ws *ws, int *stat_m);
Expand Down
2 changes: 2 additions & 0 deletions include/hpipm_d_dense_qp_ipm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,8 @@ void d_dense_qp_ipm_get_max_res_ineq(struct d_dense_qp_ipm_ws *ws, double *res_i
//
void d_dense_qp_ipm_get_max_res_comp(struct d_dense_qp_ipm_ws *ws, double *res_comp);
//
void d_dense_qp_ipm_get_obj(struct d_dense_qp_ipm_ws *ws, double *obj);
//
void d_dense_qp_ipm_get_stat(struct d_dense_qp_ipm_ws *ws, double **stat);
//
void d_dense_qp_ipm_get_stat_m(struct d_dense_qp_ipm_ws *ws, int *stat_m);
Expand Down
2 changes: 2 additions & 0 deletions include/hpipm_s_dense_qcqp_ipm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,8 @@ void s_dense_qcqp_ipm_get_max_res_ineq(struct s_dense_qcqp_ipm_ws *ws, float *re
//
void s_dense_qcqp_ipm_get_max_res_comp(struct s_dense_qcqp_ipm_ws *ws, float *res_comp);
//
void s_dense_qcqp_ipm_get_obj(struct s_dense_qcqp_ipm_ws *ws, float *obj);
//
void s_dense_qcqp_ipm_get_stat(struct s_dense_qcqp_ipm_ws *ws, float **stat);
//
void s_dense_qcqp_ipm_get_stat_m(struct s_dense_qcqp_ipm_ws *ws, int *stat_m);
Expand Down
2 changes: 2 additions & 0 deletions include/hpipm_s_dense_qp_ipm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ void s_dense_qp_ipm_get_max_res_ineq(struct s_dense_qp_ipm_ws *ws, float *res_in
//
void s_dense_qp_ipm_get_max_res_comp(struct s_dense_qp_ipm_ws *ws, float *res_comp);
//
void s_dense_qp_ipm_get_obj(struct s_dense_qp_ipm_ws *ws, float *obj);
//
void s_dense_qp_ipm_get_stat(struct s_dense_qp_ipm_ws *ws, float **stat);
//
void s_dense_qp_ipm_get_stat_m(struct s_dense_qp_ipm_ws *ws, int *stat_m);
Expand Down
2 changes: 1 addition & 1 deletion test_problems/test_d_cast_qcqp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,7 @@ int main()
double max_res_comp; d_dense_qcqp_ipm_get_max_res_comp(&dense_workspace, &max_res_comp);
printf("\nipm max res: stat = %e, eq = %e, ineq = %e, comp = %e\n", max_res_stat, max_res_eq, max_res_ineq, max_res_comp);

printf("\nalpha_aff\tmu_aff\t\tsigma\t\talpha_prim\talpha_dual\tmu\t\tres_stat\tres_eq\t\tres_ineq\tres_comp\tlq fact\t\titref pred\titref corr\tlin res stat\tlin res eq\tlin res ineq\tlin res comp\n");
printf("\nalpha_aff\tmu_aff\t\tsigma\t\talpha_prim\talpha_dual\tmu\t\tres_stat\tres_eq\t\tres_ineq\tres_comp\tobj\t\tlq fact\t\titref pred\titref corr\tlin res stat\tlin res eq\tlin res ineq\tlin res comp\n");
double *stat; d_dense_qcqp_ipm_get_stat(&dense_workspace, &stat);
int stat_m; d_dense_qcqp_ipm_get_stat_m(&dense_workspace, &stat_m);
d_print_exp_tran_mat(stat_m, iter+1, stat, stat_m);
Expand Down
2 changes: 1 addition & 1 deletion test_problems/test_d_cond.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ int main()
printf("\nipm iter = %d\n", iter);
printf("\nipm max res: stat = %e, eq = %e, ineq = %e, comp = %e\n", max_res_stat, max_res_eq, max_res_ineq, max_res_comp);

printf("\nalpha_aff\tmu_aff\t\tsigma\t\talpha_prim\talpha_dual\tmu\t\tres_stat\tres_eq\t\tres_ineq\tres_comp\tlq fact\t\titref pred\titref corr\tlin res stat\tlin res eq\tlin res ineq\tlin res comp\n");
printf("\nalpha_aff\tmu_aff\t\tsigma\t\talpha_prim\talpha_dual\tmu\t\tres_stat\tres_eq\t\tres_ineq\tres_comp\tobj\t\tlq fact\t\titref pred\titref corr\tlin res stat\tlin res eq\tlin res ineq\tlin res comp\n");
d_print_exp_tran_mat(stat_m, iter+1, stat, stat_m);

printf("\ncond time = %e [s]\n", time_cond);
Expand Down
2 changes: 1 addition & 1 deletion test_problems/test_d_cond_qcqp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,7 @@ int main()
printf("\nipm iter = %d\n", iter);
printf("\nipm max res: stat = %e, eq = %e, ineq = %e, comp = %e\n", max_res_stat, max_res_eq, max_res_ineq, max_res_comp);

printf("\nalpha_aff\tmu_aff\t\tsigma\t\talpha_prim\talpha_dual\tmu\t\tres_stat\tres_eq\t\tres_ineq\tres_comp\tlq fact\t\titref pred\titref corr\tlin res stat\tlin res eq\tlin res ineq\tlin res comp\n");
printf("\nalpha_aff\tmu_aff\t\tsigma\t\talpha_prim\talpha_dual\tmu\t\tres_stat\tres_eq\t\tres_ineq\tres_comp\tobj\t\tlq fact\t\titref pred\titref corr\tlin res stat\tlin res eq\tlin res ineq\tlin res comp\n");
d_print_exp_tran_mat(stat_m, iter+1, stat, stat_m);

printf("\nred eq dof all time = %e [s]\n", time_red_eq_dof_all);
Expand Down
2 changes: 1 addition & 1 deletion test_problems/test_d_dense.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ int main()
printf("\nipm iter = %d\n", iter);
printf("\nipm max res: stat = %e, eq = %e, ineq = %e, comp = %e\n", max_res_stat, max_res_eq, max_res_ineq, max_res_comp);

printf("\nalpha_aff\tmu_aff\t\tsigma\t\talpha_p\t\talpha_d\t\tmu\t\tres_stat\tres_eq\t\tres_ineq\tres_comp\tlq fact\t\titref pred\titref corr\tlin res stat\tlin res eq\tlin res ineq\tlin res comp\n");
printf("\nalpha_aff\tmu_aff\t\tsigma\t\talpha_p\t\talpha_d\t\tmu\t\tres_stat\tres_eq\t\tres_ineq\tres_comp\tobj\t\tlq fact\t\titref pred\titref corr\tlin res stat\tlin res eq\tlin res ineq\tlin res comp\n");
d_print_exp_tran_mat(stat_m, iter+1, stat, stat_m);

printf("\ndense ipm time = %e [s]\n\n", time_dense_ipm);
Expand Down
2 changes: 1 addition & 1 deletion test_problems/test_d_dense_qcqp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ int main()
printf("\nipm iter = %d\n", iter);
printf("\nipm max res: stat = %e, eq = %e, ineq = %e, comp = %e\n", max_res_stat, max_res_eq, max_res_ineq, max_res_comp);

printf("\nalpha_aff\tmu_aff\t\tsigma\t\talpha_p\t\talpha_d\t\tmu\t\tres_stat\tres_eq\t\tres_ineq\tres_comp\tlq fact\t\titref pred\titref corr\tlin res stat\tlin res eq\tlin res ineq\tlin res comp\n");
printf("\nalpha_aff\tmu_aff\t\tsigma\t\talpha_p\t\talpha_d\t\tmu\t\tres_stat\tres_eq\t\tres_ineq\tres_comp\tobj\t\tlq fact\t\titref pred\titref corr\tlin res stat\tlin res eq\tlin res ineq\tlin res comp\n");
d_print_exp_tran_mat(stat_m, iter+1, stat, stat_m);

printf("\ndense ipm time = %e [s]\n\n", time_dense_ipm);
Expand Down

0 comments on commit 04152e3

Please sign in to comment.