@@ -207,13 +207,13 @@ static void compute_residuals(ScsResiduals *r, scs_int m, scs_int n) {
207
207
r -> res_unbdd_a = NAN ;
208
208
r -> res_unbdd_p = NAN ;
209
209
r -> res_infeas = NAN ;
210
- if (r -> ctx_tau < 0 ) {
210
+ if (r -> ctx_tau < - INFEAS_NEGATIVITY_TOL ) {
211
211
nm_ax_s = NORM (r -> ax_s , m );
212
212
nm_px = NORM (r -> px , n );
213
213
r -> res_unbdd_a = SAFEDIV_POS (nm_ax_s , - r -> ctx_tau );
214
214
r -> res_unbdd_p = SAFEDIV_POS (nm_px , - r -> ctx_tau );
215
215
}
216
- if (r -> bty_tau < 0 ) {
216
+ if (r -> bty_tau < - INFEAS_NEGATIVITY_TOL ) {
217
217
nm_aty = NORM (r -> aty , n );
218
218
r -> res_infeas = SAFEDIV_POS (nm_aty , - r -> bty_tau );
219
219
}
@@ -587,22 +587,22 @@ static void print_summary(ScsWork *w, scs_int i, SCS(timer) * solve_timer) {
587
587
scs_printf ("\n" );
588
588
589
589
#if VERBOSITY > 0
590
- scs_printf ("Norm u = %4f , " , SCS (norm_2 )(w -> u , w -> d -> n + w -> d -> m + 1 ));
591
- scs_printf ("Norm u_t = %4f , " , SCS (norm_2 )(w -> u_t , w -> d -> n + w -> d -> m + 1 ));
592
- scs_printf ("Norm v = %4f , " , SCS (norm_2 )(w -> v , w -> d -> n + w -> d -> m + 1 ));
593
- scs_printf ("Norm rsk = %4f , " , SCS (norm_2 )(w -> rsk , w -> d -> n + w -> d -> m + 1 ));
594
- scs_printf ("Norm x = %4f , " , SCS (norm_2 )(w -> xys_orig -> x , w -> d -> n ));
595
- scs_printf ("Norm y = %4f , " , SCS (norm_2 )(w -> xys_orig -> y , w -> d -> m ));
596
- scs_printf ("Norm s = %4f , " , SCS (norm_2 )(w -> xys_orig -> s , w -> d -> m ));
597
- scs_printf ("Norm |Ax + s| = %1.2e , " , SCS (norm_2 )(r -> ax_s , w -> d -> m ));
598
- scs_printf ("tau = %4f , " , w -> u [w -> d -> n + w -> d -> m ]);
599
- scs_printf ("kappa = %4f , " , w -> rsk [w -> d -> n + w -> d -> m ]);
600
- scs_printf ("|u - u_t| = %1.2e , " ,
590
+ scs_printf ("Norm u = %1.6e , " , SCS (norm_2 )(w -> u , w -> d -> n + w -> d -> m + 1 ));
591
+ scs_printf ("Norm u_t = %1.6e , " , SCS (norm_2 )(w -> u_t , w -> d -> n + w -> d -> m + 1 ));
592
+ scs_printf ("Norm v = %1.6e , " , SCS (norm_2 )(w -> v , w -> d -> n + w -> d -> m + 1 ));
593
+ scs_printf ("Norm rsk = %1.6e , " , SCS (norm_2 )(w -> rsk , w -> d -> n + w -> d -> m + 1 ));
594
+ scs_printf ("Norm x = %1.6e , " , SCS (norm_2 )(w -> xys_orig -> x , w -> d -> n ));
595
+ scs_printf ("Norm y = %1.6e , " , SCS (norm_2 )(w -> xys_orig -> y , w -> d -> m ));
596
+ scs_printf ("Norm s = %1.6e , " , SCS (norm_2 )(w -> xys_orig -> s , w -> d -> m ));
597
+ scs_printf ("Norm |Ax + s| = %1.6e , " , SCS (norm_2 )(r -> ax_s , w -> d -> m ));
598
+ scs_printf ("tau = %1.6e , " , w -> u [w -> d -> n + w -> d -> m ]);
599
+ scs_printf ("kappa = %1.6e , " , w -> rsk [w -> d -> n + w -> d -> m ]);
600
+ scs_printf ("|u - u_t| = %1.6e , " ,
601
601
SCS (norm_diff )(w -> u , w -> u_t , w -> d -> n + w -> d -> m + 1 ));
602
- scs_printf ("res_infeas = %1.2e , " , r -> res_infeas );
603
- scs_printf ("res_unbdd_a = %1.2e , " , r -> res_unbdd_a );
604
- scs_printf ("res_unbdd_p = %1.2e , " , r -> res_unbdd_p );
605
- scs_printf ("ctx_tau = %1.2e , " , r -> ctx_tau );
602
+ scs_printf ("res_infeas = %1.6e , " , r -> res_infeas );
603
+ scs_printf ("res_unbdd_a = %1.6e , " , r -> res_unbdd_a );
604
+ scs_printf ("res_unbdd_p = %1.6e , " , r -> res_unbdd_p );
605
+ scs_printf ("ctx_tau = %1.6e , " , r -> ctx_tau );
606
606
scs_printf ("bty_tau = %1.2e\n" , r -> bty_tau );
607
607
#endif
608
608
0 commit comments