Changeset 2023 for XIOS/dev/dev_trunk_graph/src/filter

Timestamp:

01/26/21 23:52:07 (3 years ago)

Author:

yushan

Message:

Graph intermediate commit to a tmp branch.

Location:

XIOS/dev/dev_trunk_graph/src/filter

Files:

• pass_through_filter.cpp (modified) (1 diff)
• pass_through_filter.hpp (modified) (1 diff)
• temporal_filter.cpp (modified) (4 diffs)
• temporal_filter.hpp (modified) (1 diff)
• transform_filter.cpp (modified) (1 diff)

XIOS/dev/dev_trunk_graph/src/filter/pass_through_filter.cpp

@@ -32 +32 @@
         data[0]->graphPackage->fromFilter = -1;
       }
+
+      for(int i=0; i<this->graphPackage->filterId; i++)
+      {
+        if(  (*CWorkflowGraph::vectorOfNodes_)[i].label_field_id == this->label_field_id  
+          && (*CWorkflowGraph::vectorOfNodes_)[i].timestamp == data[0]->timestamp
+          && CXios::isClient
+          && (*CWorkflowGraph::vectorOfNodes_)[i].filter_name == "Pass through filter" )
+        {
+          data[0]->graphPackage->fromFilter = i;
+          return;
+        }  
+      }
       
       CWorkflowGraph::addNode("Pass through filter", 2, false, 1, data[0]);
+      if(CXios::isClient) (*CWorkflowGraph::vectorOfNodes_)[this->graphPackage->filterId].label_field_id = this->label_field_id;
+      CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);
+      
       data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
       std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
       
-      CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);
+      
       data[0]->graphPackage->fromFilter = this->graphPackage->filterId;
         

XIOS/dev/dev_trunk_graph/src/filter/pass_through_filter.hpp

@@ -20 +20 @@
       CPassThroughFilter(CGarbageCollector& gc);
 
+      StdString label_field_id;
+
     protected:
       /*!

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

@@ -27 +27 @@
     , nbSamplingDates(0)
     , isFirstOperation(true)
+    , graphCycleCompleted(true)
   {
   }
@@ -32 +33 @@
   void CTemporalFilter::buildWorkflowGraph(std::vector<CDataPacketPtr> data)
   {
-    if(this->graphEnabled)
+    if(this->graphEnabled )
     {
       if(!data[0]->graphPackage)
@@ -39 +40 @@
       }
       
-      if(this->graphPackage->sourceFilterIds.size()==0)
+      //if(this->graphPackage->sourceFilterIds.size()==0)
+      if(graphCycleCompleted)
       {  
         this->graphPackage->filterId = CWorkflowGraph::getNodeSize();
         CWorkflowGraph::addNode("Temporal filter", 3, false, 0, data[0]);
+        graphCycleCompleted = false;
       }
       
@@ -105 +108 @@
         isFirstOperation = false;
         
+        graphCycleCompleted = true;
       }
     }

XIOS/dev/dev_trunk_graph/src/filter/temporal_filter.hpp

@@ -54 +54 @@
        */
       bool virtual isDataExpected(const CDate& date) const;
+      bool graphCycleCompleted;
 
     private:

XIOS/dev/dev_trunk_graph/src/filter/transform_filter.cpp

@@ -51 +51 @@
       packet->graphPackage->contextId = data[0]->graphPackage->contextId;          
       packet->graphPackage->currentField = data[0]->graphPackage->currentField;//this->graphPackage->inFields[0];
-      std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
     
       CWorkflowGraph::addNode("Spatial transform filter "+algorithm->getAlgoName(), 4, false, 1, packet);
       CWorkflowGraph::addEdge(packet->graphPackage->fromFilter, this->graphPackage->filterId, packet);
+      
+      
+      
       packet->graphPackage->fromFilter = this->graphPackage->filterId;
       packet->graphPackage->currentField = this->graphPackage->inFields[0];
+      std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
     }
   }