Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use weighted distributions for "condensity" and heating logic #225

Open
wants to merge 25 commits into
base: add-cwhs
Choose a base branch
from
Open

Use weighted distributions for "condensity" and heating logic #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f321cc9
Reverse temperature legend order.
spahrenk Jan 8, 2025
2580783
Improve id/name organization.
spahrenk Jan 9, 2025
ccc138b
Improve html.
spahrenk Jan 9, 2025
8f3ff1c
Update data model.
spahrenk Jan 9, 2025
479f36c
Define basic struct.
spahrenk Jan 11, 2025
c8540f6
Use WeightedDistribution.
spahrenk Jan 13, 2025
93f2bcb
Fix export.
spahrenk Jan 13, 2025
5c2b885
Fix tank temp from Distribution.
spahrenk Jan 14, 2025
a8b6ffb
Adapt sizing calc.
spahrenk Jan 14, 2025
1b8de1d
Improve file load.
spahrenk Jan 14, 2025
19464a7
Fix file logic.
spahrenk Jan 14, 2025
0304cee
Remove empty weighted-dists.
spahrenk Jan 15, 2025
53040f9
Export unitary weights.
spahrenk Jan 15, 2025
8f796b0
Update initialization and checks.
spahrenk Jan 15, 2025
299cd49
Add turn-on standby description.
spahrenk Jan 15, 2025
dff6029
Improve standby logic.
spahrenk Jan 15, 2025
3c66ae7
Replace condensity.
spahrenk Jan 16, 2025
7695971
Address add heat issues.
spahrenk Jan 16, 2025
ce91bcf
Correct normalization.
spahrenk Jan 16, 2025
482925d
Fix element position.
spahrenk Jan 16, 2025
2d2b0f3
Fix lowest node; replace ref.
spahrenk Jan 16, 2025
49d053a
Format gen code.
spahrenk Jan 16, 2025
05e6930
Provide return value.
spahrenk Jan 16, 2025
de723cc
Convert to int.
spahrenk Jan 16, 2025
8be2863
Merge branch 'main' into use-weighted-dist
spahrenk Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,12 @@ jobs:
cxx: cl
experimental: false
- os: macos
os_ver: "12"
os_ver: "13"
config: Release
coverage: false
cc: clang
cxx: clang++
experimental: false
- os: macos
os_ver: "11"
config: Release
coverage: false
cc: clang
cxx: clang++
experimental: true
- os: ubuntu
os_ver: "20.04"
config: Debug
Expand Down
402 changes: 218 additions & 184 deletions hpwh_data_model/cpp/include/hpwh_data_model/ashrae205.h
View file
Open in desktop

Large diffs are not rendered by default.

102 changes: 53 additions & 49 deletions hpwh_data_model/cpp/include/hpwh_data_model/centralwaterheatingsystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,53 +10,57 @@

/// @note This class has been auto-generated. Local changes will not be saved!

