- Timestamp:
- 01/26/21 23:52:07 (3 years ago)
- Location:
- XIOS/dev/dev_trunk_graph/src
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/dev_trunk_graph/src/filter/pass_through_filter.cpp
r2021 r2023 32 32 data[0]->graphPackage->fromFilter = -1; 33 33 } 34 35 for(int i=0; i<this->graphPackage->filterId; i++) 36 { 37 if( (*CWorkflowGraph::vectorOfNodes_)[i].label_field_id == this->label_field_id 38 && (*CWorkflowGraph::vectorOfNodes_)[i].timestamp == data[0]->timestamp 39 && CXios::isClient 40 && (*CWorkflowGraph::vectorOfNodes_)[i].filter_name == "Pass through filter" ) 41 { 42 data[0]->graphPackage->fromFilter = i; 43 return; 44 } 45 } 34 46 35 47 CWorkflowGraph::addNode("Pass through filter", 2, false, 1, data[0]); 48 if(CXios::isClient) (*CWorkflowGraph::vectorOfNodes_)[this->graphPackage->filterId].label_field_id = this->label_field_id; 49 CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]); 50 36 51 data[0]->graphPackage->currentField = this->graphPackage->inFields[0]; 37 52 std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end()); 38 53 39 CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);54 40 55 data[0]->graphPackage->fromFilter = this->graphPackage->filterId; 41 56 -
XIOS/dev/dev_trunk_graph/src/filter/pass_through_filter.hpp
r2019 r2023 20 20 CPassThroughFilter(CGarbageCollector& gc); 21 21 22 StdString label_field_id; 23 22 24 protected: 23 25 /*! -
XIOS/dev/dev_trunk_graph/src/filter/temporal_filter.cpp
r2021 r2023 27 27 , nbSamplingDates(0) 28 28 , isFirstOperation(true) 29 , graphCycleCompleted(true) 29 30 { 30 31 } … … 32 33 void CTemporalFilter::buildWorkflowGraph(std::vector<CDataPacketPtr> data) 33 34 { 34 if(this->graphEnabled )35 if(this->graphEnabled ) 35 36 { 36 37 if(!data[0]->graphPackage) … … 39 40 } 40 41 41 if(this->graphPackage->sourceFilterIds.size()==0) 42 //if(this->graphPackage->sourceFilterIds.size()==0) 43 if(graphCycleCompleted) 42 44 { 43 45 this->graphPackage->filterId = CWorkflowGraph::getNodeSize(); 44 46 CWorkflowGraph::addNode("Temporal filter", 3, false, 0, data[0]); 47 graphCycleCompleted = false; 45 48 } 46 49 … … 105 108 isFirstOperation = false; 106 109 110 graphCycleCompleted = true; 107 111 } 108 112 } -
XIOS/dev/dev_trunk_graph/src/filter/temporal_filter.hpp
r2019 r2023 54 54 */ 55 55 bool virtual isDataExpected(const CDate& date) const; 56 bool graphCycleCompleted; 56 57 57 58 private: -
XIOS/dev/dev_trunk_graph/src/filter/transform_filter.cpp
r2021 r2023 51 51 packet->graphPackage->contextId = data[0]->graphPackage->contextId; 52 52 packet->graphPackage->currentField = data[0]->graphPackage->currentField;//this->graphPackage->inFields[0]; 53 std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());54 53 55 54 CWorkflowGraph::addNode("Spatial transform filter "+algorithm->getAlgoName(), 4, false, 1, packet); 56 55 CWorkflowGraph::addEdge(packet->graphPackage->fromFilter, this->graphPackage->filterId, packet); 56 57 58 57 59 packet->graphPackage->fromFilter = this->graphPackage->filterId; 58 60 packet->graphPackage->currentField = this->graphPackage->inFields[0]; 61 std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end()); 59 62 } 60 63 } -
XIOS/dev/dev_trunk_graph/src/node/field.cpp
r2021 r2023 569 569 if(buildGraph_) 570 570 { 571 (*fieldRef).build_workflow_graph.set(build_workflow_graph); 571 (*fieldRef).build_workflow_graph.set(build_workflow_graph); 572 inputFilter->label_field_id = fieldRef->getId(); 572 573 } 573 574 else … … 653 654 if (fileIn_->isClientSide()) fileIn_->readFieldAttributesMetaData(this); 654 655 CGrid* newGrid ; 655 std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid_->buildTransformationGraph(gc, true, nullptr, detectMissingValues, defaultValue, newGrid, buildGraph_ ) ;656 std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid_->buildTransformationGraph(gc, true, nullptr, detectMissingValues, defaultValue, newGrid, buildGraph_, this) ; 656 657 grid_ = newGrid ; 657 658 grid_ref=grid_->getId() ; // for server … … 672 673 grid_->solveElementsRefInheritance() ; 673 674 CGrid* newGrid ; 674 std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid_->buildTransformationGraph(gc, true, nullptr, detectMissingValues, defaultValue, newGrid, buildGraph_ ) ;675 std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid_->buildTransformationGraph(gc, true, nullptr, detectMissingValues, defaultValue, newGrid, buildGraph_, this) ; 675 676 newGrid->duplicateAttributes(grid_) ; // for grid attributes (mask) 676 677 grid_ = newGrid ; -
XIOS/dev/dev_trunk_graph/src/node/grid.cpp
r2021 r2023 1700 1700 std::shared_ptr<CFilter> inputFilter = std::shared_ptr<CPassThroughFilter>(new CPassThroughFilter(gc)); 1701 1701 std::shared_ptr<CFilter> outputFilter = inputFilter ; 1702 1703 1702 /*cout<<"***************CGrid::buildTransformationGraph***************"<<field->getId()<<" CGrid::buildTransformationGraph"<<endl; 1703 inputFilter->graphEnabled = true; 1704 inputFilter->graphPackage = new CGraphPackage; 1705 inputFilter->graphPackage->inFields.push_back(field); 1706 */ 1704 1707 string newId ; 1705 1708 if (gridSrc!=nullptr) newId = gridSrc->getId() + " --> " + this->getId() ; -
XIOS/dev/dev_trunk_graph/src/transformation/domain_algorithm/domain_algorithm_reorder.hpp
r2019 r2023 26 26 27 27 static bool registerTrans(); 28 virtual StdString getAlgoName() {return "\\nreorder_domain";} 28 29 29 30 -
XIOS/dev/dev_trunk_graph/src/transformation/generic_algorithm_transformation.hpp
r2021 r2023 42 42 virtual bool isGenerateTransformation(void) { return false ;} 43 43 44 virtual StdString getAlgoName() { return " Generic algorithm transformation";}44 virtual StdString getAlgoName() { return "\\nGeneric algorithm transformation";} 45 45 46 46 virtual vector<string> getAuxFieldId(void) ; -
XIOS/dev/dev_trunk_graph/src/workflow_graph.hpp
r2019 r2023 66 66 StdString context_id; 67 67 int context; 68 StdString label_field_id; 68 69 }; 69 70
Note: See TracChangeset
for help on using the changeset viewer.