Minor bug fixes tohandle edge cases. Allow mosek params to be passed …

…in properly, fix to mtimes dimensions.
spot-toolbox · Dec 12, 2015 · 83e5230 · 83e5230
1 parent 2760de3
commit 83e5230
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/@msspoly/mtimes.m b/@msspoly/mtimes.m
@@ -21,8 +21,8 @@
     end
 end
 
-sz1 = p1.dim;
-sz2 = p2.dim;
+sz1 = p1.dim(1);
+sz2 = p2.dim(2);
 
 if sz1 == 0 | sz2 == 0
    q = msspoly(sparse(sz1,sz2));

diff --git a/@msspoly/subs.m b/@msspoly/subs.m
@@ -75,7 +75,7 @@
 elseif deg(p,a) <=1 
      % Polynomial is /linear/ in variables to be substituted.
      sz = size(p);
-     p = p(:);
+     p = reshape(p,[],1);
 
      pA = diff(p,a);
      pc = subs(p,a,0*a);

diff --git a/spotopt/solvers/spot_mosek.m b/spotopt/solvers/spot_mosek.m
@@ -131,9 +131,9 @@
 
     start = spot_now();
     if options.verbose
-        [r,res] = mosekopt(cmd,prob);
+        [r,res] = mosekopt(cmd,prob,param);
     else
-        [info.console,r,res] = evalc('mosekopt(cmd, prob);');
+        [info.console,r,res] = evalc('mosekopt(cmd, prob, param);');
     end
     [info.ctime,info.wtime] = spot_etime(spot_now(),start);