From f17d771c68dbb80708880e186d14c7e707c1bf4f Mon Sep 17 00:00:00 2001 From: Renaud G Date: Thu, 24 Dec 2015 11:19:55 +0100 Subject: -Adding mergenode to the project. --- node/mergenode.cpp | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ node/mergenode.h | 43 ++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 node/mergenode.cpp create mode 100644 node/mergenode.h (limited to 'node') diff --git a/node/mergenode.cpp b/node/mergenode.cpp new file mode 100644 index 0000000..7068cf5 --- /dev/null +++ b/node/mergenode.cpp @@ -0,0 +1,78 @@ +/*************************************************************************** +* Copyright (C) 2014 by Renaud Guezennec * +* http://renaudguezennec.homelinux.org/accueil,3.html * +* * +* This file is part of DiceParser * +* * +* DiceParser is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program; if not, write to the * +* Free Software Foundation, Inc., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +***************************************************************************/ +#include "mergenode.h" + +MergeNode::MergeNode() + : m_diceResult(new DiceResult()) +{ + m_result = m_diceResult; +} +void MergeNode::run(ExecutionNode* previous) +{ + m_previousNode = previous; + if(NULL!=previous) + { + m_result->setPrevious(previous->getResult()); + } + Result* tmpResult = previous->getResult(); + while(NULL!=tmpResult) + { + DiceResult* dice = dynamic_cast(tmpResult); + if(NULL!=dice) + { + foreach(Die* die, dice->getResultList()) + { + if(!m_diceResult->getResultList().contains(die)) + { + m_diceResult->getResultList().append(die); + } + } + } + tmpResult = tmpResult->getPrevious(); + } + + if(NULL!=m_nextNode) + { + m_nextNode->run(this); + } +} + +QString MergeNode::toString(bool withLabel) const +{ + if(withLabel) + { + return QString("%1 [label=\"Merge Node %2\"]").arg(m_id).arg(m_number); + } + else + { + return m_id; + } +} +qint64 MergeNode::getPriority() const +{ + qint64 priority=0; + if(NULL!=m_nextNode) + { + priority = m_nextNode->getPriority(); + } + return priority; +} diff --git a/node/mergenode.h b/node/mergenode.h new file mode 100644 index 0000000..347975f --- /dev/null +++ b/node/mergenode.h @@ -0,0 +1,43 @@ +/*************************************************************************** +* Copyright (C) 2014 by Renaud Guezennec * +* http://renaudguezennec.homelinux.org/accueil,3.html * +* * +* This file is part of DiceParser * +* * +* DiceParser is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program; if not, write to the * +* Free Software Foundation, Inc., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +***************************************************************************/ +#ifndef MERGENODE_H +#define MERGENODE_H + +#include "node/executionnode.h" +#include "result/diceresult.h" + +/** + * @brief The MergeNode class is an ExecutionNode. It is dedicated to merge result of several commands. + */ +class MergeNode : public ExecutionNode +{ +public: + MergeNode(); + void run(ExecutionNode* previous); + virtual QString toString(bool withLabel)const; + virtual qint64 getPriority() const; +private: + qint64 m_number; + DiceResult* m_diceResult; +}; + +#endif // NUMBERNODE_H -- cgit v1.2.3-70-g09d2 From 597d3790ce9eb10ae1f7d69bee74f5e46f4e1eb4 Mon Sep 17 00:00:00 2001 From: Renaud Date: Mon, 28 Dec 2015 21:01:05 +0100 Subject: manage homogeneous --- node/mergenode.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'node') diff --git a/node/mergenode.cpp b/node/mergenode.cpp index 7068cf5..5145bc8 100644 --- a/node/mergenode.cpp +++ b/node/mergenode.cpp @@ -39,6 +39,8 @@ void MergeNode::run(ExecutionNode* previous) DiceResult* dice = dynamic_cast(tmpResult); if(NULL!=dice) { + ///@todo improve here to set homogeneous while is really + m_diceResult->setHomogeneous(false); foreach(Die* die, dice->getResultList()) { if(!m_diceResult->getResultList().contains(die)) -- cgit v1.2.3-70-g09d2