-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #93 from NREL/validate_options
Validate options
- Loading branch information
Showing
9 changed files
with
319 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
buildstockbatch/test/test_inputs/enforce-validate-options-bad.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
buildstock_directory: test_openstudio_buildstock | ||
project_directory: project_singlefamilydetached | ||
baseline: | ||
n_datapoints: 30 | ||
n_buildings_represented: 81221016 | ||
upgrades: | ||
- upgrade_name: bad upgrade | ||
options: | ||
- option: Vintage|Extra Argument | ||
apply_logic: | ||
- or: | ||
- Insulation Slab|Invalid Option | ||
- Insulation Slab|None | ||
- not: Insulation Wall|Good Option|| | ||
- and: | ||
- Vintage|1960s | ||
- Vintage| 1980s | ||
- option: Insulation Finished Basement|Good Option | ||
apply_logic: | ||
- Insulation Unfinished Basement|Extra Argument | ||
package_apply_logic: Vintage|1970s||Vintage|1941s | ||
- options: | ||
- option: | | ||
apply_logic: | ||
- or: | ||
- Insulation Slat|Good Option | ||
- Insulation Slab|None | ||
- not: Insulation Wall|Good Option | ||
- and: | ||
- Vintage|1960s|Vintage|1960s | ||
- Vintage|1980s | ||
- option: Insulation Finished Basement|Good Option | ||
apply_logic: | ||
- Insulation Unfinished Basement|Extra Argument | ||
package_apply_logic: Vintage|1960s||Vintage|1940s&&Vintage|1980s | ||
downselect: | ||
resample: False | ||
logic: Invalid Parameter|2000s |
24 changes: 24 additions & 0 deletions
24
buildstockbatch/test/test_inputs/enforce-validate-options-good.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
buildstock_directory: test_openstudio_buildstock | ||
project_directory: project_singlefamilydetached | ||
baseline: | ||
n_datapoints: 30 | ||
n_buildings_represented: 81221016 | ||
upgrades: | ||
- upgrade_name: good upgrade | ||
options: | ||
- option: Vintage|<1940 | ||
apply_logic: | ||
- or: | ||
- Insulation Slab|Good Option | ||
- Insulation Slab|None | ||
- not: Insulation Wall|Good Option | ||
- and: | ||
- Vintage|1960s||Vintage|1960s | ||
- Vintage|1980s | ||
- option: Insulation Finished Basement|Good Option | ||
apply_logic: | ||
- Insulation Unfinished Basement|Extra Argument | ||
package_apply_logic: Vintage|1960s||Vintage|1940s | ||
downselect: | ||
resample: False | ||
logic: Vintage|2000s |
24 changes: 24 additions & 0 deletions
24
buildstockbatch/test/test_inputs/enforce-validate-options-wrong-path.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
buildstock_directory: test_openstudio_buildstock_wrong | ||
project_directory: project_singlefamilydetached | ||
baseline: | ||
n_datapoints: 30 | ||
n_buildings_represented: 81221016 | ||
upgrades: | ||
- upgrade_name: good upgrade | ||
options: | ||
- option: Vintage|<1940 | ||
apply_logic: | ||
- or: | ||
- Insulation Slab|Good Option | ||
- Insulation Slab|None | ||
- not: Insulation Wall|Good Option | ||
- and: | ||
- Vintage|1960s||Vintage|1960s | ||
- Vintage|1980s | ||
- option: Insulation Finished Basement|Good Option | ||
apply_logic: | ||
- Insulation Unfinished Basement|Extra Argument | ||
package_apply_logic: Vintage|1960s||Vintage|1940s | ||
downselect: | ||
resample: False | ||
logic: Vintage|2000s |
26 changes: 26 additions & 0 deletions
26
buildstockbatch/test/test_inputs/test_openstudio_buildstock/resources/options_lookup.tsv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
Parameter Name Option Name Measure Dir Measure Arg 1 Measure Arg 2 ... | ||
Location AL_Birmingham.Muni.AP.722280 | ||
Location AL_Huntsville.Intl.AP-Jones.Field.723230 | ||
Location AL_Mobile-Rgnl.AP.722230 | ||
Vintage <1940 | ||
Vintage 1940s | ||
Vintage <1950 | ||
Vintage 1950s | ||
Vintage 1960s | ||
Vintage 1970s | ||
Vintage 1980s | ||
Vintage 1990s | ||
Vintage 2000s | ||
Vintage 2010s | ||
Insulation Slab None | ||
Insulation Slab Good Option ResidentialConstructionsSlab perimeter_r=0 perimeter_width=0 whole_r=0 gap_r=0 exterior_r=0 exterior_depth=0 | ||
Insulation Slab Missing Argument ResidentialConstructionsSlab perimeter_r=0 perimeter_width=0 whole_r=10 gap_r=5 exterior_r=0 | ||
Insulation Unfinished Basement None | ||
Insulation Unfinished Basement Good Option ResidentialConstructionsUnfinishedBasement wall_ins_height=0 wall_cavity_r=0 wall_install_grade=1 wall_cavity_depth_in=0 wall_filled_cavity=true wall_framing_factor=0 wall_rigid_r=0 wall_drywall_thick_in=0.5 ceiling_cavity_r=0 ceiling_install_grade=1 ceiling_framing_factor=0.13 ceiling_joist_height_in=9.25 slab_whole_r=0 | ||
Insulation Unfinished Basement Extra Argument ResidentialConstructionsUnfinishedBasement wall_ins_height=0 wall_cavity_r=0 wall_install_grade=1 wall_cavity_depth_in=0 wall_filled_cavity=true wall_framing_factor=0 wall_rigid_r=0 wall_drywall_thick_in=0.5 ceiling_cavity_r=13 ceiling_install_grade=1 ceiling_framing_factor=0.13 ceiling_joist_height_in=9.25 slab_whole_r=0 extra_arg=1 | ||
Insulation Finished Basement None | ||
Insulation Finished Basement Good Option ResidentialConstructionsFinishedBasement wall_ins_height=0 wall_cavity_r=0 wall_install_grade=1 wall_cavity_depth_in=0 wall_filled_cavity=true wall_framing_factor=0 wall_rigid_r=0 wall_drywall_thick_in=0.5 slab_whole_r=0 | ||
Insulation Finished Basement Bad Value ResidentialConstructionsFinishedBasement wall_ins_height=4 wall_cavity_r=0 wall_install_grade=1 wall_cavity_depth_in=0 wall_filled_cavity=1.5 wall_framing_factor=0 wall_rigid_r=5 wall_drywall_thick_in=0.5 slab_whole_r=0 | ||
Insulation Wall Good Option ResidentialConstructionsWallsWoodStud cavity_r=0 install_grade=1 cavity_depth_in=3.5 cavity_filled=false framing_factor=0.25 drywall_thick_in=0.5 osb_thick_in=0.5 rigid_r=0.0 "exterior_finish=Vinyl, Light" | ||
Insulation Wall Missing Measure ResidentialConstructionsWallsWoodStud cavity_r=0 install_grade=1 cavity_depth_in=3.5 cavity_filled=false framing_factor=0.25 drywall_thick_in=0.5 osb_thick_in=0.5 rigid_r=0.0 "exterior_finish=Vinyl, Light" | ||
ResidentialMissingMeasure |
Oops, something went wrong.