Incremental solving infrastructure #831
Merged
Conversation
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
Collaborator
wu-haoze
commented
Aug 22, 2024
•
wu-haoze
commented
- Old InputQuery class renamed to "Query"
- New InputQuery class introduced which allows pushing/popping constraints incrementally. Keep naming the outward-facing query class InputQuery makes the API backward compatible.
- InputQuery and Query both inherits an IQuery abstract class. QueryLoaders, different parsers, and methods like preprocessQuery now operate on IQuery.
- Update incremental-solving example in maraboupy/example
wu-haoze
commented
Aug 22, 2024
| @@ -347,39 +329,23 @@ void DnCManager::printResult() | |||
| { | |||
| std::cout << "sat\n" << std::endl; | |||
|
|
|||
| extractSolution( *_baseInputQuery ); | |||
|
|
|||
| Vector<double> inputVector( _baseInputQuery->getNumInputVariables() ); | |||
There was a problem hiding this comment.
There is a danger that the network-level reasoner's output variable is different from the actual output variable. Also, the output assignment might be inconsistent with the satisfying assignment returned by the API call. Disabling this re-computation with NLR for now and left a TODO.
wu-haoze
commented
Aug 22, 2024
| @@ -918,19 +918,18 @@ void Engine::fixViolatedPlConstraintIfPossible() | |||
| _tableau->setNonBasicAssignment( fix._variable, fix._value, true ); | |||
| } | |||
|
|
|||
| bool Engine::processInputQuery( InputQuery &inputQuery ) | |||
| bool Engine::processInputQuery( const IQuery &inputQuery ) | |||
There was a problem hiding this comment.
Making this const so that we know processInputQuery does not change the InputQuery, which will be "re-processed" later during incremental solving.
wu-haoze
commented
Aug 22, 2024
| @@ -973,35 +972,12 @@ bool Engine::calculateBounds( InputQuery &inputQuery ) | |||
| return true; | |||
| } | |||
|
|
|||
| void Engine::informConstraintsOfInitialBounds( InputQuery &inputQuery ) const | |||
There was a problem hiding this comment.
Moving this to Preprocessor. This is the first thing we do now in the Preprocessor.
wu-haoze
commented
Aug 22, 2024
| @@ -376,42 +376,6 @@ struct MarabouOptions | |||
| }; | |||
|
|
|||
|
|
|||
| /* The default parameters here are just for readability, you should specify | |||
There was a problem hiding this comment.
I believe this method is not needed given that we already have calculuateBounds(). Writing a deep-copy constructor for the context dependent InputQuery class just for this seems a bit unncessary.
MatthewDaggitt
requested changes
Aug 23, 2024
Fix documentation in PropertyParser; Add documentation for IQuery, InputQuery, and Query; Add CDMap class which inherits from CVC4's cdhashmap class.
MatthewDaggitt
approved these changes
Aug 23, 2024
wu-haoze
added a commit
that referenced
this pull request
Sep 11, 2024
…cted (#829) * fix unit test * Change initialization strategy in DeepSoI if NLR is not fully constructed * Drop support for Tensorflow and fix MacOS bug in unit test to pass CI tests (#827) * fix unit test and CI * bump python version * test * remove test * test_sub * add network * add a test for Sub * remove local robustness method * Incremental solving infrastructure (#831) * fix unit test * update python requirement * test requirement * cdhasmap * add IInputQuery * rename * progress * seems to work * add test * make input query const * incremental * new incremental solving * add python test * update change log * fix format * test cd hasmap * add todos * revert ci.yml * rename ipq to query * Addressing Matthew's comments: Fix documentation in PropertyParser; Add documentation for IQuery, InputQuery, and Query; Add CDMap class which inherits from CVC4's cdhashmap class. * revert cdhashmap * Update Test_InputQuery.h * Update Test_InputQuery.h * Update test_query.py * Update Marabou.py * Update test_query.py * Update Test_InputQuery.h * Update Test_Engine.h * Update Test_Engine.h * Change initialization strategy in DeepSoI if NLR is not fully constructed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.