Changeset 2023

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

Files:

• filter/pass_through_filter.cpp (modified) (1 diff)
• filter/pass_through_filter.hpp (modified) (1 diff)
• filter/temporal_filter.cpp (modified) (4 diffs)
• filter/temporal_filter.hpp (modified) (1 diff)
• filter/transform_filter.cpp (modified) (1 diff)
• node/field.cpp (modified) (3 diffs)
• node/grid.cpp (modified) (1 diff)
• transformation/domain_algorithm/domain_algorithm_reorder.hpp (modified) (1 diff)
• transformation/generic_algorithm_transformation.hpp (modified) (1 diff)
• workflow_graph.hpp (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());
     }
   }

XIOS/dev/dev_trunk_graph/src/node/field.cpp

@@ -569 +569 @@
       if(buildGraph_)
       {
-        (*fieldRef).build_workflow_graph.set(build_workflow_graph);  
+        (*fieldRef).build_workflow_graph.set(build_workflow_graph); 
+        inputFilter->label_field_id = fieldRef->getId(); 
       }    
       else
@@ -653 +654 @@
          if (fileIn_->isClientSide()) fileIn_->readFieldAttributesMetaData(this);
          CGrid* newGrid ;
-         std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid_->buildTransformationGraph(gc, true, nullptr, detectMissingValues, defaultValue, newGrid, buildGraph_) ;
+         std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid_->buildTransformationGraph(gc, true, nullptr, detectMissingValues, defaultValue, newGrid, buildGraph_, this) ;
          grid_ = newGrid ;
          grid_ref=grid_->getId() ; // for server 
@@ -672 +673 @@
         grid_->solveElementsRefInheritance() ;
         CGrid* newGrid ;
-        std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid_->buildTransformationGraph(gc, true, nullptr, detectMissingValues, defaultValue, newGrid, buildGraph_) ;
+        std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid_->buildTransformationGraph(gc, true, nullptr, detectMissingValues, defaultValue, newGrid, buildGraph_, this) ;
         newGrid->duplicateAttributes(grid_) ; // for grid attributes (mask)
         grid_ = newGrid ;

XIOS/dev/dev_trunk_graph/src/node/grid.cpp

@@ -1700 +1700 @@
     std::shared_ptr<CFilter> inputFilter = std::shared_ptr<CPassThroughFilter>(new CPassThroughFilter(gc));
     std::shared_ptr<CFilter> outputFilter = inputFilter ;
-
-
+    /*cout<<"***************CGrid::buildTransformationGraph***************"<<field->getId()<<" CGrid::buildTransformationGraph"<<endl;
+    inputFilter->graphEnabled = true;
+    inputFilter->graphPackage = new CGraphPackage;
+    inputFilter->graphPackage->inFields.push_back(field);
+*/
     string newId ;
     if (gridSrc!=nullptr) newId = gridSrc->getId() + " --> " + this->getId()  ;

XIOS/dev/dev_trunk_graph/src/transformation/domain_algorithm/domain_algorithm_reorder.hpp

@@ -26 +26 @@
 
       static bool registerTrans();
+      virtual StdString getAlgoName() {return "\\nreorder_domain";}
 
   

XIOS/dev/dev_trunk_graph/src/transformation/generic_algorithm_transformation.hpp

@@ -42 +42 @@
     virtual bool isGenerateTransformation(void) { return false ;}
     
-    virtual StdString getAlgoName() { return "Generic algorithm transformation";}
+    virtual StdString getAlgoName() { return "\\nGeneric algorithm transformation";}
 
     virtual vector<string> getAuxFieldId(void) ;

XIOS/dev/dev_trunk_graph/src/workflow_graph.hpp

@@ -66 +66 @@
     StdString context_id;
     int context;
+    StdString label_field_id;
   };