github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Run clang-format with claude code and fix VS warnings (#2629)

Browse Source 
* Run clang-format with claude code and fix VS warnings

* More clang-format

* And the tests too

* Cleanup from clang-tidy

* More constness and modernization

* Cleanup and modernization
This commit is contained in:
Ian Bell
2025-10-05 11:02:51 -04:00
committed by GitHub
parent eac9028460
commit 9eb3eb8db1
67 changed files with 2744 additions and 2638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/DataStructures.cpp
View File

@@ -180,13 +180,13 @@ std::string get_parameter_information(int key, const std::string& info) {
const std::map<int, std::string>* M;
auto& parameter_information = get_parameter_information();
// Hook up the right map (since they are all of the same type)
if (!info.compare("IO")) {
if (info == "IO") {
M = &(parameter_information.IO_map);
} else if (!info.compare("short")) {
} else if (info == "short") {
M = &(parameter_information.short_desc_map);
} else if (!info.compare("long")) {
} else if (info == "long") {
M = &(parameter_information.description_map);
} else if (!info.compare("units")) {
} else if (info == "units") {
M = &(parameter_information.units_map);
} else {
throw ValueError(format("Bad info string [%s] to get_parameter_information", info.c_str()));
@@ -434,25 +434,17 @@ struct scheme_info
};
const scheme_info scheme_info_list[] = {
{ i1, "1"},
{ i2a, "2A"},
{ i2b, "2B"},
{ i3a, "3A"},
{ i3b, "3B"},
{ i4a, "4A"},
{ i4b, "4B"},
{ i4c, "4C"},
{i1, "1"}, {i2a, "2A"}, {i2b, "2B"}, {i3a, "3A"}, {i3b, "3B"}, {i4a, "4A"}, {i4b, "4B"}, {i4c, "4C"},
};
class SchemeInformation {
public:
class SchemeInformation
{
public:
std::map<schemes, std::string> short_desc_map;
std::map<std::string, schemes> index_map;
SchemeInformation()
{
SchemeInformation() {
const scheme_info* const end = scheme_info_list + sizeof(scheme_info_list) / sizeof(scheme_info_list[0]);
for (const scheme_info* el = scheme_info_list; el != end; ++el)
{
for (const scheme_info* el = scheme_info_list; el != end; ++el) {
short_desc_map.insert(std::pair<schemes, std::string>(el->key, el->short_desc));
index_map.insert(std::pair<std::string, schemes>(el->short_desc, el->key));
}
@@ -476,27 +468,25 @@ const std::string& get_scheme_short_desc(schemes scheme) {
throw ValueError("Cannot find the short scheme description.");
}
bool is_valid_scheme(const std::string &scheme_name, schemes &iOutput) {
bool is_valid_scheme(const std::string& scheme_name, schemes& iOutput) {
auto& scheme_information = get_scheme_information();
auto it = scheme_information.index_map.find(scheme_name);
// If equal to end, not found
if (it != scheme_information.index_map.end()){
if (it != scheme_information.index_map.end()) {
// Found, return it
iOutput = static_cast<schemes>(it->second);
return true;
}
else{
} else {
return false;
}
}
schemes get_scheme_index(const std::string &param_name) {
schemes get_scheme_index(const std::string& scheme_name) {
schemes iScheme;
if (is_valid_scheme(param_name, iScheme)){
if (is_valid_scheme(scheme_name, iScheme)) {
return iScheme;
}
else{
throw ValueError(format("Your input name [%s] is not valid in get_scheme_index (names are case sensitive)",param_name.c_str()));
} else {
throw ValueError(format("Your input name [%s] is not valid in get_scheme_index (names are case sensitive)", scheme_name.c_str()));
}
}
@@ -772,21 +762,19 @@ const std::vector<backend_family_info> backend_family_list = {
{TREND_BACKEND_FAMILY, "TREND"}, {TTSE_BACKEND_FAMILY, "TTSE"}, {BICUBIC_BACKEND_FAMILY, "BICUBIC"}, {SRK_BACKEND_FAMILY, "SRK"},
{PR_BACKEND_FAMILY, "PR"}, {VTPR_BACKEND_FAMILY, "VTPR"}, {PCSAFT_BACKEND_FAMILY, "PCSAFT"}};
const std::vector<backend_info> backend_list = {
{HEOS_BACKEND_PURE, "HelmholtzEOSBackend", HEOS_BACKEND_FAMILY},
{HEOS_BACKEND_MIX, "HelmholtzEOSMixtureBackend", HEOS_BACKEND_FAMILY},
{REFPROP_BACKEND_PURE, "REFPROPBackend", REFPROP_BACKEND_FAMILY},
{REFPROP_BACKEND_MIX, "REFPROPMixtureBackend", REFPROP_BACKEND_FAMILY},
{INCOMP_BACKEND, "IncompressibleBackend", INCOMP_BACKEND_FAMILY},
{IF97_BACKEND, "IF97Backend", IF97_BACKEND_FAMILY},
{TREND_BACKEND, "TRENDBackend", TREND_BACKEND_FAMILY},
{TTSE_BACKEND, "TTSEBackend", TTSE_BACKEND_FAMILY},
{BICUBIC_BACKEND, "BicubicBackend", BICUBIC_BACKEND_FAMILY},
{SRK_BACKEND, "SRKBackend", SRK_BACKEND_FAMILY},
{PR_BACKEND, "PengRobinsonBackend", PR_BACKEND_FAMILY},
{VTPR_BACKEND, "VTPRBackend", VTPR_BACKEND_FAMILY},
{PCSAFT_BACKEND, "PCSAFTBackend", PCSAFT_BACKEND_FAMILY}
};
const std::vector<backend_info> backend_list = {{HEOS_BACKEND_PURE, "HelmholtzEOSBackend", HEOS_BACKEND_FAMILY},
{HEOS_BACKEND_MIX, "HelmholtzEOSMixtureBackend", HEOS_BACKEND_FAMILY},
{REFPROP_BACKEND_PURE, "REFPROPBackend", REFPROP_BACKEND_FAMILY},
{REFPROP_BACKEND_MIX, "REFPROPMixtureBackend", REFPROP_BACKEND_FAMILY},
{INCOMP_BACKEND, "IncompressibleBackend", INCOMP_BACKEND_FAMILY},
{IF97_BACKEND, "IF97Backend", IF97_BACKEND_FAMILY},
{TREND_BACKEND, "TRENDBackend", TREND_BACKEND_FAMILY},
{TTSE_BACKEND, "TTSEBackend", TTSE_BACKEND_FAMILY},
{BICUBIC_BACKEND, "BicubicBackend", BICUBIC_BACKEND_FAMILY},
{SRK_BACKEND, "SRKBackend", SRK_BACKEND_FAMILY},
{PR_BACKEND, "PengRobinsonBackend", PR_BACKEND_FAMILY},
{VTPR_BACKEND, "VTPRBackend", VTPR_BACKEND_FAMILY},
{PCSAFT_BACKEND, "PCSAFTBackend", PCSAFT_BACKEND_FAMILY}};
class BackendInformation
{