namespace hpwh_data_model {
namespace central_water_heating_system_ns {
inline std::shared_ptr<Courier::Courier> logger;
void set_logger(std::shared_ptr<Courier::Courier> value);
struct Schema {
const static std::string_view schema_title;
const static std::string_view schema_version;
const static std::string_view schema_description;
};
struct CentralWaterHeatingSystem {
rstank_ns::RSTANK tank;
std::vector<heat_source_configuration_ns::HeatSourceConfiguration> heat_source_configurations;
std::string primary_heat_source_id;
double standby_power;
double external_inlet_height;
double external_outlet_height;
double multipass_flow_rate;
bool tank_is_set;
bool heat_source_configurations_is_set;
bool primary_heat_source_id_is_set;
bool standby_power_is_set;
bool external_inlet_height_is_set;
bool external_outlet_height_is_set;
bool multipass_flow_rate_is_set;
const static std::string_view tank_units;
const static std::string_view heat_source_configurations_units;
const static std::string_view primary_heat_source_id_units;
const static std::string_view standby_power_units;
const static std::string_view external_inlet_height_units;
const static std::string_view external_outlet_height_units;
const static std::string_view multipass_flow_rate_units;
const static std::string_view tank_description;
const static std::string_view heat_source_configurations_description;
const static std::string_view primary_heat_source_id_description;
const static std::string_view standby_power_description;
const static std::string_view external_inlet_height_description;
const static std::string_view external_outlet_height_description;
const static std::string_view multipass_flow_rate_description;
const static std::string_view tank_name;
const static std::string_view heat_source_configurations_name;
const static std::string_view primary_heat_source_id_name;
const static std::string_view standby_power_name;
const static std::string_view external_inlet_height_name;
const static std::string_view external_outlet_height_name;
const static std::string_view multipass_flow_rate_name;
};
void from_json(const nlohmann::json& j, CentralWaterHeatingSystem& x);
}
}
namespace hpwh_data_model
{
namespace central_water_heating_system_ns
{
inline std::shared_ptr<Courier::Courier> logger;
void set_logger(std::shared_ptr<Courier::Courier> value);
struct Schema
{
const static std::string_view schema_title;
const static std::string_view schema_version;
const static std::string_view schema_description;
};
struct CentralWaterHeatingSystem
{
rstank_ns::RSTANK tank;
std::vector<heat_source_configuration_ns::HeatSourceConfiguration> heat_source_configurations;
std::string primary_heat_source_id;
double standby_power;
double external_inlet_height;
double external_outlet_height;
double multipass_flow_rate;
bool tank_is_set;
bool heat_source_configurations_is_set;
bool primary_heat_source_id_is_set;
bool standby_power_is_set;
bool external_inlet_height_is_set;
bool external_outlet_height_is_set;
bool multipass_flow_rate_is_set;
const static std::string_view tank_units;
const static std::string_view heat_source_configurations_units;
const static std::string_view primary_heat_source_id_units;
const static std::string_view standby_power_units;
const static std::string_view external_inlet_height_units;
const static std::string_view external_outlet_height_units;
const static std::string_view multipass_flow_rate_units;
const static std::string_view tank_description;
const static std::string_view heat_source_configurations_description;
const static std::string_view primary_heat_source_id_description;
const static std::string_view standby_power_description;
const static std::string_view external_inlet_height_description;
const static std::string_view external_outlet_height_description;
const static std::string_view multipass_flow_rate_description;
const static std::string_view tank_name;
const static std::string_view heat_source_configurations_name;
const static std::string_view primary_heat_source_id_name;
const static std::string_view standby_power_name;
const static std::string_view external_inlet_height_name;
const static std::string_view external_outlet_height_name;
const static std::string_view multipass_flow_rate_name;
};
void from_json(const nlohmann::json& j, CentralWaterHeatingSystem& x);
} // namespace central_water_heating_system_ns
} // namespace hpwh_data_model
#endif
140 changes: 72 additions & 68 deletions hpwh_data_model/cpp/include/hpwh_data_model/core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,72 +9,76 @@

/// @note This class has been auto-generated. Local changes will not be saved!

