Test buildstockbatch refactor workflow generator

.github/workflows/config.yml

@@ -158,7 +158,7 @@ jobs:
 
       - name: Run buildstockbatch
         run: |
-          pip install git+https://github.com/NREL/buildstockbatch.git@v2023.10.0
+          pip install git+https://github.com/NREL/buildstockbatch.git@fix-res-wfg
 
           buildstock_local project_national/national_baseline.yml
           buildstock_local project_testing/testing_baseline.yml

test/analysis.rb

@@ -154,28 +154,32 @@ def _test_nonzero_columns(results, upgrade = false)
   return result
 end
 
-def _test_baseline_contents(contents, testing = false)
+def _test_baseline_contents(actual_contents, testing = false)
   expected_contents = expected_baseline_contents(testing)
 
-  return true if (expected_contents - contents).empty?
+  expected_extras = expected_contents - actual_contents
+  return true if expected_extras.empty?
 
   return false
 end
 
-def _test_upgrade_contents(contents, testing = false)
+def _test_upgrade_contents(actual_contents, testing = false)
   expected_contents = expected_baseline_contents(testing)
   expected_contents += expected_upgrade_contents if testing
 
-  return true if (expected_contents - contents).empty?
+  expected_extras = expected_contents - actual_contents
+  return true if expected_extras.empty?
 
   return false
 end
 
-def _test_timeseries_columns(timeseries, testing = false)
+def _test_timeseries_columns(actual_columns, testing = false)
   expected_columns = expected_timeseries_columns(testing)
 
-  return true if (expected_columns - timeseries).empty?
+  expected_extras = expected_columns - actual_columns
+  return true if expected_extras.empty?
 
+  puts "Timeseries Name, expected - actual: #{expected_extras}"
   return false
 end
 

test/test_bsb_analysis.rb

@@ -4,7 +4,7 @@
 require_relative '../test/analysis'
 require_relative '../resources/hpxml-measures/HPXMLtoOpenStudio/resources/unit_conversions.rb'
 
-class TesBuildStockBatch < Minitest::Test
+class TestBuildStockBatch < Minitest::Test
   def before_setup
     @testing_baseline = 'project_testing/testing_baseline'
     @national_baseline = 'project_national/national_baseline'
@@ -111,11 +111,10 @@ def test_testing_inputs
 
     actual_extras = actual_names - expected_names
     puts "Input Name, actual - expected: #{actual_extras}" if !actual_extras.empty?
-
-    expected_extras = expected_names - actual_names
-    puts "Input Name, expected - actual: #{expected_extras}" if !expected_extras.empty?
-
     assert_equal(0, actual_extras.size)
+
+    # expected_extras = expected_names - actual_names
+    # puts "Input Name, expected - actual: #{expected_extras}" if !expected_extras.empty?
     # assert_equal(0, expected_extras.size) # allow
   end
 
@@ -133,12 +132,10 @@ def test_national_inputs
 
     actual_extras = actual_names - expected_names
     puts "Input Name, actual - expected: #{actual_extras}" if !actual_extras.empty?
+    assert_equal(0, actual_extras.size)
 
     expected_extras = expected_names - actual_names
-    expected_extras -= ['report_simulation_output.user_output_variables']
     puts "Input Name, expected - actual: #{expected_extras}" if !expected_extras.empty?
-
-    assert_equal(0, actual_extras.size)
     assert_equal(0, expected_extras.size)
   end
 
@@ -159,11 +156,10 @@ def test_testing_annual_outputs
 
     actual_extras = actual_annual_names - expected_annual_names
     puts "Annual Name, actual - expected: #{actual_extras}" if !actual_extras.empty?
-
-    expected_extras = expected_annual_names - actual_annual_names
-    puts "Annual Name, expected - actual: #{expected_extras}" if !expected_extras.empty?
-
     assert_equal(0, actual_extras.size)
+
+    # expected_extras = expected_annual_names - actual_annual_names
+    # puts "Annual Name, expected - actual: #{expected_extras}" if !expected_extras.empty?
     # assert_equal(0, expected_extras.size) # allow
 
     tol = 0.001
@@ -198,11 +194,10 @@ def test_national_annual_outputs
 
     actual_extras = actual_annual_names - expected_annual_names
     puts "Annual Name, actual - expected: #{actual_extras}" if !actual_extras.empty?
-
-    expected_extras = expected_annual_names - actual_annual_names
-    puts "Annual Name, expected - actual: #{expected_extras}" if !expected_extras.empty?
-
     assert_equal(0, actual_extras.size)
+
+    # expected_extras = expected_annual_names - actual_annual_names
+    # puts "Annual Name, expected - actual: #{expected_extras}" if !expected_extras.empty?
     # assert_equal(0, expected_extras.size) # allow
 
     tol = 0.001
@@ -236,11 +231,10 @@ def test_timeseries_resstock_outputs
     actual_extras = actual_timeseries_names - expected_timeseries_names
     actual_extras -= ['PROJECT']
     puts "#{ts_col}, actual - expected: #{actual_extras}" if !actual_extras.empty?
-
-    expected_extras = expected_timeseries_names - actual_timeseries_names
-    puts "#{ts_col}, expected - actual: #{expected_extras}" if !expected_extras.empty?
-
     assert_equal(0, actual_extras.size)
+
+    # expected_extras = expected_timeseries_names - actual_timeseries_names
+    # puts "#{ts_col}, expected - actual: #{expected_extras}" if !expected_extras.empty?
     # assert_equal(0, expected_extras.size) # allow
 
     tol = 0.001
@@ -282,11 +276,10 @@ def test_timeseries_buildstockbatch_outputs
     actual_extras = actual_timeseries_names - expected_timeseries_names
     actual_extras -= ['PROJECT']
     puts "#{ts_col}, actual - expected: #{actual_extras}" if !actual_extras.empty?
-
-    expected_extras = expected_timeseries_names - actual_timeseries_names
-    puts "#{ts_col}, expected - actual: #{expected_extras}" if !expected_extras.empty?
-
     assert_equal(0, actual_extras.size)
+
+    # expected_extras = expected_timeseries_names - actual_timeseries_names
+    # puts "#{ts_col}, expected - actual: #{expected_extras}" if !expected_extras.empty?
     # assert_equal(0, expected_extras.size) # allow
 
     tol = 0.001

workflow/run_analysis.rb

@@ -212,7 +212,8 @@ def run_workflow(yml, in_threads, measures_only, debug_arg, overwrite, building_
     'timeseries_timestamp_convention' => 'end',
     'timeseries_num_decimal_places' => 3,
     'add_timeseries_dst_column' => true,
-    'add_timeseries_utc_column' => true
+    'add_timeseries_utc_column' => true,
+    'user_output_variables' => ''
   }
   sim_out_rep_args.update(workflow_args['simulation_output_report'])