Skip to content

Conversation

@JacksonJ-KC JacksonJ-KC self-assigned this Jan 16, 2025
# Conflicts:
#	rct229/rulesets/ashrae9012019/section1/section1rule1.py
#	rct229/rulesets/ashrae9012019/section1/section1rule5.py
#	rct229/rulesets/ashrae9012019/section1/section1rule6.py
#	rct229/rulesets/ashrae9012019/section1/section1rule7.py
#	rct229/rulesets/ashrae9012019/section11/section11rule1.py
#	rct229/rulesets/ashrae9012019/section11/section11rule10.py
#	rct229/rulesets/ashrae9012019/section11/section11rule13.py
#	rct229/rulesets/ashrae9012019/section11/section11rule16.py
#	rct229/rulesets/ashrae9012019/section11/section11rule8.py
#	rct229/rulesets/ashrae9012019/section19/section19rule15.py
#	rct229/rulesets/ashrae9012019/section19/section19rule19.py
#	rct229/rulesets/ashrae9012019/section19/section19rule35.py
#	rct229/rulesets/ashrae9012019/section19/section19rule7.py
#	rct229/rulesets/ashrae9012019/section21/section21rule1.py
#	rct229/rulesets/ashrae9012019/section21/section21rule2.py
#	rct229/rulesets/ashrae9012019/section22/section22rule17.py
#	rct229/rulesets/ashrae9012019/section22/section22rule35.py
#	rct229/rulesets/ashrae9012019/section22/section22rule37.py
#	rct229/rulesets/ashrae9012019/section22/section22rule38.py
#	rct229/rulesets/ashrae9012019/section22/section22rule39.py
#	rct229/rulesets/ashrae9012019/section23/section23rule1.py
#	rct229/rulesets/ashrae9012019/section4/section4rule1.py
#	rct229/rulesets/ashrae9012019/section4/section4rule11.py
@JacksonJ-KC JacksonJ-KC marked this pull request as ready for review February 6, 2025 14:36
# Conflicts:
#	rct229/rulesets/ashrae9012019/section1/section1rule3.py
#	rct229/rulesets/ashrae9012019/section1/section1rule4.py
#	rct229/rulesets/ashrae9012019/section11/section11rule12.py
#	rct229/rulesets/ashrae9012019/section11/section11rule17.py
#	rct229/rulesets/ashrae9012019/section11/section11rule7.py
#	rct229/rulesets/ashrae9012019/section11/section11rule8.py
#	rct229/rulesets/ashrae9012019/section12/section12rule2.py
#	rct229/rulesets/ashrae9012019/section12/section12rule3.py
#	rct229/rulesets/ashrae9012019/section12/section12rule4.py
#	rct229/rulesets/ashrae9012019/section16/section16rule2.py
#	rct229/rulesets/ashrae9012019/section16/section16rule3.py
#	rct229/rulesets/ashrae9012019/section16/section16rule4.py
#	rct229/rulesets/ashrae9012019/section16/section16rule5.py
#	rct229/rulesets/ashrae9012019/section18/section18rule1.py
#	rct229/rulesets/ashrae9012019/section18/section18rule2.py
#	rct229/rulesets/ashrae9012019/section18/section18rule3.py
#	rct229/rulesets/ashrae9012019/section19/section19rule1.py
#	rct229/rulesets/ashrae9012019/section19/section19rule10.py
#	rct229/rulesets/ashrae9012019/section19/section19rule12.py
#	rct229/rulesets/ashrae9012019/section19/section19rule17.py
#	rct229/rulesets/ashrae9012019/section19/section19rule21.py
#	rct229/rulesets/ashrae9012019/section19/section19rule3.py
#	rct229/rulesets/ashrae9012019/section19/section19rule4.py
#	rct229/rulesets/ashrae9012019/section19/section19rule5.py
#	rct229/rulesets/ashrae9012019/section19/section19rule6.py
#	rct229/rulesets/ashrae9012019/section19/section19rule8.py
#	rct229/rulesets/ashrae9012019/section21/section21rule17.py
#	rct229/rulesets/ashrae9012019/section21/section21rule5.py
#	rct229/rulesets/ashrae9012019/section21/section21rule9.py
#	rct229/rulesets/ashrae9012019/section22/section22rule20.py
#	rct229/rulesets/ashrae9012019/section22/section22rule21.py
#	rct229/rulesets/ashrae9012019/section22/section22rule22.py
#	rct229/rulesets/ashrae9012019/section22/section22rule31.py
#	rct229/rulesets/ashrae9012019/section22/section22rule32.py
#	rct229/rulesets/ashrae9012019/section23/section23rule4.py
#	rct229/rulesets/ashrae9012019/section4/section4rule1.py
#	rct229/rulesets/ashrae9012019/section4/section4rule11.py
#	rct229/rulesets/ashrae9012019/section4/section4rule2.py
#	rct229/rulesets/ashrae9012019/section5/section5rule10.py
#	rct229/rulesets/ashrae9012019/section5/section5rule11.py
#	rct229/rulesets/ashrae9012019/section5/section5rule12.py
#	rct229/rulesets/ashrae9012019/section5/section5rule13.py
#	rct229/rulesets/ashrae9012019/section5/section5rule14.py
#	rct229/rulesets/ashrae9012019/section5/section5rule15.py
#	rct229/rulesets/ashrae9012019/section5/section5rule16.py
#	rct229/rulesets/ashrae9012019/section5/section5rule19.py
#	rct229/rulesets/ashrae9012019/section5/section5rule20.py
#	rct229/rulesets/ashrae9012019/section5/section5rule21.py
#	rct229/rulesets/ashrae9012019/section5/section5rule22.py
#	rct229/rulesets/ashrae9012019/section5/section5rule23.py
#	rct229/rulesets/ashrae9012019/section5/section5rule24.py
#	rct229/rulesets/ashrae9012019/section5/section5rule25.py
#	rct229/rulesets/ashrae9012019/section5/section5rule26.py
#	rct229/rulesets/ashrae9012019/section5/section5rule27.py
#	rct229/rulesets/ashrae9012019/section5/section5rule28.py
#	rct229/rulesets/ashrae9012019/section5/section5rule29.py
#	rct229/rulesets/ashrae9012019/section5/section5rule3.py
#	rct229/rulesets/ashrae9012019/section5/section5rule31.py
#	rct229/rulesets/ashrae9012019/section5/section5rule32.py
#	rct229/rulesets/ashrae9012019/section5/section5rule35.py
#	rct229/rulesets/ashrae9012019/section5/section5rule36.py
#	rct229/rulesets/ashrae9012019/section5/section5rule37.py
#	rct229/rulesets/ashrae9012019/section5/section5rule38.py
#	rct229/rulesets/ashrae9012019/section5/section5rule4.py
#	rct229/rulesets/ashrae9012019/section5/section5rule5.py
#	rct229/rulesets/ashrae9012019/section5/section5rule6.py
#	rct229/rulesets/ashrae9012019/section5/section5rule7.py
#	rct229/rulesets/ashrae9012019/section5/section5rule8.py
#	rct229/rulesets/ashrae9012019/section5/section5rule9.py
#	rct229/rulesets/ashrae9012019/section6/section6rule5.py
@JacksonJ-KC JacksonJ-KC marked this pull request as draft April 8, 2025 17:36
@JacksonJ-KC JacksonJ-KC marked this pull request as ready for review April 9, 2025 17:29
@JacksonJ-KC JacksonJ-KC requested a review from weilixu April 9, 2025 17:34
@JacksonJ-KC
Copy link
Collaborator Author

