[Robotflow-cvs] RobotFlow/Behaviors/src Avoid.cc,1.3,1.4 Behavior.cc,1.6,1.7 BehaviorSelection.cc,1.5,1.6 Direct.cc,1.3,1.4 DirectArbiter.cc,1.2,1.3 DirectList.cc,1.2,1.3 DirectPolygon.cc,1.2,1.3 DirectSquare.cc,1.2,1.3 DirectTriangle.cc,1.2,1.3 Exploitation.cc,1.4,1.5 Goto.cc,1.4,1.5 Grasp.cc,1.2,1.3 Inhibition.cc,1.3,1.4 MinimumDistance.cc,1.2,1.3 MoveAndTurn.cc,1.2,1.3 MultiSignTracking.cc,1.4,1.5 NewBehavior.cc,1.5,1.6 NoCommand.cc,1.3,1.4 RandomTurn.cc,1.4,1.5 Recommandation.cc,1.2,1.3 Rest.cc,1.3,1.4 SafeVelocity.cc,1.3,1.4 SignTracking.cc,1.3,1.4 Subsumption.cc,1.3,1.4

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

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

Modified Files:
	Avoid.cc Behavior.cc BehaviorSelection.cc Direct.cc 
	DirectArbiter.cc DirectList.cc DirectPolygon.cc 
	DirectSquare.cc DirectTriangle.cc Exploitation.cc Goto.cc 
	Grasp.cc Inhibition.cc MinimumDistance.cc MoveAndTurn.cc 
	MultiSignTracking.cc NewBehavior.cc NoCommand.cc RandomTurn.cc 
	Recommandation.cc Rest.cc SafeVelocity.cc SignTracking.cc 
	Subsumption.cc 
Log Message:
Now using the RobotFlow namespace and the FD namespace

Index: NoCommand.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/NoCommand.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NoCommand.cc	2 Jan 2005 14:43:55 -0000	1.3
--- NoCommand.cc	29 Mar 2005 15:20:19 -0000	1.4
***************
*** 22,25 ****
--- 22,28 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class NoCommand;
***************
*** 61,65 ****
  };
  
! 
  
  #endif
--- 64,68 ----
  };
  
! }//namespace RobotFlow
  
  #endif

Index: DirectList.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/DirectList.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DirectList.cc	2 Jan 2005 14:43:54 -0000	1.2
--- DirectList.cc	29 Mar 2005 15:20:19 -0000	1.3
***************
*** 18,21 ****
--- 18,24 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  DirectCommand::DirectCommand() {
***************
*** 184,185 ****
--- 187,190 ----
  
  }
+ 
+ }//namespace RobotFlow

Index: Rest.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Rest.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Rest.cc	2 Jan 2005 14:43:55 -0000	1.3
--- Rest.cc	29 Mar 2005 15:20:19 -0000	1.4
***************
*** 22,25 ****
--- 22,28 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class Rest;
***************
*** 91,94 ****
  
  };
! 
  #endif
--- 94,97 ----
  
  };
! }//namespace RobotFlow
  #endif

Index: MinimumDistance.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/MinimumDistance.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MinimumDistance.cc	2 Jan 2005 14:43:54 -0000	1.2
--- MinimumDistance.cc	29 Mar 2005 15:20:19 -0000	1.3
***************
*** 7,10 ****
--- 7,13 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class MinimumDistance;
***************
*** 190,192 ****
--- 193,197 ----
  };
  
+ }//namespace RobotFlow
+ 
  #endif

Index: Exploitation.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Exploitation.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Exploitation.cc	2 Jan 2005 14:43:54 -0000	1.4
--- Exploitation.cc	29 Mar 2005 15:20:19 -0000	1.5
***************
*** 18,21 ****
--- 18,24 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  Exploitation::Exploitation(int max_element)
***************
*** 93,94 ****
--- 96,99 ----
     m_isNilFlag = true;
  }
+ 
+ }//namespace RobotFlow

Index: DirectArbiter.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/DirectArbiter.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DirectArbiter.cc	2 Jan 2005 14:43:54 -0000	1.2
--- DirectArbiter.cc	29 Mar 2005 15:20:19 -0000	1.3
***************
*** 8,11 ****
--- 8,14 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class DirectArbiter;
***************
*** 118,121 ****
     }  
  };
! 
  #endif
