re-run c, python qp example

cvxgrp · Feb 22, 2022 · c1ba690 · c1ba690
1 parent ac6840a
commit c1ba690
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/docs/src/examples/python/qp.py b/docs/src/examples/python/qp.py
@@ -12,8 +12,10 @@
 data = dict(P=P, A=A, b=b, c=c)
 cone = dict(z=1, l=2)
 
+# Initialize solver
+solver = scs.SCS(data, cone, eps_abs=1e-9, eps_rel=1e-9)
 # Solve!
-sol = scs.solve(data, cone, eps_abs=1e-9, eps_rel=1e-9)
+sol = solver.solve()
 
 print(f"SCS took {sol['info']['iter']} iters")
 print("Optimal solution vector x*:")

diff --git a/docs/src/examples/python/qp.py.out b/docs/src/examples/python/qp.py.out
@@ -1,5 +1,5 @@
 ------------------------------------------------------------------
-	       SCS v3.1.1 - Splitting Conic Solver
+	       SCS v3.2.0 - Splitting Conic Solver
 	(c) Brendan O'Donoghue, Stanford University, 2012
 ------------------------------------------------------------------
 problem:  variables n: 2, constraints m: 3
@@ -14,16 +14,16 @@ lin-sys:  sparse-direct
 ------------------------------------------------------------------
  iter | pri res | dua res |   gap   |   obj   |  scale  | time (s)
 ------------------------------------------------------------------
-     0| 1.53e+00  1.00e+00  4.87e+00  1.10e+00  1.00e-01  5.83e-05 
-   100| 6.18e-11  1.56e-12  1.30e-10  1.23e+00  1.00e-01  1.18e-04 
+     0| 1.51e+00  1.00e+00  4.91e+00  1.14e+00  1.00e-01  8.39e-05 
+    75| 4.09e-10  7.93e-10  1.07e-09  1.24e+00  1.00e-01  3.93e-04 
 ------------------------------------------------------------------
 status:  solved
-timings: total: 6.83e-04s = setup: 5.63e-04s + solve: 1.19e-04s
-	 lin-sys: 1.34e-05s, cones: 6.68e-06s, accel: 1.59e-05s
+timings: total: 5.30e-04s = setup: 1.31e-04s + solve: 3.98e-04s
+	 lin-sys: 1.55e-05s, cones: 4.71e-06s, accel: 2.72e-04s
 ------------------------------------------------------------------
 objective = 1.235000
 ------------------------------------------------------------------
-SCS took 100 iters
+SCS took 75 iters
 Optimal solution vector x*:
 [ 0.3 -0.7]
 Optimal dual vector y*:

diff --git a/docs/src/examples/qp.c.out b/docs/src/examples/qp.c.out
@@ -1,30 +1,30 @@
 ------------------------------------------------------------------
-	       SCS v3.0.0 - Splitting Conic Solver
+	       SCS v3.2.0 - Splitting Conic Solver
 	(c) Brendan O'Donoghue, Stanford University, 2012
 ------------------------------------------------------------------
 problem:  variables n: 2, constraints m: 3
 cones: 	  z: primal zero / dual free vars: 1
 	  l: linear vars: 2
 settings: eps_abs: 1.0e-09, eps_rel: 1.0e-09, eps_infeas: 1.0e-07
 	  alpha: 1.50, scale: 1.00e-01, adaptive_scale: 1
-	  max_iters: 100000, normalize: 1, warm_start: 0
+	  max_iters: 100000, normalize: 1, rho_x: 1.00e-06
 	  acceleration_lookback: 10, acceleration_interval: 10
 lin-sys:  sparse-direct
 	  nnz(A): 4, nnz(P): 3
 ------------------------------------------------------------------
  iter | pri res | dua res |   gap   |   obj   |  scale  | time (s)
 ------------------------------------------------------------------
-     0| 1.53e+00  1.00e+00  4.87e+00  1.10e+00  1.00e-01  1.91e-05 
-   100| 6.18e-11  1.56e-12  1.30e-10  1.23e+00  1.00e-01  8.44e-05 
+     0| 1.51e+00  1.00e+00  4.91e+00  1.14e+00  1.00e-01  8.42e-06 
+    75| 4.09e-10  7.93e-10  1.07e-09  1.24e+00  1.00e-01  4.96e-05 
 ------------------------------------------------------------------
 status:  solved
-timings: total: 1.80e-04s = setup: 9.48e-05s + solve: 8.55e-05s
-	 lin-sys: 1.30e-05s, cones: 6.97e-06s, accel: 2.28e-05s
+timings: total: 9.86e-05s = setup: 4.83e-05s + solve: 5.03e-05s
+	 lin-sys: 7.39e-06s, cones: 1.65e-06s, accel: 2.29e-05s
 ------------------------------------------------------------------
 objective = 1.235000
 ------------------------------------------------------------------
 SCS solved successfully: 1
-SCS took 100 iters, using the sparse-direct linear solver.
+SCS took 75 iters, using the sparse-direct linear solver.
 Optimal solution vector x*:
 x[0] = 0.300000
 x[1] = -0.700000