robotflow-cvs

[Dominic L. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Behaviors/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19423/Behaviors/include

Modified Files:
	Behavior.h DirectList.h Exploitation.h ExploitationEntry.h 
	Recommandation.h 
Log Message:
removing all "using namespace std;" in headers. Bumped version to 0.2.6. Preparing for the RobotFlow namespace.


Index: Exploitation.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/include/Exploitation.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Exploitation.h	2 Aug 2004 15:30:24 -0000	1.4
--- Exploitation.h	2 Jan 2005 14:43:54 -0000	1.5
***************
*** 22,26 ****
  #include <list>
  
- using namespace std;
  
  /**
--- 22,25 ----
***************
*** 78,82 ****
     * \param out The output stream to write to.
     */
!   virtual void printOn(ostream &out=cout) const;
  
   /** 
--- 77,81 ----
     * \param out The output stream to write to.
     */
!   virtual void printOn(std::ostream &out=std::cout) const;
  
   /** 
***************
*** 101,105 ****
     * \retval list<ExploitationEntry>& The reference to the list of ExloitationEntry
     */
!   list<ExploitationEntry> & get_exploitation(){return m_exploitation;}
  
   /** 
--- 100,104 ----
     * \retval list<ExploitationEntry>& The reference to the list of ExloitationEntry
     */
!   std::list<ExploitationEntry> & get_exploitation(){return m_exploitation;}
  
   /** 
***************
*** 128,132 ****
  
    ///The list of ExploitationEntry (ies)
!   list<ExploitationEntry> m_exploitation;
  
    ///maximum exploitation entries in the list
--- 127,131 ----
  
    ///The list of ExploitationEntry (ies)
!   std::list<ExploitationEntry> m_exploitation;
  
    ///maximum exploitation entries in the list

Index: ExploitationEntry.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/include/ExploitationEntry.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExploitationEntry.h	12 May 2003 19:36:13 -0000	1.1
--- ExploitationEntry.h	2 Jan 2005 14:43:54 -0000	1.2
***************
*** 23,27 ****
  #include <list>
  
- using namespace std;
  
  /**
--- 23,26 ----
***************
*** 113,122 ****
     * \param out The output stream to write to.
     */
!   void printOn(ostream &out = cout) const {
      out<<"<ExploitationEntry ";
!     out<<"<Node "<<m_node<<" ("<<m_node->getName()<<")"<<" >"<<endl;
!     out<<"<Count "<<m_count<<" >"<<endl;
!     out<<"<OutputID "<<m_output_id<<" >"<<endl;
!     out<<" >"<<endl;
    }
  
--- 112,121 ----
     * \param out The output stream to write to.
     */
!   void printOn(std::ostream &out = std::cout) const {
      out<<"<ExploitationEntry ";
!     out<<"<Node "<<m_node<<" ("<<m_node->getName()<<")"<<" >"<<std::endl;
!     out<<"<Count "<<m_count<<" >"<<std::endl;
!     out<<"<OutputID "<<m_output_id<<" >"<<std::endl;
!     out<<" >"<<std::endl;
    }
  

Index: Recommandation.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/include/Recommandation.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Recommandation.h	14 May 2004 14:09:46 -0000	1.1
--- Recommandation.h	2 Jan 2005 14:43:54 -0000	1.2
***************
*** 24,30 ****
     Recommandation(const Recommandation &recommandation);
  
!    virtual void printOn(ostream &out=cout) const;
  
!    virtual void readFrom(istream &in);
  
     int getDesirable();
--- 24,30 ----
     Recommandation(const Recommandation &recommandation);
  
!    virtual void printOn(std::ostream &out=std::cout) const;
  
!    virtual void readFrom(std::istream &in);
  
     int getDesirable();

Index: DirectList.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/include/DirectList.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DirectList.h	24 Apr 2002 02:04:45 -0000	1.3
--- DirectList.h	2 Jan 2005 14:43:54 -0000	1.4
***************
*** 22,26 ****
  #include <list>
  
- using namespace std;
  
  #define NONE 0
--- 22,25 ----
***************
*** 41,45 ****
    virtual ~DirectCommand();
  
!   virtual void printOn(ostream &out=cout) const;
  
    float x;
--- 40,44 ----
    virtual ~DirectCommand();
  
!   virtual void printOn(std::ostream &out=std::cout) const;
  
    float x;
***************
*** 67,71 ****
  
    virtual ~DirectList();
!   virtual void printOn(ostream &out=cout) const;
  
    bool listIsEmpty();
--- 66,70 ----
  
    virtual ~DirectList();
!   virtual void printOn(std::ostream &out=std::cout) const;
  
    bool listIsEmpty();
***************
*** 86,90 ****
  
   private:
!   list<DirectCommand> commandList;
  
  };
--- 85,89 ----
  
   private:
!   std::list<DirectCommand> commandList;
  
  };

Index: Behavior.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/include/Behavior.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Behavior.h	2 Aug 2004 15:29:17 -0000	1.5
--- Behavior.h	2 Jan 2005 14:43:54 -0000	1.6
***************
*** 24,30 ****
  #include <string>
  
- using namespace std;
- 
- 
  //The Sub classes must always contain in the input/output overflow toolbox definitions :
  
--- 24,27 ----
***************
*** 72,76 ****
     * Every behavior should have a different name.
     */
!   Behavior(string nodeName, ParameterSet params, string BehaviorName);
  
    /** 
--- 69,73 ----
     * Every behavior should have a different name.
     */
!   Behavior(std::string nodeName, ParameterSet params, std::string BehaviorName);
  
    /** 
***************
*** 103,107 ****
     * \retval int The identification number of the new behavior.
     */
!   static int register_behavior(const string &name);
  
    /**
--- 100,104 ----
     * \retval int The identification number of the new behavior.
     */
!   static int register_behavior(const std::string &name);
  
    /**
***************
*** 111,115 ****
     * \retval int the behavior identification number.
     */
!   static int find_behavior(const string &name);
  
    /**
--- 108,112 ----
     * \retval int the behavior identification number.
     */
!   static int find_behavior(const std::string &name);
  
    /**
***************
*** 119,123 ****
     * \retval bool Returns true if the behavior name is registered, else returns false.
     */
!   static bool behavior_exists(const string &name);
  
  
--- 116,120 ----
     * \retval bool Returns true if the behavior name is registered, else returns false.
     */
!   static bool behavior_exists(const std::string &name);
  
  
***************
*** 132,138 ****
     * Returns the data structure containing the registered behavior names. This function should not be used by derived classes.
     *
!    * \retval vector<string>& The data structure containing the registered behavior names.
     */
!   static Vector<string>& get_behaviors();
  
    /**
--- 129,135 ----
     * Returns the data structure containing the registered behavior names. This function should not be used by derived classes.
     *
!    * \retval std::vector<std::string>& The data structure containing the registered behavior names.
     */
!   static Vector<std::string>& get_behaviors();
  
    /**
***************
*** 141,145 ****
     * \param name The behavior name that we want remove
     */
!   static void remove_behavior(const string &name);
  
    /**
--- 138,142 ----
     * \param name The behavior name that we want remove
     */
!   static void remove_behavior(const std::string &name);
  
    /**