From 5416b294f3419349307b7e942c7b78168c823b9c Mon Sep 17 00:00:00 2001 From: Thomas Pfau Date: Fri, 24 Nov 2017 06:51:05 +0100 Subject: [PATCH] Removed rev and added MILP solver --- deprecated/_maps_old/drawFluxVariability.m | 2 +- src/analysis/FVA/fluxVariability.m | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deprecated/_maps_old/drawFluxVariability.m b/deprecated/_maps_old/drawFluxVariability.m index cfa58f3ccb..a9fb1c73e2 100644 --- 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 index a47d3a8cc3..3cdcfa194e 100644 --- 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