--- 121,124 ----
     }  
  };
! }//namespace RobotFlow
  #endif

Index: DirectPolygon.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/DirectPolygon.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DirectPolygon.cc	2 Jan 2005 14:43:54 -0000	1.2
--- DirectPolygon.cc	29 Mar 2005 15:20:19 -0000	1.3
***************
*** 8,11 ****
--- 8,14 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class DirectPolygon;
***************
*** 86,89 ****
     }  
  };
! 
  #endif
--- 89,92 ----
     }  
  };
! }//namespace RobotFlow
  #endif

Index: Avoid.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Avoid.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Avoid.cc	2 Jan 2005 14:43:54 -0000	1.3
--- Avoid.cc	29 Mar 2005 15:20:19 -0000	1.4
***************
*** 21,24 ****
--- 21,27 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class Avoid;
***************
*** 146,148 ****
--- 149,153 ----
    
  };
+ 
+ }//namespace RobotFlow
  #endif

Index: RandomTurn.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/RandomTurn.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RandomTurn.cc	2 Jan 2005 14:43:55 -0000	1.4
--- RandomTurn.cc	29 Mar 2005 15:20:19 -0000	1.5
***************
*** 23,26 ****
--- 23,29 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  // Random number from [0, x[ 
***************
*** 145,147 ****
--- 148,153 ----
    
  };
+ 
+ }//namespace RobotFlow
+ 
  #endif

Index: Recommandation.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Recommandation.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Recommandation.cc	2 Jan 2005 14:43:55 -0000	1.2
--- Recommandation.cc	29 Mar 2005 15:20:19 -0000	1.3
***************
*** 7,13 ****
  
  using namespace std;
  
- DECLARE_TYPE(Recommandation)
  
  DECLARE_TYPE(Vector<RECOMMANDATION_PTR>)
  
--- 7,16 ----
  
  using namespace std;
+ using namespace FD;
  
  
+ namespace RobotFlow {
+ 
+ DECLARE_TYPE(Recommandation)
  DECLARE_TYPE(Vector<RECOMMANDATION_PTR>)
  
***************
*** 170,172 ****
--- 173,177 ----
  REGISTER_DOUBLE_VTABLE(addVtable,addRecommandation,Recommandation,Recommandation);
  
+ }//namespace RobotFlow
+ 
  #endif //_RECOMMANDATION_CC_

Index: MoveAndTurn.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/MoveAndTurn.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MoveAndTurn.cc	2 Jan 2005 14:43:54 -0000	1.2
--- MoveAndTurn.cc	29 Mar 2005 15:20:19 -0000	1.3
***************
*** 22,25 ****
--- 22,28 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class MoveAndTurn;
***************
*** 199,201 ****
--- 202,206 ----
    
  };
+ 
+ }//namespace RobotFlow
  #endif

Index: Direct.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Direct.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Direct.cc	2 Jan 2005 14:43:54 -0000	1.3
--- Direct.cc	29 Mar 2005 15:20:19 -0000	1.4
***************
*** 24,27 ****
--- 24,30 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class Direct;
***************
*** 389,392 ****
  
  };
! 
  #endif
--- 392,395 ----
  
  };
! }//namespace RobotFlow
  #endif

Index: DirectTriangle.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/DirectTriangle.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DirectTriangle.cc	2 Jan 2005 14:43:54 -0000	1.2
--- DirectTriangle.cc	29 Mar 2005 15:20:19 -0000	1.3
***************
*** 8,11 ****
--- 8,14 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class DirectTriangle;
***************
*** 77,80 ****
     }  
  };
! 
  #endif
--- 80,83 ----
     }  
  };
! }//namespace RobotFlow
  #endif

Index: Goto.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Goto.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Goto.cc	20 Mar 2005 22:53:48 -0000	1.4
--- Goto.cc	29 Mar 2005 15:20:19 -0000	1.5
***************
*** 22,25 ****
--- 22,28 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class Goto;
***************
*** 311,313 ****
--- 314,318 ----
    
  };
+ 
+ }//namespace RobotFlow
  #endif

Index: MultiSignTracking.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/MultiSignTracking.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MultiSignTracking.cc	2 Jan 2005 14:43:54 -0000	1.4
--- MultiSignTracking.cc	29 Mar 2005 15:20:19 -0000	1.5
***************
*** 24,27 ****
--- 24,30 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class MultiSignTracking;
***************
*** 294,296 ****
--- 297,301 ----
    
  };
