github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-24 13:28:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove explicit need for locale, just use the punctuation character

Browse Source
This commit is contained in:
Ian Bell
2018-03-11 18:33:37 -06:00
parent 3574641434
commit ac84d0ddaf
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/CoolProp.cpp
View File

@@ -120,6 +120,7 @@ bool has_solution_concentration(const std::string &fluid_string)
std::string extract_fractions(const std::string &fluid_string, std::vector<double> &fractions)
{
if (has_fractions_in_string(fluid_string))
{
fractions.clear();
@@ -145,11 +146,14 @@ std::string extract_fractions(const std::string &fluid_string, std::vector<doubl
const std::string &name = name_fraction[0], &fraction = name_fraction[1];
// The default locale for conversion from string to double is en_US with . as the deliminter
// Good: 0.1234 Bad: 0,1234
// But you can change the locale with the configuration variable FLOAT_LOCALE_NAME to change the locale
// to something more convenient for you
// But you can change the punctuation character for fraction parsing
// with the configuration variable FLOAT_PUNCTUATION to change the locale to something more convenient for you (e.g., a ',')
// See also http://en.cppreference.com/w/cpp/locale/numpunct/decimal_point
std::stringstream ssfraction(fraction);
std::string localename = get_config_string(FLOAT_LOCALE_NAME);
ssfraction.imbue(std::locale(localename.c_str()));
struct delim : std::numpunct<char> {
char do_decimal_point() const { return get_config_string(FLOAT_PUNCTUATION)[0]; }
};
ssfraction.imbue(std::locale(ssfraction.getloc(), new delim));
double f;
ssfraction >> f;
if (ssfraction.rdbuf()->in_avail() != 0){