Fixes #413

yalmip · Jun 22, 2017 · c39a51b · c39a51b
1 parent 8a6eef3
commit c39a51b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/extras/@constraint/ge.m b/extras/@constraint/ge.m
@@ -5,7 +5,12 @@
     % Try to evaluate
     if isa(X,'constraint')
         % (z > w) > y
-        Z = X.List{end} - Y;
+        try
+            Z = X.List{end} - Y;
+        catch
+            Y = reshape(Y,[],1);
+            Z = X.List{end} - Y;
+        end
         F = X;
         F.List{end+1} = '>=';
         F.List{end+1} = Y;
@@ -14,7 +19,12 @@
         F.strict(end+1) = 0;
     else
         % z > (w > y)
-        Z = X - Y.List{1};
+        try
+            Z = X - Y.List{1};
+        catch
+            X = reshape(X,[],1);
+            Z = X - Y.List{1};
+        end
         F = Y;
         F.List = {X,'>=',F.List{:}};
         F.Evaluated = {Z,F.Evaluated{:}};

diff --git a/extras/@constraint/le.m b/extras/@constraint/le.m
@@ -5,7 +5,12 @@
 try
     if isa(X,'constraint')
         % (z > w) < y
-        Z = Y - X.List{end};
+        try        
+            Z = Y - X.List{end};
+        catch
+            Y = reshape(Y,[],1);
+            Z = Y - X.List{end};
+        end
         F = X;
         F.List{end+1} = '<=';
         F.List{end+1} = Y;
@@ -14,7 +19,12 @@
         F.strict(end+1) = 0;
     else
         % x < (w > y)
-        Z = Y.List{1} - X;
+        try
+            Z = Y.List{1} - X;
+        catch
+            X = reshape(X,[],1);
+            Z = Y.List{1} - X;
+        end
         F = Y;
         F.List = {X,'<=',F.List{:}};
         F.Evaluated = {Z,F.Evaluated{:}};