Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Define global strategy in tests #125

Merged
merged 1 commit into from
Jun 10, 2019
+21 −3
Merged

Define global strategy in tests #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/strategies/strategy.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,5 @@ Constructs a default GlobalStrategy using the strategies
`SimpleBnP` as Conquer Strategy, `SimpleBranching` as DivideStrategy
and `DepthFirst` as TreeSearchStrategy.
"""
#GlobalStrategy() = GlobalStrategy(SimpleBnP, SimpleBranching, DepthFirst)

GlobalStrategy() = GlobalStrategy(SimpleBnP, SimpleBranching, DepthFirst)
22 changes: 20 additions & 2 deletions test/full_instances_tests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ function generalized_assignment_tests()
data = CLD.GeneralizedAssignment.data("play2.txt")

coluna = JuMP.with_optimizer(Coluna.Optimizer,
params = CL.Params(
global_strategy = CL.GlobalStrategy(CL.SimpleBnP, CL.SimpleBranching, CL.DepthFirst)
),
default_optimizer = with_optimizer(GLPK.Optimizer)
)

Expand All @@ -23,6 +26,9 @@ function generalized_assignment_tests()
data = CLD.GeneralizedAssignment.data("smallgap3.txt")

coluna = JuMP.with_optimizer(Coluna.Optimizer,
params = CL.Params(
global_strategy = CL.GlobalStrategy(CL.SimpleBnP, CL.SimpleBranching, CL.DepthFirst)
),
default_optimizer = with_optimizer(GLPK.Optimizer)
)

Expand All @@ -38,6 +44,9 @@ function generalized_assignment_tests()
data = CLD.GeneralizedAssignment.data("smallgap3.txt")

coluna = JuMP.with_optimizer(Coluna.Optimizer,
params = CL.Params(
global_strategy = CL.GlobalStrategy(CL.SimpleBnP, CL.SimpleBranching, CL.DepthFirst)
),
default_optimizer = with_optimizer(GLPK.Optimizer)
)

Expand All @@ -51,6 +60,9 @@ function generalized_assignment_tests()
data = CLD.GeneralizedAssignment.data("smallgap3.txt")

coluna = JuMP.with_optimizer(Coluna.Optimizer,
params = CL.Params(
global_strategy = CL.GlobalStrategy(CL.SimpleBnP, CL.SimpleBranching, CL.DepthFirst)
),
default_optimizer = with_optimizer(GLPK.Optimizer)
)

Expand All @@ -64,8 +76,11 @@ function generalized_assignment_tests()
data = CLD.GeneralizedAssignment.data("root_infeas.txt")

coluna = JuMP.with_optimizer(Coluna.Optimizer,
default_optimizer = with_optimizer(GLPK.Optimizer)
)
params = CL.Params(
global_strategy = CL.GlobalStrategy(CL.SimpleBnP, CL.SimpleBranching, CL.DepthFirst)
),
default_optimizer = with_optimizer(GLPK.Optimizer)
)

problem, x, dec = CLD.GeneralizedAssignment.model(data, coluna)

Expand Down Expand Up @@ -110,6 +125,9 @@ function lot_sizing_tests()
data = CLD.SingleModeMultiItemsLotSizing.data("lotSizing-3-20-2.txt")

coluna = JuMP.with_optimizer(Coluna.Optimizer,
params = CL.Params(
global_strategy = CL.GlobalStrategy(CL.SimpleBenders, CL.SimpleBranching, CL.DepthFirst)
),
default_optimizer = with_optimizer(GLPK.Optimizer)
)

Expand Down