Refactoring Expressions #43
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
CactusWin
commented
Aug 24, 2022
| @@ -289,14 +347,22 @@ def basic_add_operation(type_) -> BasicAbelianOperation: | |||
| return BasicAbelianOperation(operator.add, BasicConstant(0, type_), operator.neg) | |||
|
|
|||
|
|
|||
| def BasicSummation(type_: type, index: Variable, constraint: Context, body: Expression) -> BasicQuantifierExpression: | |||
| def basic_summation( | |||
There was a problem hiding this comment.
Renamed this and BasicIntegral to follow the python convention of naming functions
CactusWin
commented
Aug 24, 2022
| import neuralpp.symbolic.functions as functions | ||
|
|
||
|
|
||
| class AmbiguousTypeError(TypeError, ValueError): |
There was a problem hiding this comment.
I moved all the error classes to a new folder. I realized that these files are hard to read because of how many things there are in the files.
| super().__init__(f"{python_callable} is ambiguous.") | ||
|
|
||
|
|
||
| def boolean_function_of_arity(arity: int) -> Callable: |
There was a problem hiding this comment.
I moved these extra functions that do not depend on Expression to the util folder. I had to remove a function from that folder due to circular dependency.
CactusWin
commented
Aug 24, 2022
| @@ -50,6 +50,21 @@ def _symbolically_eliminate(operation: AbelianOperation, index: Variable, interv | |||
| return None | |||
|
|
|||
|
|
|||
| def _map_leaves_of_if_then_else(conditional_intervals: Expression, | |||
There was a problem hiding this comment.
Moved this from utils due to circular dependency
CactusWin
commented
Aug 26, 2022
| @@ -181,6 +181,8 @@ def from_constraint(index: Variable, constraint: Context, context: Context, is_i | |||
| For example, x > 0 and x <= 5 should return an interval [1, 5] | |||
| More complicated cases will be added later | |||
| """ | |||
| if profiler is None: | |||
| profiler = Profiler() | |||
There was a problem hiding this comment.
Added this for the interval test to pass
rodrigodesalvobraz
approved these changes
Aug 30, 2022
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.
Main Files Changed
In the
symbolicfolderexpression.pybasic_expression.pysympy_expression.pyz3_expression.pyIn the
utilfoldercallable_util.pysymbolic_error_util.pysympy_util.py=> Xiang already had this andz3_utilz3_util.pyLinting
I downloaded
blackto lint the file (pip install black) =>black file_name --fast. I'm linting now, so the files are cleaner to read and to make it easier for us to switch to fbcode. I think this is the linter that phabriactor is based off.Organization
I moved all the extraneous files into a
utilfile. I created 2 util files (symbolic_error_utilandcallable_util)callable_utilsympy_utilsymbolic_error_utilI made sure all of the import functions are used => removed any that are unused
I ordered the functions and classes the same along files.
Code
There is no new code!
Tests
I commented out a test in
normalizer_testbecause it is failing in the main branchReviewing
I think it'll be easier to review this PR with the raw file, rather than going through the GitHub interface
Next Steps