Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Feature/DEI-42 add combine rule #9

Merged
merged 37 commits into from
Mar 9, 2023
Merged

Feature/DEI-42 add combine rule #9

merged 37 commits into from
Mar 9, 2023

Conversation

ye4deltares
Copy link
Contributor

finished the test

@ye4deltares
Add an interface for dataset-based-rules
ae05d23
@ye4deltares
The file has been renamed and renewed.
a51e63b
@ye4deltares
Implement the combine rule logic
875f198
@ye4deltares
Added two more rules. Total number of rules becomes 7. Tests for all …
597ad56 
…7 have been added.
@ye4deltares
Update combine_results_rule.py
b3d9338
@ye4deltares
Added dimension/shape check for combining rules
18e0035
@ye4deltares
Merge branch 'main' into feature/DEI-42-Add-combine-rule
3b074dc
@ye4deltares
Updated the check tests
a2e90d4
@ye4deltares
Updated the max and min for np_arrays
e5efc37
@ye4deltares
Removed typing any
60b2258
@ye4deltares
Remove the f-string
77442c7
@ye4deltares
Merge branch 'main' into feature/DEI-42-Add-combine-rule
01f4581
@ye4deltares
Update combine results rules data parsing
9960444
@ye4deltares
Merge branch 'main' into feature/DEI-42-Add-combine-rule
a77d40c
@ye4deltares
Added test code for data parsing
4238b0c
@ye4deltares
Tested the parser for the combine results rule
ee25916
@ye4deltares
Removed the too-long errors and whitespaces
30a01db
@ye4deltares
Removed a comment
a9c4a47
@Davidrag Davidrag self-requested a review February 16, 2023 16:07
IoannaMi
IoannaMi suggested changes Feb 20, 2023
View reviewed changes
Copy link
Contributor

@IoannaMi IoannaMi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small comments basically for styling; suggestion to add an exception

decoimpact/business/entities/rules/combine_results_rule.py Outdated Show resolved Hide resolved
decoimpact/business/entities/rules/combine_results_rule.py Outdated Show resolved Hide resolved
decoimpact/business/entities/rules/combine_results_rule.py Outdated Show resolved Hide resolved
decoimpact/business/entities/rules/combine_results_rule.py Outdated Show resolved Hide resolved
decoimpact/business/entities/rules/combine_results_rule.py Outdated Show resolved Hide resolved
decoimpact/data/api/i_combine_results_rule_data.py Show resolved Hide resolved
decoimpact/data/parsers/parser_combine_results_rule.py Outdated Show resolved Hide resolved
tests/data/entities/test_combine_results_data.py Outdated Show resolved Hide resolved
tests/data/parsers/test_parser_combine_results_rule.py Outdated
@@ -0,0 +1,90 @@
"""
Tests for ParserMultiplyRule class
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests for parserCombinResultsRule class

decoimpact/business/entities/rules/combine_results_rule.py Outdated Show resolved Hide resolved
IoannaMi
IoannaMi approved these changes Mar 1, 2023
View reviewed changes
Copy link
Contributor

@IoannaMi IoannaMi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@Davidrag Davidrag merged commit 3d42816 into main Mar 9, 2023
@Davidrag Davidrag deleted the feature/DEI-42-Add-combine-rule branch March 9, 2023 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IoannaMi IoannaMi IoannaMi approved these changes

@Davidrag Davidrag Awaiting requested review from Davidrag

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ye4deltares @IoannaMi @Davidrag @mKlapwijk