+ 
+ }//namespace RobotFlow
  #endif

Index: Inhibition.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Inhibition.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Inhibition.cc	2 Jan 2005 14:43:54 -0000	1.3
--- Inhibition.cc	29 Mar 2005 15:20:19 -0000	1.4
***************
*** 21,24 ****
--- 21,27 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class Inhibition;
***************
*** 84,88 ****
  };
  
! 
  
  #endif
--- 87,91 ----
  };
  
! }//namespace RobotFlow
  
  #endif

Index: Subsumption.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Subsumption.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Subsumption.cc	2 Jan 2005 14:43:55 -0000	1.3
--- Subsumption.cc	29 Mar 2005 15:20:19 -0000	1.4
***************
*** 21,24 ****
--- 21,27 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class Subsumption;
***************
*** 93,96 ****
  };
  
! 
  #endif
--- 96,99 ----
  };
  
! }//namespace RobotFlow
  #endif

Index: SafeVelocity.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/SafeVelocity.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SafeVelocity.cc	2 Jan 2005 14:43:55 -0000	1.3
--- SafeVelocity.cc	29 Mar 2005 15:20:19 -0000	1.4
***************
*** 23,26 ****
--- 23,30 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ 
+ namespace RobotFlow {
  
  class SafeVelocity;
***************
*** 203,205 ****
--- 207,210 ----
  };
  
+ }//namespace RobotFlow
  #endif

Index: Grasp.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Grasp.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Grasp.cc	2 Jan 2005 14:43:54 -0000	1.2
--- Grasp.cc	29 Mar 2005 15:20:19 -0000	1.3
***************
*** 9,12 ****
--- 9,15 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class Grasp;
***************
*** 655,656 ****
--- 658,660 ----
  const unsigned char Grasp::GRIPPER_MOVING		= 128;
  
+ }//namespace RobotFlow

Index: SignTracking.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/SignTracking.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SignTracking.cc	2 Jan 2005 14:43:55 -0000	1.3
--- SignTracking.cc	29 Mar 2005 15:20:19 -0000	1.4
***************
*** 25,28 ****
--- 25,32 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ 
+ namespace RobotFlow {
  
  class SignTracking;
***************
*** 247,249 ****
--- 251,255 ----
    
  };
+ 
+ }//namespace RobotFlow
  #endif

Index: BehaviorSelection.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/BehaviorSelection.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BehaviorSelection.cc	2 Jan 2005 14:43:54 -0000	1.5
--- BehaviorSelection.cc	29 Mar 2005 15:20:19 -0000	1.6
***************
*** 26,29 ****
--- 26,32 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class BehaviorSelection;
***************
*** 115,118 ****
  };
  
! 
  #endif
--- 118,121 ----
  };
  
! }//namespace RobotFlow
  #endif

Index: DirectSquare.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/DirectSquare.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DirectSquare.cc	2 Jan 2005 14:43:54 -0000	1.2
--- DirectSquare.cc	29 Mar 2005 15:20:19 -0000	1.3
***************
*** 8,11 ****
--- 8,14 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class DirectSquare;
***************
*** 78,81 ****
     }  
  };
! 
  #endif
--- 81,84 ----
     }  
  };
! }//namespace RobotFlow
  #endif

Index: NewBehavior.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/NewBehavior.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NewBehavior.cc	2 Jan 2005 14:43:55 -0000	1.5
--- NewBehavior.cc	29 Mar 2005 15:20:19 -0000	1.6
***************
*** 23,26 ****
--- 23,29 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  class NewBehavior;
***************
*** 126,129 ****
  
  
! 
  #endif
--- 129,132 ----
  
  
! }//namespace RobotFlow
  #endif

Index: Behavior.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Behavior.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Behavior.cc	2 Jan 2005 14:43:54 -0000	1.6
--- Behavior.cc	29 Mar 2005 15:20:19 -0000	1.7
***************
*** 19,22 ****
--- 19,25 ----
  
  using namespace std;
+ using namespace FD;
+ 
+ namespace RobotFlow {
  
  Vector<string>& Behavior::get_behaviors() {
***************
*** 212,213 ****
--- 215,217 ----
  }
  
+ }//namespace RobotFlow