Merge pull request #1304 from NREL/fix/issue1119

change constant ruleset value checking
NREL · Apr 16, 2022 · 8f4f6f9 · 8f4f6f9
2 parents 92cf9b3 + aaacdec
commit 8f4f6f9
Show file tree

Hide file tree

Showing 66 changed files with 432,990 additions and 445,320 deletions.
diff --git a/data/standards/test_performance_expected_dd_results.csv b/data/standards/test_performance_expected_dd_results.csv
diff --git a/lib/openstudio-standards/standards/Standards.Model.rb b/lib/openstudio-standards/standards/Standards.Model.rb
@@ -2010,7 +2010,7 @@ def model_add_constant_schedule_ruleset(model,
       if existing_sch.is_initialized
         existing_sch = existing_sch.get
         existing_day_sch_vals = existing_sch.defaultDaySchedule.values
-        if existing_day_sch_vals.size == 1 && existing_day_sch_vals[0] == value
+        if existing_day_sch_vals.size == 1 && (existing_day_sch_vals[0] - value).abs < 1.0e-6
           return existing_sch
         end
       end

diff --git a/.../regression_models/FullServiceRestaurant-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/.../regression_models/FullServiceRestaurant-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/.../regression_models/FullServiceRestaurant-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/.../regression_models/FullServiceRestaurant-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/.../regression_models/FullServiceRestaurant-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/.../regression_models/FullServiceRestaurant-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/.../regression_models/FullServiceRestaurant-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm b/.../regression_models/FullServiceRestaurant-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...type/regression_models/HighriseApartment-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...type/regression_models/HighriseApartment-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...type/regression_models/HighriseApartment-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...type/regression_models/HighriseApartment-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...type/regression_models/HighriseApartment-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/...type/regression_models/HighriseApartment-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...type/regression_models/HighriseApartment-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm b/...type/regression_models/HighriseApartment-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...doe_prototype/regression_models/Hospital-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...doe_prototype/regression_models/Hospital-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...doe_prototype/regression_models/Hospital-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...doe_prototype/regression_models/Hospital-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...doe_prototype/regression_models/Hospital-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/...doe_prototype/regression_models/Hospital-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...doe_prototype/regression_models/Hospital-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm b/...doe_prototype/regression_models/Hospital-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...e_prototype/regression_models/LargeHotel-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...e_prototype/regression_models/LargeHotel-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...e_prototype/regression_models/LargeHotel-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...e_prototype/regression_models/LargeHotel-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...e_prototype/regression_models/LargeHotel-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/...e_prototype/regression_models/LargeHotel-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...e_prototype/regression_models/LargeHotel-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm b/...e_prototype/regression_models/LargeHotel-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/..._prototype/regression_models/LargeOffice-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/..._prototype/regression_models/LargeOffice-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/..._prototype/regression_models/LargeOffice-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/..._prototype/regression_models/LargeOffice-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/..._prototype/regression_models/LargeOffice-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/..._prototype/regression_models/LargeOffice-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/..._prototype/regression_models/LargeOffice-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm b/..._prototype/regression_models/LargeOffice-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...prototype/regression_models/MediumOffice-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...prototype/regression_models/MediumOffice-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...prototype/regression_models/MediumOffice-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...prototype/regression_models/MediumOffice-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...prototype/regression_models/MediumOffice-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/...prototype/regression_models/MediumOffice-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...prototype/regression_models/MediumOffice-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm b/...prototype/regression_models/MediumOffice-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...otype/regression_models/MidriseApartment-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...otype/regression_models/MidriseApartment-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...otype/regression_models/MidriseApartment-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...otype/regression_models/MidriseApartment-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...otype/regression_models/MidriseApartment-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/...otype/regression_models/MidriseApartment-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...otype/regression_models/MidriseApartment-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm b/...otype/regression_models/MidriseApartment-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...e_prototype/regression_models/Outpatient-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...e_prototype/regression_models/Outpatient-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...e_prototype/regression_models/Outpatient-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...e_prototype/regression_models/Outpatient-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm