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

DSDA_Improvement #11

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

DSDA_Improvement #11

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b50ae9f
Commented import from the dsda_functions.py
AlbertLee125 Jan 24, 2024
6099bff
Set mip_transformation option into False
AlbertLee125 Jan 26, 2024
a2ac3eb
Remove unused import statement
AlbertLee125 Feb 5, 2024
bf1fd83
Added the Benchmarking Codes and results of Zedong's ldsda
AlbertLee125 Jul 30, 2024
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 gdp/dsda/dsda_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from gdp.dsda.model_serializer import StoreSpec, from_json, to_json
from pyomo.common.errors import InfeasibleConstraintException
from pyomo.contrib.fbbt.fbbt import fbbt
from pyomo.contrib.gdpopt.data_class import MasterProblemResult
# from pyomo.contrib.gdpopt.data_class import MasterProblemResult
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is not imported anywhere, do not just comment it out but remove it

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I removed the imports

from pyomo.core.base.misc import display
from pyomo.core.plugins.transform.logical_to_linear import \
update_boolean_vars_from_binary
Expand Down
2 changes: 1 addition & 1 deletion main_column.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ def problem_logic_column(m):
model_args=model_args,
starting_point=starting_point,
ext_dict=ext_ref,
mip_transformation=True,
mip_transformation=False,
transformation=transformation,
ext_logic=problem_logic_column,
k=k,
Expand Down
2 changes: 1 addition & 1 deletion main_cstr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ def problem_logic_cstr(m):
starting_point=starting_point,
ext_dict=ext_ref,
ext_logic=problem_logic_cstr,
mip_transformation=True,
mip_transformation=False,
transformation=transformation,
k=k,
provide_starting_initialization=True,
Expand Down
4 changes: 2 additions & 2 deletions main_small_batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def problem_logic_batch(m):
model_args={},
starting_point=starting_point,
ext_dict=ext_ref,
mip_transformation=True,
mip_transformation=False,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see that you removed the MIP transformation for each one of these steps. I would like you to check each subproblem, what the instance looks like, and what that MIP transformation is introducing. Start with small_batch.

transformation=transformation,
ext_logic=problem_logic_batch,
k=k,
Expand All @@ -163,7 +163,7 @@ def problem_logic_batch(m):
iter_timelimit=timelimit,
timelimit=timelimit,
gams_output=False,
tee=globaltee,
tee=False,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why removing the tee?

global_tee=globaltee,
)
new_result = {'Method': str('D-SDA_MIP_'+transformation), 'Approach': str('k='+k), 'Solver': solver, 'Objective': pe.value(
Expand Down