byterazor/libtree
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Dominik Meyer 2019-04-10 09:55:13 +02:00
commit 243d8783ce
No known key found for this signature in database
GPG Key ID: B4C312B600606B64
1 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
include/Tree/tree.hpp
View File

@ -168,7 +168,21 @@ namespace Tree
* *
* @param c - a shared_ptr to a BaseNode * @param c - a shared_ptr to a BaseNode
*/ */
void addChild(const std::shared_ptr<Tree::BaseNode> &c) {c->setParent(shared_from_this()); children.push_back(c); } void addChild(const std::shared_ptr<Tree::BaseNode> &c) {
if (c!=nullptr)
{
c->setParent(shared_from_this());
children.push_back(c);
}
}
/**
* @brief prepends a child to the node which is already a shared_ptr
*
* @param c - a shared_ptr to a BaseNode
*/
void prependChild(const std::shared_ptr<Tree::BaseNode> &c) {c->setParent(shared_from_this()); children.push_front(c); }
/** /**
* @brief adds a container of nodes to the list of children * @brief adds a container of nodes to the list of children
@ -180,6 +194,15 @@ namespace Tree
void addChildren(Iter begin, Iter end) { std::copy( begin, end, std::back_inserter( children ) );} void addChildren(Iter begin, Iter end) { std::copy( begin, end, std::back_inserter( children ) );}
/**
* @brief prepends a container of nodes to the list of children
*
* @param begin - iterator to the beginning of the container of objects of type std::shared_ptr<Tree::BaseNode>
* @param end - iterator to the end of the container of objects of type std::shared_ptr<Tree::BaseNode>
*/
template <typename Iter>
void prependChildren(Iter begin, Iter end) { std::copy( begin, end, std::front_inserter( children ) );}
/** /**
* @brief finds the next node in the tree of a given type * @brief finds the next node in the tree of a given type
* *
@ -202,12 +225,25 @@ namespace Tree
/** /**
* @brief finds all nodes of a given base * @brief finds all nodes of a given base
* *
* @param base - the base type of the node as a string * @param b - the base type of the node as a string
* @param c - a container for holding all found nodes, has to be holding objects of type std::shared_ptr<Tree::BaseNode> * @param c - a container for holding all found nodes, has to be holding objects of type std::shared_ptr<Tree::BaseNode>
*/ */
template <typename Container> template <class Container>
void findAllBase(const std::string &base, Container &c); void findAllBase(const std::string &b, Container &c)
{
std::list<std::shared_ptr<Tree::BaseNode>>::iterator it;
if (base() == b)
{
c.push_back(shared_from_this());
}
for(it = children.begin(); it != children.end(); ++it)
{
(*it)->findAllBase(b,c);
}
}
/** /**
* @brief checks if the given node is a direct child of this node * @brief checks if the given node is a direct child of this node