Reorder downselect args

NREL · Feb 9, 2021 · c671702 · c671702
1 parent 9fa36be
commit c671702
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/buildstockbatch/test/test_inputs/complete-schema.yml b/buildstockbatch/test/test_inputs/complete-schema.yml
@@ -7,8 +7,8 @@ sampler:
   type: residential_quota_downselect
   args:
     n_datapoints: 30
-    resample: False
     logic: HVAC System Heating Natural Gas|Gas Furnace, 60% AFUE
+    resample: False
 workflow_generator:
   type: residential_default
   args:

diff --git a/buildstockbatch/test/test_inputs/enforce-validate-measures-bad.yml b/buildstockbatch/test/test_inputs/enforce-validate-measures-bad.yml
@@ -8,6 +8,6 @@ baseline:
     - residential_constructions_basement
   sampling_algorithm: quota
 downselect:
-  resample: False
   logic: Vintage|2000s
+  resample: False
 schema_version: 0.2
diff --git a/buildstockbatch/test/test_inputs/enforce-validate-measures-good.yml b/buildstockbatch/test/test_inputs/enforce-validate-measures-good.yml
@@ -9,6 +9,6 @@ baseline:
     - ResidentialConstructionsUnfinishedBasement
     - ResidentialConstructionsFinishedBasement
 downselect:
-  resample: False
   logic: Vintage|2000s
+  resample: False
 schema_version: 0.2
diff --git a/buildstockbatch/test/test_inputs/enforce-validate-options-bad.yml b/buildstockbatch/test/test_inputs/enforce-validate-options-bad.yml
@@ -35,6 +35,6 @@ upgrades:
             - Insulation Unfinished Basement|Extra Argument
     package_apply_logic: Vintage|1960s||Vintage|1940s&&Vintage|1980s
 downselect:
-  resample: False
   logic: Invalid Parameter|2000s
+  resample: False
 schema_version: 0.2
diff --git a/buildstockbatch/test/test_inputs/enforce-validate-options-good.yml b/buildstockbatch/test/test_inputs/enforce-validate-options-good.yml
@@ -21,6 +21,6 @@ upgrades:
           - Insulation Unfinished Basement|Extra Argument
     package_apply_logic: Vintage|1960s||Vintage|1940s
 downselect:
-  resample: False
   logic: Vintage|2000s
+  resample: False
 schema_version: 0.2
diff --git a/buildstockbatch/test/test_inputs/enforce-validate-options-wrong-path.yml b/buildstockbatch/test/test_inputs/enforce-validate-options-wrong-path.yml
@@ -21,6 +21,6 @@ upgrades:
           - Insulation Unfinished Basement|Extra Argument
     package_apply_logic: Vintage|1960s||Vintage|1940s
 downselect:
-  resample: False
   logic: Vintage|2000s
+  resample: False
 schema_version: 0.2
diff --git a/docs/changelog/migration_0_20.rst b/docs/changelog/migration_0_20.rst
@@ -88,10 +88,10 @@ Old Spec:
       sampling_algorithm: quota
       n_datapoints: 350000
     downselect:
-      resample: false
       logic:
         - Geometry Building Type RECS|Single-Family Detached
         - Vacancy Status|Occupied
+      resample: false
 
 New Spec:
 
@@ -102,10 +102,10 @@ New Spec:
       type: residential_quota_downselect
       args:
         n_datapoints: 350000
-        resample: false
         logic:
           - Geometry Building Type RECS|Single-Family Detached
           - Vacancy Status|Occupied
+        resample: false
 
 Precomputed Sampling
 ~~~~~~~~~~~~~~~~~~~~

diff --git a/docs/samplers/residential_quota_downselect.rst b/docs/samplers/residential_quota_downselect.rst
@@ -29,10 +29,10 @@ Configuration Example
       type: residential_quota_downselect
       args:
         n_datapoints: 350000
-        resample: false
         logic:
           - Geometry Building Type RECS|Single-Family Detached
           - Vacancy Status|Occupied
+        resample: false
 
 Arguments
 ~~~~~~~~~

diff --git a/project_resstock_national.yml b/project_resstock_national.yml
@@ -9,10 +9,10 @@ sampler:
   type: residential_quota_downselect
   args:
     n_datapoints: 350000
-    resample: false
     logic:
       - Geometry Building Type RECS|Single-Family Detached
       - Vacancy Status|Occupied
+    resample: false
 
 workflow_generator:
   type: residential_default