rw.c in scs-0.4.2

- old
+ new

@@ -58,11 +58,11 @@
   if (file_int_sz == sizeof(scs_int)) {
     return fread(dest, sizeof(scs_int), nitems, fin);
   }
   void *ptr = scs_calloc(nitems, file_int_sz);
   size_t val = fread(ptr, file_int_sz, nitems, fin);
-  scs_int i;
+  size_t i;
   switch (file_int_sz) {
   case 4:
     for (i = 0; i < nitems; ++i) {
       dest[i] = (scs_int)(((int *)ptr)[i]);
     }
@@ -326,12 +326,19 @@
                   "pobj_normalized,"
                   "dobj_normalized,"
                   "tau_normalized,"
                   "kap_normalized,"
                   "ax_nrm_inf,"
+                  "ax_s_nrm_inf"
                   "px_nrm_inf,"
                   "aty_nrm_inf,"
+                  "xt_p_x,"
+                  "xt_p_x_tau,"
+                  "ctx,"
+                  "ctx_tau,"
+                  "bty,"
+                  "bty_tau,"
                   "b_nrm_inf,"
                   "c_nrm_inf,"
                   "scale,"
                   "diff_u_ut_nrm_2,"
                   "diff_v_v_prev_nrm_2,"
@@ -383,11 +390,18 @@
   fprintf(fout, "%.16e,", r_n->pobj);
   fprintf(fout, "%.16e,", r_n->dobj);
   fprintf(fout, "%.16e,", r_n->tau);
   fprintf(fout, "%.16e,", r_n->kap);
   fprintf(fout, "%.16e,", SCS(norm_inf)(r->ax, w->d->m));
+  fprintf(fout, "%.16e,", SCS(norm_inf)(r->ax_s, w->d->m));
   fprintf(fout, "%.16e,", SCS(norm_inf)(r->px, w->d->n));
   fprintf(fout, "%.16e,", SCS(norm_inf)(r->aty, w->d->n));
+  fprintf(fout, "%.16e,", r->xt_p_x);
+  fprintf(fout, "%.16e,", r->xt_p_x_tau);
+  fprintf(fout, "%.16e,", r->ctx);
+  fprintf(fout, "%.16e,", r->ctx_tau);
+  fprintf(fout, "%.16e,", r->bty);
+  fprintf(fout, "%.16e,", r->bty_tau);
   fprintf(fout, "%.16e,", SCS(norm_inf)(w->b_orig, w->d->m));
   fprintf(fout, "%.16e,", SCS(norm_inf)(w->c_orig, w->d->n));
   fprintf(fout, "%.16e,", w->stgs->scale);
   fprintf(fout, "%.16e,", SCS(norm_diff)(w->u, w->u_t, l));
   fprintf(fout, "%.16e,", SCS(norm_diff)(w->v, w->v_prev, l));