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

Commits on Feb 3, 2023

  1. Add an interface for dataset-based-rules

    @ye4deltares
    ye4deltares committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    ae05d23 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2023

  1. The file has been renamed and renewed.

    @ye4deltares
    ye4deltares committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    a51e63b View commit details
    Browse the repository at this point in the history

  2. Implement the combine rule logic

    @ye4deltares
    ye4deltares committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    875f198 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2023

  1. Added two more rules. Total number of rules becomes 7. Tests for all … 

    …7 have been added.
    @ye4deltares
    ye4deltares committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    597ad56 View commit details
    Browse the repository at this point in the history

  2. Update combine_results_rule.py

    @ye4deltares
    ye4deltares committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    b3d9338 View commit details
    Browse the repository at this point in the history

  3. Added dimension/shape check for combining rules

    @ye4deltares
    ye4deltares committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    18e0035 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into feature/DEI-42-Add-combine-rule

    @ye4deltares
    ye4deltares committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    3b074dc View commit details
    Browse the repository at this point in the history

  5. Updated the check tests

    @ye4deltares
    ye4deltares committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    a2e90d4 View commit details
    Browse the repository at this point in the history

  6. Updated the max and min for np_arrays

    @ye4deltares
    ye4deltares committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    e5efc37 View commit details
    Browse the repository at this point in the history

  7. Removed typing any

    @ye4deltares
    ye4deltares committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    60b2258 View commit details
    Browse the repository at this point in the history

  8. Remove the f-string

    @ye4deltares
    ye4deltares committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    77442c7 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2023

  1. Merge branch 'main' into feature/DEI-42-Add-combine-rule

    @ye4deltares
    ye4deltares committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    01f4581 View commit details
    Browse the repository at this point in the history

  2. Update combine results rules data parsing

    @ye4deltares
    ye4deltares committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    9960444 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feature/DEI-42-Add-combine-rule

    @ye4deltares
    ye4deltares committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    a77d40c View commit details
    Browse the repository at this point in the history

  4. Added test code for data parsing

    @ye4deltares
    ye4deltares committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    4238b0c View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2023

  1. Tested the parser for the combine results rule

    @ye4deltares
    ye4deltares committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    ee25916 View commit details
    Browse the repository at this point in the history

  2. Removed the too-long errors and whitespaces

    @ye4deltares
    ye4deltares committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    30a01db View commit details
    Browse the repository at this point in the history

  3. Removed a comment

    @ye4deltares
    ye4deltares committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    a9c4a47 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. Update comments after reviewed

    @ye4deltares
    ye4deltares committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    1d5921a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feature/DEI-42-Add-combine-rule

    @ye4deltares
    ye4deltares committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    db11588 View commit details
    Browse the repository at this point in the history

  3. Solved the conflict when merging the main.

    @ye4deltares
    ye4deltares committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    071c69d View commit details
    Browse the repository at this point in the history

  4. Added an exception string

    @ye4deltares
    ye4deltares committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    5425983 View commit details
    Browse the repository at this point in the history

  5. change operationType to MultiArrayOperationType; style; fix tests

    @IoannaMi
    IoannaMi committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    a6cffe7 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2023

  1. Merge branch 'main' into feature/DEI-42-Add-combine-rule

    @mKlapwijk
    mKlapwijk committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    9f52db7 View commit details
    Browse the repository at this point in the history

  2. Corrected a typo

    @ye4deltares
    ye4deltares committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    b04098b View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. changed capitaliza to upper (ALL letters should be upper case, not on… 

    …ly initials)
    @Davidrag
    Davidrag committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    dd1ecbf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feature/DEI-42-Add-combine-rule

    @Davidrag
    Davidrag committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    351315a View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. Added some missing tests to parser

    @Davidrag
    Davidrag committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    72a7ac1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feature/DEI-42-Add-combine-rule

    @Davidrag
    Davidrag committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    7d031b8 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. Refactored combine results rule and tests

    @Davidrag
    Davidrag committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    326682c View commit details
    Browse the repository at this point in the history

  2. Removed unused import

    @Davidrag
    Davidrag committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    066a419 View commit details
    Browse the repository at this point in the history

  3. removed match case to make compliant with python 3.9 (in agents)

    @Davidrag
    Davidrag committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    9c1388e View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. Improvements validation and execution 

    Moved validation of data outside rule validation.
Added time info to output file.
    @Davidrag
    Davidrag committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    72e822b View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. Added test for dims and corrected small typos/missing info.

    @Davidrag
    Davidrag committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    d4e3e25 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. Architectural design changes.

    @Davidrag
    Davidrag committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    cbdbca9 View commit details
    Browse the repository at this point in the history

  2. Fixed failing test.

    @Davidrag
    Davidrag committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    f52a305 View commit details
    Browse the repository at this point in the history

  3. Removed unused import (Any)

    @Davidrag
    Davidrag committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    c7c36cc View commit details
    Browse the repository at this point in the history