From 2f88d763f4ce77571baa5f39c25223c002781ea5 Mon Sep 17 00:00:00 2001 From: Ovidiu Mircescu Date: Thu, 30 Jul 2020 15:55:31 +0200 Subject: [PATCH] Cleaning before merge to master. --- src/engine/Bloc.cxx | 8 +- src/engine/ComposedNode.cxx | 64 +++++++------- src/engine/ComposedNode.hxx | 2 +- src/engine/DynParaLoop.cxx | 22 ++--- src/engine/ElementaryNode.cxx | 26 +++--- src/engine/ElementaryNode.hxx | 8 +- src/engine/Executor.cxx | 20 ++--- src/engine/ForEachLoop.cxx | 24 ++--- src/engine/ForLoop.cxx | 6 +- src/engine/InlineNode.cxx | 2 +- src/engine/InputPort.cxx | 4 +- src/engine/LinkInfo.cxx | 8 +- src/engine/Loop.cxx | 32 +++---- src/engine/NbBranches.cxx | 2 +- src/engine/NewAPI.hxx | 87 ------------------- src/engine/Node.cxx | 14 +-- src/engine/OptimizerLoop.cxx | 12 +-- src/engine/OutGate.cxx | 2 +- src/engine/OutputDataStreamPort.cxx | 9 +- src/engine/OutputPort.cxx | 14 +-- src/engine/PlayGround.hxx | 4 +- src/engine/Plugin/PluginSimplex.cxx | 2 +- src/engine/Pool.cxx | 6 +- src/engine/ServiceNode.cxx | 2 +- src/engine/Switch.cxx | 34 ++++---- src/engine/Test/ContainerTest.cxx | 8 +- src/engine/Test/PluginOptEvTest1.cxx | 2 +- src/engine/Test/RuntimeForEngineTest.cxx | 4 +- src/engine/Test/ToyNode.cxx | 14 +-- src/engine/VisitorSaveSchema.cxx | 4 +- src/engine/VisitorSaveState.cxx | 2 +- src/engine/WhileLoop.cxx | 4 +- src/engine/WlmTask.hxx | 2 +- src/runtime/CalStreamPort.cxx | 4 +- src/runtime/CppCORBAConv.cxx | 4 +- src/runtime/CppContainer.cxx | 2 +- src/runtime/CppPorts.cxx | 2 +- src/runtime/NeutralCORBAConv.cxx | 12 +-- src/runtime/OutNode.cxx | 2 +- src/runtime/PresetNode.cxx | 2 +- src/runtime/PresetPorts.cxx | 2 +- src/runtime/PythonCORBAConv.cxx | 28 +++--- src/runtime/PythonCppConv.cxx | 4 +- src/runtime/PythonNode.cxx | 4 +- src/runtime/PythonPorts.cxx | 2 +- src/runtime/SalomeContainer.cxx | 2 +- src/runtime/SalomeHPContainer.cxx | 4 +- src/runtime/StudyNodes.cxx | 4 +- src/runtime/XMLPorts.cxx | 4 +- src/workloadmanager/DefaultAlgorithm.cxx | 2 +- src/workloadmanager/DefaultAlgorithm.hxx | 4 +- src/workloadmanager/Task.hxx | 4 +- src/workloadmanager/Test/CMakeLists.txt | 2 +- src/workloadmanager/Test/TestMain.cxx | 2 +- src/workloadmanager/WorkloadManager.cxx | 6 +- .../Test/OptimizerAlgASyncExample.cxx | 3 +- .../Test/OptimizerAlgSyncExample.cxx | 3 +- 57 files changed, 234 insertions(+), 328 deletions(-) delete mode 100644 src/engine/NewAPI.hxx diff --git a/src/engine/Bloc.cxx b/src/engine/Bloc.cxx index 52c158e0e..3bbf5fecb 100644 --- a/src/engine/Bloc.cxx +++ b/src/engine/Bloc.cxx @@ -173,7 +173,7 @@ void Bloc::exUpdateState() * If node name already used in bloc, throw exception. * Publish inputPorts in current bloc and ancestors. */ -bool Bloc::edAddChild(Node *node) +bool Bloc::edAddChild(Node *node) { if(isNodeAlreadyAggregated(node)) { @@ -217,7 +217,7 @@ bool Bloc::edAddChild(Node *node) * @exception If 'node' is NOT the son of 'this'. */ -void Bloc::edRemoveChild(Node *node) +void Bloc::edRemoveChild(Node *node) { StaticDefinedComposedNode::edRemoveChild(node); list::iterator iter=find(_setOfNode.begin(),_setOfNode.end(),node); @@ -276,7 +276,7 @@ std::vector< std::list > Bloc::splitIntoIndependantGraph() const return ret; } -Node *Bloc::getChildByShortName(const std::string& name) const +Node *Bloc::getChildByShortName(const std::string& name) const { for (list::const_iterator iter = _setOfNode.begin(); iter != _setOfNode.end(); iter++) if ((*iter)->getName() == name) @@ -335,7 +335,7 @@ bool insertNodeChildrenInSet(Node *node, std::set& nodeSet) * \b WARNING : When using this method 'node' has to be checked in order to be part of direct children of 'this'. * */ -void Bloc::checkNoCyclePassingThrough(Node *node) +void Bloc::checkNoCyclePassingThrough(Node *node) { set currentNodesToTest; //don't insert node to test in set. diff --git a/src/engine/ComposedNode.cxx b/src/engine/ComposedNode.cxx index 633accbce..065b89299 100644 --- a/src/engine/ComposedNode.cxx +++ b/src/engine/ComposedNode.cxx @@ -186,7 +186,7 @@ DeploymentTree ComposedNode::getDeploymentTree() const /*! * \param deep if \b true a deep check is perfomed. Typically has to be called by an executor before any attempt to launch an execution. */ -DeploymentTree ComposedNode::checkDeploymentTree(bool deep) const +DeploymentTree ComposedNode::checkDeploymentTree(bool deep) const { DeploymentTree ret; list< ElementaryNode * > tasks=getRecursiveConstituents(); @@ -270,7 +270,7 @@ void ComposedNode::notifyFrom(const Task *sender, //* I : task emitting event * \return true if a new link has been created, false otherwise. */ -bool ComposedNode::edAddLink(OutPort *start, InPort *end) +bool ComposedNode::edAddLink(OutPort *start, InPort *end) { DEBTRACE("ComposedNode::edAddLink"); set represented; @@ -330,7 +330,7 @@ bool ComposedNode::edAddLink(OutPort *start, InPort *end) * \param end : the InPort to connect * \return true if a new link has been created, false otherwise. */ -bool ComposedNode::edAddDFLink(OutPort *start, InPort *end) +bool ComposedNode::edAddDFLink(OutPort *start, InPort *end) { Node* n1=start->getNode(); Node* n2=end->getNode(); @@ -384,7 +384,7 @@ bool ComposedNode::edAddDFLink(OutPort *start, InPort *end) * supporting it. * \return true if a new link has been created, false otherwise. */ -bool ComposedNode::edAddLink(OutGate *start, InGate *end) +bool ComposedNode::edAddLink(OutGate *start, InGate *end) { Node* n1=start->getNode(); Node* n2=end->getNode(); @@ -418,13 +418,13 @@ bool ComposedNode::edAddLink(OutGate *start, InGate *end) /*! * Add a controlflow link between two nodes by calling edAddLink on their control ports */ -bool ComposedNode::edAddCFLink(Node *nodeS, Node *nodeE) +bool ComposedNode::edAddCFLink(Node *nodeS, Node *nodeE) { return edAddLink(nodeS->getOutGate(),nodeE->getInGate()); } //! Remove a controlflow link. -void ComposedNode::edRemoveCFLink(Node *nodeS, Node *nodeE) +void ComposedNode::edRemoveCFLink(Node *nodeS, Node *nodeE) { edRemoveLink(nodeS->getOutGate(),nodeE->getInGate()); } @@ -438,7 +438,7 @@ void ComposedNode::edRemoveCFLink(Node *nodeS, Node *nodeE) * implies DF/DS gateway. */ -void ComposedNode::edRemoveLink(OutPort *start, InPort *end) +void ComposedNode::edRemoveLink(OutPort *start, InPort *end) { if(!start->isAlreadyLinkedWith(end)) throw Exception("ComposedNode::edRemoveLink : unexisting link"); @@ -520,7 +520,7 @@ void ComposedNode::edRemoveLink(OutPort *start, InPort *end) } //! Remove a controlflow link. -void ComposedNode::edRemoveLink(OutGate *start, InGate *end) +void ComposedNode::edRemoveLink(OutGate *start, InGate *end) { ComposedNode* father=checkHavingCommonFather(start->getNode(),end->getNode()); if(father!=this) @@ -528,13 +528,13 @@ void ComposedNode::edRemoveLink(OutGate *start, InGate *end) start->edRemoveInGate(end); } -bool ComposedNode::edAddChild(Node *DISOWNnode) +bool ComposedNode::edAddChild(Node *DISOWNnode) { return false; // --- reimplemented in derived classes } //! Remove a child node. -void ComposedNode::edRemoveChild(Node *node) +void ComposedNode::edRemoveChild(Node *node) { if(!node) return; @@ -559,7 +559,7 @@ void ComposedNode::edRemoveChild(Node *node) * separator was not found). */ bool ComposedNode::splitNamesBySep(const std::string& globalName, const char separator[], - std::string& firstPart, std::string& lastPart, bool priority) + std::string& firstPart, std::string& lastPart, bool priority) { const string delims(separator); string portName, nodeName; @@ -612,7 +612,7 @@ std::vector< std::pair > ComposedNode::getSetOfLinksLeaving return ret; } -void ComposedNode::checkConsistency(LinkInfo& info) const +void ComposedNode::checkConsistency(LinkInfo& info) const { info.clearAll(); info.setPointOfView((ComposedNode *)this); @@ -659,7 +659,7 @@ void ComposedNode::checkConsistency(LinkInfo& info) const * This method check that G1 <- G2 <- G3 <- G1 does not happened. * Typically called by methods that set a hierarchy (Bloc::edAddChild, Loop::edSetNode, ...). */ -void ComposedNode::checkNoCrossHierachyWith(Node *node) const +void ComposedNode::checkNoCrossHierachyWith(Node *node) const { ComposedNode *nodeC=dynamic_cast(node); if(!nodeC) @@ -714,7 +714,7 @@ Node *ComposedNode::getLowestNodeDealingAll(const std::list& ports) c /*! * call it only for 'starts' to 'end' links \b DEALED by 'this'. */ -void ComposedNode::checkLinksCoherenceRegardingControl(const std::vector& starts, InputPort *end, LinkInfo& info) const +void ComposedNode::checkLinksCoherenceRegardingControl(const std::vector& starts, InputPort *end, LinkInfo& info) const { map < ComposedNode *, list, SortHierarc > outputs;//forward link classical vector outputsCross;//forward link cross @@ -924,7 +924,7 @@ void ComposedNode::edDisconnectAllLinksWithMe() } } -ComposedNode *ComposedNode::getRootNode() const +ComposedNode *ComposedNode::getRootNode() const { if(!_father) return (ComposedNode *)this; @@ -965,7 +965,7 @@ Node *ComposedNode::isInMyDescendance(Node *nodeToTest) const return 0; } -string ComposedNode::getChildName(const Node* node) const +string ComposedNode::getChildName(const Node* node) const { string nodeName=node->getQualifiedName(); if (!isNodeAlreadyAggregated(node)) @@ -996,7 +996,7 @@ std::string ComposedNode::getMyQualifiedName(const Node *directSon) const return directSon->getName(); } -Node *ComposedNode::getChildByName(const std::string& name) const +Node *ComposedNode::getChildByName(const std::string& name) const { string potentiallyDirectSonName, remainsPath; bool forwardNeeded=ComposedNode::splitNamesBySep(name, SEP_CHAR_BTW_LEVEL, @@ -1014,7 +1014,7 @@ Node *ComposedNode::getChildByName(const std::string& name) const * \exception Exception : If 'nodeToTest' is NOT in descendance of 'this' AND not equal to 'this' * \param nodeToTest : the node to check */ -void ComposedNode::checkInMyDescendance(Node *nodeToTest) const +void ComposedNode::checkInMyDescendance(Node *nodeToTest) const { const char whatC[]=" is not the descendance of node "; if(nodeToTest==0) @@ -1047,7 +1047,7 @@ void ComposedNode::checkInMyDescendance(Node *nodeToTest) const * \return The lowest common ancestor if it exists. * */ -ComposedNode *ComposedNode::getLowestCommonAncestor(Node *node1, Node *node2) +ComposedNode *ComposedNode::getLowestCommonAncestor(Node *node1, Node *node2) { const char what[]="The two nodes do not share the same genealogy"; if(node1==0 || node2==0) @@ -1197,12 +1197,12 @@ list ComposedNode::getProgressWeight() const * get the input port name used by the current node, recursively built with children names. */ -string ComposedNode::getInPortName(const InPort * inPort) const +string ComposedNode::getInPortName(const InPort * inPort) const { return getPortName(inPort); } -string ComposedNode::getOutPortName(const OutPort *outPort) const +string ComposedNode::getOutPortName(const OutPort *outPort) const { return getPortName(outPort); } @@ -1273,7 +1273,7 @@ list ComposedNode::getSetOfOutputDataStreamPort() const return ret; } -OutPort *ComposedNode::getOutPort(const std::string& name) const +OutPort *ComposedNode::getOutPort(const std::string& name) const { string portName, nodeName; if(splitNamesBySep(name,Node::SEP_CHAR_IN_PORT,nodeName,portName,false)) @@ -1294,7 +1294,7 @@ OutPort *ComposedNode::getOutPort(const std::string& name) const * and so the leaf of type ElementaryNode aggregating * this InputPort is directly invoked. */ -InputPort * ComposedNode::getInputPort(const std::string& name) const +InputPort * ComposedNode::getInputPort(const std::string& name) const { try { return Node::getInputPort(name); @@ -1319,7 +1319,7 @@ InputPort * ComposedNode::getInputPort(const std::string& name) const * Contrary to YACS::ENGINE::ComposedNode::getInputPort, this method is recursive and go * down hierarchy step by step to complete its work. */ -OutputPort * ComposedNode::getOutputPort(const std::string& name) const +OutputPort * ComposedNode::getOutputPort(const std::string& name) const { string portName, nodeName; if(splitNamesBySep(name,Node::SEP_CHAR_IN_PORT,nodeName,portName,false)) @@ -1334,7 +1334,7 @@ OutputPort * ComposedNode::getOutputPort(const std::string& name) const } } -InputDataStreamPort *ComposedNode::getInputDataStreamPort(const std::string& name) const +InputDataStreamPort *ComposedNode::getInputDataStreamPort(const std::string& name) const { string portName, nodeName; if(splitNamesBySep(name,Node::SEP_CHAR_IN_PORT,nodeName,portName,true)) @@ -1349,7 +1349,7 @@ InputDataStreamPort *ComposedNode::getInputDataStreamPort(const std::string& nam } } -OutputDataStreamPort *ComposedNode::getOutputDataStreamPort(const std::string& name) const +OutputDataStreamPort *ComposedNode::getOutputDataStreamPort(const std::string& name) const { string portName, nodeName; if(splitNamesBySep(name,Node::SEP_CHAR_IN_PORT,nodeName,portName,true)) @@ -1445,7 +1445,7 @@ YACS::Event ComposedNode::updateStateOnFailedEventFrom(Node *node, const Executo } void ComposedNode::checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) + InPort *end, const std::list& pointsOfViewEnd) { if((dynamic_cast(start) || dynamic_cast(end)) && (dynamic_cast(start) || dynamic_cast(end))) @@ -1469,19 +1469,19 @@ void ComposedNode::buildDelegateOf(std::pair& port, InPort { } -void ComposedNode::getDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) +void ComposedNode::getDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) { } -void ComposedNode::getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) +void ComposedNode::getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) { } -void ComposedNode::releaseDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) +void ComposedNode::releaseDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) { } -void ComposedNode::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) +void ComposedNode::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) { } @@ -1600,7 +1600,7 @@ std::string ComposedNode::getErrorReport() -void ComposedNode::checkBasicConsistency() const +void ComposedNode::checkBasicConsistency() const { DEBTRACE("ComposedNode::checkBasicConsistency"); std::list::const_iterator iter; diff --git a/src/engine/ComposedNode.hxx b/src/engine/ComposedNode.hxx index 0b86c2139..f5a025d27 100644 --- a/src/engine/ComposedNode.hxx +++ b/src/engine/ComposedNode.hxx @@ -177,7 +177,7 @@ namespace YACS }; template - std::string ComposedNode::getPortName(const PORT * port) const + std::string ComposedNode::getPortName(const PORT * port) const { Node *node = port->getNode(); std::string portName = port->getName(); diff --git a/src/engine/DynParaLoop.cxx b/src/engine/DynParaLoop.cxx index 64c0a37bb..291ae71d2 100644 --- a/src/engine/DynParaLoop.cxx +++ b/src/engine/DynParaLoop.cxx @@ -138,7 +138,7 @@ Node * DynParaLoop::edSetFinalizeNode(Node * node) * \param end : the InPort to connect * \return true if a new link has been created, false otherwise. */ -bool DynParaLoop::edAddDFLink(OutPort *start, InPort *end) +bool DynParaLoop::edAddDFLink(OutPort *start, InPort *end) { return edAddLink(start,end); } @@ -195,7 +195,7 @@ std::list DynParaLoop::getLocalOutputPorts() const return ret; } -OutPort *DynParaLoop::getOutPort(const std::string& name) const +OutPort *DynParaLoop::getOutPort(const std::string& name) const { if (name == NAME_OF_SPLITTED_SEQ_OUT || name == OLD_NAME_OF_SPLITTED_SEQ_OUT) return (OutPort *)&_splittedPort; @@ -203,7 +203,7 @@ OutPort *DynParaLoop::getOutPort(const std::string& name) const } -OutputPort *DynParaLoop::getOutputPort(const std::string& name) const +OutputPort *DynParaLoop::getOutputPort(const std::string& name) const { if (name == NAME_OF_SPLITTED_SEQ_OUT || name == OLD_NAME_OF_SPLITTED_SEQ_OUT) return (OutputPort *)&_splittedPort; @@ -242,7 +242,7 @@ Node * DynParaLoop::edRemoveFinalizeNode() return removeNode(_finalizeNode); } -void DynParaLoop::edRemoveChild(Node *node) +void DynParaLoop::edRemoveChild(Node *node) { ComposedNode::edRemoveChild(node); if(node==_node) @@ -254,7 +254,7 @@ void DynParaLoop::edRemoveChild(Node *node) modified(); } -bool DynParaLoop::edAddChild(Node *DISOWNnode) +bool DynParaLoop::edAddChild(Node *DISOWNnode) { return edSetNode(DISOWNnode); } @@ -280,7 +280,7 @@ std::list DynParaLoop::getSetOfInputPort() const return ret; } -InputPort *DynParaLoop::getInputPort(const std::string& name) const +InputPort *DynParaLoop::getInputPort(const std::string& name) const { if(_nbOfBranches->isMyName(name)) return _nbOfBranches->getPort(); @@ -296,7 +296,7 @@ std::list DynParaLoop::getLocalInputPorts() const return ret; } -unsigned DynParaLoop::getNumberOfBranchesCreatedDyn() const +unsigned DynParaLoop::getNumberOfBranchesCreatedDyn() const { if(_execNodes.empty()) throw Exception("ForEachLoop::getNumberOfBranches : No branches created dynamically ! - ForEachLoop needs to run or to be runned to call getNumberOfBranches"); @@ -304,7 +304,7 @@ unsigned DynParaLoop::getNumberOfBranchesCreatedDyn() const return _execNodes.size(); } -Node *DynParaLoop::getChildByShortName(const std::string& name) const +Node *DynParaLoop::getChildByShortName(const std::string& name) const { if (_node && name == _node->getName()) return _node; @@ -316,7 +316,7 @@ Node *DynParaLoop::getChildByShortName(const std::string& name) const throw Exception(what); } -Node *DynParaLoop::getChildByNameExec(const std::string& name, unsigned id) const +Node *DynParaLoop::getChildByNameExec(const std::string& name, unsigned id) const { if(id>=getNumberOfBranchesCreatedDyn()) throw Exception("ForEachLoop::getChildByNameExec : invalid id - too large compared with dynamically created branches."); @@ -519,7 +519,7 @@ void DynParaLoop::checkControlDependancy(OutPort *start, InPort *end, bool cross } void DynParaLoop::checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) + InPort *end, const std::list& pointsOfViewEnd) { ComposedNode::checkLinkPossibility(start, pointsOfViewStart, end, pointsOfViewEnd); Node * startNode = isInMyDescendance(start->getNode()); @@ -575,7 +575,7 @@ InputPort *DynParaLoop::getDynInputPortByAbsName(int branchNb, const std::string return 0; } -void DynParaLoop::checkBasicConsistency() const +void DynParaLoop::checkBasicConsistency() const { DEBTRACE("DynParaLoop::checkBasicConsistency"); ComposedNode::checkBasicConsistency(); diff --git a/src/engine/ElementaryNode.cxx b/src/engine/ElementaryNode.cxx index 00b95e6f9..2ef22cc4c 100644 --- a/src/engine/ElementaryNode.cxx +++ b/src/engine/ElementaryNode.cxx @@ -165,7 +165,7 @@ int ElementaryNode::getNumberOfOutputPorts() const return _setOfOutputPort.size(); } -InputPort *ElementaryNode::getInputPort(const std::string& name) const +InputPort *ElementaryNode::getInputPort(const std::string& name) const { try { return Node::getInputPort(name); @@ -174,7 +174,7 @@ InputPort *ElementaryNode::getInputPort(const std::string& name) const return getPort(name,_setOfInputPort); } -OutputPort *ElementaryNode::getOutputPort(const std::string& name) const +OutputPort *ElementaryNode::getOutputPort(const std::string& name) const { return getPort(name,_setOfOutputPort); } @@ -236,12 +236,12 @@ std::vector< std::pair > ElementaryNode::getSetOfLinksComin return ret; } -InputDataStreamPort *ElementaryNode::getInputDataStreamPort(const std::string& name) const +InputDataStreamPort *ElementaryNode::getInputDataStreamPort(const std::string& name) const { return getPort(name,_setOfInputDataStreamPort); } -OutputDataStreamPort *ElementaryNode::getOutputDataStreamPort(const std::string& name) const +OutputDataStreamPort *ElementaryNode::getOutputDataStreamPort(const std::string& name) const { return getPort(name,_setOfOutputDataStreamPort); } @@ -520,7 +520,7 @@ void ElementaryNode::getReadyTasks(std::vector& tasks) * remove port from node at edition. Ports are typed. */ -void ElementaryNode::edRemovePort(Port *port) +void ElementaryNode::edRemovePort(Port *port) { DEBTRACE("ElementaryNode::edRemovePort "); if(port->getNode()!=this) @@ -568,13 +568,13 @@ list ElementaryNode::getProgressWeight() const return ret; } -Node *ElementaryNode::getChildByName(const std::string& name) const +Node *ElementaryNode::getChildByName(const std::string& name) const { string what("ElementaryNode does not agregate any nodes particullary node with name "); what+=name; throw Exception(what); } -void ElementaryNode::checkBasicConsistency() const +void ElementaryNode::checkBasicConsistency() const { DEBTRACE("ElementaryNode::checkBasicConsistency"); list::const_iterator iter; @@ -600,7 +600,7 @@ InputPort *ElementaryNode::createInputPort(const std::string& inputPortName, Typ * WARNING: CHECK CASE OF BLOC: ONLY INPUT PORTS NOT INTERNALLY CONNECTED MUST BE VISIBLE. */ -InputPort *ElementaryNode::edAddInputPort(const std::string& inputPortName, TypeCode* type) +InputPort *ElementaryNode::edAddInputPort(const std::string& inputPortName, TypeCode* type) { // Cannot create an InputPort defined with InPropertyPort name. @@ -669,7 +669,7 @@ OutputPort *ElementaryNode::createOutputPort(const std::string& outputPortName, * for now, publication is done the same way as input ports */ -OutputPort *ElementaryNode::edAddOutputPort(const std::string& outputPortName, TypeCode* type) +OutputPort *ElementaryNode::edAddOutputPort(const std::string& outputPortName, TypeCode* type) { OutputPort *ret =0; if (edCheckAddPort(outputPortName,_setOfOutputPort,type)) @@ -691,7 +691,7 @@ InputDataStreamPort *ElementaryNode::createInputDataStreamPort(const std::string return getRuntime()->createInputDataStreamPort(inputPortDSName, this, type); } -InputDataStreamPort *ElementaryNode::edAddInputDataStreamPort(const std::string& inputPortDSName, TypeCode* type) +InputDataStreamPort *ElementaryNode::edAddInputDataStreamPort(const std::string& inputPortDSName, TypeCode* type) { InputDataStreamPort *ret = 0; if (edCheckAddPort(inputPortDSName,_setOfInputDataStreamPort,type)) @@ -708,7 +708,7 @@ OutputDataStreamPort *ElementaryNode::createOutputDataStreamPort(const std::stri return getRuntime()->createOutputDataStreamPort(outputPortDSName, this, type); } -OutputDataStreamPort *ElementaryNode::edAddOutputDataStreamPort(const std::string& outputPortDSName, TypeCode* type) +OutputDataStreamPort *ElementaryNode::edAddOutputDataStreamPort(const std::string& outputPortDSName, TypeCode* type) { OutputDataStreamPort *ret = 0; if (edCheckAddPort(outputPortDSName,_setOfOutputDataStreamPort,type)) @@ -724,7 +724,7 @@ OutputDataStreamPort *ElementaryNode::edAddOutputDataStreamPort(const std::strin * get the input port name used by the current node (see composed nodes) */ -string ElementaryNode::getInPortName(const InPort * inPort) const +string ElementaryNode::getInPortName(const InPort * inPort) const { Node *node = inPort->getNode(); if ( node != this ) @@ -735,7 +735,7 @@ string ElementaryNode::getInPortName(const InPort * inPort) const return inPort->getName(); } -string ElementaryNode::getOutPortName(const OutPort *outPort) const +string ElementaryNode::getOutPortName(const OutPort *outPort) const { Node *node = outPort->getNode(); if ( node != this ) diff --git a/src/engine/ElementaryNode.hxx b/src/engine/ElementaryNode.hxx index a59071685..d9db52d2c 100644 --- a/src/engine/ElementaryNode.hxx +++ b/src/engine/ElementaryNode.hxx @@ -157,7 +157,7 @@ namespace YACS */ template - PORT *ElementaryNode::getPort(const std::string& name, const std::list& setOfPorts) const + PORT *ElementaryNode::getPort(const std::string& name, const std::list& setOfPorts) const { for(typename std::list::const_iterator iter=setOfPorts.begin();iter!=setOfPorts.end();iter++) { @@ -176,7 +176,7 @@ namespace YACS */ template - PORT *ElementaryNode::edAddPort(const std::string& portName, std::list& setOfPorts, ENUMTYPE type) + PORT *ElementaryNode::edAddPort(const std::string& portName, std::list& setOfPorts, ENUMTYPE type) { checkValidityOfPortName(portName); if(isPortNameAlreadyExist(portName, setOfPorts)) @@ -190,7 +190,7 @@ namespace YACS } template - bool ElementaryNode::edCheckAddPort(const std::string& portName, std::list& setOfPorts, ENUMTYPE type) + bool ElementaryNode::edCheckAddPort(const std::string& portName, std::list& setOfPorts, ENUMTYPE type) { checkValidityOfPortName(portName); if(isPortNameAlreadyExist(portName, setOfPorts)) @@ -206,7 +206,7 @@ namespace YACS */ template - void ElementaryNode::edRemovePortTypedFromSet(PORT *port, std::list& setOfPorts) + void ElementaryNode::edRemovePortTypedFromSet(PORT *port, std::list& setOfPorts) { if(!isPortNameAlreadyExist(port->getName(), setOfPorts)) throw Exception("Port is not part of the list : unable to remove it"); diff --git a/src/engine/Executor.cxx b/src/engine/Executor.cxx index e34d946ff..f16453f4f 100644 --- a/src/engine/Executor.cxx +++ b/src/engine/Executor.cxx @@ -1427,7 +1427,7 @@ void Executor::loadTask(Task *task, const WorkloadManager::RunInfo& runInfo) traceExec(task, "initService", ComputePlacement(task)); task->initService(); } - catch(Exception& ex) + catch(Exception& ex) { std::cerr << ex.what() << std::endl; {//Critical section @@ -1437,7 +1437,7 @@ void Executor::loadTask(Task *task, const WorkloadManager::RunInfo& runInfo) traceExec(task, "state:"+Node::getStateName(task->getState()), ComputePlacement(task)); }//End of critical section } - catch(...) + catch(...) { std::cerr << "Load failed" << std::endl; {//Critical section @@ -1492,9 +1492,6 @@ void Executor::endTask(Task *task, YACS::Event ev) } _numberOfRunningTasks--; _runningTasks.erase(task); - DEBTRACE("_numberOfRunningTasks: " << _numberOfRunningTasks - << " _execMode: " << _execMode - << " _executorState: " << _executorState); if ((_numberOfRunningTasks == 0) && (_execMode != YACS::CONTINUE)) // no more running tasks { if (_executorState == YACS::WAITINGTASKS) @@ -1544,7 +1541,7 @@ YACS::Event Executor::runTask(Task *task) message += ex.what(); traceExec(task, message,ComputePlacement(task)); } - catch(...) + catch(...) { // Execution has failed std::cerr << "Execution has failed: unknown reason" << std::endl; @@ -1559,7 +1556,7 @@ YACS::Event Executor::runTask(Task *task) task->disconnectService(); traceExec(task, "disconnectService",ComputePlacement(task)); } - catch(...) + catch(...) { // Disconnect has failed std::cerr << "disconnect has failed" << std::endl; @@ -1596,7 +1593,7 @@ void Executor::makeDatastreamConnections(Task *task) task->connected(); }//End of critical section } - catch(Exception& ex) + catch(Exception& ex) { std::cerr << ex.what() << std::endl; try @@ -1604,7 +1601,7 @@ void Executor::makeDatastreamConnections(Task *task) (task)->disconnectService(); traceExec(task, "disconnectService",ComputePlacement(task)); } - catch(...) + catch(...) { // Disconnect has failed traceExec(task, "disconnectService failed, ABORT",ComputePlacement(task)); @@ -1615,7 +1612,7 @@ void Executor::makeDatastreamConnections(Task *task) _mainSched->notifyFrom(task,YACS::ABORT,this); }//End of critical section } - catch(...) + catch(...) { std::cerr << "Problem in connectService" << std::endl; try @@ -1623,7 +1620,7 @@ void Executor::makeDatastreamConnections(Task *task) (task)->disconnectService(); traceExec(task, "disconnectService",ComputePlacement(task)); } - catch(...) + catch(...) { // Disconnect has failed traceExec(task, "disconnectService failed, ABORT",ComputePlacement(task)); @@ -1808,7 +1805,6 @@ void Executor::runWlm(Scheduler *graph,int debug, bool fromScratch) YACS::BASES::AutoLocker alck(&_mutexForTrace); _trace.close(); } - DEBTRACE("End of RunB thread"); } void Executor::RunW(Scheduler *graph,int debug, bool fromScratch) diff --git a/src/engine/ForEachLoop.cxx b/src/engine/ForEachLoop.cxx index f5e349685..d3bc13f27 100644 --- a/src/engine/ForEachLoop.cxx +++ b/src/engine/ForEachLoop.cxx @@ -107,7 +107,7 @@ AnySplitOutputPort::AnySplitOutputPort(const AnySplitOutputPort& other, Node *ne { } -bool AnySplitOutputPort::addInPort(InPort *inPort) +bool AnySplitOutputPort::addInPort(InPort *inPort) { bool ret=OutputPort::addInPort(inPort); if(_repr) @@ -123,7 +123,7 @@ void AnySplitOutputPort::getAllRepresented(std::set& represented) con _repr->getAllRepresented(represented); } -int AnySplitOutputPort::removeInPort(InPort *inPort, bool forward) +int AnySplitOutputPort::removeInPort(InPort *inPort, bool forward) { bool ret=OutputPort::removeInPort(inPort,forward); if(_repr) @@ -219,7 +219,7 @@ SplitterNode::SplitterNode(const SplitterNode& other, ForEachLoopGen *father):El { } -InputPort *SplitterNode::getInputPort(const std::string& name) const +InputPort *SplitterNode::getInputPort(const std::string& name) const { if(name==NAME_OF_SEQUENCE_INPUT) return (InputPort *)&_dataPortToDispatch; @@ -672,7 +672,7 @@ int ForEachLoopGen::getNumberOfInputPorts() const return DynParaLoop::getNumberOfInputPorts()+1; } -void ForEachLoopGen::checkNoCyclePassingThrough(Node *node) +void ForEachLoopGen::checkNoCyclePassingThrough(Node *node) { //TO DO } @@ -695,7 +695,7 @@ std::list ForEachLoopGen::getLocalInputPorts() const return ret; } -InputPort *ForEachLoopGen::getInputPort(const std::string& name) const +InputPort *ForEachLoopGen::getInputPort(const std::string& name) const { if(name==SplitterNode::NAME_OF_SEQUENCE_INPUT) return (InputPort *)&_splitterNode._dataPortToDispatch; @@ -703,7 +703,7 @@ InputPort *ForEachLoopGen::getInputPort(const std::string& name) const return DynParaLoop::getInputPort(name); } -OutputPort *ForEachLoopGen::getOutputPort(const std::string& name) const +OutputPort *ForEachLoopGen::getOutputPort(const std::string& name) const { for(vector::const_iterator iter=_outGoingPorts.begin();iter!=_outGoingPorts.end();iter++) { @@ -713,7 +713,7 @@ OutputPort *ForEachLoopGen::getOutputPort(const std::string& name) const return DynParaLoop::getOutputPort(name); } -OutPort *ForEachLoopGen::getOutPort(const std::string& name) const +OutPort *ForEachLoopGen::getOutPort(const std::string& name) const { for(vector::const_iterator iter=_outGoingPorts.begin();iter!=_outGoingPorts.end();iter++) { @@ -723,7 +723,7 @@ OutPort *ForEachLoopGen::getOutPort(const std::string& name) const return DynParaLoop::getOutPort(name); } -Node *ForEachLoopGen::getChildByShortName(const std::string& name) const +Node *ForEachLoopGen::getChildByShortName(const std::string& name) const { if(name==NAME_OF_SPLITTERNODE) return (Node *)&_splitterNode; @@ -957,7 +957,7 @@ void ForEachLoopGen::buildDelegateOf(std::pair& port, InPo throw Exception("ForEachLoopGen::buildDelegateOf : not implemented for DS because not specified"); } -void ForEachLoopGen::getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) +void ForEachLoopGen::getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) { string typeOfPortInstance=(port.first)->getNameOfTypeOfCurrentInstance(); if(typeOfPortInstance==OutputPort::NAME) @@ -978,7 +978,7 @@ void ForEachLoopGen::getDelegateOf(std::pair& port, InPort throw Exception("ForEachLoopGen::getDelegateOf : not implemented because not specified"); } -void ForEachLoopGen::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) +void ForEachLoopGen::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) { string typeOfPortInstance=portDwn->getNameOfTypeOfCurrentInstance(); if(typeOfPortInstance==OutputPort::NAME) @@ -1075,7 +1075,7 @@ void ForEachLoopGen::createOutputOutOfScopeInterceptors(int branchNb) } void ForEachLoopGen::checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) + InPort *end, const std::list& pointsOfViewEnd) { DynParaLoop::checkLinkPossibility(start, pointsOfViewStart, end, pointsOfViewEnd); if(end->getNode() == &_splitterNode) @@ -1296,4 +1296,4 @@ void ForEachLoopDyn::accept(Visitor *visitor) Node *ForEachLoopDyn::simpleClone(ComposedNode *father, bool editionOnly) const { return new ForEachLoopDyn(*this,father,editionOnly); -} \ No newline at end of file +} diff --git a/src/engine/ForLoop.cxx b/src/engine/ForLoop.cxx index 3830cf2d3..ce3d7e4e3 100644 --- a/src/engine/ForLoop.cxx +++ b/src/engine/ForLoop.cxx @@ -67,7 +67,7 @@ Node *ForLoop::simpleClone(ComposedNode *father, bool editionOnly) const return new ForLoop(*this,father,editionOnly); } -InputPort* ForLoop::getInputPort(const std::string& name) const +InputPort* ForLoop::getInputPort(const std::string& name) const { if(name == NAME_OF_NSTEPS_NUMBER)return (InputPort*)&_nbOfTimesPort; return Loop::getInputPort(name); @@ -182,14 +182,14 @@ std::list ForLoop::getLocalInputPorts() const return ret; } -OutPort *ForLoop::getOutPort(const std::string& name) const +OutPort *ForLoop::getOutPort(const std::string& name) const { if(name==NAME_OF_INDEX) return (OutPort *)&_indexPort; return Loop::getOutPort(name); } -OutputPort *ForLoop::getOutputPort(const std::string& name) const +OutputPort *ForLoop::getOutputPort(const std::string& name) const { if(name==NAME_OF_INDEX) return (OutputPort *)&_indexPort; diff --git a/src/engine/InlineNode.cxx b/src/engine/InlineNode.cxx index 48c7be6f8..5254f34eb 100644 --- a/src/engine/InlineNode.cxx +++ b/src/engine/InlineNode.cxx @@ -72,7 +72,7 @@ void InlineFuncNode::setFname(const std::string& fname) modified(); } -void InlineFuncNode::checkBasicConsistency() const +void InlineFuncNode::checkBasicConsistency() const { InlineNode::checkBasicConsistency(); if(_fname.empty() ) diff --git a/src/engine/InputPort.cxx b/src/engine/InputPort.cxx index 495523ea0..4cd3b3b7f 100644 --- a/src/engine/InputPort.cxx +++ b/src/engine/InputPort.cxx @@ -145,7 +145,7 @@ void InputPort::edRemoveManInit() } //! Check basically that this port has one chance to be specified on time. It's a necessary condition \b not \b sufficient at all. -void InputPort::checkBasicConsistency() const +void InputPort::checkBasicConsistency() const { if(!_canBeNull && !edIsManuallyInitialized() && _backLinks.size()==0 ) { @@ -192,7 +192,7 @@ ProxyPort::~ProxyPort() */ } -void ProxyPort::edRemoveAllLinksLinkedWithMe() +void ProxyPort::edRemoveAllLinksLinkedWithMe() { _port->edRemoveAllLinksLinkedWithMe(); } diff --git a/src/engine/LinkInfo.cxx b/src/engine/LinkInfo.cxx index e53801fbf..2acb33ca9 100644 --- a/src/engine/LinkInfo.cxx +++ b/src/engine/LinkInfo.cxx @@ -50,7 +50,7 @@ void LinkInfo::startCollapseTransac() _level++; } -void LinkInfo::endCollapseTransac() +void LinkInfo::endCollapseTransac() { if(--_level==0) { @@ -83,7 +83,7 @@ void LinkInfo::pushWarnLink(OutPort *semStart, InPort *end, WarnReason reason) _collapse[reason].back().push_back(pair(semStart,end)); } -void LinkInfo::pushErrLink(OutPort *semStart, InPort *end, ErrReason reason) +void LinkInfo::pushErrLink(OutPort *semStart, InPort *end, ErrReason reason) { if(reason==E_NEVER_SET_INPUTPORT) _unsetInPort.push_back(end); @@ -96,7 +96,7 @@ void LinkInfo::pushErrLink(OutPort *semStart, InPort *end, ErrReason reason) throw Exception(getErrRepr()); } -void LinkInfo::pushErrSwitch(CollectorSwOutPort *collector) +void LinkInfo::pushErrSwitch(CollectorSwOutPort *collector) { _errorsOnSwitchCases.push_back(collector); if(_level==0) @@ -109,7 +109,7 @@ void LinkInfo::pushUselessCFLink(Node *start, Node *end) _uselessLinks.insert(pair(start,end)); } -void LinkInfo::takeDecision() const +void LinkInfo::takeDecision() const { if(!_errors.empty()) throw Exception(getErrRepr()); diff --git a/src/engine/Loop.cxx b/src/engine/Loop.cxx index 6a7c82a0a..67b6beb3b 100644 --- a/src/engine/Loop.cxx +++ b/src/engine/Loop.cxx @@ -47,7 +47,7 @@ void InputPort4DF2DS::getAllRepresentants(std::set& repr) const repr.insert(s.begin(),s.end()); } -void *InputPort4DF2DS::get() const +void *InputPort4DF2DS::get() const { if(!_data) { @@ -122,7 +122,7 @@ void DFToDSForLoop::getReadyTasks(std::vector& tasks) { } -InputPort *DFToDSForLoop::getInputPort(const std::string& name) const +InputPort *DFToDSForLoop::getInputPort(const std::string& name) const { try { return Node::getInputPort(name); @@ -133,7 +133,7 @@ InputPort *DFToDSForLoop::getInputPort(const std::string& name) const return (*it); } -OutputDataStreamPort *DFToDSForLoop::getOutputDataStreamPort(const std::string& name) const +OutputDataStreamPort *DFToDSForLoop::getOutputDataStreamPort(const std::string& name) const { list::const_iterator it =_setOfOutputDataStreamPort.begin(); return (*it); @@ -227,13 +227,13 @@ void DSToDFForLoop::getReadyTasks(std::vector& tasks) { } -OutputPort *DSToDFForLoop::getOutputPort(const std::string& name) const +OutputPort *DSToDFForLoop::getOutputPort(const std::string& name) const { list::const_iterator it = _setOfOutputPort.begin(); return (*it); } -InputDataStreamPort *DSToDFForLoop::getInputDataStreamPort(const std::string& name) const +InputDataStreamPort *DSToDFForLoop::getInputDataStreamPort(const std::string& name) const { list::const_iterator it = _setOfInputDataStreamPort.begin(); return (*it); @@ -390,7 +390,7 @@ void Loop::getReadyTasks(std::vector& tasks) } } -void Loop::edRemoveChild(Node *node) +void Loop::edRemoveChild(Node *node) { StaticDefinedComposedNode::edRemoveChild(node); if(_node==node) @@ -437,7 +437,7 @@ void Loop::partitionRegardingDPL(const PartDefinition *pd, std::mappartitionRegardingDPL(pd,zeMap); } -Node *Loop::getChildByShortName(const std::string& name) const +Node *Loop::getChildByShortName(const std::string& name) const { if (_node) if(name==_node->getName()) @@ -446,12 +446,12 @@ Node *Loop::getChildByShortName(const std::string& name) const throw Exception(what); } -TypeCode* Loop::MappingDF2DS(TypeCode* type) +TypeCode* Loop::MappingDF2DS(TypeCode* type) { return type; } -TypeCode* Loop::MappingDS2DF(TypeCode* type) +TypeCode* Loop::MappingDS2DF(TypeCode* type) { return type; } @@ -513,7 +513,7 @@ void Loop::buildDelegateOf(std::pair& port, InPort *finalT port.first=(*iter)->getOutputDataStreamPort(""); } -void Loop::getDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) +void Loop::getDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) { string typeOfPortInstance=port->getNameOfTypeOfCurrentInstance(); if(typeOfPortInstance!=InputPort::NAME || @@ -536,7 +536,7 @@ void Loop::getDelegateOf(InPort * & port, OutPort *initialStart, const std::list } void Loop::getDelegateOf(std::pair& port, InPort *finalTarget, - const std::list& pointsOfView) + const std::list& pointsOfView) { string typeOfPortInstance=(port.first)->getNameOfTypeOfCurrentInstance(); if(typeOfPortInstance!=OutputPort::NAME || @@ -558,7 +558,7 @@ void Loop::getDelegateOf(std::pair& port, InPort *finalTar port.first=(*iter)->getOutputDataStreamPort(""); } -void Loop::releaseDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) +void Loop::releaseDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) { string typeOfPortInstance=port->getNameOfTypeOfCurrentInstance(); if(typeOfPortInstance!=InputPort::NAME || @@ -588,7 +588,7 @@ void Loop::releaseDelegateOf(InPort * & port, OutPort *initialStart, const std:: } } -void Loop::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) +void Loop::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) { if(portDwn==portUp) return ; @@ -604,7 +604,7 @@ void Loop::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTar } } -void Loop::checkNoCyclePassingThrough(Node *node) +void Loop::checkNoCyclePassingThrough(Node *node) { //throw Exception("Loop::checkNoCyclePassingThrough : Internal error occured"); } @@ -644,7 +644,7 @@ bool Loop::isNecessaryToBuildSpecificDelegateDF2DS(const std::list - -// ça sera peut-être une struct s'il n'y a rien d'autre que les deux paramètres -class Resource -{ -public: - unsigned int nbCores()const; - const std::string& name()const; -}; - -// ça sera peut-être une struct s'il n'y a rien d'autre que les deux paramètres -class ContainerType -{ -public: - const std::string& name()const; - // float pour pouvoir gérer plus tard des containers qui peuvent être lancé - // à plusieurs sur le même coeur. - const float parallelism()const; - // normalement, pas besoin de start. Quand yacs lance un traitement, il - // commence par faire un "load" qui cherche le container avec les - // caractéristiques données et il lance un nouveau s'il ne le trouve pas. - // Donc on peut s'appuyer sur le mécanisme existant et jouer sur les - // caractéristiques pour identifier le container. - //virtual void start(const std::string& resourceName, unsigned int index); -}; - -// probablement une struct -class Container -// Cet objet est créé par le WorkloadManager chaque fois qu'une tâche peut être -// lancée et il contient l'identification du container à utiliser pour faire -// le traitement. voir Task.run -{ -public: - const Resource* resource()const; - const ContainerType* type()const; - // indice du container parmi ceux du même type sur la resource: - unsigned int index()const; -}; - -class Task -// Cet objet doit être créé par YACS et soumis au WorkloadManager -{ -public: - const ContainerType* type()const; - // Cette méthode est à implémenter dans YACS. Elle est appelée par le - // WorkloadManager au moment où une ressource est disponible et en paramétre - // on trouve l'identification du container à utiliser. YACS permet déjà - // d'identifier les containers par leur nom. A partir des informations de - // l'objet en paramètre on peut construire un nom de container qui sera unique. - // Avec ce nom, on peut utiliser les méthodes existantes pour charger le - // container salome / kernel et lancer le traitement à faire dans le noeud - // YACS. - // Les traitements à faire dans cette fonction sont: trouver le container - // kernel et si besoin l'initialiser, lancer le traitement du noeud et - // attendre la fin du calcul. - virtual void run(const Container& container)=0; -}; - -class WorkloadManager -// Cet objet doit être créé par YACS à chaque exécution d'un schéma. -{ -public: - // Fonction à appeler par YACS avant le début de l'exécution du schéma pour - // renseigner les ressources disponibles. A mon avis, on peut se limiter dans - // un premier temps de prendre toutes les ressources du catalogue qui peuvent - // lancer des containers. Cela suffit pour le lancement sur cluster. En local - // on pourrait avoir envie de ne pas utiliser tous ce qu'il y a dans le - // catalogue, mais on n'a qu'à modifier le catalogue à la main si on veut - // faire le malin. - void addResource(Resource* r); - - // Fonction à appeler par YACS au moment où un noeud de traitement est prêt à - // être lancé. Cet appel ajoute la tâche dans la queue d'attente et rend tout - // de suite la main. La fonction 'run' de la tâche sera appelée plus tard, au - // moment où une ressource est effectivement disponible. - void addTask(Task* t); - - // Fonction à appeler par YACS pour démarrer le moteur qui distribue les tâches. - // Il y aura au moins deux fils d'exécution: un qui gère les arrivées dans la - // queue et un qui gère les fins de tâche. Ce sont ces deux fils qui démarrent - // ici. Après, chaque exécution de tâche aura son propre fil. - void start(); - - // Fonction à appeler par YACS pour indiquer qu'il n'y aura plus de tâches à - // soumettre. Le moteur pourra s'arrêter à la fin des tâches en cours. - void stop(); -}; diff --git a/src/engine/Node.cxx b/src/engine/Node.cxx index 6cbd2f127..7bafb9649 100644 --- a/src/engine/Node.cxx +++ b/src/engine/Node.cxx @@ -235,7 +235,7 @@ void Node::exDisabledState() _outGate.exNotifyDisabled(); } -InPort *Node::getInPort(const std::string& name) const +InPort *Node::getInPort(const std::string& name) const { InPort *ret; try @@ -250,13 +250,13 @@ InPort *Node::getInPort(const std::string& name) const } InPropertyPort * -Node::getInPropertyPort() const +Node::getInPropertyPort() const { return _inPropertyPort; } InputPort * -Node::getInputPort(const std::string& name) const +Node::getInputPort(const std::string& name) const { if (name == "__InPropertyPort__Node__YACS_") return _inPropertyPort; @@ -271,7 +271,7 @@ Node::getInputPort(const std::string& name) const * \note: Contrary to getOutputPort method, this method returns the output port at highest level, possible. * That is to say in some ComposedNode, like ForEachLoop or Switch, an outport inside 'this' is seen differently than the true outport. */ -OutPort *Node::getOutPort(const std::string& name) const +OutPort *Node::getOutPort(const std::string& name) const { OutPort *ret; try @@ -427,7 +427,7 @@ DynParaLoop *Node::getClosestDPLAmongAncestors() const return NULL; } -ComposedNode *Node::getRootNode() const +ComposedNode *Node::getRootNode() const { if(!_father) throw Exception("No root node"); @@ -442,7 +442,7 @@ ComposedNode *Node::getRootNode() const * USAGE NOT CLEAR, not used so far, when are those characters set ? */ -void Node::checkValidityOfPortName(const std::string& name) +void Node::checkValidityOfPortName(const std::string& name) { if(name.find(SEP_CHAR_IN_PORT, 0 )!=string::npos) { @@ -464,7 +464,7 @@ void Node::checkValidityOfNodeName(const std::string& name) * @note : Check that 'node1' and 'node2' have exactly the same father * @exception : If 'node1' and 'node2' have NOT exactly the same father */ -ComposedNode *Node::checkHavingCommonFather(Node *node1, Node *node2) +ComposedNode *Node::checkHavingCommonFather(Node *node1, Node *node2) { if(node1!=0 && node2!=0) { diff --git a/src/engine/OptimizerLoop.cxx b/src/engine/OptimizerLoop.cxx index f53c627fe..36e0ad1cb 100644 --- a/src/engine/OptimizerLoop.cxx +++ b/src/engine/OptimizerLoop.cxx @@ -264,7 +264,7 @@ int OptimizerLoop::getNumberOfInputPorts() const return DynParaLoop::getNumberOfInputPorts()+2; } -InputPort *OptimizerLoop::getInputPort(const std::string& name) const +InputPort *OptimizerLoop::getInputPort(const std::string& name) const { if (name == NAME_OF_ALGO_INIT_PORT) return (InputPort *)&_algoInitPort; @@ -468,7 +468,7 @@ YACS::Event OptimizerLoop::updateStateOnFailedEventFrom(Node *node, const Execut return DynParaLoop::updateStateOnFailedEventFrom(node,execInst); } -void OptimizerLoop::checkNoCyclePassingThrough(Node *node) +void OptimizerLoop::checkNoCyclePassingThrough(Node *node) { } @@ -523,7 +523,7 @@ void OptimizerLoop::checkCFLinks(const std::list& starts, InputPort * } void OptimizerLoop::checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) + InPort *end, const std::list& pointsOfViewEnd) { DynParaLoop::checkLinkPossibility(start, pointsOfViewStart, end, pointsOfViewEnd); std::string linkName("("); @@ -799,7 +799,7 @@ std::string OptimizerLoop::getAlgLib() const /*! * Throw an exception if the node is not valid */ -void OptimizerLoop::checkBasicConsistency() const +void OptimizerLoop::checkBasicConsistency() const { DEBTRACE("OptimizerLoop::checkBasicConsistency"); if (_alglib == "") @@ -831,14 +831,14 @@ std::list OptimizerLoop::getLocalOutputPorts() const return ret; } -OutPort * OptimizerLoop::getOutPort(const std::string& name) const +OutPort * OptimizerLoop::getOutPort(const std::string& name) const { return (name == NAME_OF_ALGO_RESULT_PORT) ? (OutPort *)&_algoResultPort : DynParaLoop::getOutPort(name); } -OutputPort * OptimizerLoop::getOutputPort(const std::string& name) const +OutputPort * OptimizerLoop::getOutputPort(const std::string& name) const { return (name == NAME_OF_ALGO_RESULT_PORT) ? (OutputPort *)&_algoResultPort : DynParaLoop::getOutputPort(name); diff --git a/src/engine/OutGate.cxx b/src/engine/OutGate.cxx index 730789370..a6d2f817d 100644 --- a/src/engine/OutGate.cxx +++ b/src/engine/OutGate.cxx @@ -117,7 +117,7 @@ std::list OutGate::edSetInGate() const return ret; } -void OutGate::edRemoveInGate(InGate *inGate, bool coherenceWithInGate) +void OutGate::edRemoveInGate(InGate *inGate, bool coherenceWithInGate) { std::list< pair >::iterator iter(std::find_if(_setOfInGate.begin(),_setOfInGate.end(),ItemCmp(inGate))); if(iter==_setOfInGate.end()) diff --git a/src/engine/OutputDataStreamPort.cxx b/src/engine/OutputDataStreamPort.cxx index 86cc5a795..b337fff95 100644 --- a/src/engine/OutputDataStreamPort.cxx +++ b/src/engine/OutputDataStreamPort.cxx @@ -84,7 +84,6 @@ string OutputDataStreamPort::getNameOfTypeOfCurrentInstance() const } bool OutputDataStreamPort::edAddInputDataStreamPort(InputDataStreamPort *port) - { DEBTRACE("OutputDataStreamPort::edAddInputDataStreamPort"); if(!isAlreadyInSet(port)) @@ -105,7 +104,7 @@ bool OutputDataStreamPort::edAddInputDataStreamPort(InputDataStreamPort *port) return false; } -int OutputDataStreamPort::edRemoveInputDataStreamPort(InputDataStreamPort *inPort, bool forward) +int OutputDataStreamPort::edRemoveInputDataStreamPort(InputDataStreamPort *inPort, bool forward) { if(forward) { @@ -130,7 +129,7 @@ int OutputDataStreamPort::edRemoveInputDataStreamPort(InputDataStreamPort *inPor } } -bool OutputDataStreamPort::addInPort(InPort *inPort) +bool OutputDataStreamPort::addInPort(InPort *inPort) { DEBTRACE("OutputDataStreamPort::addInPort"); if(inPort->getNameOfTypeOfCurrentInstance()!=InputDataStreamPort::NAME) @@ -142,7 +141,7 @@ bool OutputDataStreamPort::addInPort(InPort *inPort) return edAddInputDataStreamPort(static_cast(inPort)); } -void OutputDataStreamPort::edRemoveAllLinksLinkedWithMe() +void OutputDataStreamPort::edRemoveAllLinksLinkedWithMe() { set::iterator iter; set vec(_setOfInputDataStreamPort); @@ -151,7 +150,7 @@ void OutputDataStreamPort::edRemoveAllLinksLinkedWithMe() _setOfInputDataStreamPort.clear(); } -int OutputDataStreamPort::removeInPort(InPort *inPort, bool forward) +int OutputDataStreamPort::removeInPort(InPort *inPort, bool forward) { DEBTRACE("OutputDataStreamPort::removeInPort"); if(inPort->getNameOfTypeOfCurrentInstance()!=InputDataStreamPort::NAME && !forward) diff --git a/src/engine/OutputPort.cxx b/src/engine/OutputPort.cxx index 195320351..b727c0ef8 100644 --- a/src/engine/OutputPort.cxx +++ b/src/engine/OutputPort.cxx @@ -50,7 +50,7 @@ string OutputPort::getNameOfTypeOfCurrentInstance() const return NAME; } -void OutputPort::edRemoveAllLinksLinkedWithMe() +void OutputPort::edRemoveAllLinksLinkedWithMe() { set::iterator iter; set vec(_setOfInputPort); @@ -72,7 +72,7 @@ void OutputPort::put(const void *data) /** * check if output type is an input type and if a data converter exists before link */ -bool OutputPort::edAddInputPort(InputPort *phyPort) +bool OutputPort::edAddInputPort(InputPort *phyPort) { DEBTRACE("OutputPort::edAddInputPort"); if(!isAlreadyInSet(phyPort)) @@ -89,7 +89,7 @@ bool OutputPort::edAddInputPort(InputPort *phyPort) return false; } -bool OutputPort::edAddInPropertyPort(InPropertyPort *phyPort) +bool OutputPort::edAddInPropertyPort(InPropertyPort *phyPort) { DEBTRACE("OutputPort::edAddInPropertyPort"); if(!isAlreadyInSet(phyPort)) @@ -111,7 +111,7 @@ bool OutputPort::edAddInPropertyPort(InPropertyPort *phyPort) * If 'forward' == true the forward deletion * If 'forward' == false no forward deletion performed, oneway deletion without update 'inputPort' side. */ -int OutputPort::edRemoveInputPort(InputPort *inputPort, bool forward) +int OutputPort::edRemoveInputPort(InputPort *inputPort, bool forward) { if(forward) { @@ -202,7 +202,7 @@ OutputPort::isConnected() const /** * check compatibility of port class ( an inputPort ) before trying to create the link. */ -bool OutputPort::addInPort(InPort *inPort) +bool OutputPort::addInPort(InPort *inPort) { DEBTRACE("OutputPort::addInPort"); if(inPort->getNameOfTypeOfCurrentInstance()!=InputPort::NAME && @@ -225,7 +225,7 @@ bool OutputPort::addInPort(InPort *inPort) /** * check compatibility of port class ( an inputPort ) before trying to remove link WITHOUT forward. */ -int OutputPort::removeInPort(InPort *inPort, bool forward) +int OutputPort::removeInPort(InPort *inPort, bool forward) { if(inPort->getNameOfTypeOfCurrentInstance()!=InputPort::NAME && !forward) { @@ -258,6 +258,6 @@ const std::set& OutputPort::getSetOfPhyLinks() const } //! Check validity of output port. Nothing on base class -void OutputPort::checkBasicConsistency() const +void OutputPort::checkBasicConsistency() const { } diff --git a/src/engine/PlayGround.hxx b/src/engine/PlayGround.hxx index 5152145b4..d4cf0e7cc 100644 --- a/src/engine/PlayGround.hxx +++ b/src/engine/PlayGround.hxx @@ -54,8 +54,8 @@ namespace YACS int _nbCores; mutable std::vector _occupied; }; - - + + class ResourceIterator : public std::iterator< std::input_iterator_tag, // iterator_category Resource, // value_type diff --git a/src/engine/Plugin/PluginSimplex.cxx b/src/engine/Plugin/PluginSimplex.cxx index 5102ff1e2..6561740c6 100644 --- a/src/engine/Plugin/PluginSimplex.cxx +++ b/src/engine/Plugin/PluginSimplex.cxx @@ -96,7 +96,7 @@ void PluginSimplex::takeDecision() rien = solv->next(); } -void PluginSimplex::initialize(const Any *input) +void PluginSimplex::initialize(const Any *input) { } diff --git a/src/engine/Pool.cxx b/src/engine/Pool.cxx index 059ee9872..3b6516bb0 100644 --- a/src/engine/Pool.cxx +++ b/src/engine/Pool.cxx @@ -137,7 +137,7 @@ void Pool::destroyCurrentCase() * corrupted 'this'. * */ -void Pool::checkConsistency() +void Pool::checkConsistency() { // First check unicity of ids. std::set ids; @@ -157,7 +157,7 @@ void Pool::checkConsistency() /*! * \throw See the \b throw case of pushOutSampleAt method. */ -void Pool::setCurrentId(int id) +void Pool::setCurrentId(int id) { std::list< std::pair >::iterator iter; for(iter=_container.begin();iter!=_container.end();iter++) @@ -178,7 +178,7 @@ void Pool::setCurrentId(int id) * has destroyed a case id different from its id. * */ -void Pool::putOutSampleAt(int id, Any *outValue) +void Pool::putOutSampleAt(int id, Any *outValue) { std::list< std::pair >::iterator iter; for(iter=_container.begin();iter!=_container.end();iter++) diff --git a/src/engine/ServiceNode.cxx b/src/engine/ServiceNode.cxx index 196d981d6..a5681d4cc 100644 --- a/src/engine/ServiceNode.cxx +++ b/src/engine/ServiceNode.cxx @@ -143,7 +143,7 @@ bool ServiceNode::isDeployable() const } //! Associate an existing component instance to this service node \b AND check the consistency regarding the deployment from root node point of view. -void ServiceNode::setComponent(ComponentInstance* compo) +void ServiceNode::setComponent(ComponentInstance* compo) { DEBTRACE("ServiceNode::setComponent " << compo); if(compo) diff --git a/src/engine/Switch.cxx b/src/engine/Switch.cxx index f2ef483ad..631d697b7 100644 --- a/src/engine/Switch.cxx +++ b/src/engine/Switch.cxx @@ -60,7 +60,7 @@ std::string CollectorSwOutPort::getNameOfTypeOfCurrentInstance() const return _className; } -void CollectorSwOutPort::edRemoveAllLinksLinkedWithMe() +void CollectorSwOutPort::edRemoveAllLinksLinkedWithMe() { map::iterator pt; if(_consumer) @@ -80,7 +80,7 @@ void CollectorSwOutPort::getAllRepresented(std::set& represented) con ((*pt).second)->getAllRepresented(represented); } -bool CollectorSwOutPort::addInPort(InPort *inPort) +bool CollectorSwOutPort::addInPort(InPort *inPort) { if(_currentProducer) {//a specific link is beeing done @@ -93,7 +93,7 @@ bool CollectorSwOutPort::addInPort(InPort *inPort) (*iter).second->addInPort(inPort); } -int CollectorSwOutPort::removeInPort(InPort *inPort, bool forward) +int CollectorSwOutPort::removeInPort(InPort *inPort, bool forward) { if(_currentProducer) { @@ -180,7 +180,7 @@ bool CollectorSwOutPort::removePotentialProducerForMaster() return _potentialProducers.empty(); } -bool CollectorSwOutPort::checkManagementOfPort(OutPort *port) +bool CollectorSwOutPort::checkManagementOfPort(OutPort *port) { for(map::iterator iter=_potentialProducers.begin();iter!=_potentialProducers.end();iter++) if((*iter).second==port) @@ -425,7 +425,7 @@ void Switch::partitionRegardingDPL(const PartDefinition *pd, std::mappartitionRegardingDPL(pd,zeMap); } -void Switch::edRemoveChild(Node *node) +void Switch::edRemoveChild(Node *node) { map< int , Node * >::iterator iter=_mapOfNode.begin(); for(;iter!=_mapOfNode.end();iter++) @@ -452,7 +452,7 @@ std::list Switch::getLocalInputPorts() const ret.push_back((InputPort *)&_condition); return ret; } -OutPort *Switch::getOutPort(const std::string& name) const +OutPort *Switch::getOutPort(const std::string& name) const { for(map::const_iterator iter=_outPortsCollector.begin();iter!=_outPortsCollector.end();iter++) if(name==(*iter).second->getName()) @@ -463,14 +463,14 @@ OutPort *Switch::getOutPort(const std::string& name) const return StaticDefinedComposedNode::getOutPort(name); } -InputPort *Switch::getInputPort(const std::string& name) const +InputPort *Switch::getInputPort(const std::string& name) const { if(name==SELECTOR_INPUTPORT_NAME) return (InputPort *)&_condition; return StaticDefinedComposedNode::getInputPort(name); } -Node *Switch::getChildByShortName(const std::string& name) const +Node *Switch::getChildByShortName(const std::string& name) const { if(name==DEFAULT_NODE_NAME) { @@ -497,12 +497,12 @@ Node *Switch::edSetDefaultNode(Node *node) return edSetNode(ID_FOR_DEFAULT_NODE,node); } -Node *Switch::edReleaseDefaultNode() +Node *Switch::edReleaseDefaultNode() { return edReleaseCase(ID_FOR_DEFAULT_NODE); } -Node *Switch::edReleaseCase(int caseId) +Node *Switch::edReleaseCase(int caseId) { map< int , Node * >::iterator iter=_mapOfNode.find(caseId); if(iter==_mapOfNode.end()) @@ -534,7 +534,7 @@ Node *Switch::edGetNode(int caseId) * 0 is returned if caseId is a new ID. * \b WARNING : 'node' is held by 'this' after call, whereas returned node is no more held. */ -Node *Switch::edSetNode(int caseId, Node *node) +Node *Switch::edSetNode(int caseId, Node *node) { if(!node) throw Exception("Switch::edSetNode : null node cannot be set as a case in switch node"); @@ -625,7 +625,7 @@ list Switch::getProgressWeight() const return ret; } -bool Switch::edAddChild(Node *node) +bool Switch::edAddChild(Node *node) { int aCase = getMaxCase() + 1; DEBTRACE(aCase); @@ -682,13 +682,13 @@ void Switch::checkControlDependancy(OutPort *start, InPort *end, bool cross, throw Exception("Switch::checkControlDependancy : a link was dectected between 2 cases of a switch. Impossible !"); } -void Switch::checkNoCyclePassingThrough(Node *node) +void Switch::checkNoCyclePassingThrough(Node *node) { throw Exception("Switch::checkNoCyclePassingThrough : uncorrect control flow link relative to switch"); } void Switch::checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) + InPort *end, const std::list& pointsOfViewEnd) { throw Exception("Switch::checkLinkPossibility : A link between 2 different cases of a same Switch requested -> Impossible"); } @@ -710,7 +710,7 @@ void Switch::buildDelegateOf(std::pair& port, InPort *fina port.first=newCollector; } -void Switch::getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) +void Switch::getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) { map::iterator iter=_outPortsCollector.find(finalTarget); if(iter==_outPortsCollector.end()) @@ -724,7 +724,7 @@ void Switch::getDelegateOf(std::pair& port, InPort *finalT port.first=(*iter).second; } -void Switch::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) +void Switch::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) { set repr; portDwn->getAllRepresented(repr); @@ -811,7 +811,7 @@ std::string Switch::getMyQualifiedName(const Node *directSon) const return id; } -std::string Switch::getCaseId(const Node *node) const +std::string Switch::getCaseId(const Node *node) const { const char sep='_'; map::const_iterator iter; diff --git a/src/engine/Test/ContainerTest.cxx b/src/engine/Test/ContainerTest.cxx index e4b401023..11d0cde51 100644 --- a/src/engine/Test/ContainerTest.cxx +++ b/src/engine/Test/ContainerTest.cxx @@ -54,7 +54,7 @@ bool ContainerTest::isAlreadyStarted(const Task *askingNode) const return _alreadyStarted; } -void ContainerTest::start(const Task *askingNode) +void ContainerTest::start(const Task *askingNode) { if(_alreadyStarted) throw Exception("ContainerTest already started !!!!"); @@ -77,7 +77,7 @@ Container *ContainerTest::cloneAlways() const return new ContainerTest; } -void ContainerTest::checkCapabilityToDealWith(const ComponentInstance *inst) const +void ContainerTest::checkCapabilityToDealWith(const ComponentInstance *inst) const { if(inst->getKind()!=SUPPORTED_COMP_KIND) throw Exception("ContainerTest not compatible with this type of instance."); @@ -102,7 +102,7 @@ bool ContainerTest2::isAlreadyStarted(const Task *askingNode) const return _alreadyStarted; } -void ContainerTest2::start(const Task *askingNode) +void ContainerTest2::start(const Task *askingNode) { if(_alreadyStarted) throw Exception("ContainerTest already started !!!!"); @@ -130,7 +130,7 @@ void ContainerTest2::initAllContainers() _counter=0; } -void ContainerTest2::checkCapabilityToDealWith(const ComponentInstance *inst) const +void ContainerTest2::checkCapabilityToDealWith(const ComponentInstance *inst) const { if(inst->getKind()!=SUPPORTED_COMP_KIND) throw Exception("ContainerTest not compatible with this type of instance."); diff --git a/src/engine/Test/PluginOptEvTest1.cxx b/src/engine/Test/PluginOptEvTest1.cxx index 1d365ff3d..bf19ccfab 100644 --- a/src/engine/Test/PluginOptEvTest1.cxx +++ b/src/engine/Test/PluginOptEvTest1.cxx @@ -99,7 +99,7 @@ void PluginOptEvTest1::takeDecision() _idTest++; } -void PluginOptEvTest1::initialize(const Any *input) +void PluginOptEvTest1::initialize(const Any *input) { } diff --git a/src/engine/Test/RuntimeForEngineTest.cxx b/src/engine/Test/RuntimeForEngineTest.cxx index 311bb3e66..7d17d12a2 100644 --- a/src/engine/Test/RuntimeForEngineTest.cxx +++ b/src/engine/Test/RuntimeForEngineTest.cxx @@ -61,7 +61,7 @@ InputPort *TestElemInputPort::clone(Node *newHelder) const return new TestElemInputPort(*this,newHelder); } -void *TestElemInputPort::get() const +void *TestElemInputPort::get() const { stringstream msg; msg << "Not implemented (" << __FILE__ << ":" << __LINE__ << ")"; @@ -118,7 +118,7 @@ std::vector< std::pair > RuntimeForEngineTest::getCatalogOfComp return std::vector< std::pair >(); } -ElementaryNode* RuntimeForEngineTest::createNode(const string& implementation, const string& name) +ElementaryNode* RuntimeForEngineTest::createNode(const string& implementation, const string& name) { return new TestElemNode(name); } diff --git a/src/engine/Test/ToyNode.cxx b/src/engine/Test/ToyNode.cxx index e0427f4c3..39d3f26bf 100644 --- a/src/engine/Test/ToyNode.cxx +++ b/src/engine/Test/ToyNode.cxx @@ -77,7 +77,7 @@ bool InputToyPort::edIsManuallyInitialized() const return _initData!=0; } -void *InputToyPort::get() const +void *InputToyPort::get() const { return (void *)_data; } @@ -221,7 +221,7 @@ int ToyNode::getNumberOfOutputPorts() const return ElementaryNode::getNumberOfInputPorts()+1; } -OutputPort *ToyNode::getOutputPort(const std::string& name) const +OutputPort *ToyNode::getOutputPort(const std::string& name) const { if(name==NAME_FOR_NB) return (OutputPort *)&_nbOfInputsPort; @@ -337,7 +337,7 @@ std::list SeqToyNode::getSetOfInputPort() const return ret; } -InputPort *SeqToyNode::getInputPort(const std::string& name) const +InputPort *SeqToyNode::getInputPort(const std::string& name) const { if(name==NAME_NBOFELTS_INSEQ_INPRT) return (InputPort *)&_inIntValue; @@ -357,7 +357,7 @@ std::list SeqToyNode::getSetOfOutputPort() const return ret; } -OutputPort *SeqToyNode::getOutputPort(const std::string& name) const +OutputPort *SeqToyNode::getOutputPort(const std::string& name) const { if(name==NAME_SEQ_OUTPRT) return (OutputPort *)&_seqOut; @@ -587,7 +587,7 @@ bool InputLimitPort::edIsManuallyInitialized() const return _initData!=0; } -void *InputLimitPort::get() const +void *InputLimitPort::get() const { if(!_data) { @@ -717,7 +717,7 @@ std::list LimitNode::getSetOfOutputPort() const return ret; } -InputPort *LimitNode::getInputPort(const std::string& name) const +InputPort *LimitNode::getInputPort(const std::string& name) const { if(name==NAME_FOR_SWPORT) return (InputPort *)&_entry; @@ -725,7 +725,7 @@ InputPort *LimitNode::getInputPort(const std::string& name) const return ElementaryNode::getInputPort(name); } -OutputPort *LimitNode::getOutputPort(const std::string& name) const +OutputPort *LimitNode::getOutputPort(const std::string& name) const { if(name==NAME_FOR_SWPORT) return (OutputPort *)&_switchPort; diff --git a/src/engine/VisitorSaveSchema.cxx b/src/engine/VisitorSaveSchema.cxx index 47a8aa6e7..f686a8df4 100644 --- a/src/engine/VisitorSaveSchema.cxx +++ b/src/engine/VisitorSaveSchema.cxx @@ -71,7 +71,7 @@ VisitorSaveSchema::~VisitorSaveSchema() } } -void VisitorSaveSchema::openFileSchema(std::string xmlSchema) +void VisitorSaveSchema::openFileSchema(std::string xmlSchema) { _out.open(xmlSchema.c_str(), ios::out); if (!_out) @@ -161,7 +161,7 @@ void VisitorSaveSchema::visitForEachLoopDyn(ForEachLoopDyn *node) if (node->edGetSamplePort()) _out << " type=\"" << node->edGetSamplePort()->edGetType()->name() << "\""; _out << ">" << endl; - + writeProperties(node); node->DynParaLoop::accept(this); writeSimpleDataLinks(node); diff --git a/src/engine/VisitorSaveState.cxx b/src/engine/VisitorSaveState.cxx index e8b835144..4e365a86d 100644 --- a/src/engine/VisitorSaveState.cxx +++ b/src/engine/VisitorSaveState.cxx @@ -72,7 +72,7 @@ VisitorSaveState::~VisitorSaveState() } } -void VisitorSaveState::openFileDump(const std::string& xmlDump) +void VisitorSaveState::openFileDump(const std::string& xmlDump) { _out.open(xmlDump.c_str(), ios::out); if (!_out) diff --git a/src/engine/WhileLoop.cxx b/src/engine/WhileLoop.cxx index 7e1dc41a3..40075d051 100644 --- a/src/engine/WhileLoop.cxx +++ b/src/engine/WhileLoop.cxx @@ -89,7 +89,7 @@ Node *WhileLoop::simpleClone(ComposedNode *father, bool editionOnly) const return new WhileLoop(*this,father,editionOnly); } -InputPort *WhileLoop::getInputPort(const std::string& name) const +InputPort *WhileLoop::getInputPort(const std::string& name) const { if(name==NAME_OF_INPUT_CONDITION) return (InputPort*)&_conditionPort; @@ -122,7 +122,7 @@ YACS::Event WhileLoop::updateStateOnFinishedEventFrom(Node *node) void WhileLoop::checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, InPort *end, - const std::list& pointsOfViewEnd) + const std::list& pointsOfViewEnd) { DEBTRACE("WhileLoop::checkLinkPossibility"); } diff --git a/src/engine/WlmTask.hxx b/src/engine/WlmTask.hxx index d97889d5d..4bbbf375d 100644 --- a/src/engine/WlmTask.hxx +++ b/src/engine/WlmTask.hxx @@ -33,7 +33,7 @@ public: const WorkloadManager::ContainerType& type()const override; void run(const WorkloadManager::RunInfo& runInfo)override; bool isAccepted(const WorkloadManager::Resource& r)override; - + static void loadResources(WorkloadManager::WorkloadManager& wm); private: WorkloadManager::ContainerType _type; diff --git a/src/runtime/CalStreamPort.cxx b/src/runtime/CalStreamPort.cxx index 78f262ed8..87609ecf7 100644 --- a/src/runtime/CalStreamPort.cxx +++ b/src/runtime/CalStreamPort.cxx @@ -278,7 +278,7 @@ OutputCalStreamPort *OutputCalStreamPort::clone(Node *newHelder) const return new OutputCalStreamPort(*this,newHelder); } -bool OutputCalStreamPort::addInPort(InPort *inPort) +bool OutputCalStreamPort::addInPort(InPort *inPort) { DEBTRACE("OutputCalStreamPort::addInPort " << InputCalStreamPort::NAME ); if(inPort->getNameOfTypeOfCurrentInstance()!=InputCalStreamPort::NAME) @@ -300,7 +300,7 @@ bool OutputCalStreamPort::addInPort(InPort *inPort) } -int OutputCalStreamPort::removeInPort(InPort *inPort, bool forward) +int OutputCalStreamPort::removeInPort(InPort *inPort, bool forward) { DEBTRACE("OutputCalStreamPort::removeInPort"); if(inPort->getNameOfTypeOfCurrentInstance()!=InputCalStreamPort::NAME && !forward) diff --git a/src/runtime/CppCORBAConv.cxx b/src/runtime/CppCORBAConv.cxx index 810c0b221..9cf320573 100644 --- a/src/runtime/CppCORBAConv.cxx +++ b/src/runtime/CppCORBAConv.cxx @@ -35,7 +35,7 @@ namespace YACS return convertNeutralCorba(t, data); } - void CppCorba::put(const void *data) + void CppCorba::put(const void *data) { put((Any *)data); } @@ -45,7 +45,7 @@ namespace YACS * \param data : python object */ - void CppCorba::put(Any *data) + void CppCorba::put(Any *data) { CORBA::Any* a = convertCppCorba(edGetType(), data); _port->put(a); diff --git a/src/runtime/CppContainer.cxx b/src/runtime/CppContainer.cxx index f6507d589..ec1c740e8 100644 --- a/src/runtime/CppContainer.cxx +++ b/src/runtime/CppContainer.cxx @@ -168,7 +168,7 @@ std::string CppContainer::getFullPlacementId(const Task *askingNode) const return "/"; } -void CppContainer::checkCapabilityToDealWith(const ComponentInstance *inst) const +void CppContainer::checkCapabilityToDealWith(const ComponentInstance *inst) const { if(inst->getKind()!=CppComponent::KIND) throw Exception("CppContainer::checkCapabilityToDealWith : CppContainer is not able to deal with this type of ComponentInstance."); diff --git a/src/runtime/CppPorts.cxx b/src/runtime/CppPorts.cxx index 6236c83e2..1d36f2bc4 100644 --- a/src/runtime/CppPorts.cxx +++ b/src/runtime/CppPorts.cxx @@ -92,7 +92,7 @@ YACS::ENGINE::Any * InputCppPort::getCppObj() const return _data; } -void *InputCppPort::get() const +void *InputCppPort::get() const { return (void*) _data; } diff --git a/src/runtime/NeutralCORBAConv.cxx b/src/runtime/NeutralCORBAConv.cxx index 326c7bd20..c9c37b3c2 100644 --- a/src/runtime/NeutralCORBAConv.cxx +++ b/src/runtime/NeutralCORBAConv.cxx @@ -27,7 +27,7 @@ using namespace YACS::ENGINE; using namespace std; -void NeutralCorbaInt::put(const void *data) +void NeutralCorbaInt::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -37,7 +37,7 @@ void NeutralCorbaInt::put(const void *data) * \param data : YACS::ENGINE::Any object */ -void NeutralCorbaInt::put(YACS::ENGINE::Any *data) +void NeutralCorbaInt::put(YACS::ENGINE::Any *data) { CORBA::Any *a =convertNeutralCorba(edGetType(),data); _port->put(a); @@ -45,7 +45,7 @@ void NeutralCorbaInt::put(YACS::ENGINE::Any *data) delete a; } -void NeutralCorbaBool::put(const void *data) +void NeutralCorbaBool::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -55,7 +55,7 @@ void NeutralCorbaBool::put(const void *data) * \param data : YACS::ENGINE::Any object */ -void NeutralCorbaBool::put(YACS::ENGINE::Any *data) +void NeutralCorbaBool::put(YACS::ENGINE::Any *data) { CORBA::Any *a =convertNeutralCorba(edGetType(),data); _port->put(a); @@ -64,7 +64,7 @@ void NeutralCorbaBool::put(YACS::ENGINE::Any *data) } -void NeutralCorbaDouble::put(const void *data) +void NeutralCorbaDouble::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -74,7 +74,7 @@ void NeutralCorbaDouble::put(const void *data) * \param data : YACS::ENGINE::Any object */ -void NeutralCorbaDouble::put(YACS::ENGINE::Any *data) +void NeutralCorbaDouble::put(YACS::ENGINE::Any *data) { CORBA::Any *a =convertNeutralCorba(edGetType(),data); _port->put(a); diff --git a/src/runtime/OutNode.cxx b/src/runtime/OutNode.cxx index fd6f24e6b..552454337 100644 --- a/src/runtime/OutNode.cxx +++ b/src/runtime/OutNode.cxx @@ -107,7 +107,7 @@ void OutNode::setData(InputPort* port, const std::string& data) inp->setData(data); } -void OutNode::checkBasicConsistency() const +void OutNode::checkBasicConsistency() const { DEBTRACE("OutNode::checkBasicConsistency"); if (! _setOfOutputPort.empty()) diff --git a/src/runtime/PresetNode.cxx b/src/runtime/PresetNode.cxx index 18dcd2130..3985bbf6f 100644 --- a/src/runtime/PresetNode.cxx +++ b/src/runtime/PresetNode.cxx @@ -81,7 +81,7 @@ void PresetNode::setData(OutputPort* port, const std::string& data) outp->setData(data); } -void PresetNode::checkBasicConsistency() const +void PresetNode::checkBasicConsistency() const { DEBTRACE("PresetNode::checkBasicConsistency"); if (! _setOfInputPort.empty()) diff --git a/src/runtime/PresetPorts.cxx b/src/runtime/PresetPorts.cxx index 72dc532ca..bcbaf2186 100644 --- a/src/runtime/PresetPorts.cxx +++ b/src/runtime/PresetPorts.cxx @@ -63,7 +63,7 @@ void OutputPresetPort::setData(std::string data) modified(); } -void OutputPresetPort::checkBasicConsistency() const +void OutputPresetPort::checkBasicConsistency() const { DEBTRACE("OutputPresetPort::checkBasicConsistency " << _storeData); if (_storeData.empty()) diff --git a/src/runtime/PythonCORBAConv.cxx b/src/runtime/PythonCORBAConv.cxx index df191399f..7658136b2 100644 --- a/src/runtime/PythonCORBAConv.cxx +++ b/src/runtime/PythonCORBAConv.cxx @@ -42,7 +42,7 @@ using namespace std; /*!Convert a PyObject (integer) to CORBA::Any (integer) * It's only a wrapper around put(PyObject *data) */ -void PyCorbaInt::put(const void *data) +void PyCorbaInt::put(const void *data) { put((PyObject *)data); } @@ -51,7 +51,7 @@ void PyCorbaInt::put(const void *data) /*! * \param data : python object */ -void PyCorbaInt::put(PyObject *data) +void PyCorbaInt::put(PyObject *data) { CORBA::Any *a= convertPyObjectCorba(_port->edGetType(),data); YACS::ENGINE::InterpreterSaveThread _loc; @@ -65,7 +65,7 @@ void PyCorbaInt::put(PyObject *data) * * \param data : python object */ -void PyCorbaBool::put(const void *data) +void PyCorbaBool::put(const void *data) { put((PyObject *)data); } @@ -76,7 +76,7 @@ void PyCorbaBool::put(const void *data) * * \param data : python object */ -void PyCorbaBool::put(PyObject *data) +void PyCorbaBool::put(PyObject *data) { CORBA::Any *a= convertPyObjectCorba(_port->edGetType(),data); YACS::ENGINE::InterpreterSaveThread _loc; @@ -85,7 +85,7 @@ void PyCorbaBool::put(PyObject *data) delete a; } -void PyCorbaString::put(const void *data) +void PyCorbaString::put(const void *data) { put((PyObject *)data); } @@ -95,7 +95,7 @@ void PyCorbaString::put(const void *data) * \param data : python object */ -void PyCorbaString::put(PyObject *data) +void PyCorbaString::put(PyObject *data) { CORBA::Any *a= convertPyObjectCorba(_port->edGetType(),data); YACS::ENGINE::InterpreterSaveThread _loc; @@ -104,7 +104,7 @@ void PyCorbaString::put(PyObject *data) } -void PyCorbaDouble::put(const void *data) +void PyCorbaDouble::put(const void *data) { put((PyObject *)data); } @@ -114,7 +114,7 @@ void PyCorbaDouble::put(const void *data) * \param data : python object */ -void PyCorbaDouble::put(PyObject *data) +void PyCorbaDouble::put(PyObject *data) { CORBA::Any *a= convertPyObjectCorba(_port->edGetType(),data); YACS::ENGINE::InterpreterSaveThread _loc; @@ -136,12 +136,12 @@ PyCorbaSequence::PyCorbaSequence(InputCorbaPort* p) * \param data : python object */ -void PyCorbaSequence::put(const void *data) +void PyCorbaSequence::put(const void *data) { put((PyObject *)data); } -void PyCorbaSequence::put(PyObject *data) +void PyCorbaSequence::put(PyObject *data) { DEBTRACE("data refcnt: " << data->ob_refcnt); #ifdef _DEVDEBUG_ @@ -178,12 +178,12 @@ PyCorbaObjref::PyCorbaObjref(InputCorbaPort* p) * \param data : python object */ -void PyCorbaObjref::put(const void *data) +void PyCorbaObjref::put(const void *data) { put((PyObject *)data); } -void PyCorbaObjref::put(PyObject *data) +void PyCorbaObjref::put(PyObject *data) { DEBTRACE("data refcnt: " << data->ob_refcnt); #ifdef _DEVDEBUG_ @@ -205,7 +205,7 @@ PyCorbaStruct::PyCorbaStruct(InputCorbaPort* p) { } -void PyCorbaStruct::put(const void *data) +void PyCorbaStruct::put(const void *data) { put((PyObject *)data); } @@ -214,7 +214,7 @@ void PyCorbaStruct::put(const void *data) /*! * \param data : python object */ -void PyCorbaStruct::put(PyObject *data) +void PyCorbaStruct::put(PyObject *data) { DEBTRACE("data refcnt: " << data->ob_refcnt); #ifdef _DEVDEBUG_ diff --git a/src/runtime/PythonCppConv.cxx b/src/runtime/PythonCppConv.cxx index 6e7046c30..1b0b32872 100644 --- a/src/runtime/PythonCppConv.cxx +++ b/src/runtime/PythonCppConv.cxx @@ -38,7 +38,7 @@ namespace YACS return convertPyObjectNeutral(t, data); } - void PyCpp::put(const void *data) + void PyCpp::put(const void *data) { put((PyObject *)data); } @@ -48,7 +48,7 @@ namespace YACS * \param data : python object */ - void PyCpp::put(PyObject *data) + void PyCpp::put(PyObject *data) { YACS::ENGINE::Any *a; //Do not need to take the Python GIL as put is called from Python node diff --git a/src/runtime/PythonNode.cxx b/src/runtime/PythonNode.cxx index ac9002432..a0375d662 100644 --- a/src/runtime/PythonNode.cxx +++ b/src/runtime/PythonNode.cxx @@ -348,7 +348,7 @@ PythonNode::~PythonNode() } } -void PythonNode::checkBasicConsistency() const +void PythonNode::checkBasicConsistency() const { DEBTRACE("checkBasicConsistency"); InlineNode::checkBasicConsistency(); @@ -952,7 +952,7 @@ void PyFuncNode::init(bool start) setState(YACS::TORECONNECT); } -void PyFuncNode::checkBasicConsistency() const +void PyFuncNode::checkBasicConsistency() const { DEBTRACE("checkBasicConsistency"); InlineFuncNode::checkBasicConsistency(); diff --git a/src/runtime/PythonPorts.cxx b/src/runtime/PythonPorts.cxx index ee21ba553..f123067ef 100644 --- a/src/runtime/PythonPorts.cxx +++ b/src/runtime/PythonPorts.cxx @@ -194,7 +194,7 @@ PyObject * InputPyPort::getPyObj() const return _data; } -void *InputPyPort::get() const +void *InputPyPort::get() const { return (void*) _data; } diff --git a/src/runtime/SalomeContainer.cxx b/src/runtime/SalomeContainer.cxx index 0b8cc0004..390dd350f 100644 --- a/src/runtime/SalomeContainer.cxx +++ b/src/runtime/SalomeContainer.cxx @@ -112,7 +112,7 @@ Container *SalomeContainer::cloneAlways() const return new SalomeContainer(*this); } -void SalomeContainer::checkCapabilityToDealWith(const ComponentInstance *inst) const +void SalomeContainer::checkCapabilityToDealWith(const ComponentInstance *inst) const { if(inst->getKind()!=SalomeComponent::KIND) throw Exception("SalomeContainer::checkCapabilityToDealWith : SalomeContainer is not able to deal with this type of ComponentInstance."); diff --git a/src/runtime/SalomeHPContainer.cxx b/src/runtime/SalomeHPContainer.cxx index 2d136da6e..5f3087b87 100644 --- a/src/runtime/SalomeHPContainer.cxx +++ b/src/runtime/SalomeHPContainer.cxx @@ -111,7 +111,7 @@ bool SalomeHPContainer::isAlreadyStarted(const Task *askingNode) const return helper->isAlreadyStarted(askingNode); } -void SalomeHPContainer::start(const Task *askingNode) +void SalomeHPContainer::start(const Task *askingNode) { SalomeContainerMonoHelper *helper(_launchModeType.getHelperOfTaskThreadSafe(this,askingNode)); SalomeContainerToolsDecorator sctDeco(&_sct,this->getPG(),&_launchModeType,askingNode,this->getNumberOfCoresPerWorker()); @@ -228,7 +228,7 @@ std::map SalomeHPContainer::getResourceProperties(const return _sct.getResourceProperties(name); } -void SalomeHPContainer::checkCapabilityToDealWith(const ComponentInstance *inst) const +void SalomeHPContainer::checkCapabilityToDealWith(const ComponentInstance *inst) const { if(inst->getKind()!=SalomeHPComponent::KIND) throw Exception("SalomeHPContainer::checkCapabilityToDealWith : SalomeContainer is not able to deal with this type of ComponentInstance."); diff --git a/src/runtime/StudyNodes.cxx b/src/runtime/StudyNodes.cxx index 245dbd047..cbc9d5818 100644 --- a/src/runtime/StudyNodes.cxx +++ b/src/runtime/StudyNodes.cxx @@ -94,7 +94,7 @@ void StudyInNode::execute() DEBTRACE("+++++++ end StudyInNode::execute +++++++++++" ); } -void StudyInNode::checkBasicConsistency() const +void StudyInNode::checkBasicConsistency() const { DEBTRACE("StudyInNode::checkBasicConsistency"); if (! _setOfInputPort.empty()) @@ -231,7 +231,7 @@ void StudyOutNode::execute() DEBTRACE("+++++++ end StudyOutNode::execute +++++++++++" ); } -void StudyOutNode::checkBasicConsistency() const +void StudyOutNode::checkBasicConsistency() const { DEBTRACE("StudyOutNode::checkBasicConsistency"); if (! _setOfOutputPort.empty()) diff --git a/src/runtime/XMLPorts.cxx b/src/runtime/XMLPorts.cxx index 058bca756..59ade05c0 100644 --- a/src/runtime/XMLPorts.cxx +++ b/src/runtime/XMLPorts.cxx @@ -53,7 +53,7 @@ const char *InputXmlPort::getXml() const return _data.c_str(); } -void *InputXmlPort::get() const +void *InputXmlPort::get() const { return (void *) _data.c_str(); } @@ -139,7 +139,7 @@ void OutputXmlPort::put(const void *data) put((const char*)data); } -void OutputXmlPort::put(const char *data) +void OutputXmlPort::put(const char *data) { DEBTRACE(data); InputPort *p; diff --git a/src/workloadmanager/DefaultAlgorithm.cxx b/src/workloadmanager/DefaultAlgorithm.cxx index 962c8dbf8..8d69376aa 100644 --- a/src/workloadmanager/DefaultAlgorithm.cxx +++ b/src/workloadmanager/DefaultAlgorithm.cxx @@ -180,7 +180,7 @@ bool DefaultAlgorithm::ResourceLoadInfo::isSupported { return ctype.neededCores <= _resource.nbCores ; } - + bool DefaultAlgorithm::ResourceLoadInfo::isAllocPossible (const ContainerType& ctype)const { diff --git a/src/workloadmanager/DefaultAlgorithm.hxx b/src/workloadmanager/DefaultAlgorithm.hxx index b144184c9..4c88f3084 100644 --- a/src/workloadmanager/DefaultAlgorithm.hxx +++ b/src/workloadmanager/DefaultAlgorithm.hxx @@ -61,7 +61,7 @@ private: std::set _runningContainers; // 0 to max possible containers on this resource unsigned int _firstFreeContainer; }; - + class ResourceLoadInfo { public: @@ -83,7 +83,7 @@ private: float _loadCost; std::list _ctypes; }; - + private: std::list _resources; std::list _waitingTasks; diff --git a/src/workloadmanager/Task.hxx b/src/workloadmanager/Task.hxx index 93b80ee19..71dc10eed 100644 --- a/src/workloadmanager/Task.hxx +++ b/src/workloadmanager/Task.hxx @@ -43,7 +43,7 @@ namespace WorkloadManager (id == other.id && name < other.name); } }; - + struct YACSLIBWLM_EXPORT Resource { unsigned int nbCores = 0; // needed by WorkloadManager @@ -58,7 +58,7 @@ namespace WorkloadManager (id == other.id && name < other.name); } }; - + struct YACSLIBWLM_EXPORT RunInfo { ContainerType type; diff --git a/src/workloadmanager/Test/CMakeLists.txt b/src/workloadmanager/Test/CMakeLists.txt index 805691f30..d1ba1f07a 100644 --- a/src/workloadmanager/Test/CMakeLists.txt +++ b/src/workloadmanager/Test/CMakeLists.txt @@ -18,7 +18,7 @@ # SET(_link_LIBRARIES - ${CPPUNIT_LIBRARIES} + ${CPPUNIT_LIBRARIES} ${PTHREAD_LIBRARIES} YACSlibWorkloadmanager ) diff --git a/src/workloadmanager/Test/TestMain.cxx b/src/workloadmanager/Test/TestMain.cxx index b299f0684..8f9cca00d 100644 --- a/src/workloadmanager/Test/TestMain.cxx +++ b/src/workloadmanager/Test/TestMain.cxx @@ -216,7 +216,7 @@ void MyTest::atest() DEBUG_LOG("Number of tasks: ", tasksNumber); for(int type_id = 0; type_id < typesNumber; type_id++) - DEBUG_LOG("Tasks from ", type_id * tasksNumber / typesNumber, + DEBUG_LOG("Tasks from ", type_id * tasksNumber / typesNumber, " to ", (type_id + 1) * tasksNumber / typesNumber, " are of type ", check.types[type_id].name); diff --git a/src/workloadmanager/WorkloadManager.cxx b/src/workloadmanager/WorkloadManager.cxx index 5b1daa63a..716bed0c7 100644 --- a/src/workloadmanager/WorkloadManager.cxx +++ b/src/workloadmanager/WorkloadManager.cxx @@ -33,19 +33,19 @@ namespace WorkloadManager , _algo(algo) { } - + WorkloadManager::~WorkloadManager() { stop(); } - + void WorkloadManager::addResource(const Resource& r) { std::unique_lock lock(_data_mutex); _algo.addResource(r); _startCondition.notify_one(); } - + void WorkloadManager::addTask(Task* t) { std::unique_lock lock(_data_mutex); diff --git a/src/yacsloader/Test/OptimizerAlgASyncExample.cxx b/src/yacsloader/Test/OptimizerAlgASyncExample.cxx index 900fd31a3..e2e88eda0 100644 --- a/src/yacsloader/Test/OptimizerAlgASyncExample.cxx +++ b/src/yacsloader/Test/OptimizerAlgASyncExample.cxx @@ -93,7 +93,6 @@ YACS::ENGINE::TypeCode * OptimizerAlgASyncExample::getTCForAlgoResult() const * future to initialize an algorithm with custom data. */ void OptimizerAlgASyncExample::initialize(const YACS::ENGINE::Any *input) - { std::cout << "Algo initialize, input = " << input->getIntValue() << std::endl; } @@ -160,4 +159,4 @@ YACS::ENGINE::Any * OptimizerAlgASyncExample::getAlgoResult() YACS::ENGINE::OptimizerAlgBase * createOptimizerAlgASyncExample(YACS::ENGINE::Pool *pool) { return new OptimizerAlgASyncExample(pool); -} \ No newline at end of file +} diff --git a/src/yacsloader/Test/OptimizerAlgSyncExample.cxx b/src/yacsloader/Test/OptimizerAlgSyncExample.cxx index 60e81dad0..8d8f6d913 100644 --- a/src/yacsloader/Test/OptimizerAlgSyncExample.cxx +++ b/src/yacsloader/Test/OptimizerAlgSyncExample.cxx @@ -100,7 +100,6 @@ YACS::ENGINE::TypeCode * OptimizerAlgSyncExample::getTCForAlgoResult() const * future to initialize an algorithm with custom data. */ void OptimizerAlgSyncExample::initialize(const YACS::ENGINE::Any *input) - { std::cout << "Algo initialize, input = " << input->getIntValue() << std::endl; } @@ -160,4 +159,4 @@ YACS::ENGINE::Any * OptimizerAlgSyncExample::getAlgoResult() YACS::ENGINE::OptimizerAlgBase * createOptimizerAlgSyncExample(YACS::ENGINE::Pool *pool) { return new OptimizerAlgSyncExample(pool); -} \ No newline at end of file +} -- 2.30.2