Merge branch 'master' of ssh://github.com/cvxgrp/scs

cvxgrp · Oct 8, 2021 · 5be0e16 · 5be0e16
2 parents 13e675d + 3aaa93c
commit 5be0e16
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/src/cones.c b/src/cones.c
@@ -232,7 +232,7 @@ void SCS(finish_cone)(ScsConeWork *c) {
 
 char *SCS(get_cone_header)(const ScsCone *k) {
   char *tmp = (char *)scs_malloc(sizeof(char) * 512);
-  scs_int i, soc_vars, soc_blks, sd_vars, sd_blks;
+  scs_int i, soc_vars, sd_vars;
   sprintf(tmp, "cones: ");
   if (k->z) {
     sprintf(tmp + strlen(tmp), "\t  z: primal zero / dual free vars: %li\n",
@@ -245,24 +245,20 @@ char *SCS(get_cone_header)(const ScsCone *k) {
     sprintf(tmp + strlen(tmp), "\t  b: box cone vars: %li\n", (long)(k->bsize));
   }
   soc_vars = 0;
-  soc_blks = 0;
   if (k->qsize && k->q) {
-    soc_blks = k->qsize;
     for (i = 0; i < k->qsize; i++) {
       soc_vars += k->q[i];
     }
-    sprintf(tmp + strlen(tmp), "\t  q: soc vars: %li, soc blks: %li\n",
-            (long)soc_vars, (long)soc_blks);
+    sprintf(tmp + strlen(tmp), "\t  q: soc vars: %li, qsize: %li\n",
+            (long)soc_vars, (long)k->qsize);
   }
   sd_vars = 0;
-  sd_blks = 0;
   if (k->ssize && k->s) {
-    sd_blks = k->ssize;
     for (i = 0; i < k->ssize; i++) {
       sd_vars += get_sd_cone_size(k->s[i]);
     }
-    sprintf(tmp + strlen(tmp), "\t  s: sd vars: %li, sd blks: %li\n",
-            (long)sd_vars, (long)sd_blks);
+    sprintf(tmp + strlen(tmp), "\t  s: psd vars: %li, ssize: %li\n",
+            (long)sd_vars, (long)k->ssize);
   }
   if (k->ep || k->ed) {
     sprintf(tmp + strlen(tmp), "\t  e: exp vars: %li, dual exp vars: %li\n",
@@ -489,9 +485,9 @@ static scs_int proj_semi_definite_cone(scs_float *X, const scs_int n,
   BLAS(syev)("Vectors", "Lower", &nb, Xs, &nb, e, work, &lwork, &info);
   if (info != 0) {
     scs_printf("WARN: LAPACK syev error, info = %i\n", info);
-  }
-  if (info < 0) {
-    return -1;
+    if (info < 0) {
+      return info;
+    }
   }
 
   first_idx = -1;
@@ -724,7 +720,7 @@ static void proj_power_cone(scs_float *v, scs_float a) {
 /* project onto the primal K cone in the paper */
 static scs_int proj_cone(scs_float *x, const ScsCone *k, ScsConeWork *c,
                          scs_int normalize) {
-  scs_int i;
+  scs_int i, status;
   scs_int count = 0;
 
   if (k->z) {
@@ -764,8 +760,9 @@ static scs_int proj_cone(scs_float *x, const ScsCone *k, ScsConeWork *c,
   if (k->ssize && k->s) {
     /* project onto PSD cones */
     for (i = 0; i < k->ssize; ++i) {
-      if (proj_semi_definite_cone(&(x[count]), k->s[i], c) < 0) {
-        return -1;
+      status = proj_semi_definite_cone(&(x[count]), k->s[i], c);
+      if (status < 0) {
+        return status;
       }
       count += get_sd_cone_size(k->s[i]);
     }