-
from l1regls import l1regls
-from cvxopt import matrix, normal
-import numpy as np
-
-X = matrix( [ [ 2, 0, 1], [0, 1, 3]])
-y = matrix( [4, 2, 3])
-x = l1regls(X,y)
-
-from cvxopt import matrix, spdiag, mul, div, sqrt, normal, setseed
+from cvxopt import matrix, spdiag, mul, div, sqrt, normal, setseed
from cvxopt import blas, lapack, solvers, sparse, spmatrix
import math
@@ -662,6 +654,15 @@ x = l1regls(X,y)
return g
return solvers.coneqp(P, q, G, h, kktsolver = Fkkt)['x'][:n]
+
+
+
+#from l1regls import l1regls
+from cvxopt import matrix, normal
+
+X = matrix( [ [ 2, 0, 1], [0, 1, 3]])
+y = matrix( [4, 2, 3])
+x = l1regls(X,y)
diff --git a/doc/pub/week36/html/week36-reveal.html b/doc/pub/week36/html/week36-reveal.html
index 387a4be06..69bfc5368 100644
--- a/doc/pub/week36/html/week36-reveal.html
+++ b/doc/pub/week36/html/week36-reveal.html
@@ -1203,15 +1203,7 @@ python file.
-
from l1regls import l1regls
-from cvxopt import matrix, normal
-import numpy as np
-
-X = matrix( [ [ 2, 0, 1], [0, 1, 3]])
-y = matrix( [4, 2, 3])
-x = l1regls(X,y)
-
-from cvxopt import matrix, spdiag, mul, div, sqrt, normal, setseed
+from cvxopt import matrix, spdiag, mul, div, sqrt, normal, setseed
from cvxopt import blas, lapack, solvers, sparse, spmatrix
import math
@@ -1468,6 +1460,15 @@ x = l1regls(X,y)
return g
return solvers.coneqp(P, q, G, h, kktsolver = Fkkt)['x'][:n]
+
+
+
+#from l1regls import l1regls
+from cvxopt import matrix, normal
+
+X = matrix( [ [ 2, 0, 1], [0, 1, 3]])
+y = matrix( [4, 2, 3])
+x = l1regls(X,y)
diff --git a/doc/pub/week36/html/week36-solarized.html b/doc/pub/week36/html/week36-solarized.html
index e202e4869..774afd790 100644
--- a/doc/pub/week36/html/week36-solarized.html
+++ b/doc/pub/week36/html/week36-solarized.html
@@ -1245,15 +1245,7 @@ python file.
-
from l1regls import l1regls
-from cvxopt import matrix, normal
-import numpy as np
-
-X = matrix( [ [ 2, 0, 1], [0, 1, 3]])
-y = matrix( [4, 2, 3])
-x = l1regls(X,y)
-
-from cvxopt import matrix, spdiag, mul, div, sqrt, normal, setseed
+from cvxopt import matrix, spdiag, mul, div, sqrt, normal, setseed
from cvxopt import blas, lapack, solvers, sparse, spmatrix
import math
@@ -1510,6 +1502,15 @@ x = l1regls(X,y)
return g
return solvers.coneqp(P, q, G, h, kktsolver = Fkkt)['x'][:n]
+
+
+
+#from l1regls import l1regls
+from cvxopt import matrix, normal
+
+X = matrix( [ [ 2, 0, 1], [0, 1, 3]])
+y = matrix( [4, 2, 3])
+x = l1regls(X,y)
diff --git a/doc/pub/week36/html/week36.html b/doc/pub/week36/html/week36.html
index 07a2f6b74..6e2ebd211 100644
--- a/doc/pub/week36/html/week36.html
+++ b/doc/pub/week36/html/week36.html
@@ -1250,15 +1250,7 @@ python file.
-
from l1regls import l1regls
-from cvxopt import matrix, normal
-import numpy as np
-
-X = matrix( [ [ 2, 0, 1], [0, 1, 3]])
-y = matrix( [4, 2, 3])
-x = l1regls(X,y)
-
-from cvxopt import matrix, spdiag, mul, div, sqrt, normal, setseed
+from cvxopt import matrix, spdiag, mul, div, sqrt, normal, setseed
from cvxopt import blas, lapack, solvers, sparse, spmatrix
import math
@@ -1515,6 +1507,15 @@ x = l1regls(X,y)
return g
return solvers.coneqp(P, q, G, h, kktsolver = Fkkt)['x'][:n]
+
+
+
+#from l1regls import l1regls
+from cvxopt import matrix, normal
+
+X = matrix( [ [ 2, 0, 1], [0, 1, 3]])
+y = matrix( [4, 2, 3])
+x = l1regls(X,y)
diff --git a/doc/pub/week36/ipynb/ipynb-week36-src.tar.gz b/doc/pub/week36/ipynb/ipynb-week36-src.tar.gz
index a59fb9041..6fdf443eb 100644
Binary files a/doc/pub/week36/ipynb/ipynb-week36-src.tar.gz and b/doc/pub/week36/ipynb/ipynb-week36-src.tar.gz differ
diff --git a/doc/pub/week36/ipynb/week36.ipynb b/doc/pub/week36/ipynb/week36.ipynb
index 96c70946b..7e0eef9de 100644
--- a/doc/pub/week36/ipynb/week36.ipynb
+++ b/doc/pub/week36/ipynb/week36.ipynb
@@ -1501,14 +1501,6 @@
},
"outputs": [],
"source": [
- "from l1regls import l1regls\n",
- "from cvxopt import matrix, normal\n",
- "import numpy as np\n",
- "\n",
- "X = matrix( [ [ 2, 0, 1], [0, 1, 3]])\n",
- "y = matrix( [4, 2, 3])\n",
- "x = l1regls(X,y)\n",
- "\n",
"from cvxopt import matrix, spdiag, mul, div, sqrt, normal, setseed\n",
"from cvxopt import blas, lapack, solvers, sparse, spmatrix\n",
"import math\n",
@@ -1765,7 +1757,16 @@
"\n",
" return g\n",
"\n",
- " return solvers.coneqp(P, q, G, h, kktsolver = Fkkt)['x'][:n]"
+ " return solvers.coneqp(P, q, G, h, kktsolver = Fkkt)['x'][:n]\n",
+ "\n",
+ "\n",
+ "\n",
+ "#from l1regls import l1regls\n",
+ "from cvxopt import matrix, normal\n",
+ "\n",
+ "X = matrix( [ [ 2, 0, 1], [0, 1, 3]])\n",
+ "y = matrix( [4, 2, 3])\n",
+ "x = l1regls(X,y)"
]
},
{
diff --git a/doc/src/week36/week36.do.txt b/doc/src/week36/week36.do.txt
index 5ac331223..e12e31964 100644
--- a/doc/src/week36/week36.do.txt
+++ b/doc/src/week36/week36.do.txt
@@ -910,14 +910,6 @@ simpler problem we discussed above, where we have added the latter
python file.
!bc pycod
-from l1regls import l1regls
-from cvxopt import matrix, normal
-import numpy as np
-
-X = matrix( [ [ 2, 0, 1], [0, 1, 3]])
-y = matrix( [4, 2, 3])
-x = l1regls(X,y)
-
from cvxopt import matrix, spdiag, mul, div, sqrt, normal, setseed
from cvxopt import blas, lapack, solvers, sparse, spmatrix
import math
@@ -1176,6 +1168,17 @@ def l1regls(A, b):
return solvers.coneqp(P, q, G, h, kktsolver = Fkkt)['x'][:n]
+
+
+#from l1regls import l1regls
+from cvxopt import matrix, normal
+
+X = matrix( [ [ 2, 0, 1], [0, 1, 3]])
+y = matrix( [4, 2, 3])
+x = l1regls(X,y)
+
+
+
!ec
!split