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

RCT/YJ/Rule 12-3 #1409

Merged
merged 13 commits into from
Aug 21, 2024
Merged

RCT/YJ/Rule 12-3 #1409

merged 13 commits into from
Aug 21, 2024

Commits on Jul 26, 2024

  1. Replaced with RuleSetModelDescriptionRule

    @yunjoonjung-PNNL
    yunjoonjung-PNNL committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    d744aa7 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. First cut at 12-3 rule test JSON. Also required updating the schema t… 

    …o account for "automatic_controlled_percentage"
    gonz102 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    b61f494 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'RT/JG/ruletest_12_3' of https://github.com/pnnl/ruleset… 

    …-checking-tool into RS/YJ/Rule_12-3
    @yunjoonjung-PNNL
    yunjoonjung-PNNL committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    04cb834 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. Updated the rule 12-3

    @yunjoonjung-PNNL
    yunjoonjung-PNNL committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    f934658 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/pnnl/ruleset-checking-tool… 

    … into RS/YJ/Rule_12-3
    @yunjoonjung-PNNL
    yunjoonjung-PNNL committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    f9ff99d View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Merge branch 'RT/JG/ruletest_12_4' into RT/JG/ruletest_12_3

    gonz102 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    90ff732 View commit details
    Browse the repository at this point in the history

  2. Updated 12-3 per Yun Joon's recommendations. Missing a few parameters.

    gonz102 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    6a47ed6 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2024

  1. Merge branch 'RT/JG/ruletest_12_3' of https://github.com/pnnl/ruleset… 

    …-checking-tool into RS/YJ/Rule_12-3
    @yunjoonjung-PNNL
    yunjoonjung-PNNL committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    b0879ae View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Fix rule 12-3 after testing

    @yunjoonjung-PNNL
    yunjoonjung-PNNL committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    fca10e8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/pnnl/ruleset-checking-tool… 

    … into RS/YJ/Rule_12-3
    @yunjoonjung-PNNL
    yunjoonjung-PNNL committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    6720d29 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. Merge branch 'develop' of https://github.com/pnnl/ruleset-checking-tool… 

    … into RS/YJ/Rule_12-3
    @yunjoonjung-PNNL
    yunjoonjung-PNNL committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    c3b6634 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. Merge branch 'feature/section12' of https://github.com/pnnl/ruleset-c… 

    …hecking-tool into RS/YJ/Rule_12-3

# Conflicts:
#	rct229/rulesets/ashrae9012019/section12/section12rule3.py
    @weilixu
    weilixu committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    e3d62bf View commit details
    Browse the repository at this point in the history

  2. update format

    @weilixu
    weilixu committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    6c25996 View commit details
    Browse the repository at this point in the history