Support 1.0

jump-dev · Nov 6, 2019 · e4ba9a2 · e4ba9a2
1 parent 3d79025
commit e4ba9a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/examples/literate/general_examples/robust_approx_fitting.jl b/examples/literate/general_examples/robust_approx_fitting.jl
@@ -24,7 +24,9 @@
 #      (reduces to minimizing $\max\{\|(A-B)x - b\|_2, \|(A+B)x - b\|_2\}$ ).
 #
 using Convex, LinearAlgebra, SCS
-
+if VERSION < v"1.2.0-DEV.0"
+     LinearAlgebra.diagm(v::AbstractVector) = diagm(0 => v)
+end
 # Input Data
 m = 20;
 n = 10;

diff --git a/examples/literate/supplemental_material/Convex.jl_intro_ISMP2015.jl b/examples/literate/supplemental_material/Convex.jl_intro_ISMP2015.jl
@@ -113,7 +113,7 @@ square(x) <= sum(y)
 
 M = Z 
 for i = 1:length(y)
-    global M += rand(size(Z))*y[i]
+    global M += rand(size(Z)...)*y[i]
 end
 M ⪰ 0