Merge pull request #141 from Ayush-iitkgp/correcting_diag_atom

Correcting diag atom
jump-dev · Jun 7, 2016 · ee89004 · ee89004
2 parents fc4efc6 + 493cbb3
commit ee89004
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/atoms/affine/diag.jl b/src/atoms/affine/diag.jl
@@ -20,7 +20,7 @@ type DiagAtom <: AbstractExpr
   function DiagAtom(x::AbstractExpr, k::Int=0)
     (num_rows, num_cols) = x.size
 
-    if k >= num_cols || k <= -num_rows
+    if k >= min(num_rows, num_cols) || k <= -min(num_rows, num_cols)
       error("Bounds error in calling diag")
     end