OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-29 20:43:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

ParameterSystem: replace loop with standard algorithms

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-09-05 08:50:55 +02:00
parent 95ab000612
commit 5b40229211
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
opm/models/utils/parametersystem.cpp
View File

@ -134,13 +134,10 @@ void getFlattenedKeyList(std::vector<std::string>& dest,
std::string parseKey(std::string& s)
{
unsigned i;
for (i = 0; i < s.size(); ++ i)
if (std::isspace(s[i]) || s[i] == '=')
break;
std::string ret = s.substr(0, i);
s = s.substr(i);
auto it = std::find_if(s.begin(), s.end(),
[](const char ch) { return std::isspace(ch) || ch == '='; });
std::string ret {s.begin(), it};
s.erase(s.begin(), it);
return ret;
}
@ -180,13 +177,9 @@ std::string parseQuotedValue(std::string& s, const std::string& errorPrefix)
std::string parseUnquotedValue(std::string& s, const std::string&)
{
unsigned i;
for (i = 0; i < s.size(); ++ i)
if (std::isspace(s[i]))
break;
std::string ret = s.substr(0, i);
s = s.substr(i);
auto it = std::find_if(s.begin(), s.end(), ::isspace);
std::string ret{s.begin(), it};
s.erase(s.begin(), it);
return ret;
}
@ -298,11 +291,9 @@ void printParamUsage(std::ostream& os,
void removeLeadingSpace(std::string& s)
{
unsigned i;
for (i = 0; i < s.size(); ++ i)
if (!std::isspace(s[i]))
break;
s = s.substr(i);
s.erase(s.begin(),
std::find_if(s.begin(), s.end(),
[](const char ch) { return !std::isspace(ch); }));
}
std::string transformKey(const std::string& s,