JacksonJ-KC commented Apr 25, 2025

@jugonzal07 I am having a hard time tracing which changes to the TCD spreadsheet have test jsons that have been merged vs in open pull requests. You might find that after this branch gets merged there is some misalignment, particularly in sections 5 and 19 Rules 5-30, 19-3, 19-23, 19-37. I am trying to make sure the content of the new _renumb spreadsheets matches the masters and that we are passing CI tests.

random_numbers12 = "".join([str(random.randint(0, 9)) for _ in range(2)])
random_letter3 = random.choice(string.ascii_lowercase)
random_numbers45 = "".join([str(random.randint(0, 9)) for _ in range(2)])
unique_rule_id = f"{random_numbers12}{random_letter3}{random_numbers45}"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Consider this

def generate_unique_rule_id():
    """
    Generate a unique rule ID for a rule. The rule ID is generated in the format of:
    prm9012019rule + 2 digits + 1 lowercase letter + 2 digits
    """
    def generate_id():
        random_numbers12 = "".join([str(random.randint(0, 9)) for _ in range(2)])
        random_letter3 = random.choice(string.ascii_lowercase)
        random_numbers45 = "".join([str(random.randint(0, 9)) for _ in range(2)])
        return f"{random_numbers12}{random_letter3}{random_numbers45}"

    unique_rule_id = generate_id()

    # Check if the generated rule ID already exists
    while unique_rule_id in rule_map:
        unique_rule_id = generate_id()

    return f"prm9012019rule{unique_rule_id}"

@weilixu
Copy link
Collaborator

weilixu commented Apr 25, 2025

@JacksonJ-KC All good, ready to merge.
@jugonzal07 let me know your suggestion to Jackson's comment.

@jugonzal07
Copy link
Contributor

@jugonzal07 I am having a hard time tracing which changes to the TCD spreadsheet have test jsons that have been merged vs in open pull requests. You might find that after this branch gets merged there is some misalignment, particularly in sections 5 and 19 Rules 5-30, 19-3, 19-23, 19-37. I am trying to make sure the content of the new _renumb spreadsheets matches the masters and that we are passing CI tests.

I gotcha. I'll get you a list of those changes against your renumbering. I believe nearly all should be up to date. I've kept a catalogue of the changes I've made and it shouldn't be too tough to do a comparison. All my latest changes this week have been in copies of the renumbering spreadsheet. I'll try and have that for our stand-up tomorrow.

@weilixu weilixu merged commit f03c3a0 into develop May 14, 2025
2 checks passed
@weilixu weilixu deleted the RS/JDJ/final-renumbering branch May 14, 2025 20:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants