CDPP / AMDA_Kernel

Commit 86fbae45a1d47ba2c6c6ef9120a564d449b271f7

Authored by Benjamin Renard
1 parent d6800e08
Exists in master and in 97 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 9383, 9719, 9719.new, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6598, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SolarOrbiter, SpeasyGet, akka-centos7, akka-scatter-multi-xparams, amdadev, amdadev_test, cu2022, das2, density_maps, develop, evol-5638, evol-6371, evol_9042, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_5639, rm_5776, rm_6015, rm_6595, rm_6599, rm_6616, rm_6616_bis, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, sum-components-indexes, test-merge, tickplot, ubuntu

Compute param Id correction only once (cf. #6134)

Showing 2 changed files with 13 additions and 0 deletions   Show diff stats
Inline Side-by-side
src/Parameters/ParameterManager.cc
  Diff comments   View file @86fbae4
... ... @@ -117,6 +117,11 @@ ParameterSPtr ParameterManager::findParamInParameterList(const std::string& para
117 117  
118 118 void ParameterManager::applyParamIdCorrection(std::string& paramId)
119 119 {
  120 + if (_paramIdCorrectionMap.find(paramId) != _paramIdCorrectionMap.end()) {
  121 + paramId = _paramIdCorrectionMap[paramId];
  122 + return;
  123 + }
  124 +
120 125 //Some characters are used to apply an operation, a process, etc... in an expression
121 126 //These characters can't be used for a parmId
122 127 //=> replace "-", "+", "*", "/", "^", "(", ")", "[", "]", "{", "}","&","|",
... ... @@ -127,6 +132,7 @@ void ParameterManager::applyParamIdCorrection(std::string& paramId)
127 132 "&", "|", "$", ".", ",", "#",
128 133 };
129 134  
  135 + std::string originalParamId = paramId;
130 136 std::string replaceBy;
131 137 for (auto c : charList) {
132 138 replaceBy = "";
... ... @@ -135,6 +141,8 @@ void ParameterManager::applyParamIdCorrection(std::string& paramId)
135 141 replaceBy += "_";
136 142 paramId = boost::replace_all_copy(paramId, c, replaceBy);
137 143 }
  144 +
  145 + _paramIdCorrectionMap[originalParamId] = paramId;
138 146 }
139 147  
140 148 ParameterSPtr& ParameterManager::checkIfIsANeededParameter(ParameterSPtr& pParam) {
... ...
src/Parameters/ParameterManager.hh
  Diff comments   View file @86fbae4
... ... @@ -189,6 +189,11 @@ private:
189 189 std::map<int, std::map<std::string, std::vector<std::string>>> _timeIntervalDataList;
190 190  
191 191 /*
  192 + * @brief store paramId correction to compute it only once and improve execution time
  193 + */
  194 + std::map<std::string,std::string> _paramIdCorrectionMap;
  195 +
  196 + /*
192 197 * @brief default value for the gap threshold of all parameters
193 198 */
194 199 double _defaultGapThreshold;
... ...