small changes

src/base/solvers/cardOpt/sparseLP/optimizeCardinality.m

@@ -195,8 +195,8 @@
     ltp=length(problem.p);
     ltq=length(problem.q);
     ltr=length(problem.r);
-    if ltp==1
-        if ~islogical(problem.p)
+    if ltp==1 && problem.p~=0
+        if length(problem.p)~=1 && ~islogical(problem.p)
             solution.stat = -1;
             error('Error: p should be a logical vector');
         end
@@ -212,7 +212,7 @@
     solution.stat = -1;
     error('Error: the size/location of vector y is not defined');
 else
-    if ~islogical(problem.q)
+    if length(problem.q)~=1 && ~islogical(problem.q) && problem.q~=0
         solution.stat = -1;
         error('Error: q should be a logical vector');
     end
@@ -222,7 +222,7 @@
     solution.stat = -1;
     error('Error: the size of vector z is not defined');
 else
-    if ~islogical(problem.r)
+    if length(problem.r)~=1 && ~islogical(problem.r)
         solution.stat = -1;
         error('Error: r should be a logical vector');
     end

src/base/solvers/getSetSolver/changeCobraSolver.m

@@ -3,7 +3,7 @@
 %
 % USAGE:
 %
-%    [solverOK, solverInstalled] = changeCobraSolver(solverName, solverType, printLevel, validationLevel)
+%    [solverOK, solverInstalled] = changeCobraSolver(solverName, problemType, printLevel, validationLevel)
 %
 % INPUTS:
 %    solverName:           Solver name
@@ -538,7 +538,7 @@
         end
         try
             % Skip the CLP solver until further developments
-            if ~strcmp(solverType, 'CLP')
+            if ~strcmp(problemType, 'CLP')
                 %This is the code that actually tests if a solver is working
                 if validationLevel>1
                     %display progress