OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python DeckKeyword constr. resolved nested try blocks.

Browse Source 
...
This commit is contained in:
Steinar Foss
2019-10-06 15:11:49 +02:00
parent 6865278ac5
commit 7555c00ac3
1 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
python/cxx/deck_keyword.cpp
View File

@@ -60,29 +60,15 @@ struct DeckRecordIterator
}; };
bool is_number(const std::string& s)
{
return !s.empty() && std::find_if(s.begin(),
s.end(), [](char c) { return !std::isdigit(c); }) == s.end();
}
void push_string_as_deck_value(std::vector<DeckValue>& record, const std::string str) { void push_string_as_deck_value(std::vector<DeckValue>& record, const std::string str) {
int max_indx = str.length() - 1; if (str.back() == '*') {
if (str[max_indx] == '*') {
int it; int it;
if (max_indx == 0) if (str.length() == 1)
it = 1; it = 1;
else {
std::string substr = str.substr(0, max_indx);
if (is_number(substr)) {
it = std::stoi(substr);
}
else else
throw py::type_error("DeckKeyword: string values ending in '*' can only be preceeded by a number."); it = stod( str.substr(0, str.length() - 1) );
}
for (int i = 0; i < it; i++) for (int i = 0; i < it; i++)
record.push_back( DeckValue() ); record.push_back( DeckValue() );
@@ -111,22 +97,26 @@ void python::common::export_DeckKeyword(py::module& module) {
try { try {
int val_int = value_obj.cast<int>(); int val_int = value_obj.cast<int>();
value_record.push_back( DeckValue(val_int) ); value_record.push_back( DeckValue(val_int) );
continue;
} }
catch (std::exception e_int) { catch (std::exception e_int) {}
try { try {
double val_double = value_obj.cast<double>(); double val_double = value_obj.cast<double>();
value_record.push_back( DeckValue(val_double) ); value_record.push_back( DeckValue(val_double) );
continue;
} }
catch(std::exception e_double) { catch (std::exception e_double) {}
try { try {
std::string val_string = value_obj.cast<std::string>(); std::string val_string = value_obj.cast<std::string>();
push_string_as_deck_value(value_record, val_string); push_string_as_deck_value(value_record, val_string);
continue;
} }
catch(std::exception e_string) { catch (std::exception e_string) {}
throw py::type_error("DeckKeyword: tried to add unkown type to record."); throw py::type_error("DeckKeyword: tried to add unkown type to record.");
}
}
}
} }
value_record_list.push_back( value_record ); value_record_list.push_back( value_record );
} }