=== MAJOR RELEASE ====

[bbtk.git] / packages / std / src / bbstdStringToVector.h

diff --git a/packages/std/src/bbstdStringToVector.h b/packages/std/src/bbstdStringToVector.h
index bbb6de1b015338642ad7bff91060355b7dca1dfb..31305d3f345e3ad67bc162a820290da369984ea7 100644 (file)
--- a/packages/std/src/bbstdStringToVector.h
+++ b/packages/std/src/bbstdStringToVector.h
@@ -1,69 +1,70 @@
 #ifndef __bbstdStringToVector_INCLUDED_h__
 #define __bbstdStringToVector_INCLUDED_h__
 
-#include "bbtkUserBlackBox.h"
+#include "bbtkAtomicBlackBox.h"
 
 namespace bbstd
 {
-//=================================================================
-// UserBlackBox declaration
-template <class T>
-class StringToVector : public bbtk::UserBlackBox
-{  
-  BBTK_USER_BLACK_BOX_INTERFACE(StringToVector,bbtk::UserBlackBox);
+  //=================================================================
+  // BlackBox declaration
+  template <class T>
+  class StringToVector : public bbtk::AtomicBlackBox
+  {  
+    BBTK_TEMPLATE_BLACK_BOX_INTERFACE(StringToVector,bbtk::AtomicBlackBox,T);
     BBTK_DECLARE_INPUT(In,std::string);
     BBTK_DECLARE_OUTPUT(Out,std::vector<T>);
-  BBTK_PROCESS(DoIt);
-  void DoIt(); 
-  T decode_item(const std::string&);
-};
+    BBTK_PROCESS(DoIt);
+    void DoIt(); 
+    T decode_item(const std::string&);
+  };
+  //=================================================================  
 
-//=================================================================
- 
-// UserBlackBox description
-  BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(StringToVector);
-  BBTK_NAME("StringTo"+bbtk::TypeName<std::vector<T> >());
+  //=================================================================
+  // BlackBox description
+  BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(StringToVector,bbtk::AtomicBlackBox);
+  BBTK_NAME("StringTo"+bbtk::HumanTypeName<std::vector<T> >());
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
-  BBTK_CATEGORY("adaptor");
   BBTK_DEFAULT_ADAPTOR();
-  BBTK_DESCRIPTION("Converts the content of the input string to a "+bbtk::TypeName<std::vector<T> >());
-    BBTK_TEMPLATE_INPUT(StringToVector, In,"Input",std::string);
-    typedef std::vector<T> Tvector;
-    BBTK_TEMPLATE_OUTPUT(StringToVector, Out,"Output",Tvector);
+  BBTK_DESCRIPTION("Converts the content of the input string to a "
+                  +bbtk::HumanTypeName<std::vector<T> >()
+                  +" ("+bbtk::TypeName<std::vector<T> >()+")");
+  BBTK_TEMPLATE_INPUT(StringToVector, In,"Input",std::string);
+  typedef std::vector<T> Tvector;
+  BBTK_TEMPLATE_OUTPUT(StringToVector, Out,"Output",Tvector);
   BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(StringToVector);
-
-//=================================================================
-
-template <class T>
-void StringToVector<T>::DoIt()
-{
-  //  std::cout << "StringToVector<"<<bbtk::TypeName<T>()<<">::DoIt()"<<std::endl;
-
-  typedef T type;
-  std::string delimiters(" ,;");
-  std::string str(bbGetInputIn()); 
-  //  std::cout << "'"<< str << "'"<<std::endl;
-  // Skip delimiters at beginning.
-  std::string::size_type lastPos = str.find_first_not_of(delimiters, 0);
-  // Find first "non-delimiter".
-  std::string::size_type pos     = str.find_first_of(delimiters, lastPos);
-  bbmOutputOut.clear();
-  while (std::string::npos != pos || std::string::npos != lastPos)
-    {
-      // Found a token, add it to the vector.
-      bbmOutputOut.push_back( 
-                            this->decode_item( str.substr(lastPos, pos - lastPos) ) );
-      //      std::cout << this->bbGetOutputOut().back() << std::endl;
-      // Skip delimiters.  Note the "not_of"
-      lastPos = str.find_first_not_of(delimiters, pos);
-      // Find next "non-delimiter"
-      pos = str.find_first_of(delimiters, lastPos);
-    }
-  //  std::cout << "s=" << this->bbGetOutputOut().size() << std::endl;
-}
-//=================================================================
-
-
+  //=================================================================
+  
+  //=================================================================
+  template <class T>
+  void StringToVector<T>::DoIt()
+  {
+    //  std::cout << "StringToVector<"<<bbtk::TypeName<T>()<<">::DoIt()"<<std::endl;
+    
+    typedef T type;
+    std::string delimiters(" ,;");
+    std::string str(bbGetInputIn()); 
+    //  std::cout << "'"<< str << "'"<<std::endl;
+    // Skip delimiters at beginning.
+    std::string::size_type lastPos = str.find_first_not_of(delimiters, 0);
+    // Find first "non-delimiter".
+    std::string::size_type pos     = str.find_first_of(delimiters, lastPos);
+    bbmOutputOut.clear();
+    while (std::string::npos != pos || std::string::npos != lastPos)
+      {
+       // Found a token, add it to the vector.
+       bbmOutputOut.push_back( 
+                              this->decode_item( str.substr(lastPos, pos - lastPos) ) );
+       //      std::cout << this->bbGetOutputOut().back() << std::endl;
+       // Skip delimiters.  Note the "not_of"
+       lastPos = str.find_first_not_of(delimiters, pos);
+       // Find next "non-delimiter"
+       pos = str.find_first_of(delimiters, lastPos);
+      }
+    //  std::cout << "s=" << this->bbGetOutputOut().size() << std::endl;
+  }
+  //=================================================================
+  
+  
 } // namespace bbstd
 
 #endif //__bbstdStringToVector_INCLUDED_h__