Changeset 2193 for XIOS/dev/dev_ym/XIOS_COUPLING/src/workflow_graph.cpp

Timestamp:

07/22/21 14:05:58 (3 years ago)

Author:

yushan

Message:

workflow graph : enable unary and binary arithmetic filters

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/workflow_graph.cpp (modified) (9 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/workflow_graph.cpp

@@ -17 +17 @@
   bool CWorkflowGraph::build_begin = false;
 
+  std::unordered_map <size_t, int> *CWorkflowGraph::mapHashFilterID_ = 0;
+  std::unordered_map <size_t, int> *CWorkflowGraph::mapHashFilterID_srv_ = 0;
+
 
   CWorkflowGraph::CWorkflowGraph()
@@ -29 +32 @@
     for(int i=0; i<vectorOfNodes_->size(); i++)
     {
+      std::cout<<"Node["<<i<<"] is "<<(*vectorOfNodes_)[i].filter_name<<std::endl;
       info(100)<<"Node["<<i<<"] is "<<(*vectorOfNodes_)[i].filter_name<<std::endl;
     }
@@ -34 +38 @@
     for(int i=0; i<vectorOfEdges_->size(); i++)
     {
+      std::cout<<"Edge["<<i<<"] from "<<(*vectorOfEdges_)[i].from<<" to "<<(*vectorOfEdges_)[i].to<<std::endl;
       info(100)<<"Edge["<<i<<"] from "<<(*vectorOfEdges_)[i].from<<" to "<<(*vectorOfEdges_)[i].to<<std::endl;
     }
@@ -85 +90 @@
     if(CXios::isClient)
     {
+      // if(vectorOfEdges_&&vectorOfNodes_) outputWorkflowGraph_client_stdout();
+      // std::cout<<"Trying to add an edge from "<<from<<" to "<<to<<std::endl;
       if(!vectorOfEdges_) vectorOfEdges_ = new std::vector<graph_edge_object>;
       std::string currentContextId = CContext::getCurrent()->getId();
@@ -158 +165 @@
     if(CXios::isClient)
     {
+      //if(vectorOfEdges_&&vectorOfNodes_) outputWorkflowGraph_client_stdout();
+      // std::cout<<"Trying to add a node naming "<<filterName<<std::endl;
       if(!vectorOfNodes_) vectorOfNodes_ = new std::vector<graph_node_object>;
       if(!vectorOfContexts_) vectorOfContexts_ = new std::vector<StdString>;
+      if(!mapHashFilterID_) mapHashFilterID_ = new std::unordered_map <size_t, int>;
+
       std::string currentContextId = CContext::getCurrent()->getId();
       if ( std::find(vectorOfContexts_->begin(), vectorOfContexts_->end(), currentContextId) == vectorOfContexts_->end() )
@@ -172 +183 @@
       node_obj.date = packet->date;
       node_obj.timestamp = packet->timestamp;
+      
       for(int i=0; i<vectorOfContexts_->size(); i++)
       {
@@ -181 +193 @@
         }
       }    
+      
       node_obj.attributes = packet->graphPackage->currentField->recordXiosAttributes();
-
+      
       vectorOfNodes_->push_back(node_obj);
-      //info(100)<<"****************** Add node "<<filterName<<std::endl;   
     }
     else
@@ -190 +202 @@
       if(!vectorOfNodes_srv_) vectorOfNodes_srv_ = new std::vector<graph_node_object>;
       if(!vectorOfContexts_srv_) vectorOfContexts_srv_ = new std::vector<StdString>;
+      if(!mapHashFilterID_srv_) mapHashFilterID_srv_ = new std::unordered_map <size_t, int>;
+
       std::string currentContextId = CContext::getCurrent()->getId();
       if ( std::find(vectorOfContexts_srv_->begin(), vectorOfContexts_srv_->end(), currentContextId) == vectorOfContexts_srv_->end() )
@@ -213 +227 @@
 
       vectorOfNodes_srv_->push_back(node_obj);
-      //info(100)<<"******************Server side : Add node "<<filterName<<std::endl; 
     }