vendor/scs/test/run_from_file.c in scs-0.2.3 vs vendor/scs/test/run_from_file.c in scs-0.3.0

@@ -10,20 +10,28 @@
     s->scale = atof(val);
   } else if (strcmp(param, "rho_x") == 0) {
     s->rho_x = atof(val);
   } else if (strcmp(param, "max_iters") == 0) {
     s->max_iters = atoi(val);
-  } else if (strcmp(param, "eps") == 0) {
-    s->eps = atof(val);
+  } else if (strcmp(param, "eps_abs") == 0) {
+    s->eps_abs = atof(val);
+  } else if (strcmp(param, "eps_rel") == 0) {
+    s->eps_rel = atof(val);
+  } else if (strcmp(param, "eps_infeas") == 0) {
+    s->eps_infeas = atof(val);
   } else if (strcmp(param, "alpha") == 0) {
     s->alpha = atof(val);
-  } else if (strcmp(param, "cg_rate") == 0) {
-    s->cg_rate = atof(val);
   } else if (strcmp(param, "verbose") == 0) {
     s->verbose = atoi(val);
   } else if (strcmp(param, "acceleration_lookback") == 0) {
     s->acceleration_lookback = atoi(val);
+  } else if (strcmp(param, "acceleration_interval") == 0) {
+    s->acceleration_interval = atoi(val);
+  } else if (strcmp(param, "adaptive_scale") == 0) {
+    s->adaptive_scale = atoi(val);
+  } else if (strcmp(param, "log_csv_filename") == 0) {
+    s->log_csv_filename = val;
   } else {
     return -1;
   }
   scs_printf("Success.\n");
   return 0;
@@ -34,36 +42,37 @@
 int main(int argc, char **argv) {
   char *filename;
   scs_int read_status;
   ScsData *d;
   ScsCone *k;
+  ScsSettings *stgs;
   ScsSolution *sol;
   ScsInfo info = {0};
   scs_int i;
   if (argc < 2) {
     scs_printf("Need to specify a filename, exit.\n");
     return -1;
   }
   filename = argv[1];
-  read_status = SCS(read_data)(filename, &d, &k);
+  read_status = SCS(read_data)(filename, &d, &k, &stgs);
   if (read_status < 0) {
     scs_printf("Data read failure, exit.\n");
     return -1;
   }
   for (i = 2; i < argc; i += 2) {
     if (argc < i + 2) {
       scs_printf("Incorrect number of arguments supplied\n.");
-      SCS(free_data)(d, k);
+      SCS(free_data)(d, k, stgs);
       return -1;
     }
-    if (override_setting(d->stgs, argv[i], argv[i + 1]) < 0) {
+    if (override_setting(stgs, argv[i], argv[i + 1]) < 0) {
       scs_printf("Unrecognized setting %s\n", argv[i]);
-      SCS(free_data)(d, k);
+      SCS(free_data)(d, k, stgs);
       return -1;
     }
   }
   sol = scs_calloc(1, sizeof(ScsSolution));
-  scs(d, k, sol, &info);
-  SCS(free_data)(d, k);
+  scs(d, k, stgs, sol, &info);
+  SCS(free_data)(d, k, stgs);
   SCS(free_sol)(sol);
   return 0;
 }