FIX: bug for wrong output x

alphamind/model/data_preparing.py

@@ -485,7 +485,7 @@ def fetch_predict_phase(engine,
 
     ret = dict()
     ret['x_names'] = transformer.names
-    ret['predict'] = {'x': pd.DataFrame(ne_x, columns=transformer.names), 'code': codes,
+    ret['predict'] = {'x': pd.DataFrame(ne_x, columns=transformer.names, index=codes), 'code': codes,
                       'y': ne_y.flatten()}
 
     return ret

notebooks/Example 10 - Quadratic Optimizer Comparison with CVXOPT.ipynb

@@ -87,7 +87,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Wall time: 3.22 ms\n"
+      "Wall time: 2 ms\n"
      ]
     }
    ],
@@ -134,17 +134,17 @@
       "          warm start: on, polish: on, time_limit: off\n",
       "\n",
       "iter   objective    pri res    dua res    rho        time\n",
-      "   1  -7.8878e+03   4.61e+00   6.68e+04   1.00e-01   1.28e-03s\n",
-      " 125  -2.4830e+02   3.58e-07   2.76e-05   5.82e-01   5.35e-03s\n",
+      "   1  -7.8878e+03   4.61e+00   6.68e+04   1.00e-01   1.40e-03s\n",
+      " 125  -2.4830e+02   3.58e-07   2.76e-05   5.82e-01   4.57e-03s\n",
       "\n",
       "status:               solved\n",
       "solution polish:      unsuccessful\n",
       "number of iterations: 125\n",
       "optimal objective:    -248.2989\n",
-      "run time:             7.43e-03s\n",
+      "run time:             5.42e-03s\n",
       "optimal rho estimate: 1.87e+00\n",
       "\n",
-      "Wall time: 43 ms\n"
+      "Wall time: 49 ms\n"
      ]
     },
     {
@@ -211,9 +211,9 @@
       "12  -2.483e+02  -2.483e+02  +3e-07  5e-13  2e-15  1e-10  8e-10  0.9775  1e-04   1  1  1 |  0  0\n",
       "\n",
       "OPTIMAL (within feastol=5.3e-13, reltol=1.3e-09, abstol=3.2e-07).\n",
-      "Runtime: 0.013621 seconds.\n",
+      "Runtime: 0.015751 seconds.\n",
       "\n",
-      "Wall time: 52 ms\n"
+      "Wall time: 59 ms\n"
      ]
     },
     {
@@ -277,7 +277,7 @@
       "12: -2.4829e+02 -2.4831e+02  1e-02  2e-16  4e-16\n",
       "13: -2.4830e+02 -2.4830e+02  1e-04  2e-16  1e-15\n",
       "Optimal solution found.\n",
-      "Wall time: 80.5 ms\n"
+      "Wall time: 69 ms\n"
      ]
     }
    ],
@@ -315,7 +315,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Wall time: 20.6 ms\n"
+      "Wall time: 26 ms\n"
      ]
     },
     {
@@ -465,9 +465,9 @@
      "output_type": "stream",
      "text": [
       "Scale(n)       cvxpy      cvxopt       ipopt\n",
-      "100           0.0520      0.0440      0.0070\n",
-      "200           0.0413      0.0520      0.0120\n",
-      "300           0.0420      0.0630      0.0170\n"
+      "100           0.0320      0.0240      0.0060\n",
+      "200           0.0360      0.0420      0.0120\n",
+      "300           0.0440      0.0630      0.0180\n"
      ]
     }
    ],