From b16b312b100408695bb1dadaafa158b9ec9acf6d Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Fri, 30 Dec 2016 17:38:33 +0100
Subject: [PATCH] simplify and comb std tree
---
alib2std/src/extensions/forward_tree.hpp | 12 +++++-------
alib2std/src/extensions/tree.hpp | 12 +++++-------
alib2std/src/forward_tree | 2 +-
alib2std/src/tree | 2 +-
4 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/alib2std/src/extensions/forward_tree.hpp b/alib2std/src/extensions/forward_tree.hpp
index 63d83983eb..80482e62ce 100644
--- a/alib2std/src/extensions/forward_tree.hpp
+++ b/alib2std/src/extensions/forward_tree.hpp
@@ -33,24 +33,22 @@ public:
return m_children;
}
- void nicePrint ( std::ostream & os, const std::string & prefix, const bool last ) const {
+ void nicePrint ( std::ostream & os, std::string prefix, const bool last ) const {
os << prefix;
- std::string nextPrefix ( prefix );
-
if ( last ) {
os << "\\-";
- nextPrefix += " ";
+ prefix += " ";
} else {
os << "|-";
- nextPrefix += "| ";
+ prefix += "| ";
}
os << getData ( ) << std::endl;
for ( unsigned int i = 0; i < m_children.size ( ); ++i ) {
- os << nextPrefix << "|" << std::endl;
- m_children[i].nicePrint ( os, nextPrefix, i == m_children.size ( ) - 1 );
+ os << prefix << "|" << std::endl;
+ m_children[i].nicePrint ( os, prefix, i == m_children.size ( ) - 1 );
}
}
diff --git a/alib2std/src/extensions/tree.hpp b/alib2std/src/extensions/tree.hpp
index 13379c304b..27ecb2285a 100644
--- a/alib2std/src/extensions/tree.hpp
+++ b/alib2std/src/extensions/tree.hpp
@@ -42,24 +42,22 @@ public:
return m_children;
}
- void nicePrint ( std::ostream & os, const std::string & prefix, const bool last ) const {
+ void nicePrint ( std::ostream & os, std::string prefix, const bool last ) const {
os << prefix;
- std::string nextPrefix ( prefix );
-
if ( last ) {
os << "\\-";
- nextPrefix += " ";
+ prefix += " ";
} else {
os << "|-";
- nextPrefix += "| ";
+ prefix += "| ";
}
os << getData ( ) << std::endl;
for ( unsigned int i = 0; i < m_children.size ( ); ++i ) {
- os << nextPrefix << "|" << std::endl;
- m_children[i].nicePrint ( os, nextPrefix, i == m_children.size ( ) - 1 );
+ os << prefix << "|" << std::endl;
+ m_children[i].nicePrint ( os, prefix, i == m_children.size ( ) - 1 );
}
}
diff --git a/alib2std/src/forward_tree b/alib2std/src/forward_tree
index f3e395180b..10c1fbb67d 100644
--- a/alib2std/src/forward_tree
+++ b/alib2std/src/forward_tree
@@ -11,5 +11,5 @@
#include "extensions/tree_base.hpp"
#include "extensions/forward_tree.hpp"
-#endif /* __TREE_HEADER_WRAPPER */
+#endif /* __TREE_HEADER_WRAPPER_ */
diff --git a/alib2std/src/tree b/alib2std/src/tree
index 0016f27b1a..c6794dd053 100644
--- a/alib2std/src/tree
+++ b/alib2std/src/tree
@@ -11,5 +11,5 @@
#include "extensions/tree_base.hpp"
#include "extensions/tree.hpp"
-#endif /* __TREE_HEADER_WRAPPER */
+#endif /* __TREE_HEADER_WRAPPER_ */
--
GitLab