Add reformulation parser #745
Conversation
Codecov ReportBase: 86.54% // Head: 86.54% // No change to project coverage 👍
Additional details and impacted files@@ Coverage Diff @@
## master #745 +/- ##
=======================================
Coverage 86.54% 86.54%
=======================================
Files 59 59
Lines 5405 5405
=======================================
Hits 4678 4678
Misses 727 727 Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
|
Do you think you can move this outside Coluna? I think it would be nice to keep it in the tests. I don't know if we can have a kind of |
|
Would it be better if the parser file in src/ was moved to test/, and add include("parser.jl") in ColunaTests module? Because creating a submodule I'd have to define some constants that are already in ColunaTests and export the functions from the new module. |
Sounds good :) |
test/integration/parser.jl
Outdated
| names = [] | ||
| kinds = [] | ||
| duties = [] | ||
| costs = [] | ||
| bounds = [] |
There was a problem hiding this comment.
| names = [] | |
| kinds = [] | |
| duties = [] | |
| costs = [] | |
| bounds = [] | |
| names = String[] | |
| kinds = ClMP.VarKind[] | |
| duties = ClMP.Duty{ClMP.Variable}[] | |
| costs = Float64[] | |
| bounds = Tuple{Float64,Float64}[] |
test/integration/parser.jl
Outdated
| infos = AuxiliaryConstrInfo[] | ||
| coeff_matrix = CL.getcoefmatrix(form) | ||
| for (constrid, constr) in CL.getconstrs(form) | ||
| coeffs = [] |
There was a problem hiding this comment.
| coeffs = [] | |
| coeffs = Float64[] |
test/integration/parser.jl
Outdated
| y1 >= 1 | ||
| 1 <= y2 | ||
| """ | ||
| @test_throws ErrorException reformfromstring(s) |
There was a problem hiding this comment.
Can you create a UndefinedMasterParserError thrown when this error happens?
test/integration/parser.jl
Outdated
| y1 >= 1 | ||
| 1 <= y2 | ||
| """ | ||
| @test_throws ErrorException reformfromstring(s) |
There was a problem hiding this comment.
Can you create a specific error type e.g. UndefinedObjectiveParserError
test/integration/parser.jl
Outdated
| bounds | ||
| y <= 10 | ||
| """ | ||
| @test_throws ErrorException reformfromstring(s) |
There was a problem hiding this comment.
can you create a specific error type?
test/integration/parser.jl
Outdated
| bounds | ||
| x >= 10 | ||
| """ | ||
| @test_throws ErrorException reformfromstring(s) |
There was a problem hiding this comment.
can you create a specific error type?
test/parser.jl
Outdated
| if m !== nothing | ||
| vars = _get_vars_list(m[4]) # separate variables as "x_1, x_2" into a list [x_1, x_2] | ||
| if m[1] !== nothing # has lower bound (nb <= var) or upper bound (nb >= var) | ||
| bound1 = String(m[2]) | ||
| end | ||
| if m[5] !== nothing # has upper bound (var <= nb) or lower bound (var >= nb) | ||
| bound2 = String(m[6]) | ||
| end |
There was a problem hiding this comment.
| if m !== nothing | |
| vars = _get_vars_list(m[4]) # separate variables as "x_1, x_2" into a list [x_1, x_2] | |
| if m[1] !== nothing # has lower bound (nb <= var) or upper bound (nb >= var) | |
| bound1 = String(m[2]) | |
| end | |
| if m[5] !== nothing # has upper bound (var <= nb) or lower bound (var >= nb) | |
| bound2 = String(m[6]) | |
| end | |
| if !isnothing(m) | |
| vars = _get_vars_list(m[4]) # separate variables as "x_1, x_2" into a list [x_1, x_2] | |
| if !isnothing(m[1]) # has lower bound (nb <= var) or upper bound (nb >= var) | |
| bound1 = String(m[2]) | |
| end | |
| if !isnothing(m[5]) # has upper bound (var <= nb) or lower bound (var >= nb) | |
| bound2 = String(m[6]) | |
| end |
test/parser.jl
Outdated
|
|
||
| function read_master!(::Val{:constraints}, cache::ReadCache, line::AbstractString) | ||
| constr = _read_constraint(line) | ||
| if constr !== nothing |
There was a problem hiding this comment.
| if constr !== nothing | |
| if !isnothing(constr) |
test/parser.jl
Outdated
|
|
||
| function read_subproblem!(cache::ReadCache, line::AbstractString, nb_sp::Int64) | ||
| constr = _read_constraint(line) | ||
| if constr !== nothing |
There was a problem hiding this comment.
| if constr !== nothing | |
| if !isnothing(constr) |
test/parser.jl
Outdated
| if haskey(cache.variables, varid) | ||
| var = cache.variables[varid] | ||
| if var.duty <= ClMP.DwSpPricingVar || var.duty <= ClMP.MasterRepPricingVar | ||
| if spform === nothing |
There was a problem hiding this comment.
| if spform === nothing | |
| if isnothing(spform) |
| push!(constraints, c) | ||
| i += 1 | ||
| end | ||
| #create subproblems constraints in master |
There was a problem hiding this comment.
This is a very long method. Is it possible to isolate each step in a specific method?
Closes #702 .