namespace hpwh_data_model {
namespace core_ns {
typedef std::string UUID;
typedef std::string Date;
typedef std::string Timestamp;
typedef std::string Version;
inline std::shared_ptr<Courier::Courier> logger;
void set_logger(std::shared_ptr<Courier::Courier> value);
struct Schema {
const static std::string_view schema_title;
const static std::string_view schema_version;
const static std::string_view schema_description;
};
struct Metadata {
std::string schema_author;
ashrae205_ns::SchemaType schema;
std::string schema_version;
std::string description;
std::string timestamp;
std::string id;
int version;
std::string data_source;
std::string disclaimer;
std::string notes;
bool schema_author_is_set;
bool schema_is_set;
bool schema_version_is_set;
bool description_is_set;
bool timestamp_is_set;
bool id_is_set;
bool version_is_set;
bool data_source_is_set;
bool disclaimer_is_set;
bool notes_is_set;
const static std::string_view schema_author_units;
const static std::string_view schema_units;
const static std::string_view schema_version_units;
const static std::string_view description_units;
const static std::string_view timestamp_units;
const static std::string_view id_units;
const static std::string_view version_units;
const static std::string_view data_source_units;
const static std::string_view disclaimer_units;
const static std::string_view notes_units;
const static std::string_view schema_author_description;
const static std::string_view schema_description;
const static std::string_view schema_version_description;
const static std::string_view description_description;
const static std::string_view timestamp_description;
const static std::string_view id_description;
const static std::string_view version_description;
const static std::string_view data_source_description;
const static std::string_view disclaimer_description;
const static std::string_view notes_description;
const static std::string_view schema_author_name;
const static std::string_view schema_name;
const static std::string_view schema_version_name;
const static std::string_view description_name;
const static std::string_view timestamp_name;
const static std::string_view id_name;
const static std::string_view version_name;
const static std::string_view data_source_name;
const static std::string_view disclaimer_name;
const static std::string_view notes_name;
};
void from_json(const nlohmann::json& j, Metadata& x);
}
}
namespace hpwh_data_model
{
namespace core_ns
{
typedef std::string UUID;
typedef std::string Date;
typedef std::string Timestamp;
typedef std::string Version;
inline std::shared_ptr<Courier::Courier> logger;
void set_logger(std::shared_ptr<Courier::Courier> value);
struct Schema
{
const static std::string_view schema_title;
const static std::string_view schema_version;
const static std::string_view schema_description;
};
struct Metadata
{
std::string schema_author;
ashrae205_ns::SchemaType schema;
std::string schema_version;
std::string description;
std::string timestamp;
std::string id;
int version;
std::string data_source;
std::string disclaimer;
std::string notes;
bool schema_author_is_set;
bool schema_is_set;
bool schema_version_is_set;
bool description_is_set;
bool timestamp_is_set;
bool id_is_set;
bool version_is_set;
bool data_source_is_set;
bool disclaimer_is_set;
bool notes_is_set;
const static std::string_view schema_author_units;
const static std::string_view schema_units;
const static std::string_view schema_version_units;
const static std::string_view description_units;
const static std::string_view timestamp_units;
const static std::string_view id_units;
const static std::string_view version_units;
const static std::string_view data_source_units;
const static std::string_view disclaimer_units;
const static std::string_view notes_units;
const static std::string_view schema_author_description;
const static std::string_view schema_description;
const static std::string_view schema_version_description;
const static std::string_view description_description;
const static std::string_view timestamp_description;
const static std::string_view id_description;
const static std::string_view version_description;
const static std::string_view data_source_description;
const static std::string_view disclaimer_description;
const static std::string_view notes_description;
const static std::string_view schema_author_name;
const static std::string_view schema_name;
const static std::string_view schema_version_name;
const static std::string_view description_name;
const static std::string_view timestamp_name;
const static std::string_view id_name;
const static std::string_view version_name;
const static std::string_view data_source_name;
const static std::string_view disclaimer_name;
const static std::string_view notes_name;
};
void from_json(const nlohmann::json& j, Metadata& x);
} // namespace core_ns
} // namespace hpwh_data_model
#endif
17 changes: 9 additions & 8 deletions hpwh_data_model/cpp/include/hpwh_data_model/enum-info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@

#include <string_view>

namespace hpwh_data_model {
namespace hpwh_data_model
{

struct enum_info
{
std::string_view enumerant_name;
std::string_view display_text;
std::string_view description;
};
}
struct enum_info
{
std::string_view enumerant_name;
std::string_view display_text;
std::string_view description;
};
} // namespace hpwh_data_model

#endif
5 changes: 3 additions & 2 deletions hpwh_data_model/cpp/include/hpwh_data_model/heat-source-template.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef HEATSOURCETEMPLATE_H_
#define HEATSOURCETEMPLATE_H_
struct HeatSourceTemplate {
virtual ~HeatSourceTemplate() = default;
struct HeatSourceTemplate
{
virtual ~HeatSourceTemplate() = default;
};
#endif
5 changes: 3 additions & 2 deletions hpwh_data_model/cpp/include/hpwh_data_model/heating-logic-template.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef HEATINGLOGICTEMPLATE_H_
#define HEATINGLOGICTEMPLATE_H_
struct HeatingLogicTemplate {
virtual ~HeatingLogicTemplate() = default;
struct HeatingLogicTemplate
{
virtual ~HeatingLogicTemplate() = default;
};
#endif
Loading
Loading