Changeset 1679 for XIOS/dev/dev_trunk_omp/src/filter/unary_arithmetic_filter.cpp

Timestamp:

07/02/19 11:42:27 (5 years ago)

Author:

yushan

Message:

MARK: Dynamic workflow graph developement. Branch up to date with trunk @1676. Using vis.js

File:

• XIOS/dev/dev_trunk_omp/src/filter/unary_arithmetic_filter.cpp (modified) (2 diffs)

XIOS/dev/dev_trunk_omp/src/filter/unary_arithmetic_filter.cpp

@@ -30 +30 @@
   CDataPacketPtr CUnaryArithmeticFilter::apply(std::vector<CDataPacketPtr> data)
   {
-    if(this->tag)
+    bool building_graph = this->tag ? data[0]->timestamp >= this->start_graph && data[0]->timestamp <= this->end_graph : false;
+
+    if(building_graph)
     {
       this->filterID = InvalidableObject::filterIdGenerator++;
+      int edgeID = InvalidableObject::edgeIdGenerator++;
       
-      if(CWorkflowGraph::mapFieldToFilters_ptr==0) CWorkflowGraph::mapFieldToFilters_ptr = new std::unordered_map <StdString, vector <int> >;
-      if(CWorkflowGraph::mapFilters_ptr==0) CWorkflowGraph::mapFilters_ptr = new std::unordered_map <int, StdString>;
+      if(CWorkflowGraph::mapFieldToFilters_ptr_with_info==0) CWorkflowGraph::mapFieldToFilters_ptr_with_info = new std::unordered_map <int, graph_info_box_edge >;
+      if(CWorkflowGraph::mapFilters_ptr_with_info==0) CWorkflowGraph::mapFilters_ptr_with_info = new std::unordered_map <int, graph_info_box_node>;
 
-
-      (*CWorkflowGraph::mapFilters_ptr)[this->filterID] = op_expression +" F Filter" ;
       std::cout<<"CunaryArithmeticFilter::apply filter tag = "<<this->tag<<std::endl;
 
-      StdString str = data[0]->fieldID +" ts=" + to_string(data[0]->timestamp);
-      (*CWorkflowGraph::mapFieldToFilters_ptr)[str].push_back(data[0]->src_filterID);
-      (*CWorkflowGraph::mapFieldToFilters_ptr)[str].push_back(this->filterID);   
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_name = "F Filter";
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_class = 2;
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_filled = 1;
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].expected_entry_nb = 1;
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].date = data[0]->date;
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].timestamp = data[0]->timestamp;
+
+      if(CWorkflowGraph::build_begin)
+      {
+
+        CWorkflowGraph::addEdge(edgeID, this->filterID, data[0]);
+
+        (*CWorkflowGraph::mapFilters_ptr_with_info)[data[0]->src_filterID].filter_filled = 0 ; 
+      }
+      else CWorkflowGraph::build_begin = true;
   
     }
@@ -51 +64 @@
     packet->timestamp = data[0]->timestamp;
     packet->status = data[0]->status;
-    packet->fieldID = this->output_field_id;
+    packet->field = this->field;
 
     if (packet->status == CDataPacket::NO_ERROR)
       packet->data.reference(op(data[0]->data));
 
-    if(this->tag) packet->src_filterID = this->filterID;
+    if(building_graph) packet->src_filterID = this->filterID;
 
     return packet;