ok for getClbInfo such as sum_into_table_range_mex_els_spec_sum

Hacene SI HADJ MOHAND
1 parent 5f604c87
Showing 4 changed files with 68 additions and 47 deletions Show diff stats
src/ExternLib/GetClbInfo/GetClbInfoProcess.cc
src/ExternLib/GetClbInfo/GetClbInfoProcess.hh
src/Info/ParamTable.cc
src/Parameters/Process.hh
@@ -50,19 +50,24 @@ TimeStamp GetClbInfoProcess::init() {
 	dynamic_cast<Base::GetClbInfo*>(_operation)->init(*_parameterInput,_attributList);
 	_paramData = ParamDataSPtr(_operation->getParamOutput());
 	_paramData->setMinSampling(_paramInput->getMinSampling());
+                    AMDA::Parameters::SemiVariableTable semiVariableTableElements;
+                    int i = 0;
+                    unsigned int nbHeader = 0;
+                    for (auto info : lInfoList){
+                               semiVariableTableElements.tabValues[i] = *info.second; 
+                               if (nbHeader < (*info.second).size()) 
+                                        nbHeader = (*info.second).size();  
+                               i++;
+                    }
+                    for (unsigned int i = 0 ; i < nbHeader; i++)
+                        semiVariableTableElements.tabHeader.push_back("Energy[" + std::to_string(i)+"]"); 
+                    this->setSemiVariableTable(semiVariableTableElements);
+                    if (!semiVariableTableElements.tabValues.empty())
+                           _parameterInput->setIsTableIndexParam(true);
+           
 	return timeStamp;
-}
-std::list<std::string> GetClbInfoProcess::getUsedClbInfo(){
-                        std::list<std::string> clbInfoList ;
-                        Parameter::InfoList lInfoList = _parameterInput->getInfoList();
-                        if( ! lInfoList.empty()){
-                            for(auto info: lInfoList ){
-                            clbInfoList.push_back(info.first);
-                        }
-                        }
-                         
-                        return clbInfoList;
-}
+         }
+
  
 } /* namespace GetClbInfo */
 } /* namespace AMDA */
@@ -39,7 +39,6 @@ namespace GetClbInfo {
 		 */
 		AMDA::Parameters::TimeStamp init();
  
-                                       std::list<std::string> getUsedClbInfo();
 	};
  
 } /* namespace GetClbInfo */
@@ -186,7 +186,7 @@ namespace AMDA {
         void ParamTable::addSemiVariableTableInfo(ParameterManager* parameterManager, int dim, std::string paramId, std::string tabKey, std::vector<std::pair<std::string, std::string>>&infoMap) {
             AMDA::Parameters::ParameterSPtr pParam = parameterManager->getParameter(paramId);
             Process* lProcess = dynamic_cast<Process*> (pParam->getDataWriterTemplate().get());
-            if (lProcess  !=  NULL) {
+            if (lProcess != NULL) {
                 AMDA::Parameters::SemiVariableTable semiVariableTable = lProcess ->getSemiVariableTable();
                 std::list<std::string>::iterator it;
                 it = std::find(_printedTables.begin(), _printedTables.end(), paramId);
@@ -199,39 +199,60 @@ namespace AMDA {
                     }
                     PUSHINFO(infoMap, "", head.str());
                     // recuperer les centres 
+                    bool variableSizes = false;
                     int nModes = semiVariableTable.tabValues.size();
-                    int nValues = semiVariableTable.tabValues.begin()->second.size();
-                    std::vector<double> energyVec;
-                    std::map<std::string, std::vector<double>> paramsTableData;
-                    std::map<int, std::vector<double>> semiVariableTableData;
-                    for (int i = 0; i < nValues; ++i) {
-                        energyVec.clear();
-                        for (int j = 0; j < nModes; ++j) {
-                            energyVec.push_back(semiVariableTable.tabValues[j][i]);
-                        }
-                        paramsTableData[tabKey] = energyVec;
-                        for (int j = 0; j < 2 * nModes; j = j + 2) {
-                            t_TableBound bound = getBound(parameterManager, j / 2, &paramsTableData);
-                            semiVariableTableData[j].push_back(bound.min);
-                            semiVariableTableData[j + 1].push_back(bound.max);
-                        }
+                    int nValues = semiVariableTable.tabHeader.size();
+                    for (auto tabValues : semiVariableTable.tabValues) {
+                        if (tabValues.second.size() != nValues)
+                            variableSizes = true;
                     }
-                    int l = 0;
-                    int k = 0;
-                    for (auto v : semiVariableTableData) {
+                    if (variableSizes) {
                         std::ostringstream values;
-                        std::string born;
-                        (l % 2 == 0) ? born = " Min " : born = " Max ";
-                        values << std::to_string(k) << born;
-                        // Convert all doubles to string ","
-                        std::copy(v.second.begin(), v.second.end(),
-                                std::ostream_iterator<double>(values, " "));
-                        PUSHINFO(infoMap, "", values.str());
-                        values.str("");
-                        if (l % 2 != 0)
-                            k++;
-                        l++;
+                        for (auto tabValues : semiVariableTable.tabValues) {
+                            values << std::to_string(tabValues.first) << " ";
+                            for (unsigned int i = 0; i < nValues; i++) {
+                                if (i < tabValues.second.size()) {
+                                    values << std::to_string(tabValues.second[i]) << " ";
+                                } else {
+                                    values << "NAN ";
+                                }
+                            }
+                              PUSHINFO(infoMap, "", values.str());
+                                values.str("");
+                        }
+                    } else {
+                        std::vector<double> energyVec;
+                        std::map<std::string, std::vector<double>> paramsTableData;
+                        std::map<int, std::vector<double>> semiVariableTableData;
+                        for (int i = 0; i < nValues; ++i) {
+                            energyVec.clear();
+                            for (int j = 0; j < nModes; ++j) {
+                                energyVec.push_back(semiVariableTable.tabValues[j][i]);
+                            }
+                            paramsTableData[tabKey] = energyVec;
+                            for (int j = 0; j < 2 * nModes; j = j + 2) {
+                                t_TableBound bound = getBound(parameterManager, j / 2, &paramsTableData);
+                                semiVariableTableData[j].push_back(bound.min);
+                                semiVariableTableData[j + 1].push_back(bound.max);
+                            }
+                        }
+                        int l = 0;
+                        int k = 0;
+                        for (auto v : semiVariableTableData) {
+                            std::ostringstream values;
+                            std::string born;
+                            (l % 2 == 0) ? born = " Min " : born = " Max ";
+                            values << std::to_string(k) << born;
+                            // Convert all doubles to string ","
+                            std::copy(v.second.begin(), v.second.end(),
+                                    std::ostream_iterator<double>(values, " "));
+                            PUSHINFO(infoMap, "", values.str());
+                            values.str("");
+                            if (l % 2 != 0)
+                                k++;
+                            l++;
  
+                        }
                     }
                     _printedTables.push_back(paramId);
                 }
@@ -86,10 +86,6 @@ public:
  
 	void setAttributList(AttributeList pAttributList) { _attributList = pAttributList; }
  
-                   virtual  std::list<std::string> getUsedClbInfo(){
-                        std::list<std::string> clbInfoList;
-                        return clbInfoList;
-                   }
  
                   AMDA::Parameters::SemiVariableTable getSemiVariableTable(){
                        return _semiVariableTable;