update

Davide Faconti · Davide Faconti · commit f4b3f1ec8264 · 2019-02-19T15:22:19.000+01:00
diff --git a/include/behaviortree_cpp/basic_types.h b/include/behaviortree_cpp/basic_types.h
@@ -38,6 +38,13 @@ enum class NodeStatus
     FAILURE
 };
 
+enum class PortDirection{
+    INPUT,
+    OUTPUT,
+    INOUT
+};
+
+
 typedef nonstd::string_view StringView;
 
 /**
@@ -90,6 +97,10 @@ NodeStatus convertFromString<NodeStatus>(StringView str);
 template <>  // Names with all capital letters
 NodeType convertFromString<NodeType>(StringView str);
 
+template <>
+PortDirection convertFromString<PortDirection>(StringView str);
+
+
 typedef std::function<Any(StringView)> StringConverter;
 
 typedef std::unordered_map<const std::type_info*, StringConverter> StringConvertersMap;
@@ -113,18 +124,22 @@ StringConverter GetAnyFromStringFunctor<void>()
 /**
  * @brief toStr converts NodeStatus to string. Optionally colored.
  */
-const char* toStr(const BT::NodeStatus& status, bool colored = false);
+const char* toStr(BT::NodeStatus status, bool colored = false);
 
 std::ostream& operator<<(std::ostream& os, const BT::NodeStatus& status);
 
 /**
  * @brief toStr converts NodeType to string.
  */
-const char* toStr(const BT::NodeType& type);
+const char* toStr(BT::NodeType type);
 
 std::ostream& operator<<(std::ostream& os, const BT::NodeType& type);
 
 
+const char* toStr(BT::PortDirection direction);
+
+std::ostream& operator<<(std::ostream& os, const BT::PortDirection& type);
+
 // Small utility, unless you want to use <boost/algorithm/string.hpp>
 std::vector<StringView> splitString(const StringView& strToSplit, char delimeter);
 
@@ -173,13 +188,6 @@ template <typename T> using Optional = nonstd::expected<T, std::string>;
  * */
 using Result = Optional<void>;
 
-enum class PortDirection{INPUT, OUTPUT, INOUT };
-
-const char* toStr(PortDirection type);
-
-std::ostream& operator<<(std::ostream& os, const BT::PortDirection& type);
-
-
 class PortInfo
 {
 
diff --git a/src/basic_types.cpp b/src/basic_types.cpp
@@ -4,7 +4,7 @@
 
 namespace BT
 {
-const char* toStr(const NodeStatus& status, bool colored)
+const char* toStr(NodeStatus status, bool colored)
 {
     if (!colored)
     {
@@ -45,7 +45,7 @@ const char* toStr(const NodeStatus& status, bool colored)
     return "Undefined";
 }
 
-const char* toStr(const NodeType& type)
+const char* toStr(NodeType type)
 {
     switch (type)
     {
@@ -174,6 +174,15 @@ NodeType convertFromString<NodeType>(StringView str)
     return NodeType::UNDEFINED;
 }
 
+template <>
+PortDirection convertFromString<PortDirection>(StringView str)
+{
+    if( str == "Input"  || str == "INPUT" )    return PortDirection::INPUT;
+    if( str == "Output" || str == "OUTPUT")    return PortDirection::OUTPUT;
+    return PortDirection::INOUT;
+}
+
+
 std::ostream& operator<<(std::ostream& os, const NodeType& type)
 {
     os << toStr(type);
@@ -217,10 +226,6 @@ PortDirection PortInfo::direction() const
     return _type;
 }
 
-const std::type_info* PortInfo::type() const
-{
-    return _info;
-}
 
 Any PortInfo::parseString(const char *str) const
 {
@@ -254,11 +259,16 @@ const char *toStr(PortDirection type)
 {
     switch(type)
     {
-    case PortDirection::INPUT:  return "input_port";
-    case PortDirection::OUTPUT: return "output_port";
-    case PortDirection::INOUT:  return "input_port";
+    case PortDirection::INPUT:  return "Input";
+    case PortDirection::OUTPUT: return "Output";
+    case PortDirection::INOUT:  return "InOut";
     }
 }
 
+const std::type_info* PortInfo::type() const
+{
+    return _info;
+}
+
 
 }   // end namespace

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace BT`
`6`	`6`	`{`
`7`		`-const char* toStr(const NodeStatus& status, bool colored)`
	`7`	`+const char* toStr(NodeStatus status, bool colored)`
`8`	`8`	`{`
`9`	`9`	`if (!colored)`
`10`	`10`	`{`
`@@ -45,7 +45,7 @@ const char* toStr(const NodeStatus& status, bool colored)`
`45`	`45`	`return "Undefined";`
`46`	`46`	`}`
`47`	`47`
`48`		`-const char* toStr(const NodeType& type)`
	`48`	`+const char* toStr(NodeType type)`
`49`	`49`	`{`
`50`	`50`	`switch (type)`
`51`	`51`	`{`
`@@ -174,6 +174,15 @@ NodeType convertFromString<NodeType>(StringView str)`
`174`	`174`	`return NodeType::UNDEFINED;`
`175`	`175`	`}`
`176`	`176`
	`177`	`+template <>`
	`178`	`+PortDirection convertFromString<PortDirection>(StringView str)`
	`179`	`+{`
	`180`	`+ if( str == "Input" \|\| str == "INPUT" ) return PortDirection::INPUT;`
	`181`	`+ if( str == "Output" \|\| str == "OUTPUT") return PortDirection::OUTPUT;`
	`182`	`+ return PortDirection::INOUT;`
	`183`	`+}`
	`184`	`+`
	`185`	`+`
`177`	`186`	`std::ostream& operator<<(std::ostream& os, const NodeType& type)`
`178`	`187`	`{`
`179`	`188`	`os << toStr(type);`
`@@ -217,10 +226,6 @@ PortDirection PortInfo::direction() const`
`217`	`226`	`return _type;`
`218`	`227`	`}`
`219`	`228`
`220`		`-const std::type_info* PortInfo::type() const`
`221`		`-{`
`222`		`- return _info;`
`223`		`-}`
`224`	`229`
`225`	`230`	`Any PortInfo::parseString(const char *str) const`
`226`	`231`	`{`
`@@ -254,11 +259,16 @@ const char *toStr(PortDirection type)`
`254`	`259`	`{`
`255`	`260`	`switch(type)`
`256`	`261`	`{`
`257`		`- case PortDirection::INPUT: return "input_port";`
`258`		`- case PortDirection::OUTPUT: return "output_port";`
`259`		`- case PortDirection::INOUT: return "input_port";`
	`262`	`+ case PortDirection::INPUT: return "Input";`
	`263`	`+ case PortDirection::OUTPUT: return "Output";`
	`264`	`+ case PortDirection::INOUT: return "InOut";`
`260`	`265`	`}`
`261`	`266`	`}`
`262`	`267`
	`268`	`+const std::type_info* PortInfo::type() const`
	`269`	`+{`
	`270`	`+ return _info;`
	`271`	`+}`
	`272`	`+`
`263`	`273`
`264`	`274`	`} // end namespace`