Changeset 1679 for XIOS/dev/dev_trunk_omp/src/filter/temporal_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/temporal_filter.cpp (modified) (3 diffs)

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

@@ -10 +10 @@
   CTemporalFilter::CTemporalFilter(CGarbageCollector& gc, const std::string& opId,
                                    const CDate& initDate, const CDuration samplingFreq, const CDuration samplingOffset, const CDuration opFreq,
-                                   bool ignoreMissingValue /*= false*/, bool buildWorkflowGraph /*= false*/)
-    : CFilter(gc, 1, this, buildWorkflowGraph)
+                                   bool ignoreMissingValue /*= false*/)
+    : CFilter(gc, 1, this)
     , functor(createFunctor(opId, ignoreMissingValue, tmpData))
     , isOnceOperation(functor->timeType() == func::CFunctor::once)
@@ -33 +33 @@
   CDataPacketPtr CTemporalFilter::apply(std::vector<CDataPacketPtr> data)
   {
+    bool building_graph=this->tag ? data[0]->timestamp >= this->start_graph && data[0]->timestamp <= this->end_graph : false;
    
-    if(this->tag)
+    if(building_graph)
     {
       if(this->filterIDoutputs.size()==0) this->filterID = InvalidableObject::filterIdGenerator++;
+      int edgeID = InvalidableObject::edgeIdGenerator++;
       
 
-      std::cout<<"CTemporalFilter::apply filter tag = "<<this->tag<<std::endl;
+      std::cout<<"CTemporalFilter::apply filter tag = "<<this->tag<<" start = "<<this->start_graph<<" end = "<<this->end_graph<<std::endl;
 
-      if(CWorkflowGraph::mapFieldToFilters_ptr==0) CWorkflowGraph::mapFieldToFilters_ptr = new std::unordered_map <StdString, vector <int> >;
+      if(CWorkflowGraph::mapFieldToFilters_ptr_with_info==0) CWorkflowGraph::mapFieldToFilters_ptr_with_info = new std::unordered_map <int, graph_info_box_edge >;
 
-      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);
-       
-    
-      if(CWorkflowGraph::mapFilters_ptr==0) CWorkflowGraph::mapFilters_ptr = new std::unordered_map <int, StdString>;
+      if(CWorkflowGraph::build_begin)
+      {
 
-      if(this->filterIDoutputs.size()==0) (*CWorkflowGraph::mapFilters_ptr)[this->filterID] = "Temporal Filter";  
+        CWorkflowGraph::addEdge(edgeID, this->filterID, data[0]);
+
+        (*CWorkflowGraph::mapFilters_ptr_with_info)[data[0]->src_filterID].filter_filled = 0 ;
+      }
+      
+      if(CWorkflowGraph::mapFilters_ptr_with_info==0) CWorkflowGraph::mapFilters_ptr_with_info = new std::unordered_map <int, graph_info_box_node>;
+
+      if(this->filterIDoutputs.size()==0)
+      {
+        (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_name = "Temporal Filter";   
+        (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_class = 3;   
+        (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_filled = 1;   
+        // (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].expected_entry_nb = (initDate + nbOperationDates*opFreq - samplingFreq + offsetMonth + offsetAllButMonth) / data[0]->date +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;   
+      }
+
 
       this->filterIDoutputs.push_back(data[0]->src_filterID); 
@@ -102 +117 @@
 
         isFirstOperation = false;
-        if(this->tag) packet->src_filterID=this->filterID;
-        packet->fieldID = this->output_field_id;
-        if(this->tag) this->filterIDoutputs.clear();
+        if(building_graph) packet->src_filterID=this->filterID;
+        packet->field = this->field;
+        if(building_graph) this->filterIDoutputs.clear();
+        if(building_graph) CWorkflowGraph::build_begin=true;
       }
     }