Commit 7abf24a081e0decf4a12ac0f406330599d64ce72
1 parent
c057fb1b
Exists in
master
and in
85 other branches
correcting bug
Showing
3 changed files
with
4 additions
and
8 deletions
Show diff stats
src/ExternLib/GetClbInfo/GetClbInfoProcess.cc
| @@ -54,9 +54,7 @@ TimeStamp GetClbInfoProcess::init() { | @@ -54,9 +54,7 @@ TimeStamp GetClbInfoProcess::init() { | ||
| 54 | int i = 0; | 54 | int i = 0; |
| 55 | unsigned int nbHeader = 0; | 55 | unsigned int nbHeader = 0; |
| 56 | for (auto info : lInfoList){ | 56 | for (auto info : lInfoList){ |
| 57 | - std::stringstream index; | ||
| 58 | - index << std::setw(3) << std::setfill('0') <<i; | ||
| 59 | - semiVariableTableElements.tabValues[index.str()] = *info.second; | 57 | + semiVariableTableElements.tabValues[std::to_string(i)] = *info.second; |
| 60 | if (nbHeader < (*info.second).size()) | 58 | if (nbHeader < (*info.second).size()) |
| 61 | nbHeader = (*info.second).size(); | 59 | nbHeader = (*info.second).size(); |
| 62 | i++; | 60 | i++; |
src/Info/ParamTable.cc
| @@ -211,8 +211,7 @@ namespace AMDA { | @@ -211,8 +211,7 @@ namespace AMDA { | ||
| 211 | } | 211 | } |
| 212 | } | 212 | } |
| 213 | 213 | ||
| 214 | - bool ParamTable::addSemiVariableTableInfo(ParameterManager* parameterManager, int dim, std::string paramId, std::string tabKey, std::vector<std::pair<std::string, std::string>>&infoMap) { | ||
| 215 | - bool isAddedTable = false; | 214 | + void ParamTable::addSemiVariableTableInfo(ParameterManager* parameterManager, int dim, std::string paramId, std::string tabKey, std::vector<std::pair<std::string, std::string>>&infoMap) { |
| 216 | AMDA::Parameters::ParameterSPtr pParam = parameterManager->getParameter(paramId); | 215 | AMDA::Parameters::ParameterSPtr pParam = parameterManager->getParameter(paramId); |
| 217 | Process* lProcess = dynamic_cast<Process*> (pParam->getDataWriterTemplate().get()); | 216 | Process* lProcess = dynamic_cast<Process*> (pParam->getDataWriterTemplate().get()); |
| 218 | if (lProcess != NULL) { | 217 | if (lProcess != NULL) { |
| @@ -220,7 +219,6 @@ namespace AMDA { | @@ -220,7 +219,6 @@ namespace AMDA { | ||
| 220 | std::list<std::string>::iterator it; | 219 | std::list<std::string>::iterator it; |
| 221 | it = std::find(_printedTables.begin(), _printedTables.end(), paramId); | 220 | it = std::find(_printedTables.begin(), _printedTables.end(), paramId); |
| 222 | if (!semiVariableTable.tabHeader.empty() && it == _printedTables.end()) { | 221 | if (!semiVariableTable.tabHeader.empty() && it == _printedTables.end()) { |
| 223 | - isAddedTable = true; | ||
| 224 | std::stringstream head; | 222 | std::stringstream head; |
| 225 | head.str(""); | 223 | head.str(""); |
| 226 | head << "mode" << " "; | 224 | head << "mode" << " "; |
| @@ -295,7 +293,7 @@ namespace AMDA { | @@ -295,7 +293,7 @@ namespace AMDA { | ||
| 295 | const std::vector<std::string>& paramLinkedParams = paramInfo->getLinkedParamList(); | 293 | const std::vector<std::string>& paramLinkedParams = paramInfo->getLinkedParamList(); |
| 296 | for (auto pId : paramLinkedParams) | 294 | for (auto pId : paramLinkedParams) |
| 297 | addSemiVariableTableInfo(parameterManager, dim, pId, tabKey, infoMap); | 295 | addSemiVariableTableInfo(parameterManager, dim, pId, tabKey, infoMap); |
| 298 | - return isAddedTable; | 296 | + return; |
| 299 | } | 297 | } |
| 300 | 298 | ||
| 301 | void ParamTable::addVariableTableInfo(ParameterManager * parameterManager, int dim, std::vector<std::pair<std::string, std::string>>&tableInfo) { | 299 | void ParamTable::addVariableTableInfo(ParameterManager * parameterManager, int dim, std::vector<std::pair<std::string, std::string>>&tableInfo) { |
src/Info/ParamTable.hh
| @@ -80,7 +80,7 @@ namespace Info { | @@ -80,7 +80,7 @@ namespace Info { | ||
| 80 | 80 | ||
| 81 | void addTableInfo(ParameterManager *parameterManager, int dim, std::vector<std::pair<std::string,std::string>>& infoMap); | 81 | void addTableInfo(ParameterManager *parameterManager, int dim, std::vector<std::pair<std::string,std::string>>& infoMap); |
| 82 | 82 | ||
| 83 | - bool addSemiVariableTableInfo(ParameterManager *parameterManager, int dim, std::string paramId, std::string key, std::vector<std::pair<std::string,std::string>>& infoMap); | 83 | + void addSemiVariableTableInfo(ParameterManager *parameterManager, int dim, std::string paramId, std::string key, std::vector<std::pair<std::string,std::string>>& infoMap); |
| 84 | 84 | ||
| 85 | void addRelatedParams(ParameterManager *parameterManager, std::string paramId, std::list<std::string>relatedParams); | 85 | void addRelatedParams(ParameterManager *parameterManager, std::string paramId, std::list<std::string>relatedParams); |
| 86 | 86 |