Removed rev and added MILP solver

NicolasSompairac · Nov 24, 2017 · 5416b29 · 5416b29
1 parent 952382c
commit 5416b29
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/deprecated/_maps_old/drawFluxVariability.m b/deprecated/_maps_old/drawFluxVariability.m
@@ -67,7 +67,7 @@
 for i=1:length(model.rxns)
     if minFlux(i)*maxFlux(i)>=0 
         %unidirectional
-        if model.rev(i) 
+        if model.lb(i) < 0
             %reversible
             if minFlux(i)<0 || maxFlux(i)<0
                 %reverse direction: Cyan 0 255 255

diff --git a/src/analysis/FVA/fluxVariability.m b/src/analysis/FVA/fluxVariability.m
@@ -324,16 +324,15 @@
     global CBT_LP_SOLVER;
     global CBT_MILP_SOLVER;
     global CBT_QP_SOLVER;
-    lpsolver = CBT_LP_SOLVER;
-    qpsolver = CBT_QP_SOLVER;
-    milpsolver = CBT_MILP_SOLVER;    
+    lpsolver = CBT_LP_SOLVER
+    qpsolver = CBT_QP_SOLVER
+    milpsolver = CBT_MILP_SOLVER   
     if minNorm        
         parfor i = 1:length(rxnNameList)
             changeCobraSolver(qpsolver,'QP',0,1);
             changeCobraSolver(lpsolver,'LP',0,1);
-        changeCobraSolver(milpsolver,'MILP',0,1);        
-
-        parLPproblem = LPproblem;        
+            changeCobraSolver(milpsolver,'MILP',0,1);                
+            parLPproblem = LPproblem;        
             parLPproblem.osense = 1;
             [minFlux(i),Vmin(:,i)] = calcSolForEntry(model,rxnNameList,i,parLPproblem,1, method, allowLoops,printLevel,minNorm,cpxControl,preCompMinSols{i});
             parLPproblem.osense = -1;
@@ -345,6 +344,7 @@
         parfor i = 1:length(rxnListMin)    
             changeCobraSolver(qpsolver,'QP',0,1);
             changeCobraSolver(lpsolver,'LP',0,1);
+            changeCobraSolver(milpsolver,'MILP',0,1);
             parLPproblem = LPproblem;
             [mins(i)] = calcSolForEntry(model,rxnListMin,i,parLPproblem,1, method, allowLoops,printLevel,minNorm,cpxControl,[]);
         end