Merge branch 'develop' of https://github.com/yalmip/YALMIP into develop

Conflicts: extras/setupBounds.m
yalmip · Oct 18, 2017 · 0b6c71b · 0b6c71b
2 parents b95e900 + 740d7f3
commit 0b6c71b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/extras/setupBounds.m b/extras/setupBounds.m
@@ -58,7 +58,7 @@
 % propagate simple quadratic
 quadratic = find(variabletype == 2);
 if ~isempty(quadratic)
-    monomtable = mainmonomtable(quadratic,:);
+    monomtable = mainmonomtable(quadratic,:);    
     [i,j] = find(monomtable');   
     x = i;    
     z = quadratic(:);