[Robotflow-cvs] RobotFlow/MARIE/include MarieCommandBehavior.h,1.3,1.4 MarieCommandCamera.h,1.3,1.4 MarieCommandJoystick.h,1.2,1.3 MarieCommandMotor.h,1.2,1.3 MarieDataBumper.h,1.2,1.3 MarieDataCamera.h,1.2,1.3 MarieDataIR.h,1.2,1.3 MarieDataLaser.h,1.2,1.3 MarieDataMap.h,1.3,1.4 MarieDataNull.h,1.2,1.3 MarieDataOdometry.h,1.2,1.3 MarieDataRaw.h,1.2,1.3 MarieDataSonar.h,1.2,1.3 MarieLoad.h,1.2,1.3 MarieObject.h,1.2,1.3 MariePeek.h,1.2,1.3 MariePull.h,1.2,1.3 MariePush.h,1.2,1.3 MarieRequestSystem.h,1.2,1.3 MarieSave.h,1.2,1.3

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

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

Modified Files:
	MarieCommandBehavior.h MarieCommandCamera.h 
	MarieCommandJoystick.h MarieCommandMotor.h MarieDataBumper.h 
	MarieDataCamera.h MarieDataIR.h MarieDataLaser.h 
	MarieDataMap.h MarieDataNull.h MarieDataOdometry.h 
	MarieDataRaw.h MarieDataSonar.h MarieLoad.h MarieObject.h 
	MariePeek.h MariePull.h MariePush.h MarieRequestSystem.h 
	MarieSave.h 
Log Message:
Now using the RobotFlow namespace and the FD namespace

Index: MarieDataBumper.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataBumper.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieDataBumper.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieDataBumper.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 41,46 ****
       
       //from BufferedNode   
