Guy Amir - added addSignConstraint to Maraboupy #344
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
# Conflicts: # src/system_tests/Test_sign.h
Merge from master
# Conflicts: # src/system_tests/Test_sign.h
Merge branch 'master' of https://github.com/guyam2/Marabou # Conflicts: # src/system_tests/Test_sign.h
Merge branch 'master' of https://github.com/guyam2/Marabou # Conflicts: # src/system_tests/Test_sign.h
|
Looks good to me; I'll just let @kjulian3 confirm that the new documentation guidelines are met. |
|
This looks good so far, but we'd probably want to make some changes to MarabouNetwork.py to expose the sign constraint to the network class and make it easier for users to access, and we should add some tests to make sure the sign constraint works correctly, as was done for #327. This could be done in a separate PR if needed. What's done here though looks correct to me |
|
Thanks Kyle. Our next step will indeed be to expose the sign constraint, probably through the TF interface, and we will make sure to test it. |
guykatzz
approved these changes
Aug 10, 2020
matanost
pushed a commit
that referenced
this pull request
Nov 2, 2021
* Guy Amir's first try 20/05/2020 * Guy Amir's first try 20/05/2020 * Guy Amir's first try 21/05/2020 * Guy Amir - 21/05 - before testing * Guy Amir's first try 20/05/2020 * Guy Amir's first try 20/05/2020 * Guy Amir - 0506 * Guy Amir - before testing - 0406 * Guy 0406 * Guy Amir's first try 20/05/2020 * Guy Amir's first try 20/05/2020 * Guy - before testing 0406 * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - while testing * Guy - after testing 1706 * Guy - while testing * Guy - system testing * Guy - system testing * Guy - system testing * Guy - system testing * Guy - system testing * Guy - after system testing * Guy - after system testing * Guy - after system testing? * Guy - after system testing? * some cleanup * WIP * Delete vcs.xml * Delete Project.xml * Merge branch 'master' of https://github.com/guyam2/Marabou # Conflicts: # src/system_tests/Test_sign.h * lots of polishing * undo changes in relu * unused var * with new function addSignConstraint() to MarabouCore.cpp - 0908 Merge branch 'master' of https://github.com/guyam2/Marabou # Conflicts: # src/system_tests/Test_sign.h * with new function addSignConstraint() to MarabouCore.cpp - 0908 Merge branch 'master' of https://github.com/guyam2/Marabou # Conflicts: # src/system_tests/Test_sign.h Co-authored-by: Guy Katz <guykatz@cs.huji.ac.il> Co-authored-by: Guy Katz <guyk@cs.stanford.edu> Co-authored-by: Guy Katz <katz911@gmail.com>
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.
same as the addReluConstraint() function