From 18b1fa61deb8b0d6d9d06fc9adcbd0caaf7f70b6 Mon Sep 17 00:00:00 2001 From: st elmo <stelmozors@gmail.com> Date: Tue, 30 Mar 2021 17:08:41 +0200 Subject: [PATCH] change solveLP back to optimizeModel --- src/analysis/fba.jl | 2 +- src/base/solver.jl | 2 +- test/base/solver.jl | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/analysis/fba.jl b/src/analysis/fba.jl index ad471bba3..431c62cae 100644 --- a/src/analysis/fba.jl +++ b/src/analysis/fba.jl @@ -11,7 +11,7 @@ s.t. S x = b Returns a solved model from [`optimizeModel`](@ref). """ fluxBalanceAnalysis(model::M, optimizer) where {M<:MetabolicModel} = - solveLP(model, optimizer; sense = MOI.MAX_SENSE) +optimizeModel(model, optimizer; sense = MOI.MAX_SENSE) """ fba(model::CobraModel, optimizer; objective_func::Union{Reaction, Array{Reaction, 1}}=Reaction[], weights=Float64[], solver_attributes=Dict{Any, Any}(), constraints=Dict{String, Tuple{Float64,Float64}}()) diff --git a/src/base/solver.jl b/src/base/solver.jl index 25d32aab6..5e52a9cb1 100644 --- a/src/base/solver.jl +++ b/src/base/solver.jl @@ -23,7 +23,7 @@ end """ Use JuMP to solve an instance of LinearModel """ -function solveLP(model::LM, optimizer; sense = MOI.MIN_SENSE) where {LM<:MetabolicModel} +function optimizeModel(model::LM, optimizer; sense = MOI.MIN_SENSE) where {LM<:MetabolicModel} optimization_model, x, _, _, _ = makeOptimizationModel(model, optimizer; sense = sense) JuMP.optimize!(optimization_model) return (optimization_model, x) diff --git a/test/base/solver.jl b/test/base/solver.jl index 349ebe784..813b9c30c 100644 --- a/test/base/solver.jl +++ b/test/base/solver.jl @@ -2,13 +2,13 @@ @testset "Solve LP" begin cp = test_simpleLP() optimizer = GLPK.Optimizer - (lp, x) = solveLP(cp, optimizer) + (lp, x) = optimizeModel(cp, optimizer) @test termination_status(lp) === MOI.OPTIMAL sol = JuMP.value.(x) @test sol ≈ [1.0, 2.0] optimizer = Clp.Optimizer - (lp, x) = solveLP(cp, optimizer) + (lp, x) = optimizeModel(cp, optimizer) @test termination_status(lp) === MOI.OPTIMAL sol = JuMP.value.(x) @test sol ≈ [1.0, 2.0] -- GitLab