🩹 Fix parameter expression parsing #843
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
The naive approach using expression.replace lead to problems when an expression for a parameter was part of another expression for a parameter.
Example:
The expression:
"100 - $inputs1.s1 - $inputs1.s3 - $inputs1.s8 - $inputs1.s12"
should have been transformed to:
"100 - group.get('inputs1.s1').value - group.get('inputs1.s3').value - group.get('inputs1.s8').value - group.get('inputs1.s12').value"
but instead was transformed to:
"100 - group.get('inputs1.s1').value - group.get('inputs1.s3').value - group.get('inputs1.s8').value - group.get('inputs1.s1').value2"
Since "inputs1.s1" partially matches "inputs1.s12".
I also moved the regex compiling out of the class, so it only gets executed when the module is loaded.
s-weigand
added
Type: Serious Bug
|
|
Sourcery Code Quality Report✅ Merging this PR will increase code quality in the affected files by 0.01%.
Here are some functions in these files that still need a tune-up:
Legend and ExplanationThe emojis denote the absolute quality of the code:
The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request. Please see our documentation here for details on how these metrics are calculated. We are actively working on this report - lots more documentation and extra metrics to come! Help us improve this quality report! |
|
Kudos, SonarCloud Quality Gate passed!
|
|
Benchmark is done. Checkout the benchmark result page. Benchmark diff v0.4.1 vs. mainParametrized benchmark signatures: BenchmarkOptimize.time_optimize(index_dependent, grouped, weight)Benchmark diff main vs. PRParametrized benchmark signatures: BenchmarkOptimize.time_optimize(index_dependent, grouped, weight) |
Codecov Report
@@ Coverage Diff @@
## main #843 +/- ##
=======================================
- Coverage 84.9% 84.9% -0.1%
=======================================
Files 77 77
Lines 4373 4371 -2
Branches 786 785 -1
=======================================
- Hits 3713 3711 -2
Misses 521 521
Partials 139 139
Continue to review full report at Codecov.
|
jsnel
approved these changes
Sep 30, 2021
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.
The naive approach using
expression.replacelead to problems when an expression for a parameter was part of another expression for a parameter.Example:
The expression:
"100 - $inputs1.s1 - $inputs1.s3 - $inputs1.s8 - $inputs1.s12"should have been transformed to:
"100 - group.get('inputs1.s1').value - group.get('inputs1.s3').value - group.get('inputs1.s8').value - group.get('inputs1.s12').value"but instead was transformed to:
"100 - group.get('inputs1.s1').value - group.get('inputs1.s3').value - group.get('inputs1.s8').value - group.get('inputs1.s1').value2"Since
"inputs1.s1"partially matches"inputs1.s12"I also moved the regex compiling out of the class, so it only gets executed when the module is loaded.
Change summary
Checklist