-
Notifications
You must be signed in to change notification settings - Fork 276
Minor update to logic in Degeneracy Hunter #1591
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
Open
adowling2
wants to merge
6
commits into
IDAES:main
Choose a base branch
from
adowling2:dege-hunter-spring2025
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ff1401f
Fixed typo/mistake in documentation
adowling2 47c8753
Replaced a ValueError in degeneracy hunter with a print to screen.
adowling2 e1c5bee
Print out the singular value too
adowling2 0007ed8
Merge branch 'main' into dege-hunter-spring2025
adam-a-a 01a7bd8
Merge branch 'main' into dege-hunter-spring2025
ksbeattie 92b29d2
Merge branch 'main' into dege-hunter-spring2025
ksbeattie 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2172,7 +2172,7 @@ def display_underdetermined_variables_and_constraints( | |
"singular values." | ||
) | ||
|
||
stream.write(f"{TAB}Smallest Singular Value {e}:\n\n") | ||
stream.write(f"{TAB}Smallest Singular Value {e} ({self.s[e-1]:.3e}):\n\n") | ||
stream.write(f"{2 * TAB}Variables:\n\n") | ||
for v in np.where(abs(self.v[:, e - 1]) > tol)[0]: | ||
stream.write(f"{3 * TAB}{self._var_list[v].name}\n") | ||
|
@@ -2745,10 +2745,13 @@ def _solve_ids_milp(self, cons: Constraint, tee: bool = False): | |
# We found an irreducible degenerate set | ||
return self._get_ids() | ||
else: | ||
raise ValueError( | ||
# We did not find an irreducible degenerate set | ||
_log.info( | ||
f"Solver did not return an optimal termination condition for " | ||
f"IDS MILP with constraint {cons.name}." | ||
f"constraint {cons.name}. This probably indicates the constraint" | ||
" is not a major component of an IDS." | ||
) | ||
return None | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
||
def find_irreducible_degenerate_sets(self, tee=False): | ||
""" | ||
|
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.
Thank you for this change---I was going to make it myself at some point.