-
Notifications
You must be signed in to change notification settings - Fork 518
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.
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
Mindtpy rewrite #2887
Merged
Merged
Mindtpy rewrite #2887
Changes from all commits
Commits
Show all changes
88 commits
Select commit
Hold shift + click to select a range
a7fd6ee
update mindtpy docstring
ZedongPeng 18358f7
replace setatter
ZedongPeng 65f522c
replace setattr
ZedongPeng 80855fe
generate var_list from var_set
ZedongPeng 18e6f40
remove feasible_no_good_cuts
ZedongPeng 8e03c40
Merge branch 'mindtpy-rewrite' of github.com:ZedongPeng/pyomo into mi…
ZedongPeng 0d4b126
Merge branch 'main' into mindtpy-rewrite
ZedongPeng 4afc6ae
add support for appsi_highs
ZedongPeng 15f4726
Merge branch 'main' into mindtpy-rewrite
ZedongPeng 596ddb7
improve mindtpy subsolver definition and usage
ZedongPeng 7ea1ea3
improve single tree implementation
ZedongPeng 8ccf173
improve single-tree implementation
ZedongPeng 1ffb3c0
add check for subsolvers
ZedongPeng 9dc2847
format
ZedongPeng e9bfc46
change default MIP solver to appsi_highs
ZedongPeng 51e7d9d
fix typo
ZedongPeng 67f1f08
Merge branch 'main' into mindtpy-rewrite
ZedongPeng 235611a
fix bug
ZedongPeng 03880e9
fix typo
ZedongPeng 2110e81
fix mindtpy singletree implementation bug
ZedongPeng b6086bc
add description for mip_start_lazy_oa_cuts
ZedongPeng 2506ef3
add comments
ZedongPeng 8271cb5
format
ZedongPeng 811fe6c
change the name of feasibility pump
ZedongPeng 044143f
remove unused import
ZedongPeng 16d25ca
simplify process_objective function args
ZedongPeng 547b8ed
add exception_flag=False for solver.available()
ZedongPeng f32699f
remove config in args
ZedongPeng 22729a2
Merge branch 'main' into mindtpy-rewrite
bernalde 26d0014
add warmstart for ipopt
ZedongPeng 2212f33
Merge branch 'main' into mindtpy-rewrite
jsiirola 9663a28
Apply black
jsiirola 32a350e
fix lp/nlp bug
ZedongPeng 6aeeb30
Merge branch 'mindtpy-rewrite' of github.com:ZedongPeng/pyomo into mi…
ZedongPeng 57f6ec7
set update_config for feasibility_nlp_opt
ZedongPeng 00d4632
rename add_feas_slacks to initialize_feas_subproblem
ZedongPeng 92ddc96
Merge branch 'main' into mindtpy-rewrite
ZedongPeng f1131d3
change MILP to MIP
ZedongPeng a47ad15
change MIQP to MIQCP
ZedongPeng 1a6452a
change MILP to MIP
ZedongPeng a62bda7
fix typo
ZedongPeng f4e4611
change MILP to MIP
ZedongPeng d6c149a
remove TODO
ZedongPeng a3bccb0
change todo to comment
ZedongPeng cf747c3
resolve tabu list todo
ZedongPeng f45d89f
change the name of simpleMINLP example
ZedongPeng 6b26224
add special handle with mip start solution in single tree
ZedongPeng 0a2db6a
add initial value for constraint qualification example
ZedongPeng aba7540
use model.clone() in mindtpy test
ZedongPeng 4f01c92
add special handle of initial binary strategy
ZedongPeng 724ab91
Merge branch 'mindtpy-rewrite' of github.com:ZedongPeng/pyomo into mi…
ZedongPeng 8201e9b
black format
ZedongPeng 6d0b94d
Merge branch 'main' into mindtpy-rewrite
ZedongPeng d5a4f8f
add description for mip_strategy_presolvenode
ZedongPeng e103981
remove handle_main_other_conditions function
ZedongPeng b20f111
change wrt to w.r.t.
ZedongPeng c6b637a
fix typo
ZedongPeng ee778cf
fix bug
ZedongPeng 9d98391
fix typo
ZedongPeng 0171081
change [...] to values()
ZedongPeng f38dbcc
fix typo
ZedongPeng 190e780
add comments for callback
ZedongPeng e2a9fe6
improve comments
ZedongPeng ebf1057
fix mip_start_lazy_oa_cuts bug
ZedongPeng b4ff4e3
remove clone of ConstraintQualificationExample
ZedongPeng 6e6f258
change the way of checking empty list
ZedongPeng 2698fac
update the link of CPLEX
ZedongPeng cb3669a
change number to enum
ZedongPeng 2147f11
add the log of error message
ZedongPeng fd36c5d
Merge branch 'main' into mindtpy-rewrite
ZedongPeng 9ef5c32
black format
ZedongPeng 053528e
improve constraint list and var list generation
ZedongPeng ce48825
Merge branch 'main' into mindtpy-rewrite
bernalde 526a79e
rename mindtpy_object to mindtpy_solver
ZedongPeng a941bd4
rename set_solver_timelimit to update_solver_timelimit
ZedongPeng a637a4e
change remaining time calculation from int to ceil
ZedongPeng c1b7667
Merge branch 'mindtpy-rewrite' of github.com:ZedongPeng/pyomo into mi…
ZedongPeng 0eebd8f
black format
ZedongPeng 676d9a2
Merge branch 'main' into mindtpy-rewrite
mrmundt 2cb4c22
fix math domain error
ZedongPeng c0d8ad9
fix docstring
ZedongPeng fa810fd
change GUROBI to Gurobi
ZedongPeng 8014474
remove appsi_highs support
ZedongPeng f26ae11
remove wrong calculate_dual_at_solution check
ZedongPeng 3fe865d
black format
ZedongPeng 59941ba
add comments
ZedongPeng 987b40a
add comments for optimalitytarget
ZedongPeng 0d9430d
black format
ZedongPeng File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The two options above are removed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In RLP/NLP algorithm, the regularization problem might become infeasible. There were two options in this case. The first is to use the incumbent solution. Another is to reduce the level coefficient for the trust region. In our paper, we only mention the first method. The implementation of reducing the level coefficient makes the code a little complicated. Therefore I just removed these two configs and use the incumbent solution by default.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You don't have to since this is in contrib, but it might be good to provide a deprecation path so as not to break users' code.