!      MarieDataBumper(std::string nodeName, ParameterSet params);
!      virtual void calculate(int output_id, int count, Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
--- 41,46 ----
       
       //from BufferedNode   
!      MarieDataBumper(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);

Index: MarieCommandMotor.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandMotor.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieCommandMotor.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieCommandMotor.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 42,47 ****
       
       //from BufferedNode   
!      MarieCommandMotor(std::string nodeName, ParameterSet params);
!      virtual void calculate(int output_id, int count, Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
--- 42,47 ----
       
       //from BufferedNode   
!      MarieCommandMotor(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);

Index: MariePeek.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MariePeek.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MariePeek.h	2 Jan 2005 14:43:57 -0000	1.2
--- MariePeek.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 28,32 ****
  namespace marie
  {
!   class MariePeek : public BufferedNode {
    
    private: 
--- 28,32 ----
  namespace marie
  {
!   class MariePeek : public FD::BufferedNode {
    
    private: 
***************
*** 39,44 ****
    public:
    
!      MariePeek(std::string nodeName, ParameterSet params);
!      void calculate(int output_id, int count, Buffer &out);   
    };
  }
--- 39,44 ----
    public:
    
!      MariePeek(std::string nodeName, FD::ParameterSet params);
!      void calculate(int output_id, int count, FD::Buffer &out);   
    };
  }

Index: MarieCommandJoystick.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandJoystick.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieCommandJoystick.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieCommandJoystick.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 41,46 ****
       
       //from BufferedNode   
!      MarieCommandJoystick(std::string nodeName, ParameterSet params);
!      virtual void calculate(int output_id, int count, Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
--- 41,46 ----
       
       //from BufferedNode   
!      MarieCommandJoystick(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);

Index: MarieLoad.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieLoad.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieLoad.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieLoad.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 28,32 ****
  namespace marie
  {
!   class MarieLoad : public BufferedNode {
    
    private: 
--- 28,32 ----
  namespace marie
  {
!   class MarieLoad : public FD::BufferedNode {
    
    private: 
***************
*** 39,44 ****
    public:
    
!      MarieLoad(std::string nodeName, ParameterSet params);
!      void calculate(int output_id, int count, Buffer &out);   
    };
  }
--- 39,44 ----
    public:
    
!      MarieLoad(std::string nodeName, FD::ParameterSet params);
!      void calculate(int output_id, int count, FD::Buffer &out);   
    };
  }

Index: MarieObject.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieObject.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieObject.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieObject.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 49,57 ****
  namespace marie
  {
!   class MarieObject : public BufferedNode {
    
     public:
       
!      MarieObject(std::string nodeName, ParameterSet params) : BufferedNode(nodeName,params) {}
       virtual void copyDataAbstract(DataAbstract *data) = 0;
        
--- 49,57 ----
  namespace marie
  {
!   class MarieObject : public FD::BufferedNode {
    
     public:
       
!      MarieObject(std::string nodeName, FD::ParameterSet params) : FD::BufferedNode(nodeName,params) {}
       virtual void copyDataAbstract(DataAbstract *data) = 0;
        

Index: MarieDataSonar.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataSonar.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieDataSonar.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieDataSonar.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 40,45 ****
       
       //from BufferedNode
!      MarieDataSonar(std::string nodeName, ParameterSet params);
!      virtual void calculate(int output_id, int count, Buffer &out);       
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
--- 40,45 ----
       
       //from BufferedNode
!      MarieDataSonar(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);       
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);

Index: MarieCommandCamera.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandCamera.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieCommandCamera.h	2 Jan 2005 14:43:57 -0000	1.3
--- MarieCommandCamera.h	29 Mar 2005 15:20:41 -0000	1.4
***************
*** 41,46 ****
       
       //from BufferedNode   
!      MarieCommandCamera(std::string nodeName, ParameterSet params);
!      virtual void calculate(int output_id, int count, Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
--- 41,46 ----
       
       //from BufferedNode   
!      MarieCommandCamera(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);

Index: MarieDataIR.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataIR.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieDataIR.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieDataIR.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 41,46 ****
       
       //from BufferedNode
!      MarieDataIR(std::string nodeName, ParameterSet params);
!      virtual void calculate(int output_id, int count, Buffer &out);       
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
--- 41,46 ----
       
       //from BufferedNode
!      MarieDataIR(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);       
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);

Index: MarieDataCamera.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataCamera.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieDataCamera.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieDataCamera.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 41,46 ****
           
       //from BufferedNode   
!      MarieDataCamera(std::string nodeName, ParameterSet params);
!      virtual void calculate(int output_id, int count, Buffer &out); 
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
--- 41,46 ----
           
       //from BufferedNode   
!      MarieDataCamera(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out); 
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);

Index: MarieDataLaser.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataLaser.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieDataLaser.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieDataLaser.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 41,46 ****
       
       //from BufferedNode
!      MarieDataLaser(std::string nodeName, ParameterSet params);
!      virtual void calculate(int output_id, int count, Buffer &out);       
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
--- 41,46 ----
       
       //from BufferedNode
!      MarieDataLaser(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);       
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);

Index: MarieDataOdometry.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataOdometry.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieDataOdometry.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieDataOdometry.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 40,45 ****
       
       //from BufferedNode
!      MarieDataOdometry(std::string nodeName, ParameterSet params);
!      virtual void calculate(int output_id, int count, Buffer &out);   
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);   
--- 40,45 ----
       
       //from BufferedNode
!      MarieDataOdometry(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);   
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);   

Index: MarieDataRaw.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataRaw.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieDataRaw.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieDataRaw.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 41,46 ****
       
       //from BufferedNode
!      MarieDataRaw(std::string nodeName, ParameterSet params);
!      virtual void calculate(int output_id, int count, Buffer &out);       
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
--- 41,46 ----
       
       //from BufferedNode
!      MarieDataRaw(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);       
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);

Index: MarieRequestSystem.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieRequestSystem.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieRequestSystem.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieRequestSystem.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 41,46 ****
           
       //from BufferedNode   
!      MarieRequestSystem(std::string nodeName, ParameterSet params);
!      virtual void calculate(int output_id, int count, Buffer &out); 
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
--- 41,46 ----
           
       //from BufferedNode   
!      MarieRequestSystem(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out); 
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);

