WSL/SLF GitLab Repository

Commit a09d1759 authored by Mathias Bavay's avatar Mathias Bavay
Browse files

The exclude / keep files were not properly handled in order to be case...

The exclude / keep files were not properly handled in order to be case insensitive. This has been fixed in order to be consistent with the KEEP/EXCLUDE statements. The default buffer centering has been changed to 5% (more logical for the usual use cases).
parent b80ef32f
...@@ -683,11 +683,11 @@ void IOHandler::create_exclude_map() ...@@ -683,11 +683,11 @@ void IOHandler::create_exclude_map()
if (ncols > 1) { if (ncols > 1) {
for (vector<string>::iterator it = tmpvec.begin()+1; it != tmpvec.end(); ++it) { for (vector<string>::iterator it = tmpvec.begin()+1; it != tmpvec.end(); ++it) {
IOUtils::toUpper(*it); IOUtils::toUpper( *it );
} }
const std::set<std::string> tmpset(tmpvec.begin()+1, tmpvec.end()); const std::set<std::string> tmpset(tmpvec.begin()+1, tmpvec.end());
excluded_params[ tmpvec[0] ] = tmpset; excluded_params[ IOUtils::strToUpper(tmpvec[0]) ] = tmpset;
} }
} }
} catch (const std::exception&) { } catch (const std::exception&) {
...@@ -759,11 +759,11 @@ void IOHandler::create_keep_map() ...@@ -759,11 +759,11 @@ void IOHandler::create_keep_map()
if (ncols > 1) { if (ncols > 1) {
for (vector<string>::iterator it = tmpvec.begin()+1; it != tmpvec.end(); ++it) { for (vector<string>::iterator it = tmpvec.begin()+1; it != tmpvec.end(); ++it) {
IOUtils::toUpper(*it); IOUtils::toUpper( *it );
} }
const set<string> tmpset(tmpvec.begin()+1, tmpvec.end()); const set<string> tmpset(tmpvec.begin()+1, tmpvec.end());
kept_params[ tmpvec[0] ] = tmpset; kept_params[ IOUtils::strToUpper(tmpvec[0]) ] = tmpset;
} }
} }
} catch (const std::exception&) { } catch (const std::exception&) {
......
...@@ -57,7 +57,7 @@ void TimeSeriesManager::setDfltBufferProperties() ...@@ -57,7 +57,7 @@ void TimeSeriesManager::setDfltBufferProperties()
buff_before = chunk_size * buff_centering; buff_before = chunk_size * buff_centering;
} else { } else {
buff_before = chunk_size * 0.1; //10% centering by default buff_before = chunk_size * 0.05; //5% centering by default
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment