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

RS/JX/Rule12-2 #1424

Merged
merged 27 commits into from
Aug 23, 2024
Merged

RS/JX/Rule12-2 #1424

merged 27 commits into from
Aug 23, 2024

Commits on Jul 28, 2024

  1. init dev

    @Jiarongx-Xie
    Jiarongx-Xie committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    00ae775 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. minor fix and set init file

    @Jiarongx-Xie
    Jiarongx-Xie committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    50a9179 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. First cut at 12-2 rule test JSON

    gonz102 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    f010adc View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

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

    … into RS/JX/Rule12-2
    @Jiarongx-Xie
    Jiarongx-Xie committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    01a021d View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

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

    …-checking-tool into RS/JX/Rule12-2
    @Jiarongx-Xie
    Jiarongx-Xie committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    a2324db View commit details
    Browse the repository at this point in the history

  2. addressed partial PR comments,

    @Jiarongx-Xie
    Jiarongx-Xie committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    8c74d7a View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2024

  1. set up testing

    @Jiarongx-Xie
    Jiarongx-Xie committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    6234edd View commit details
    Browse the repository at this point in the history

  2. address PR comment

    @Jiarongx-Xie
    Jiarongx-Xie committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    bbc15f9 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

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

    … into RS/JX/Rule12-2
    @Jiarongx-Xie
    Jiarongx-Xie committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    34aa85c View commit details
    Browse the repository at this point in the history

  2. removed unused script

    @Jiarongx-Xie
    Jiarongx-Xie committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    94d2852 View commit details
    Browse the repository at this point in the history

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

    … into RS/JX/Rule12-2
    @Jiarongx-Xie
    Jiarongx-Xie committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    d6545ec 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/JX/Rule12-2
    @Jiarongx-Xie
    Jiarongx-Xie committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    3f5f62c View commit details
    Browse the repository at this point in the history

  2. resolve surface adjacency error for IDENTICAL, UNDEFINED

    @JacksonJ-KC
    JacksonJ-KC committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    191ed2b View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. Address PR comments

    @Jiarongx-Xie
    Jiarongx-Xie committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    4a89bb7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into RT/JG/ruletest_12_2

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

  3. Flipped schedules in proposed and baseline case for ruletest 12-2 suc… 

    …h that the EFLH in the baseline case < proposed case
    gonz102 committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    75518f2 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

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

    …-checking-tool into RS/JX/Rule12-2
    @Jiarongx-Xie
    Jiarongx-Xie committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    872b675 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. fix Case 4 logic

    @Jiarongx-Xie
    Jiarongx-Xie committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    d89bb62 View commit details
    Browse the repository at this point in the history

  2. update RDS

    @Jiarongx-Xie
    Jiarongx-Xie committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    20f17f6 View commit details
    Browse the repository at this point in the history

  3. rearrange adjacency conditions

    @JacksonJ-KC
    JacksonJ-KC committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    728c116 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1509 from pnnl/RS/JDJ/get-surface-conditioning-ca… 

    …t-error

RS/JDJ/get surface conditioning category dict error
    @weilixu
    weilixu authored Aug 22, 2024
    Configuration menu
    Copy the full SHA
    73bd182 View commit details
    Browse the repository at this point in the history

  5. updated 12-2-d such that the baseline case does not have automatic co… 

    …ntrols to correctly trigger the undetermined case.
    gonz102 committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    e098da3 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'RT/JG/ruletest_12_2' of https://github.com/pnnl/ruleset… 

    …-checking-tool into RS/JX/Rule12-2
    @Jiarongx-Xie
    Jiarongx-Xie committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    e4975e9 View commit details
    Browse the repository at this point in the history

  7. update RDS case 4

    @Jiarongx-Xie
    Jiarongx-Xie committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    0325cb1 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

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

    … into RS/JX/Rule12-2
    @weilixu
    weilixu committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    6914a74 View commit details
    Browse the repository at this point in the history

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

    …hecking-tool into RS/JX/Rule12-2

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

  3. update calc val value.

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