Index: MariePull.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MariePull.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MariePull.h	2 Jan 2005 14:43:57 -0000	1.2
--- MariePull.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 28,32 ****
  namespace marie
  {
!   class MariePull : public BufferedNode {
    
    private: 
--- 28,32 ----
  namespace marie
  {
!   class MariePull : public FD::BufferedNode {
    
    private: 
***************
*** 39,44 ****
    public:
    
!      MariePull(std::string nodeName, ParameterSet params);
!      void calculate(int output_id, int count, Buffer &out);   
    };
  }
--- 39,44 ----
    public:
    
!      MariePull(std::string nodeName, FD::ParameterSet params);
!      void calculate(int output_id, int count, FD::Buffer &out);   
    };
  }

Index: MarieSave.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieSave.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieSave.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieSave.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 27,31 ****
  namespace marie
  {
!   class MarieSave : public BufferedNode {
       
       int m_inputID;
--- 27,31 ----
  namespace marie
  {
!   class MarieSave : public FD::BufferedNode {
       
       int m_inputID;
***************
*** 35,41 ****
    public:
    
!      MarieSave(std::string nodeName, ParameterSet params);
    
!      void calculate(int output_id, int count, Buffer &out);
         
    };
--- 35,41 ----
    public:
    
!      MarieSave(std::string nodeName, FD::ParameterSet params);
    
!      void calculate(int output_id, int count, FD::Buffer &out);
         
    };

Index: MarieDataNull.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataNull.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieDataNull.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieDataNull.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 41,46 ****
       
       //from BufferedNode   
!      MarieDataNull(std::string nodeName, ParameterSet params);
!      virtual void calculate(int output_id, int count, Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
--- 41,46 ----
       
       //from BufferedNode   
!      MarieDataNull(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
***************
*** 58,62 ****
  
       //same dataNull object
!      ObjectRef m_dataNullObject;
                  
    };
--- 58,62 ----
  
       //same dataNull object
!      FD::ObjectRef m_dataNullObject;
                  
    };

Index: MarieCommandBehavior.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandBehavior.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieCommandBehavior.h	10 Mar 2005 20:59:00 -0000	1.3
--- MarieCommandBehavior.h	29 Mar 2005 15:20:41 -0000	1.4
***************
*** 40,45 ****
       
       //from BufferedNode   
!      MarieCommandBehavior(std::string nodeName, ParameterSet params);
!      virtual void calculate(int output_id, int count, Buffer &out);    
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);  
--- 40,45 ----
       
       //from BufferedNode   
!      MarieCommandBehavior(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);    
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);  

Index: MarieDataMap.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataMap.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieDataMap.h	10 Mar 2005 20:59:00 -0000	1.3
--- MarieDataMap.h	29 Mar 2005 15:20:41 -0000	1.4
***************
*** 40,45 ****
           
       //from BufferedNode   
!      MarieDataMap(std::string nodeName, ParameterSet params);
!      virtual void calculate(int output_id, int count, Buffer &out); 
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
--- 40,45 ----
           
       //from BufferedNode   
!      MarieDataMap(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out); 
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);

Index: MariePush.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MariePush.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MariePush.h	2 Jan 2005 14:43:57 -0000	1.2
--- MariePush.h	29 Mar 2005 15:20:41 -0000	1.3
***************
*** 27,31 ****
  namespace marie
  {
!   class MariePush : public BufferedNode {
       
       int m_inputID;
--- 27,31 ----
  namespace marie
  {
!   class MariePush : public FD::BufferedNode {
       
       int m_inputID;
***************
*** 35,41 ****
    public:
    
!      MariePush(std::string nodeName, ParameterSet params);
    
!      void calculate(int output_id, int count, Buffer &out);
         
    };
--- 35,41 ----
    public:
    
!      MariePush(std::string nodeName, FD::ParameterSet params);
    
!      void calculate(int output_id, int count, FD::Buffer &out);
         
    };