Restore yearly tests; format.

bigladder · Nov 7, 2024 · 2be4504 · 2be4504
1 parent 43575f3
commit 2be4504
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 100 deletions.
diff --git a/src/Condenser.cc b/src/Condenser.cc
@@ -58,9 +58,9 @@ HPWH::Condenser& HPWH::Condenser::operator=(const HPWH::Condenser& cond_in)
 
 void HPWH::Condenser::from(const std::unique_ptr<HeatSourceTemplate>& rshs_ptr)
 {
-    auto cond_ptr =
-        reinterpret_cast<hpwh_data_model::rscondenserwaterheatsource_ns::RSCONDENSERWATERHEATSOURCE*>(
-            rshs_ptr.get());
+    auto cond_ptr = reinterpret_cast<
+        hpwh_data_model::rscondenserwaterheatsource_ns::RSCONDENSERWATERHEATSOURCE*>(
+        rshs_ptr.get());
 
     auto& perf = cond_ptr->performance;
     switch (perf.coil_configuration)
@@ -97,7 +97,6 @@ void HPWH::Condenser::from(const std::unique_ptr<HeatSourceTemplate>& rshs_ptr)
               perf.compressor_lockout_temperature_hysteresis,
               0.);
 
-
     // uses btwxt performance-grid interpolation
     if (perf.performance_map_is_set)
     {
@@ -157,9 +156,9 @@ void HPWH::Condenser::from(const std::unique_ptr<HeatSourceTemplate>& rshs_ptr)
 
 void HPWH::Condenser::to(std::unique_ptr<HeatSourceTemplate>& rshs_ptr) const
 {
-    auto cond_ptr =
-        reinterpret_cast<hpwh_data_model::rscondenserwaterheatsource_ns::RSCONDENSERWATERHEATSOURCE*>(
-            rshs_ptr.get());
+    auto cond_ptr = reinterpret_cast<
+        hpwh_data_model::rscondenserwaterheatsource_ns::RSCONDENSERWATERHEATSOURCE*>(
+        rshs_ptr.get());
 
     auto& metadata = cond_ptr->metadata;
     checkTo(hpwh_data_model::ashrae205_ns::SchemaType::RSCONDENSERWATERHEATSOURCE,

diff --git a/src/HPWH.cc b/src/HPWH.cc
diff --git a/src/HPWHHeatSource.cc b/src/HPWHHeatSource.cc
@@ -95,7 +95,8 @@ HPWH::HeatSource& HPWH::HeatSource::operator=(const HeatSource& hSource)
 }
 
 void HPWH::HeatSource::from(
-    const hpwh_data_model::rsintegratedwaterheater_ns::HeatSourceConfiguration& heatsourceconfiguration)
+    const hpwh_data_model::rsintegratedwaterheater_ns::HeatSourceConfiguration&
+        heatsourceconfiguration)
 {
     auto& config = heatsourceconfiguration;
     checkFrom(name, config.id_is_set, config.id, std::string("heatsource"));
@@ -179,7 +180,6 @@ void HPWH::HeatSource::to(hpwh_data_model::rsintegratedwaterheater_ns::HeatSourc
         checkTo(companionHeatSource->name,
                 heatsourceconfiguration.companion_heat_source_id_is_set,
                 heatsourceconfiguration.companion_heat_source_id);
-
 }
 
 void HPWH::HeatSource::setCondensity(const std::vector<double>& condensity_in)

diff --git a/src/HPWHHeatSource.hh b/src/HPWHHeatSource.hh
@@ -31,7 +31,6 @@ class HPWH::HeatSource : public Sender
     /**< returns if the heat source uses a compressor or not */
     bool isAResistance() const { return typeOfHeatSource() == TYPE_resistance; }
 
-
     bool isEngaged() const;
     /**< return whether or not the heat source is engaged */
     void engageHeatSource(DRMODES DRstatus = DR_ALLOW);

diff --git a/src/HPWHHeatingLogic.hh b/src/HPWHHeatingLogic.hh
@@ -43,7 +43,8 @@ struct HPWH::HeatingLogic
     static std::shared_ptr<HeatingLogic>
     make(const hpwh_data_model::rsintegratedwaterheater_ns::HeatingLogic& logic, HPWH* hpwh);
 
-    virtual void to(hpwh_data_model::rsintegratedwaterheater_ns::HeatingLogic& heatingLogic) const = 0;
+    virtual void
+    to(hpwh_data_model::rsintegratedwaterheater_ns::HeatingLogic& heatingLogic) const = 0;
 
   protected:
     double decisionPoint;
@@ -117,7 +118,6 @@ struct HPWH::TempBasedHeatingLogic : HPWH::HeatingLogic
 
   private:
     bool areNodeWeightsValid();
-
 };
 
 #endif
diff --git a/src/HPWHUtils.cc b/src/HPWHUtils.cc
@@ -845,11 +845,10 @@ void HPWH::to_json(const hpwh_data_model::rsintegratedwaterheater_ns::HeatingLog
             if (heating_logic.heating_logic_is_set)
             {
                 nlohmann::json j_logic;
-                to_json(
-                    *reinterpret_cast<
-                        hpwh_data_model::rsintegratedwaterheater_ns::StateOfChargeBasedHeatingLogic*>(
-                        heating_logic.heating_logic.get()),
-                    j_logic);
+                to_json(*reinterpret_cast<hpwh_data_model::rsintegratedwaterheater_ns::
+                                              StateOfChargeBasedHeatingLogic*>(
+                            heating_logic.heating_logic.get()),
+                        j_logic);
                 j["heating_logic"] = j_logic;
             }
             break;
@@ -860,10 +859,11 @@ void HPWH::to_json(const hpwh_data_model::rsintegratedwaterheater_ns::HeatingLog
             if (heating_logic.heating_logic_is_set)
             {
                 nlohmann::json j_logic;
-                to_json(*reinterpret_cast<
-                            hpwh_data_model::rsintegratedwaterheater_ns::TemperatureBasedHeatingLogic*>(
-                            heating_logic.heating_logic.get()),
-                        j_logic);
+                to_json(
+                    *reinterpret_cast<
+                        hpwh_data_model::rsintegratedwaterheater_ns::TemperatureBasedHeatingLogic*>(
+                        heating_logic.heating_logic.get()),
+                    j_logic);
                 j["heating_logic"] = j_logic;
             }
             break;

diff --git a/src/Resistance.cc b/src/Resistance.cc
@@ -29,19 +29,19 @@ HPWH::Resistance& HPWH::Resistance::operator=(const HPWH::Resistance& r_in)
 
 void HPWH::Resistance::from(const std::unique_ptr<HeatSourceTemplate>& rshs_ptr)
 {
-    auto res_ptr =
-        reinterpret_cast<hpwh_data_model::rsresistancewaterheatsource_ns::RSRESISTANCEWATERHEATSOURCE*>(
-            rshs_ptr.get());
+    auto res_ptr = reinterpret_cast<
+        hpwh_data_model::rsresistancewaterheatsource_ns::RSRESISTANCEWATERHEATSOURCE*>(
+        rshs_ptr.get());
 
     auto& perf = res_ptr->performance;
     power_kW = perf.input_power / 1000.;
 }
 
 void HPWH::Resistance::to(std::unique_ptr<HeatSourceTemplate>& rshs_ptr) const
 {
-    auto res_ptr =
-        reinterpret_cast<hpwh_data_model::rsresistancewaterheatsource_ns::RSRESISTANCEWATERHEATSOURCE*>(
-            rshs_ptr.get());
+    auto res_ptr = reinterpret_cast<
+        hpwh_data_model::rsresistancewaterheatsource_ns::RSRESISTANCEWATERHEATSOURCE*>(
+        rshs_ptr.get());
 
     auto& metadata = res_ptr->metadata;
     checkTo(hpwh_data_model::ashrae205_ns::SchemaType::RSRESISTANCEWATERHEATSOURCE,

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -426,6 +426,20 @@ foreach (test ${stateOfChargeTests})
     endforeach (model)
 endforeach (test)
 
+#Add small compressor yearly tests to the list
+foreach (test ${yearTests})
+    foreach (model ${yearTestsModels})
+        add_model_test(TEST_NAME "${test}" MODEL_NAME "${model}" SPEC_TYPE "Preset")
+    endforeach (model)
+endforeach (test)
+
+#Add LARGE compressor yearly tests to the list
+foreach (test ${yearLargeTests})
+    foreach (model ${yearLargeTestsModels})
+        add_model_test(TEST_NAME "${test}" MODEL_NAME "${model}" SPEC_TYPE "Preset")
+    endforeach (model)
+endforeach (test)
+
 #Add regression test for yearly file
 add_test(NAME "RegressionTest.YearRuns" COMMAND ${CMAKE_COMMAND} -E compare_files "${CMAKE_CURRENT_BINARY_DIR}/output/DHW_YRLY.csv" "${CMAKE_CURRENT_SOURCE_DIR}/ref/DHW_YRLY.csv")