Menu
▾
▴
robotflow-cvs — CVS changes are sent to this mailing list.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(59) |
Jun
(40) |
Jul
(59) |
Aug
(81) |
Sep
(14) |
Oct
(9) |
Nov
(22) |
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(25) |
Feb
(3) |
Mar
(27) |
Apr
(14) |
May
(15) |
Jun
(112) |
Jul
(44) |
Aug
(7) |
Sep
(18) |
Oct
(34) |
Nov
(17) |
Dec
(20) |
| 2006 |
Jan
(12) |
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(11) |
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 |
Update of /cvsroot/robotflow/RobotFlow/Probes/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10496/Probes/src Modified Files: CheckBoxPanel.cc ColorTrain.cc ImageProbe.cc ImageProbeSDL.cc LaserProbe.cc PTZControl.cc SymbolKeypad.cc VirtualJoystick.cc Log Message: Now using the RobotFlow namespace and the FD namespace Index: ImageProbeSDL.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/ImageProbeSDL.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ImageProbeSDL.cc 2 Jan 2005 14:44:00 -0000 1.3 --- ImageProbeSDL.cc 29 Mar 2005 15:20:46 -0000 1.4 *************** *** 29,33 **** --- 29,35 ---- using namespace std; + using namespace FD; + namespace RobotFlow { //forward declaration *************** *** 203,207 **** }; ! #endif --- 205,209 ---- }; ! }//namespace RobotFlow #endif Index: VirtualJoystick.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/VirtualJoystick.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** VirtualJoystick.cc 2 Jan 2005 14:44:00 -0000 1.8 --- VirtualJoystick.cc 29 Mar 2005 15:20:46 -0000 1.9 *************** *** 12,15 **** --- 12,18 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_NODE(VirtualJoystick) *************** *** 419,420 **** --- 422,425 ---- return false; } + + }//namespace RobotFlow Index: PTZControl.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/PTZControl.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PTZControl.cc 2 Jan 2005 14:44:00 -0000 1.9 --- PTZControl.cc 29 Mar 2005 15:20:46 -0000 1.10 *************** *** 12,15 **** --- 12,18 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_NODE(PTZControl) *************** *** 482,484 **** } ! --- 485,487 ---- } ! }//namespace RobotFlow Index: LaserProbe.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/LaserProbe.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LaserProbe.cc 2 Jan 2005 14:44:00 -0000 1.4 --- LaserProbe.cc 29 Mar 2005 15:20:46 -0000 1.5 *************** *** 12,16 **** --- 12,18 ---- using namespace std; + using namespace FD; + namespace RobotFlow { DECLARE_NODE(LaserProbe) *************** *** 276,277 **** --- 278,280 ---- } + }//namespace RobotFlow Index: CheckBoxPanel.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/CheckBoxPanel.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CheckBoxPanel.cc 2 Jan 2005 14:43:59 -0000 1.3 --- CheckBoxPanel.cc 29 Mar 2005 15:20:46 -0000 1.4 *************** *** 28,37 **** using namespace std; //forward declaration class CheckBoxPanel; - using namespace std; - DECLARE_NODE(CheckBoxPanel) /*Node --- 28,38 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { //forward declaration class CheckBoxPanel; DECLARE_NODE(CheckBoxPanel) /*Node *************** *** 192,195 **** };//end class CheckBoxPanel ! #endif --- 193,196 ---- };//end class CheckBoxPanel ! }//namespace RobotFlow #endif Index: SymbolKeypad.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/SymbolKeypad.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SymbolKeypad.cc 2 Jan 2005 14:44:00 -0000 1.4 --- SymbolKeypad.cc 29 Mar 2005 15:20:46 -0000 1.5 *************** *** 9,12 **** --- 9,15 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_NODE(SymbolKeypad) *************** *** 1181,1182 **** --- 1184,1187 ---- return TRUE; } + + }//namespace RobotFlow Index: ImageProbe.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/ImageProbe.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ImageProbe.cc 2 Jan 2005 14:44:00 -0000 1.9 --- ImageProbe.cc 29 Mar 2005 15:20:46 -0000 1.10 *************** *** 29,32 **** --- 29,35 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { //forward declaration *************** *** 333,337 **** }; ! #endif --- 336,340 ---- }; ! }//namespace RobotFlow #endif Index: ColorTrain.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/ColorTrain.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ColorTrain.cc 2 Jan 2005 14:44:00 -0000 1.2 --- ColorTrain.cc 29 Mar 2005 15:20:46 -0000 1.3 *************** *** 30,33 **** --- 30,36 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { //forward declaration *************** *** 836,839 **** } ! #endif --- 839,842 ---- } ! }//namespace RobotFlow #endif |
|
From: Dominic L. <ma...@us...> - 2005-03-29 15:21:36
|
Update of /cvsroot/robotflow/RobotFlow/Vision/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10496/Vision/include Modified Files: Bt848.h CPoint.h CRect.h CSymbol.h CTextLine.h Cell.h ColorLookup.h Components.h ComponentsData.h Image.h ImagePool.h lines.h types.h Log Message: Now using the RobotFlow namespace and the FD namespace Index: CTextLine.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/CTextLine.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CTextLine.h 2 Jan 2005 14:44:00 -0000 1.3 --- CTextLine.h 29 Mar 2005 15:20:47 -0000 1.4 *************** *** 23,26 **** --- 23,27 ---- #include "CSymbol.h" + namespace RobotFlow { bool IsBefore(void*, void*); *************** *** 34,38 **** /////////////////////////////////////////////////////////////////////////////// ! class CTextLine : public Object { public: --- 35,39 ---- /////////////////////////////////////////////////////////////////////////////// ! class CTextLine : public FD::Object { public: *************** *** 99,101 **** --- 100,103 ---- }; + }//namespace RobotFlow #endif Index: Image.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/Image.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Image.h 2 Jan 2005 14:44:00 -0000 1.8 --- Image.h 29 Mar 2005 15:20:47 -0000 1.9 *************** *** 20,24 **** #include "Object.h" ! class Image : public Object { friend class ImagePool; --- 20,26 ---- #include "Object.h" ! namespace RobotFlow { ! ! class Image : public FD::Object { friend class ImagePool; *************** *** 85,87 **** --- 87,91 ---- }; + }//namespace RobotFlow + #endif Index: CPoint.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/CPoint.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CPoint.h 2 Jan 2005 14:44:00 -0000 1.4 --- CPoint.h 29 Mar 2005 15:20:47 -0000 1.5 *************** *** 25,28 **** --- 25,29 ---- #include "Object.h" + namespace RobotFlow { /** CPoint. *************** *** 37,41 **** \end{verbatim} */ ! class CPoint : public Object{ public: --- 38,42 ---- \end{verbatim} */ ! class CPoint : public FD::Object{ public: *************** *** 84,88 **** }; ! #endif --- 85,89 ---- }; ! }//namespace RobotFlow #endif Index: CSymbol.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/CSymbol.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CSymbol.h 2 Jan 2005 14:44:00 -0000 1.3 --- CSymbol.h 29 Mar 2005 15:20:47 -0000 1.4 *************** *** 23,26 **** --- 23,27 ---- #include <vector> + namespace RobotFlow { /** CSymbol. *************** *** 31,35 **** @version $Revision$ */ ! class CSymbol : public Object { public: --- 32,36 ---- @version $Revision$ */ ! class CSymbol : public FD::Object { public: *************** *** 70,72 **** --- 71,74 ---- }; + }//namespace RobotFlow #endif Index: Components.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/Components.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Components.h 2 Jan 2005 14:44:00 -0000 1.4 --- Components.h 29 Mar 2005 15:20:47 -0000 1.5 *************** *** 28,31 **** --- 28,32 ---- #include "Image.h" + namespace RobotFlow { #define MAX_COLOR 32 //THIS ALGORITHM CANNOT ALLOW MORE THAN 32 COLORS (CAUSE 32bits for unsigned int) *************** *** 38,43 **** int CRect_compare(const void *a, const void *b); ! ! class Components : public BufferedNode { --- 39,43 ---- int CRect_compare(const void *a, const void *b); ! class Components : public FD::BufferedNode { *************** *** 46,50 **** Components(); ! Components(std::string nodeName, ParameterSet params); ~Components(); --- 46,50 ---- Components(); ! Components(std::string nodeName, FD::ParameterSet params); ~Components(); *************** *** 62,66 **** void draw_rectangles(int color, unsigned short *image_16bits, unsigned short value); ! void calculate(int output_id, int count, Buffer &out); void reset(); --- 62,66 ---- void draw_rectangles(int color, unsigned short *image_16bits, unsigned short value); ! void calculate(int output_id, int count, FD::Buffer &out); void reset(); *************** *** 100,106 **** int m_num_colors; ! ObjectRef m_components_data; }; #endif --- 100,108 ---- int m_num_colors; ! FD::ObjectRef m_components_data; }; + }//namespace RobotFlow + #endif Index: ImagePool.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/ImagePool.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ImagePool.h 2 Jan 2005 14:44:00 -0000 1.4 --- ImagePool.h 29 Mar 2005 15:20:47 -0000 1.5 *************** *** 27,30 **** --- 27,31 ---- #include "Image.h" + namespace RobotFlow { class ImagePool { *************** *** 105,108 **** }; ! #endif --- 106,109 ---- }; ! }//namespace RobotFlow #endif Index: ComponentsData.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/ComponentsData.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ComponentsData.h 2 Jan 2005 14:44:00 -0000 1.5 --- ComponentsData.h 29 Mar 2005 15:20:47 -0000 1.6 *************** *** 22,27 **** #include "Components.h" ! class ComponentsData : public Object { public: --- 22,28 ---- #include "Components.h" + namespace RobotFlow { ! class ComponentsData : public FD::Object { public: *************** *** 67,71 **** }; ! #endif --- 68,72 ---- }; ! }//namespace RobotFlow #endif Index: lines.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/lines.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lines.h 2 Jan 2005 14:44:00 -0000 1.3 --- lines.h 29 Mar 2005 15:20:47 -0000 1.4 *************** *** 21,24 **** --- 21,26 ---- #include <iostream> + namespace RobotFlow { + struct line { *************** *** 36,40 **** }; ! class LineArray : public Object { public: --- 38,42 ---- }; ! class LineArray : public FD::Object { public: *************** *** 61,64 **** --- 63,67 ---- }; + }//namespace RobotFlow #endif Index: ColorLookup.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/ColorLookup.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ColorLookup.h 2 Jan 2005 14:44:00 -0000 1.4 --- ColorLookup.h 29 Mar 2005 15:20:47 -0000 1.5 *************** *** 20,24 **** #include "Object.h" ! class ColorLookup : public Object { public: --- 20,26 ---- #include "Object.h" ! namespace RobotFlow { ! ! class ColorLookup : public FD::Object { public: *************** *** 46,48 **** --- 48,51 ---- }; + }//namespace RobotFlow #endif Index: types.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/types.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** types.h 26 Apr 2002 23:39:37 -0000 1.1 --- types.h 29 Mar 2005 15:20:47 -0000 1.2 *************** *** 24,27 **** --- 24,29 ---- #include <math.h> + namespace RobotFlow { + typedef unsigned short word; typedef unsigned char byte; *************** *** 45,47 **** --- 47,51 ---- #define EDGE 0 + }//namespace RobotFlow + #endif Index: Bt848.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/Bt848.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Bt848.h 2 Jan 2005 14:44:00 -0000 1.4 --- Bt848.h 29 Mar 2005 15:20:47 -0000 1.5 *************** *** 25,30 **** #include <sys/signal.h> ! class Bt848 : public BufferedNode { --- 25,31 ---- #include <sys/signal.h> + namespace RobotFlow { ! class Bt848 : public FD::BufferedNode { *************** *** 35,43 **** void newframe(int sig); ! Bt848(std::string nodeName, ParameterSet params); virtual ~Bt848(); ! virtual void calculate(int output_id, int count, Buffer &out); static const int MODE_16BITS; --- 36,44 ---- void newframe(int sig); ! Bt848(std::string nodeName, FD::ParameterSet params); virtual ~Bt848(); ! virtual void calculate(int output_id, int count, FD::Buffer &out); static const int MODE_16BITS; *************** *** 77,81 **** void *mmbuf; ! ObjectRef m_image; int outputID; --- 78,82 ---- void *mmbuf; ! FD::ObjectRef m_image; int outputID; *************** *** 86,89 **** }; ! #endif --- 87,90 ---- }; ! }//namespace RobotFlow #endif Index: Cell.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/Cell.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Cell.h 2 Jan 2005 14:44:00 -0000 1.4 --- Cell.h 29 Mar 2005 15:20:47 -0000 1.5 *************** *** 26,29 **** --- 26,30 ---- #include "CPoint.h" + namespace RobotFlow { /** ImageCell. *************** *** 38,42 **** \end{verbatim} */ ! class ImageCell : public Object { public: --- 39,43 ---- \end{verbatim} */ ! class ImageCell : public FD::Object { public: *************** *** 135,138 **** }; ! #endif --- 136,139 ---- }; ! }//namespace RobotFlow #endif Index: CRect.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/CRect.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CRect.h 2 Jan 2005 14:44:00 -0000 1.6 --- CRect.h 29 Mar 2005 15:20:47 -0000 1.7 *************** *** 27,30 **** --- 27,31 ---- #include "Cell.h" + namespace RobotFlow { /** CRect. *************** *** 40,44 **** \end{verbatim} */ ! class CRect : public Object { public: --- 41,45 ---- \end{verbatim} */ ! class CRect : public FD::Object { public: *************** *** 278,281 **** }; ! #endif --- 279,282 ---- }; ! }//namespace RobotFlow #endif |
|
From: Dominic L. <ma...@us...> - 2005-03-29 15:21:36
|
Update of /cvsroot/robotflow/RobotFlow/Generic/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10496/Generic/include Modified Files: KDNode.h KDPQueue.h KDPoint.h KDTree.h Timer.h Log Message: Now using the RobotFlow namespace and the FD namespace Index: KDPQueue.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/include/KDPQueue.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** KDPQueue.h 2 Jan 2005 14:43:56 -0000 1.2 --- KDPQueue.h 29 Mar 2005 15:20:40 -0000 1.3 *************** *** 32,36 **** // IMPORTANT: class KDPQKey requires =, > operators template <class KDPQKey, class KDPQElement> ! class KDPQueue : public Object { public: --- 32,36 ---- // IMPORTANT: class KDPQKey requires =, > operators template <class KDPQKey, class KDPQElement> ! class KDPQueue : public FD::Object { public: *************** *** 83,87 **** void printOn(std::ostream &out) const { ! throw new GeneralException ("KDPQueue::printOn : routine not implemented",__FILE__,__LINE__); } --- 83,87 ---- void printOn(std::ostream &out) const { ! throw new FD::GeneralException ("KDPQueue::printOn : routine not implemented",__FILE__,__LINE__); } *************** *** 96,100 **** void readFrom(std::istream &in) { ! throw new GeneralException ("KDPQueue::readFrom : routine not implemented",__FILE__,__LINE__); } --- 96,100 ---- void readFrom(std::istream &in) { ! throw new FD::GeneralException ("KDPQueue::readFrom : routine not implemented",__FILE__,__LINE__); } Index: Timer.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/include/Timer.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Timer.h 2 Jan 2005 14:43:56 -0000 1.2 --- Timer.h 29 Mar 2005 15:20:40 -0000 1.3 *************** *** 10,19 **** #include <pthread.h> ! //(ER) for debugging extern timespec startTime; ! ! class Timer : public Object { friend void* timer_thread (void* timerPtr); --- 10,19 ---- #include <pthread.h> ! namespace RobotFlow { ! //(ER) for debugging extern timespec startTime; ! class Timer : public FD::Object { friend void* timer_thread (void* timerPtr); *************** *** 121,124 **** --- 121,125 ---- void thread_usleep( unsigned long a_ulNbrUs ); + }//namespace RobotFlow #endif Index: KDNode.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/include/KDNode.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** KDNode.h 2 Jan 2005 14:43:56 -0000 1.2 --- KDNode.h 29 Mar 2005 15:20:40 -0000 1.3 *************** *** 27,30 **** --- 27,31 ---- #include "KDPQueue.h" + namespace RobotFlow { #define KDN_LOW 0 *************** *** 35,39 **** // it should usually be either double, float, int, ... template <class KDData> ! class KDNode : public Object { public: --- 36,40 ---- // it should usually be either double, float, int, ... template <class KDData> ! class KDNode : public FD::Object { public: *************** *** 256,260 **** } else if (ch != '<') { ! throw new GeneralException ("KDNode::readFrom : Parse error: '<' expected",__FILE__,__LINE__); } --- 257,261 ---- } else if (ch != '<') { ! throw new FD::GeneralException ("KDNode::readFrom : Parse error: '<' expected",__FILE__,__LINE__); } *************** *** 270,274 **** readFromInternal(in); } ! catch (GeneralException *e) { throw e; } --- 271,275 ---- readFromInternal(in); } ! catch (FD::GeneralException *e) { throw e; } *************** *** 278,300 **** readFromLeaf(in); } ! catch (GeneralException *e) { throw e; } } else { ! throw new GeneralException ("KDNode::readFrom : unknown KDNode type",__FILE__,__LINE__); } } else { ! throw new GeneralException ("KDNode::readFrom : Unknown argument: " + tag,__FILE__,__LINE__); } if (!in) { ! throw new GeneralException ("KDNode::readFrom : Parse error trying to build " + tag,__FILE__,__LINE__); } in >> tag; if (tag != ">") { ! throw new GeneralException ("KDNode::readFrom : Parse error: '>' expected ",__FILE__,__LINE__); } } --- 279,301 ---- readFromLeaf(in); } ! catch (FD::GeneralException *e) { throw e; } } else { ! throw new FD::GeneralException ("KDNode::readFrom : unknown KDNode type",__FILE__,__LINE__); } } else { ! throw new FD::GeneralException ("KDNode::readFrom : Unknown argument: " + tag,__FILE__,__LINE__); } if (!in) { ! throw new FD::GeneralException ("KDNode::readFrom : Parse error trying to build " + tag,__FILE__,__LINE__); } in >> tag; if (tag != ">") { ! throw new FD::GeneralException ("KDNode::readFrom : Parse error: '>' expected ",__FILE__,__LINE__); } } *************** *** 390,394 **** } else if (ch != '<') { ! throw new GeneralException ("KDNode::readFromInternal : Parse error: '<' expected",__FILE__,__LINE__); } --- 391,395 ---- } else if (ch != '<') { ! throw new FD::GeneralException ("KDNode::readFromInternal : Parse error: '<' expected",__FILE__,__LINE__); } *************** *** 411,415 **** m_children[KDN_LOW]->readFrom(in); } ! catch (GeneralException *e) { throw e; } --- 412,416 ---- m_children[KDN_LOW]->readFrom(in); } ! catch (FD::GeneralException *e) { throw e; } *************** *** 421,439 **** m_children[KDN_HIGH]->readFrom(in); } ! catch (GeneralException *e) { throw e; } } else { ! throw new GeneralException ("KDNode::readFromInternal : Unknown argument: " + tag,__FILE__,__LINE__); } if (!in) { ! throw new GeneralException ("KDNode::readFromInternal : Parse error trying to build " + tag,__FILE__,__LINE__); } in >> tag; if (tag != ">") { ! throw new GeneralException ("KDNode::readFromInternal : Parse error: '>' expected ",__FILE__,__LINE__); } } --- 422,440 ---- m_children[KDN_HIGH]->readFrom(in); } ! catch (FD::GeneralException *e) { throw e; } } else { ! throw new FD::GeneralException ("KDNode::readFromInternal : Unknown argument: " + tag,__FILE__,__LINE__); } if (!in) { ! throw new FD::GeneralException ("KDNode::readFromInternal : Parse error trying to build " + tag,__FILE__,__LINE__); } in >> tag; if (tag != ">") { ! throw new FD::GeneralException ("KDNode::readFromInternal : Parse error: '>' expected ",__FILE__,__LINE__); } } *************** *** 460,464 **** } else if (ch != '<') { ! throw new GeneralException ("KDNode::readFromLeaf : Parse error: '<' expected",__FILE__,__LINE__); } --- 461,465 ---- } else if (ch != '<') { ! throw new FD::GeneralException ("KDNode::readFromLeaf : Parse error: '<' expected",__FILE__,__LINE__); } *************** *** 488,506 **** } } ! catch (GeneralException *e) { ! throw e->add(new GeneralException("In KDNode::readFromLeaf : ",__FILE__,__LINE__)); } } else { ! throw new GeneralException ("KDNode::readFromLeaf : Unknown argument: " + tag,__FILE__,__LINE__); } if (!in) { ! throw new GeneralException ("KDNode::readFromLeaf : Parse error trying to build " + tag,__FILE__,__LINE__); } in >> tag; if (tag != ">") { ! throw new GeneralException ("KDNode::readFromLeaf : Parse error: '>' expected ",__FILE__,__LINE__); } } --- 489,507 ---- } } ! catch (FD::GeneralException *e) { ! throw e->add(new FD::GeneralException("In KDNode::readFromLeaf : ",__FILE__,__LINE__)); } } else { ! throw new FD::GeneralException ("KDNode::readFromLeaf : Unknown argument: " + tag,__FILE__,__LINE__); } if (!in) { ! throw new FD::GeneralException ("KDNode::readFromLeaf : Parse error trying to build " + tag,__FILE__,__LINE__); } in >> tag; if (tag != ">") { ! throw new FD::GeneralException ("KDNode::readFromLeaf : Parse error: '>' expected ",__FILE__,__LINE__); } } *************** *** 789,791 **** --- 790,794 ---- }; + }//namespace RobotFlow + #endif Index: KDPoint.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/include/KDPoint.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** KDPoint.h 2 Jan 2005 14:43:56 -0000 1.2 --- KDPoint.h 29 Mar 2005 15:20:40 -0000 1.3 *************** *** 30,34 **** // it should usually be either double, float, int, ... template <class KDData> ! class KDPoint : public Object { public: --- 30,34 ---- // it should usually be either double, float, int, ... template <class KDData> ! class KDPoint : public FD::Object { public: *************** *** 198,202 **** } else if (ch != '<') { ! throw new GeneralException ("KDPoint::readFrom : Parse error: '<' expected",__FILE__,__LINE__); } --- 198,202 ---- } else if (ch != '<') { ! throw new FD::GeneralException ("KDPoint::readFrom : Parse error: '<' expected",__FILE__,__LINE__); } *************** *** 218,231 **** } else { ! throw new GeneralException ("KDPoint::readFrom : Unknown argument: " + tag,__FILE__,__LINE__); } if (!in) { ! throw new GeneralException ("KDPoint::readFrom : Parse error trying to build " + tag,__FILE__,__LINE__); } in >> tag; if (tag != ">") { ! throw new GeneralException ("KDPoint::readFrom : Parse error: '>' expected ",__FILE__,__LINE__); } } --- 218,231 ---- } else { ! throw new FD::GeneralException ("KDPoint::readFrom : Unknown argument: " + tag,__FILE__,__LINE__); } if (!in) { ! throw new FD::GeneralException ("KDPoint::readFrom : Parse error trying to build " + tag,__FILE__,__LINE__); } in >> tag; if (tag != ">") { ! throw new FD::GeneralException ("KDPoint::readFrom : Parse error: '>' expected ",__FILE__,__LINE__); } } Index: KDTree.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/include/KDTree.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** KDTree.h 2 Jan 2005 14:43:56 -0000 1.2 --- KDTree.h 29 Mar 2005 15:20:40 -0000 1.3 *************** *** 27,36 **** #include "KDPQueue.h" ! // Template class for node values // IMPORTANT: class requires =, -, >, < operators // it should usually be either double, float, int, ... template <class KDData> ! class KDTree : public Object { public: --- 27,36 ---- #include "KDPQueue.h" ! namespace RobotFlow { // Template class for node values // IMPORTANT: class requires =, -, >, < operators // it should usually be either double, float, int, ... template <class KDData> ! class KDTree : public FD::Object { public: *************** *** 145,149 **** } else if (ch != '<') { ! throw new GeneralException ("KDTree::readFrom : Parse error: '<' expected",__FILE__,__LINE__); } --- 145,149 ---- } else if (ch != '<') { ! throw new FD::GeneralException ("KDTree::readFrom : Parse error: '<' expected",__FILE__,__LINE__); } *************** *** 166,171 **** m_bboxLow.readFrom(in); } ! catch (GeneralException *e) { ! throw e->add(new GeneralException("In KDTree::readFrom : ",__FILE__,__LINE__)); } } --- 166,171 ---- m_bboxLow.readFrom(in); } ! catch (FD::GeneralException *e) { ! throw e->add(new FD::GeneralException("In KDTree::readFrom : ",__FILE__,__LINE__)); } } *************** *** 174,179 **** m_bboxHigh.readFrom(in); } ! catch (GeneralException *e) { ! throw e->add(new GeneralException("In KDTree::readFrom : ",__FILE__,__LINE__)); } } --- 174,179 ---- m_bboxHigh.readFrom(in); } ! catch (FD::GeneralException *e) { ! throw e->add(new FD::GeneralException("In KDTree::readFrom : ",__FILE__,__LINE__)); } } *************** *** 184,202 **** m_root->readFrom(in); } ! catch (GeneralException *e) { ! throw e->add(new GeneralException("In KDTree::readFrom : ",__FILE__,__LINE__)); } } else { ! throw new GeneralException ("KDTree::readFrom : Unknown argument: " + tag,__FILE__,__LINE__); } if (!in) { ! throw new GeneralException ("KDTree::readFrom : Parse error trying to build " + tag,__FILE__,__LINE__); } in >> tag; if (tag != ">") { ! throw new GeneralException ("KDTree::readFrom : Parse error: '>' expected ",__FILE__,__LINE__); } } --- 184,202 ---- m_root->readFrom(in); } ! catch (FD::GeneralException *e) { ! throw e->add(new FD::GeneralException("In KDTree::readFrom : ",__FILE__,__LINE__)); } } else { ! throw new FD::GeneralException ("KDTree::readFrom : Unknown argument: " + tag,__FILE__,__LINE__); } if (!in) { ! throw new FD::GeneralException ("KDTree::readFrom : Parse error trying to build " + tag,__FILE__,__LINE__); } in >> tag; if (tag != ">") { ! throw new FD::GeneralException ("KDTree::readFrom : Parse error: '>' expected ",__FILE__,__LINE__); } } *************** *** 236,256 **** // Sanity check if (m_root == NULL) { ! throw new GeneralException ("KDTree::NNSearch : nearest neighbor search requires the KDTree to contain reference points. ",__FILE__,__LINE__); } if (i_qp == NULL) { ! throw new GeneralException ("KDTree::NNSearch : NULL query point. ",__FILE__,__LINE__); } if (o_nnDist == NULL) { ! throw new GeneralException ("KDTree::NNSearch : NULL nearest neighbor distances array. ",__FILE__,__LINE__); } if (o_nn == NULL) { ! throw new GeneralException ("KDTree::NNSearch : NULL nearest neighbor points array. ",__FILE__,__LINE__); } if (i_qp->GetDimSize() != m_dimSize) { ! throw new GeneralException ("KDTree::NNSearch : query point dimension size differs from KDTree reference points. ",__FILE__,__LINE__); } --- 236,256 ---- // Sanity check if (m_root == NULL) { ! throw new FD::GeneralException ("KDTree::NNSearch : nearest neighbor search requires the KDTree to contain reference points. ",__FILE__,__LINE__); } if (i_qp == NULL) { ! throw new FD::GeneralException ("KDTree::NNSearch : NULL query point. ",__FILE__,__LINE__); } if (o_nnDist == NULL) { ! throw new FD::GeneralException ("KDTree::NNSearch : NULL nearest neighbor distances array. ",__FILE__,__LINE__); } if (o_nn == NULL) { ! throw new FD::GeneralException ("KDTree::NNSearch : NULL nearest neighbor points array. ",__FILE__,__LINE__); } if (i_qp->GetDimSize() != m_dimSize) { ! throw new FD::GeneralException ("KDTree::NNSearch : query point dimension size differs from KDTree reference points. ",__FILE__,__LINE__); } *************** *** 260,264 **** if (i_numNN > m_numPts) { ! throw new GeneralException ("KDTree::NNSearch : cannot search for more nearest neighbors than the number of reference points in KDTree. ",__FILE__,__LINE__); } --- 260,264 ---- if (i_numNN > m_numPts) { ! throw new FD::GeneralException ("KDTree::NNSearch : cannot search for more nearest neighbors than the number of reference points in KDTree. ",__FILE__,__LINE__); } *************** *** 315,335 **** // Sanity check if (m_root == NULL) { ! throw new GeneralException ("KDTree::NNSearch : nearest neighbor search requires the KDTree to contain reference points. ",__FILE__,__LINE__); } if (i_qp == NULL) { ! throw new GeneralException ("KDTree::NNSearch : NULL query point. ",__FILE__,__LINE__); } if (o_nnDist == NULL) { ! throw new GeneralException ("KDTree::NNSearch : NULL nearest neighbor distances array. ",__FILE__,__LINE__); } if (o_nnIdx == NULL) { ! throw new GeneralException ("KDTree::NNSearch : NULL nearest neighbor indexes array. ",__FILE__,__LINE__); } if (i_qp->GetDimSize() != m_dimSize) { ! throw new GeneralException ("KDTree::NNSearch : query point dimension size differs from KDTree reference points. ",__FILE__,__LINE__); } --- 315,336 ---- // Sanity check if (m_root == NULL) { ! throw new FD::GeneralException ("KDTree::NNSearch : nearest neighbor search requires the KDTree to contain reference points. ",__FILE__,__LINE__); } if (i_qp == NULL) { ! throw new FD::GeneralException ("KDTree::NNSearch : NULL query point. ",__FILE__,__LINE__); } if (o_nnDist == NULL) { ! throw new FD::GeneralException ("KDTree::NNSearch : NULL nearest neighbor distances array. ",__FILE__,__LINE__); ! } if (o_nnIdx == NULL) { ! throw new FD::GeneralException ("KDTree::NNSearch : NULL nearest neighbor indexes array. ",__FILE__,__LINE__); } if (i_qp->GetDimSize() != m_dimSize) { ! throw new FD::GeneralException ("KDTree::NNSearch : query point dimension size differs from KDTree reference points. ",__FILE__,__LINE__); } *************** *** 339,343 **** if (i_numNN > m_numPts) { ! throw new GeneralException ("KDTree::NNSearch : cannot search for more nearest neighbors than the number of reference points in KDTree. ",__FILE__,__LINE__); } --- 340,344 ---- if (i_numNN > m_numPts) { ! throw new FD::GeneralException ("KDTree::NNSearch : cannot search for more nearest neighbors than the number of reference points in KDTree. ",__FILE__,__LINE__); } *************** *** 717,719 **** --- 718,722 ---- }; + }//namespace RobotFlow + #endif |
|
From: Dominic L. <ma...@us...> - 2005-03-29 15:21:35
|
Update of /cvsroot/robotflow/RobotFlow/Devices/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10496/Devices/src Modified Files: CANON_VCC4.cc EVID30.cc LaserDevice.cc SICKLMS200.cc SNCRZ30.cc SerialDriver.cc V4L2Capture.cc Log Message: Now using the RobotFlow namespace and the FD namespace Index: V4L2Capture.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/V4L2Capture.cc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** V4L2Capture.cc 2 Jan 2005 14:43:55 -0000 1.14 --- V4L2Capture.cc 29 Mar 2005 15:20:39 -0000 1.15 *************** *** 22,25 **** --- 22,28 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class V4L2Capture; *************** *** 235,238 **** --- 238,244 ---- }; + + }//namespace RobotFlow + /*========================================================================= capture.cc *************** *** 731,732 **** --- 737,739 ---- return true; } + Index: SerialDriver.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/SerialDriver.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SerialDriver.cc 2 Jan 2005 14:43:55 -0000 1.2 --- SerialDriver.cc 29 Mar 2005 15:20:39 -0000 1.3 *************** *** 28,31 **** --- 28,34 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { /*********************************************/ *************** *** 120,121 **** --- 123,126 ---- close(fd); } + + }//namespace RobotFlow Index: EVID30.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/EVID30.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** EVID30.cc 2 Jan 2005 14:43:55 -0000 1.8 --- EVID30.cc 29 Mar 2005 15:20:38 -0000 1.9 *************** *** 38,41 **** --- 38,44 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class EVID30; *************** *** 866,868 **** --- 869,873 ---- + }//namespace RobotFlow + #endif Index: SICKLMS200.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/SICKLMS200.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SICKLMS200.cc 2 Jan 2005 14:43:55 -0000 1.3 --- SICKLMS200.cc 29 Mar 2005 15:20:39 -0000 1.4 *************** *** 22,26 **** --- 22,28 ---- using namespace std; + using namespace FD; + namespace RobotFlow { DECLARE_NODE(SICKLMS200) *************** *** 145,147 **** ! --- 147,149 ---- ! }//namespace RobotFlow Index: SNCRZ30.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/SNCRZ30.cc,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** SNCRZ30.cc 2 Jan 2005 14:43:55 -0000 1.21 --- SNCRZ30.cc 29 Mar 2005 15:20:39 -0000 1.22 *************** *** 26,29 **** --- 26,32 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_NODE(SNCRZ30); *************** *** 911,912 **** --- 914,917 ---- } } + + }//namespace RobotFlow Index: CANON_VCC4.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/CANON_VCC4.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CANON_VCC4.cc 2 Jan 2005 14:43:55 -0000 1.6 --- CANON_VCC4.cc 29 Mar 2005 15:20:38 -0000 1.7 *************** *** 37,40 **** --- 37,43 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class CANON_VCC4; *************** *** 821,824 **** } ! #endif --- 824,827 ---- } ! }//namespace RobotFlow #endif Index: LaserDevice.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/LaserDevice.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LaserDevice.cc 2 Jan 2005 14:43:55 -0000 1.3 --- LaserDevice.cc 29 Mar 2005 15:20:39 -0000 1.4 *************** *** 22,26 **** --- 22,28 ---- ///////////////////// using namespace std; + using namespace FD; + namespace RobotFlow { // Maths stuff *************** *** 1246,1247 **** --- 1248,1251 ---- return nBytes; } + + }//namespace RobotFlow |
|
From: Dominic L. <ma...@us...> - 2005-03-29 15:21:35
|
Update of /cvsroot/robotflow/RobotFlow/Control/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10496/Control/src Modified Files: EVID30_PID.cc GenericPID.cc JoystickControl.cc Saturation.cc Log Message: Now using the RobotFlow namespace and the FD namespace Index: GenericPID.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Control/src/GenericPID.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GenericPID.cc 2 Jan 2005 14:43:55 -0000 1.7 --- GenericPID.cc 29 Mar 2005 15:20:37 -0000 1.8 *************** *** 27,30 **** --- 27,33 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class GenericPID; *************** *** 181,185 **** }; ! #endif --- 184,188 ---- }; ! }//namespace RobotFlow #endif Index: Saturation.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Control/src/Saturation.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Saturation.cc 2 Jan 2005 14:43:55 -0000 1.4 --- Saturation.cc 29 Mar 2005 15:20:37 -0000 1.5 *************** *** 25,28 **** --- 25,31 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Saturation; *************** *** 115,118 **** ! #endif --- 118,121 ---- ! }//namespace RobotFlow #endif Index: EVID30_PID.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Control/src/EVID30_PID.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EVID30_PID.cc 2 Jan 2005 14:43:55 -0000 1.2 --- EVID30_PID.cc 29 Mar 2005 15:20:20 -0000 1.3 *************** *** 7,10 **** --- 7,13 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class EVID30_PID; *************** *** 213,217 **** }; ! #endif --- 216,220 ---- }; ! }//namespace RobotFlow #endif Index: JoystickControl.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Control/src/JoystickControl.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JoystickControl.cc 2 Jan 2005 14:43:55 -0000 1.2 --- JoystickControl.cc 29 Mar 2005 15:20:37 -0000 1.3 *************** *** 25,28 **** --- 25,31 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class JoystickControl; *************** *** 169,173 **** }; ! #endif --- 172,176 ---- }; ! }//namespace RobotFlow #endif |
|
From: Dominic L. <ma...@us...> - 2005-03-29 15:21:05
|
Update of /cvsroot/robotflow/RobotFlow/Behaviors/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10496/Behaviors/include Modified Files: Behavior.h DirectList.h Exploitation.h ExploitationEntry.h Recommandation.h Log Message: Now using the RobotFlow namespace and the FD namespace Index: Exploitation.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/include/Exploitation.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Exploitation.h 2 Jan 2005 14:43:54 -0000 1.5 --- Exploitation.h 29 Mar 2005 15:20:19 -0000 1.6 *************** *** 23,26 **** --- 23,28 ---- + namespace RobotFlow { + /** * *************** *** 40,44 **** * </ul> */ ! class Exploitation : public Object { public: --- 42,46 ---- * </ul> */ ! class Exploitation : public FD::Object { public: *************** *** 86,90 **** * \param output_id The output_id from the exploited node (behavior) */ ! void add_entry(int count, Node *node, int output_id); /** --- 88,92 ---- * \param output_id The output_id from the exploited node (behavior) */ ! void add_entry(int count, FD::Node *node, int output_id); /** *************** *** 138,140 **** --- 140,144 ---- }; + }//namespace RobotFlow + #endif Index: ExploitationEntry.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/include/ExploitationEntry.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExploitationEntry.h 2 Jan 2005 14:43:54 -0000 1.2 --- ExploitationEntry.h 29 Mar 2005 15:20:19 -0000 1.3 *************** *** 24,27 **** --- 24,29 ---- + namespace RobotFlow { + /** * *************** *** 52,56 **** * \param output_id The output_id from the exploited node (behavior) */ ! ExploitationEntry(int count, Node *node, int output_id) : m_node(node), m_count(count), m_output_id(output_id) { --- 54,58 ---- * \param output_id The output_id from the exploited node (behavior) */ ! ExploitationEntry(int count, FD::Node *node, int output_id) : m_node(node), m_count(count), m_output_id(output_id) { *************** *** 88,92 **** * \retval Node* The node pointer corresponding to the entry */ ! Node* getNode() {return m_node;} --- 90,94 ---- * \retval Node* The node pointer corresponding to the entry */ ! FD::Node* getNode() {return m_node;} *************** *** 123,127 **** ///The node pointer where the exploitation entry is related ! Node *m_node; ///The iteration counter where the exploitation occured --- 125,129 ---- ///The node pointer where the exploitation entry is related ! FD::Node *m_node; ///The iteration counter where the exploitation occured *************** *** 133,135 **** --- 135,139 ---- }; + }//namespace RobotFlow + #endif Index: Recommandation.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/include/Recommandation.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Recommandation.h 2 Jan 2005 14:43:54 -0000 1.2 --- Recommandation.h 29 Mar 2005 15:20:19 -0000 1.3 *************** *** 5,14 **** #include "Vector.h" class Recommandation; ! typedef RCPtr<Recommandation> RECOMMANDATION_PTR; ! typedef RCPtr< Vector<RECOMMANDATION_PTR> > RECOMMANDATION_VECTOR_PTR; ! class Recommandation: public Object { protected: --- 5,16 ---- #include "Vector.h" + namespace RobotFlow { + class Recommandation; ! typedef FD::RCPtr<Recommandation> RECOMMANDATION_PTR; ! typedef FD::RCPtr< FD::Vector<RECOMMANDATION_PTR> > RECOMMANDATION_VECTOR_PTR; ! class Recommandation: public FD::Object { protected: *************** *** 48,51 **** --- 50,55 ---- }; + }//namespace RobotFlow + #endif //_RECOMMANDATION_H_ Index: DirectList.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/include/DirectList.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DirectList.h 2 Jan 2005 14:43:54 -0000 1.4 --- DirectList.h 29 Mar 2005 15:20:19 -0000 1.5 *************** *** 23,26 **** --- 23,28 ---- + namespace RobotFlow { + #define NONE 0 #define XYH 1 *************** *** 28,32 **** #define ROT 3 ! class DirectCommand : public Object { public: --- 30,34 ---- #define ROT 3 ! class DirectCommand : public FD::Object { public: *************** *** 57,61 **** ! class DirectList : public Object { public: --- 59,63 ---- ! class DirectList : public FD::Object { public: *************** *** 89,91 **** --- 91,95 ---- }; + }//namespace RobotFlow + #endif Index: Behavior.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/include/Behavior.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Behavior.h 2 Jan 2005 14:43:54 -0000 1.6 --- Behavior.h 29 Mar 2005 15:20:18 -0000 1.7 *************** *** 24,27 **** --- 24,30 ---- #include <string> + + namespace RobotFlow { + //The Sub classes must always contain in the input/output overflow toolbox definitions : *************** *** 57,61 **** * </ul> */ ! class Behavior : public BufferedNode { public: --- 60,64 ---- * </ul> */ ! class Behavior : public FD::BufferedNode { public: *************** *** 69,73 **** * Every behavior should have a different name. */ ! Behavior(std::string nodeName, ParameterSet params, std::string BehaviorName); /** --- 72,76 ---- * Every behavior should have a different name. */ ! Behavior(std::string nodeName, FD::ParameterSet params, std::string BehaviorName); /** *************** *** 81,85 **** * \param out The output buffer where th put the result. */ ! virtual void calculate(int output_id, int count, Buffer &out); /** --- 84,88 ---- * \param out The output buffer where th put the result. */ ! virtual void calculate(int output_id, int count, FD::Buffer &out); /** *************** *** 91,95 **** * \param out The output buffer where th put the result. */ ! virtual void calculate_behavior(int output_id, int count, Buffer &out) = 0; /** --- 94,98 ---- * \param out The output buffer where th put the result. */ ! virtual void calculate_behavior(int output_id, int count, FD::Buffer &out) = 0; /** *************** *** 131,135 **** * \retval std::vector<std::string>& The data structure containing the registered behavior names. */ ! static Vector<std::string>& get_behaviors(); /** --- 134,138 ---- * \retval std::vector<std::string>& The data structure containing the registered behavior names. */ ! static FD::Vector<std::string>& get_behaviors(); /** *************** *** 162,166 **** /** last exploitation value */ ! ObjectRef m_exploitationValue; }; --- 165,169 ---- /** last exploitation value */ ! FD::ObjectRef m_exploitationValue; }; *************** *** 174,176 **** --- 177,183 ---- Behavior::register_behavior (# NodeTypeName); + + + }//namespace RobotFlow + #endif |
|
From: Carle C. <car...@us...> - 2005-03-20 22:53:57
|
Update of /cvsroot/robotflow/RobotFlow/Behaviors/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28227/Behaviors/src Modified Files: Goto.cc Log Message: calculate diff angle correctly Index: Goto.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Goto.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Goto.cc 11 Mar 2005 18:55:12 -0000 1.3 --- Goto.cc 20 Mar 2005 22:53:48 -0000 1.4 *************** *** 98,102 **** * @parameter_type int * @parameter_value 15 ! END*/ --- 98,107 ---- * @parameter_type int * @parameter_value 15 ! * ! * @parameter_name VELOCITY_ANGLE_RATIO ! * @parameter_description Max Velocity ratio to apply when velocity angle is activated (float) ! * @parameter_type float ! * @parameter_value 0.4 ! * END*/ *************** *** 124,127 **** --- 129,133 ---- int m_heading_tol; int m_activate_velocity_angle; + float m_activate_velocity_ratio; public: *************** *** 148,151 **** --- 154,158 ---- m_heading_tol = dereference_cast<int> (parameters.get("HEADING_TOLERANCE")); m_activate_velocity_angle = dereference_cast<int> (parameters.get("ACTIVATE_VELOCITY_ANGLE")); + m_activate_velocity_ratio = dereference_cast<float> (parameters.get("VELOCITY_ANGLE_RATIO")); } *************** *** 215,225 **** newHeading = ((180.0 * newHeading) / M_PI) + (double)(m_heading_offset); if(newHeading < 0) newHeading = 360.0 + newHeading; ! double diffHeading = heading - newHeading; ! std::cout << "newHeading: " << newHeading << std::endl; std::cout << "diffHeading: " << diffHeading << std::endl; --- 222,253 ---- newHeading = ((180.0 * newHeading) / M_PI) + (double)(m_heading_offset); + + std::cout << "newHeading: " << newHeading << std::endl; if(newHeading < 0) newHeading = 360.0 + newHeading; ! if(heading > 270 && newHeading < 90) ! { ! heading -= 90; ! newHeading = 270 + newHeading; ! } ! else if(heading < 90 && newHeading > 270) ! { ! heading = 270 + heading; ! newHeading -= 90; ! } ! double diffHeading = heading - newHeading; ! ! if(diffHeading > 180) ! { ! diffHeading = 360 - diffHeading; ! } ! else if(diffHeading < -180) ! { ! diffHeading = -360 -diffHeading; ! } ! std::cout << "diffHeading: " << diffHeading << std::endl; *************** *** 231,246 **** else { ! if((diffHeading > 0 && diffHeading < 180) || diffHeading < -180) { (*outputs[rotationID].buffer)[count] = ObjectRef(Int::alloc(-m_max_rotation)); } ! else { (*outputs[rotationID].buffer)[count] = ObjectRef(Int::alloc(m_max_rotation)); } if(abs(diffHeading) < m_activate_velocity_angle) { ! (*outputs[velocityID].buffer)[count] = ObjectRef(Int::alloc(m_max_velocity/5)); } else --- 259,278 ---- else { ! if(diffHeading > 0 && diffHeading < 180) { (*outputs[rotationID].buffer)[count] = ObjectRef(Int::alloc(-m_max_rotation)); } ! else if(diffHeading < 0 && diffHeading > -180) { (*outputs[rotationID].buffer)[count] = ObjectRef(Int::alloc(m_max_rotation)); } + else + { + (*outputs[rotationID].buffer)[count] = ObjectRef(Int::alloc(0)); + } if(abs(diffHeading) < m_activate_velocity_angle) { ! (*outputs[velocityID].buffer)[count] = ObjectRef(Int::alloc(int(m_max_velocity * m_activate_velocity_ratio))); } else |
|
From: Carle C. <car...@us...> - 2005-03-11 18:55:26
|
Update of /cvsroot/robotflow/RobotFlow/Behaviors/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12389/Behaviors/src Modified Files: Goto.cc Log Message: add completed result output Index: Goto.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Goto.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Goto.cc 6 Feb 2005 14:52:26 -0000 1.2 --- Goto.cc 11 Mar 2005 18:55:12 -0000 1.3 *************** *** 62,65 **** --- 62,69 ---- * @output_description Robot Rotation value (degrees/s) * + * @output_name COMPLETED + * @output_type bool + * @output_description Goto completion state + * * @output_name EXPLOITATION * @output_description Behavior exploitation *************** *** 110,113 **** --- 114,118 ---- int rotationID; int velocityID; + int completedID; *************** *** 135,139 **** rotationID = addOutput("ROTATION"); velocityID = addOutput("VELOCITY"); ! m_max_velocity = dereference_cast<int> (parameters.get("MAX_VELOCITY")); --- 140,144 ---- rotationID = addOutput("ROTATION"); velocityID = addOutput("VELOCITY"); ! completedID = addOutput("COMPLETED"); m_max_velocity = dereference_cast<int> (parameters.get("MAX_VELOCITY")); *************** *** 248,251 **** --- 253,257 ---- std::cout << "velocity: " << (*outputs[velocityID].buffer)[count] << std::endl; std::cout << std::endl; + (*outputs[completedID].buffer)[count] = ObjectRef(Bool::alloc(false)); } else *************** *** 257,260 **** --- 263,267 ---- std::cout << "velocity: " << (*outputs[velocityID].buffer)[count] << std::endl; std::cout << std::endl; + (*outputs[completedID].buffer)[count] = ObjectRef(Bool::alloc(true)); } *************** *** 265,268 **** --- 272,277 ---- (*outputs[rotationID].buffer)[count] = nilObject; (*outputs[velocityID].buffer)[count] = nilObject; + std::cout << "COMPLETED = NILOBJECT" << std::endl; + (*outputs[completedID].buffer)[count] = nilObject; } |
|
From: Carle C. <car...@us...> - 2005-03-11 18:54:58
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12254/MARIE/src Modified Files: newMarieCommandBehavior.cpp Log Message: changed to receive a vector of ObjectRef which needs to be CompositeType for behavior parameters Index: newMarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandBehavior.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** newMarieCommandBehavior.cpp 10 Mar 2005 20:59:35 -0000 1.4 --- newMarieCommandBehavior.cpp 11 Mar 2005 18:54:49 -0000 1.5 *************** *** 27,30 **** --- 27,31 ---- #include "Vector.h" #include "MarieDataNull.h" + #include "CompositeType.h" using namespace std; *************** *** 42,60 **** * @description Create an object of type MarieCommandBehavior * ! * @input_name BEHAVIOR_NAME ! * @input_type string ! * @input_description The behavior name that will be activated/deactivated ! * ! * @input_name BEHAVIOR_ACTIVATION ! * @input_type bool ! * @input_description true if the specified behavior is activated ! * ! * @input_name BEHAVIOR_PARAMETERS ! * @input_type String ! * @input_description Behavior's parameters in String form (seperated by space) ! * ! * @input_name BEHAVIOR_RESULTS ! * @input_type String ! * @input_description Behavior's results in String form (seperated by space) * * @output_name COMMAND_BEHAVIOR --- 43,49 ---- * @description Create an object of type MarieCommandBehavior * ! * @input_name BEHAVIOR_COMPOSITE_ACC ! * @input_type Vector<ObjectRef> ! * @input_description Accumulator of composite <BEHAVIOR_NAME <String>, BEHAVIOR_ACTIVATION<Bool>, BEHAVIOR_PARAMETERS<String>, BEHAVIOR_RESULTS<String>> -> behavior name, activation, parameters (separated by space), results (separated by space) * * @output_name COMMAND_BEHAVIOR *************** *** 69,79 **** class newMarieCommandBehavior : public BufferedNode { private: //intputs ! int m_behaviorNameID; ! int m_behaviorActivationID; ! int m_behaviorParametersID; ! int m_behaviorResultsID; //outputs --- 58,67 ---- class newMarieCommandBehavior : public BufferedNode { + typedef RCPtr< Vector<ObjectRef> > VECTOR_OBJECTREF_PTR; + typedef RCPtr<CompositeType> COMPOSITE_TYPE_PTR; private: //intputs ! int m_behaviorCompositeAccID; //outputs *************** *** 87,95 **** //inputs ! m_behaviorNameID = addInput("BEHAVIOR_NAME"); ! m_behaviorActivationID = addInput("BEHAVIOR_ACTIVATION"); ! m_behaviorParametersID = addInput("BEHAVIOR_PARAMETERS"); ! m_behaviorResultsID = addInput("BEHAVIOR_RESULTS"); ! //outputs m_behaviorCommandID = addOutput("COMMAND_BEHAVIOR"); --- 75,80 ---- //inputs ! m_behaviorCompositeAccID = addInput("BEHAVIOR_COMPOSITE_ACC"); ! //outputs m_behaviorCommandID = addOutput("COMMAND_BEHAVIOR"); *************** *** 98,135 **** void calculate(int output_id, int count, Buffer &out) { ! ObjectRef BehaviorNameValue = getInput(m_behaviorNameID,count); ! ObjectRef BehaviorActivationValue = getInput(m_behaviorActivationID,count); ! ObjectRef BehaviorParametersValue = getInput(m_behaviorParametersID,count); ! ObjectRef BehaviorResultsValue = getInput(m_behaviorResultsID,count); ! ! if (!BehaviorNameValue->isNil() && !BehaviorActivationValue->isNil()) { ! ! RCPtr<String> name = BehaviorNameValue; ! RCPtr<Bool> activation = BehaviorActivationValue; ! ! MarieCommandBehavior *cb = new MarieCommandBehavior(); ! ! cb->setActivation(name->val(), activation->val()); ! ! if(!BehaviorParametersValue->isNil()) ! { ! RCPtr<String> parameters = BehaviorParametersValue; ! cb->setParameters(name->val(), parameters->val()); ! } ! ! if(!BehaviorResultsValue->isNil()) ! { ! RCPtr<String> results = BehaviorResultsValue; ! cb->setResults(name->val(), results->val()); ! } ! ! out[count] = ObjectRef(cb); } ! else { ! out[count] = ObjectRef(new MarieDataNull()); } - } };//class newMarieCommandBehavior --- 83,139 ---- void calculate(int output_id, int count, Buffer &out) { + ObjectRef vectorPtr = getInput(m_behaviorCompositeAccID,count); ! if (!vectorPtr->isNil()) ! { ! VECTOR_OBJECTREF_PTR vector = vectorPtr; ! MarieCommandBehavior *cb = new MarieCommandBehavior(); ! ! for(int i = 0; i < (*vector).size(); i++) ! { ! ObjectRef elementPtr = (*vector)[i]; ! ! if(!elementPtr->isNil()) ! { ! COMPOSITE_TYPE_PTR element = elementPtr; ! ! ObjectRef namePtr = element->get("BEHAVIOR_NAME"); ! ObjectRef activationPtr = element->get("BEHAVIOR_ACTIVATION"); ! ObjectRef parametersPtr = element->get("BEHAVIOR_PARAMETERS"); ! ObjectRef resultsPtr = element->get("BEHAVIOR_RESULTS"); ! ! ! if(!namePtr->isNil()) ! { ! RCPtr<String> name = namePtr; ! ! if(!activationPtr->isNil()) ! { ! RCPtr<Bool> activation = activationPtr; ! cb->setActivation(*name, *activation); ! } ! ! if(!parametersPtr->isNil()) ! { ! RCPtr<String> parameters = parametersPtr; ! cb->setParameters(*name, *parameters); ! } ! ! if(!resultsPtr->isNil()) ! { ! RCPtr<String> results = resultsPtr; ! cb->setResults(*name, *results); ! } ! } ! } ! } ! ! out[count] = ObjectRef(cb); } ! else ! { ! out[count] = ObjectRef(new MarieDataNull()); } } };//class newMarieCommandBehavior |
|
From: Carle C. <car...@us...> - 2005-03-10 20:59:46
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv520/MARIE/src Modified Files: extractMarieCommandBehavior.cpp MarieCommandBehavior.cpp MarieDataMap.cpp newMarieCommandBehavior.cpp Log Message: updated with latest modifications in MARIE Index: extractMarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandBehavior.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** extractMarieCommandBehavior.cpp 6 Feb 2005 14:51:23 -0000 1.4 --- extractMarieCommandBehavior.cpp 10 Mar 2005 20:59:34 -0000 1.5 *************** *** 55,58 **** --- 55,62 ---- * @output_description Composite <behavior name, parameters> (parameters in string format seperated by space) * @output_type COMPOSITE + * + * @output_name RESULTS + * @output_description Composite <behavior name, results> (results in string format seperated by space) + * @output_type COMPOSITE * END*/ *************** *** 73,76 **** --- 77,83 ---- //outputs int m_parametersID; + + //outputs + int m_resultsID; public: *************** *** 88,91 **** --- 95,101 ---- //outputs m_parametersID = addOutput("PARAMS"); + + //outputs + m_resultsID = addOutput("RESULTS"); } *************** *** 99,106 **** --- 109,120 ---- CompositeType* paramsComposite = new CompositeType(); + + CompositeType* resultsComposite = new CompositeType(); std::map<std::string, bool>::const_iterator iterActivations = command->getActivationMap().begin(); std::map<std::string, string>::const_iterator iterParameters = command->getParametersMap().begin(); + + std::map<std::string, string>::const_iterator iterResults = command->getResultsMap().begin(); for( ; iterActivations != command->getActivationMap().end(); iterActivations++) *************** *** 132,138 **** --- 146,175 ---- } + for( ; iterResults != command->getResultsMap().end(); iterResults++) + { + stringstream key((*iterResults).first); + stringstream value((*iterResults).second); + try + { + //try to read FlowDesigner object + ObjectRef ObjectValue; + + value >> ObjectValue; + + resultsComposite->addField(key.str(), ObjectValue); + } + catch(...) + { + //unable to read FlowDesigner Object + //output standard string + ObjectRef ObjectValue(new String(value.str())); + resultsComposite->addField(key.str(),ObjectValue); + } + } + //output result (*outputs[m_activationID].buffer)[count] = ObjectRef(activationsComposite); (*outputs[m_parametersID].buffer)[count] = ObjectRef(paramsComposite); + (*outputs[m_resultsID].buffer)[count] = ObjectRef(resultsComposite); Index: MarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandBehavior.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieCommandBehavior.cpp 2 Jan 2005 14:43:57 -0000 1.4 --- MarieCommandBehavior.cpp 10 Mar 2005 20:59:34 -0000 1.5 *************** *** 50,53 **** --- 50,57 ---- * @input_description true if the specified behavior is activated * + * @input_name BEHAVIOR_RESULTS + * @input_type String + * @input_description Results in string format separated by space + * * @output_name BEHAVIOR_COMMAND * @output_description Output BehaviorCommand data object *************** *** 87,90 **** --- 91,95 ---- m_behaviorNameInID = addInput("BEHAVIOR_NAME"); m_behaviorActivationInID = addInput("BEHAVIOR_ACTIVATION"); + m_behaviorResultsInID = addInput("BEHAVIOR_RESULTS"); //outputs *************** *** 102,105 **** --- 107,111 ---- ObjectRef behaviorNameValue = getInput(m_behaviorNameInID,count); ObjectRef behaviorActivationValue = getInput(m_behaviorActivationInID,count); + ObjectRef behaviorResultsValue = getInput(m_behaviorResultsInID,count); //create command object *************** *** 121,124 **** --- 127,138 ---- command->setActivation(*behaviorNamePtr,*behaviorActivationPtr); } + + //look for activation for the desired behavior + if (!behaviorNameValue->isNil() && !behaviorResultsValue->isNil()) + { + RCPtr<String> behaviorNamePtr = behaviorNameValue; + RCPtr<String> behaviorResultsPtr = behaviorResultsValue; + command->setResults(*behaviorNamePtr,*behaviorResultsPtr); + } //create behavior activation vector (RobotFlow) Index: MarieDataMap.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataMap.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieDataMap.cpp 2 Jan 2005 14:43:57 -0000 1.3 --- MarieDataMap.cpp 10 Mar 2005 20:59:35 -0000 1.4 *************** *** 47,51 **** END*/ ! DECLARE_TYPE2(DataMap::ID,MarieDataMap) using namespace std; --- 47,51 ---- END*/ ! DECLARE_TYPE2(DataAssociativeMap::ID,MarieDataMap) using namespace std; *************** *** 57,62 **** } ! MarieDataMap::MarieDataMap (const DataMap &data) ! : MarieObject("MarieDataMap",ParameterSet()), DataMap(data), m_isNode(false) { --- 57,62 ---- } ! MarieDataMap::MarieDataMap (const DataAssociativeMap &data) ! : MarieObject("MarieDataMap",ParameterSet()), DataAssociativeMap(data), m_isNode(false) { *************** *** 126,130 **** //writing XML data ! string value = factory.toString((DataMap&) (*this)); out.write(value.c_str(), value.size()); --- 126,130 ---- //writing XML data ! string value = factory.toString((DataAssociativeMap&) (*this)); out.write(value.c_str(), value.size()); *************** *** 142,153 **** if (data) { ! DataMap *my_data = dynamic_cast<DataMap*>(data); if (my_data) { ! this->DataMap::operator=(*my_data); } else { ! throw new GeneralException(string("Unable to cast into DataMap Abstract : ") + data->getID(),__FILE__,__LINE__); } } --- 142,153 ---- if (data) { ! DataAssociativeMap *my_data = dynamic_cast<DataAssociativeMap*>(data); if (my_data) { ! this->DataAssociativeMap::operator=(*my_data); } else { ! throw new GeneralException(string("Unable to cast into DataAssociativeMap Abstract : ") + data->getID(),__FILE__,__LINE__); } } Index: newMarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandBehavior.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** newMarieCommandBehavior.cpp 31 Jan 2005 20:48:33 -0000 1.3 --- newMarieCommandBehavior.cpp 10 Mar 2005 20:59:35 -0000 1.4 *************** *** 54,57 **** --- 54,61 ---- * @input_description Behavior's parameters in String form (seperated by space) * + * @input_name BEHAVIOR_RESULTS + * @input_type String + * @input_description Behavior's results in String form (seperated by space) + * * @output_name COMMAND_BEHAVIOR * @output_description Output MARIE BehaviorCommand data object *************** *** 71,74 **** --- 75,80 ---- int m_behaviorActivationID; int m_behaviorParametersID; + int m_behaviorResultsID; + //outputs int m_behaviorCommandID; *************** *** 84,87 **** --- 90,94 ---- m_behaviorActivationID = addInput("BEHAVIOR_ACTIVATION"); m_behaviorParametersID = addInput("BEHAVIOR_PARAMETERS"); + m_behaviorResultsID = addInput("BEHAVIOR_RESULTS"); //outputs *************** *** 95,109 **** ObjectRef BehaviorActivationValue = getInput(m_behaviorActivationID,count); ObjectRef BehaviorParametersValue = getInput(m_behaviorParametersID,count); ! if (!BehaviorNameValue->isNil() && !BehaviorActivationValue->isNil() && !BehaviorParametersValue->isNil()) { RCPtr<String> name = BehaviorNameValue; RCPtr<Bool> activation = BehaviorActivationValue; ! RCPtr<String> parameters = BehaviorParametersValue; ! MarieCommandBehavior *cb = new MarieCommandBehavior(); cb->setActivation(name->val(), activation->val()); ! cb->setParameters(name->val(), parameters->val()); out[count] = ObjectRef(cb); --- 102,127 ---- ObjectRef BehaviorActivationValue = getInput(m_behaviorActivationID,count); ObjectRef BehaviorParametersValue = getInput(m_behaviorParametersID,count); + ObjectRef BehaviorResultsValue = getInput(m_behaviorResultsID,count); ! if (!BehaviorNameValue->isNil() && !BehaviorActivationValue->isNil()) { RCPtr<String> name = BehaviorNameValue; RCPtr<Bool> activation = BehaviorActivationValue; ! MarieCommandBehavior *cb = new MarieCommandBehavior(); cb->setActivation(name->val(), activation->val()); ! ! if(!BehaviorParametersValue->isNil()) ! { ! RCPtr<String> parameters = BehaviorParametersValue; ! cb->setParameters(name->val(), parameters->val()); ! } ! ! if(!BehaviorResultsValue->isNil()) ! { ! RCPtr<String> results = BehaviorResultsValue; ! cb->setResults(name->val(), results->val()); ! } out[count] = ObjectRef(cb); |
|
From: Carle C. <car...@us...> - 2005-03-10 20:59:09
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv344/MARIE/include Modified Files: MarieCommandBehavior.h MarieDataMap.h Log Message: updated with latest modifications in MARIE Index: MarieDataMap.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataMap.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieDataMap.h 2 Jan 2005 14:43:57 -0000 1.2 --- MarieDataMap.h 10 Mar 2005 20:59:00 -0000 1.3 *************** *** 28,41 **** //MARIE data types include ! #include "DataMap.h" namespace marie { ! class MarieDataMap : public MarieObject, public DataMap { public: MarieDataMap(); ! MarieDataMap (const DataMap &data); //from BufferedNode --- 28,41 ---- //MARIE data types include ! #include "DataAssociativeMap.h" namespace marie { ! class MarieDataMap : public MarieObject, public DataAssociativeMap { public: MarieDataMap(); ! MarieDataMap (const DataAssociativeMap &data); //from BufferedNode Index: MarieCommandBehavior.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandBehavior.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieCommandBehavior.h 2 Jan 2005 14:43:57 -0000 1.2 --- MarieCommandBehavior.h 10 Mar 2005 20:59:00 -0000 1.3 *************** *** 54,57 **** --- 54,58 ---- int m_behaviorNameInID; int m_behaviorActivationInID; + int m_behaviorResultsInID; //outputs |
|
From: Carle C. <car...@us...> - 2005-02-06 14:52:38
|
Update of /cvsroot/robotflow/RobotFlow/Behaviors/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32244 Modified Files: Goto.cc Log Message: Modified global functionnality Index: Goto.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Goto.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Goto.cc 4 Feb 2005 14:46:37 -0000 1.1 --- Goto.cc 6 Feb 2005 14:52:26 -0000 1.2 *************** *** 19,22 **** --- 19,23 ---- #include "Behavior.h" + #include <sstream> using namespace std; *************** *** 33,43 **** * @description No description available * ! * @input_name X ! * @input_type int ! * @input_description absolute target X position (mm) ! * ! * @input_name Y ! * @input_type int ! * @input_description absolute target Y position (mm) * * @input_name HEADING_POS --- 34,40 ---- * @description No description available * ! * @input_name PARAMS ! * @input_type String ! * @input_description absolute target X and Y position (mm) in String format * * @input_name HEADING_POS *************** *** 57,68 **** * @input_description Behavior activation * - * @output_name ROTATION - * @output_type int - * @output_description Robot Rotation value (degrees/s) - * * @output_name VELOCITY * @output_type int * @output_description Robot Velocity (mm/s) * * @output_name EXPLOITATION * @output_description Behavior exploitation --- 54,65 ---- * @input_description Behavior activation * * @output_name VELOCITY * @output_type int * @output_description Robot Velocity (mm/s) * + * @output_name ROTATION + * @output_type int + * @output_description Robot Rotation value (degrees/s) + * * @output_name EXPLOITATION * @output_description Behavior exploitation *************** *** 92,95 **** --- 89,97 ---- * @parameter_type int * @parameter_value 3 + * + * @parameter_name ACTIVATE_VELOCITY_ANGLE + * @parameter_description Angle range around heading that activates velocity (degrees) + * @parameter_type int + * @parameter_value 15 END*/ *************** *** 99,104 **** //inputs ! int xID; ! int yID; int headingID; int xPosID; --- 101,105 ---- //inputs ! int paramsID; int headingID; int xPosID; *************** *** 117,120 **** --- 118,122 ---- int m_goal_tol; int m_heading_tol; + int m_activate_velocity_angle; public: *************** *** 124,129 **** //inputs ! xID = addInput("X"); ! yID = addInput("Y"); headingID = addInput("HEADING_POS"); xPosID = addInput("X_POS"); --- 126,130 ---- //inputs ! paramsID = addInput("PARAMS"); headingID = addInput("HEADING_POS"); xPosID = addInput("X_POS"); *************** *** 141,144 **** --- 142,146 ---- m_goal_tol = dereference_cast<int> (parameters.get("GOAL_TOLERANCE")); m_heading_tol = dereference_cast<int> (parameters.get("HEADING_TOLERANCE")); + m_activate_velocity_angle = dereference_cast<int> (parameters.get("ACTIVATE_VELOCITY_ANGLE")); } *************** *** 147,152 **** { //cerr<<"goto activated"<<endl; ! ObjectRef xValue = getInput(xID,count); ! ObjectRef yValue = getInput(yID,count); ObjectRef headingValue = getInput(headingID,count); ObjectRef xPosValue = getInput(xPosID,count); --- 149,153 ---- { //cerr<<"goto activated"<<endl; ! ObjectRef paramsValue = getInput(paramsID,count); ObjectRef headingValue = getInput(headingID,count); ObjectRef xPosValue = getInput(xPosID,count); *************** *** 154,173 **** ! if (!xValue->isNil() && !yValue->isNil() && !headingValue->isNil() && !xPosValue->isNil() && !yPosValue->isNil()) { ! int x = dereference_cast<int>(xValue); ! int y = dereference_cast<int>(yValue); ! int heading = dereference_cast<int>(headingValue); ! int xpos = dereference_cast<int>(xPosValue); ! int ypos = dereference_cast<int>(yPosValue); if(xpos < x - m_goal_tol || xpos > x + m_goal_tol || ypos < y - m_goal_tol || ypos > y + m_goal_tol) { ! double phi = atan((double)((ypos-y)/(xpos-x))); ! double newHeading = heading; ! std::cout << "heading: " << heading << std::endl; ! if(xpos > x) { --- 155,189 ---- ! if (!paramsValue->isNil() && !headingValue->isNil() && !xPosValue->isNil() && !yPosValue->isNil()) { + RCPtr<String> params = paramsValue; + std::stringstream sstr(params->val()); ! double x; ! double y; ! ! sstr >> x; ! sstr >> y; ! ! double heading = (double)(dereference_cast<int>(headingValue)); ! ! if(heading < 0) ! heading = 360.0 + heading; ! double xpos = (double)(dereference_cast<int>(xPosValue)); ! double ypos = (double)(dereference_cast<int>(yPosValue)); ! ! std::cout << "x: " << x << std::endl; ! std::cout << "y: " << y << std::endl; ! std::cout << "xpos: " << xpos << std::endl; ! std::cout << "ypos: " << ypos << std::endl; ! std::cout << "heading: " << heading << std::endl; if(xpos < x - m_goal_tol || xpos > x + m_goal_tol || ypos < y - m_goal_tol || ypos > y + m_goal_tol) { ! double phi = abs(atan((double)((ypos-y)/(xpos-x)))); ! std::cout << "phi: " << phi << std::endl; ! double newHeading = 0; ! if(xpos > x) { *************** *** 193,200 **** } ! newHeading = ((180 * newHeading) / M_PI) + m_heading_offset; double diffHeading = heading - newHeading; std::cout << "newHeading: " << newHeading << std::endl; std::cout << "diffHeading: " << diffHeading << std::endl; --- 209,219 ---- } ! newHeading = ((180.0 * newHeading) / M_PI) + (double)(m_heading_offset); ! if(newHeading < 0) ! newHeading = 360.0 + newHeading; double diffHeading = heading - newHeading; + std::cout << "newHeading: " << newHeading << std::endl; std::cout << "diffHeading: " << diffHeading << std::endl; *************** *** 207,218 **** else { ! if(diffHeading > 0 || diffHeading > 180) { (*outputs[rotationID].buffer)[count] = ObjectRef(Int::alloc(-m_max_rotation)); - (*outputs[velocityID].buffer)[count] = ObjectRef(Int::alloc(0)); } else { (*outputs[rotationID].buffer)[count] = ObjectRef(Int::alloc(m_max_rotation)); (*outputs[velocityID].buffer)[count] = ObjectRef(Int::alloc(0)); } --- 226,244 ---- else { ! if((diffHeading > 0 && diffHeading < 180) || diffHeading < -180) { (*outputs[rotationID].buffer)[count] = ObjectRef(Int::alloc(-m_max_rotation)); } else { (*outputs[rotationID].buffer)[count] = ObjectRef(Int::alloc(m_max_rotation)); + } + + if(abs(diffHeading) < m_activate_velocity_angle) + { + (*outputs[velocityID].buffer)[count] = ObjectRef(Int::alloc(m_max_velocity/5)); + } + else + { (*outputs[velocityID].buffer)[count] = ObjectRef(Int::alloc(0)); } *************** *** 232,235 **** --- 258,263 ---- std::cout << std::endl; } + + }//object valid else |
|
From: Carle C. <car...@us...> - 2005-02-06 14:51:35
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31995 Modified Files: extractMarieCommandBehavior.cpp Log Message: Output composite instead of vectors Index: extractMarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandBehavior.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** extractMarieCommandBehavior.cpp 31 Jan 2005 20:48:33 -0000 1.3 --- extractMarieCommandBehavior.cpp 6 Feb 2005 14:51:23 -0000 1.4 *************** *** 27,30 **** --- 27,32 ---- #include "Vector.h" #include "MarieDataNull.h" + #include "CompositeType.h" + #include <map> using namespace std; *************** *** 46,56 **** * @input_description The MarieCommandBehavior object * ! * @output_name RF_ACTIVATION_VECTOR ! * @output_description RobotFlow activation vector ! * @output_type Vector<int> * ! * @output_name PARAMS_VECTOR ! * @output_description Parameters (String format) vector ! * @output_type Vector<String> * END*/ --- 48,58 ---- * @input_description The MarieCommandBehavior object * ! * @output_name ACTIVATIONS ! * @output_description Composite <behavior name, activation> ! * @output_type COMPOSITE * ! * @output_name PARAMS ! * @output_description Composite <behavior name, parameters> (parameters in string format seperated by space) ! * @output_type COMPOSITE * END*/ *************** *** 82,89 **** //outputs ! m_activationID = addOutput("RF_ACTIVATION_VECTOR"); //outputs ! m_parametersID = addOutput("PARAMS_VECTOR"); } --- 84,91 ---- //outputs ! m_activationID = addOutput("ACTIVATIONS"); //outputs ! m_parametersID = addOutput("PARAMS"); } *************** *** 94,128 **** RCPtr<MarieCommandBehavior> command = getInput(m_behaviorCommandID,count); ! //create behavior activation vector (RobotFlow) ! Vector<int> *vectActivations = Vector<int>::alloc(Behavior::get_behavior_size()); ! //create behavior activation vector (RobotFlow) ! Vector<String> *vectParams = Vector<String>::alloc(Behavior::get_behavior_size()); ! //get known behavior names ! vector<string>& behaviorNames = Behavior::get_behaviors(); ! ! const std::map<std::string, bool> &activationMap = command->getActivationMap(); ! const std::map<std::string, std::string> ¶metersMap = command->getParametersMap(); ! ! //copy activation values if they exists, else set activation to false (0) ! for (int i = 0; i < vectActivations->size(); i++) ! { ! //check if behavior exists ! if (activationMap.find(behaviorNames[i]) != activationMap.end()) ! { ! (*vectActivations)[i] = (int) command->getActivation(behaviorNames[i]); ! } ! else ! { ! //default, not activated ! (*vectActivations)[i] = 0; ! } ! ! (*vectParams)[i] = command->getParameters(behaviorNames[i]); ! } ! //output result ! (*outputs[m_activationID].buffer)[count] = ObjectRef(vectActivations); ! (*outputs[m_parametersID].buffer)[count] = ObjectRef(vectParams); --- 96,138 ---- RCPtr<MarieCommandBehavior> command = getInput(m_behaviorCommandID,count); ! CompositeType* activationsComposite = new CompositeType(); ! CompositeType* paramsComposite = new CompositeType(); ! std::map<std::string, bool>::const_iterator iterActivations = command->getActivationMap().begin(); ! ! std::map<std::string, string>::const_iterator iterParameters = command->getParametersMap().begin(); ! ! for( ; iterActivations != command->getActivationMap().end(); iterActivations++) ! { ! stringstream key((*iterActivations).first); ! activationsComposite->addField(key.str(), ObjectRef(Bool::alloc((*iterActivations).second))); ! } ! ! for( ; iterParameters != command->getParametersMap().end(); iterParameters++) ! { ! stringstream key((*iterParameters).first); ! stringstream value((*iterParameters).second); ! try ! { ! //try to read FlowDesigner object ! ObjectRef ObjectValue; ! ! value >> ObjectValue; ! ! paramsComposite->addField(key.str(), ObjectValue); ! } ! catch(...) ! { ! //unable to read FlowDesigner Object ! //output standard string ! ObjectRef ObjectValue(new String(value.str())); ! paramsComposite->addField(key.str(),ObjectValue); ! } ! } ! ! //output result ! (*outputs[m_activationID].buffer)[count] = ObjectRef(activationsComposite); ! (*outputs[m_parametersID].buffer)[count] = ObjectRef(paramsComposite); |
|
From: Carle C. <car...@us...> - 2005-02-04 14:46:51
|
Update of /cvsroot/robotflow/RobotFlow/Behaviors/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2268 Modified Files: Makefile.am Added Files: Goto.cc Log Message: Add Goto behaviors (debug version) --- NEW FILE: Goto.cc --- /* Copyright (C) 2002 Dominic Letourneau (dom...@co...) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _GOTO_CC_ #define _GOTO_CC_ #include "Behavior.h" using namespace std; class Goto; DECLARE_NODE(Goto) REGISTER_BEHAVIOR(Goto) /*Node * @name Goto * @category RobotFlow:Behaviors * @description No description available * * @input_name X * @input_type int * @input_description absolute target X position (mm) * * @input_name Y * @input_type int * @input_description absolute target Y position (mm) * * @input_name HEADING_POS * @input_type int * @input_description robot actual heading (degrees) * * @input_name X_POS * @input_type int * @input_description robot actual x postion (mm) * * @input_name Y_POS * @input_type int * @input_description robot actual y postion (mm) * * @input_name ACTIVATED * @input_type bool * @input_description Behavior activation * * @output_name ROTATION * @output_type int * @output_description Robot Rotation value (degrees/s) * * @output_name VELOCITY * @output_type int * @output_description Robot Velocity (mm/s) * * @output_name EXPLOITATION * @output_description Behavior exploitation * * @parameter_name MAX_VELOCITY * @parameter_description Velocity max (mm/s) * @parameter_type int * @parameter_value 100 * * @parameter_name MAX_ROTATION * @parameter_description Rotation speed max (degrees/s) * @parameter_type int * @parameter_value 10 * * @parameter_name HEADING_OFFSET * @parameter_description Offset of the heading value with the map orientation(degrees) * @parameter_type int * @parameter_value 0 * * @parameter_name GOAL_TOLERANCE * @parameter_description X and Y tolerance to consider position on goal (mm) * @parameter_type int * @parameter_value 50 * * @parameter_name HEADING_TOLERANCE * @parameter_description heading tolerance to consider heading to goal (degrees) * @parameter_type int * @parameter_value 3 END*/ class Goto : public Behavior { //inputs int xID; int yID; int headingID; int xPosID; int yPosID; //outputs int rotationID; int velocityID; //parameters int m_max_velocity; int m_max_rotation; int m_heading_offset; int m_goal_tol; int m_heading_tol; public: Goto(string nodeName, ParameterSet params) : Behavior(nodeName, params, "Goto") { //inputs xID = addInput("X"); yID = addInput("Y"); headingID = addInput("HEADING_POS"); xPosID = addInput("X_POS"); yPosID = addInput("Y_POS"); //outputs rotationID = addOutput("ROTATION"); velocityID = addOutput("VELOCITY"); m_max_velocity = dereference_cast<int> (parameters.get("MAX_VELOCITY")); m_max_rotation = dereference_cast<int> (parameters.get("MAX_ROTATION")); m_heading_offset = dereference_cast<int> (parameters.get("HEADING_OFFSET")); m_goal_tol = dereference_cast<int> (parameters.get("GOAL_TOLERANCE")); m_heading_tol = dereference_cast<int> (parameters.get("HEADING_TOLERANCE")); } void calculate_behavior(int output_id, int count, Buffer &out) { //cerr<<"goto activated"<<endl; ObjectRef xValue = getInput(xID,count); ObjectRef yValue = getInput(yID,count); ObjectRef headingValue = getInput(headingID,count); ObjectRef xPosValue = getInput(xPosID,count); ObjectRef yPosValue = getInput(yPosID,count); if (!xValue->isNil() && !yValue->isNil() && !headingValue->isNil() && !xPosValue->isNil() && !yPosValue->isNil()) { int x = dereference_cast<int>(xValue); int y = dereference_cast<int>(yValue); int heading = dereference_cast<int>(headingValue); int xpos = dereference_cast<int>(xPosValue); int ypos = dereference_cast<int>(yPosValue); if(xpos < x - m_goal_tol || xpos > x + m_goal_tol || ypos < y - m_goal_tol || ypos > y + m_goal_tol) { double phi = atan((double)((ypos-y)/(xpos-x))); double newHeading = heading; std::cout << "heading: " << heading << std::endl; if(xpos > x) { if(ypos > y) { newHeading = M_PI + phi; } else { newHeading = M_PI - phi; } } else { if(ypos > y) { newHeading = 0 - phi; } else { newHeading = 0 + phi; } } newHeading = ((180 * newHeading) / M_PI) + m_heading_offset; double diffHeading = heading - newHeading; std::cout << "newHeading: " << newHeading << std::endl; std::cout << "diffHeading: " << diffHeading << std::endl; if(abs(diffHeading) < m_heading_tol) { (*outputs[rotationID].buffer)[count] = ObjectRef(Int::alloc(0)); (*outputs[velocityID].buffer)[count] = ObjectRef(Int::alloc(m_max_velocity)); } else { if(diffHeading > 0 || diffHeading > 180) { (*outputs[rotationID].buffer)[count] = ObjectRef(Int::alloc(-m_max_rotation)); (*outputs[velocityID].buffer)[count] = ObjectRef(Int::alloc(0)); } else { (*outputs[rotationID].buffer)[count] = ObjectRef(Int::alloc(m_max_rotation)); (*outputs[velocityID].buffer)[count] = ObjectRef(Int::alloc(0)); } } std::cout << "rotation: " << (*outputs[rotationID].buffer)[count] << std::endl; std::cout << "velocity: " << (*outputs[velocityID].buffer)[count] << std::endl; std::cout << std::endl; } else { (*outputs[rotationID].buffer)[count] = ObjectRef(Int::alloc(0)); (*outputs[velocityID].buffer)[count] = ObjectRef(Int::alloc(0)); std::cout << "onGoal" << std::endl; std::cout << "rotation: " << (*outputs[rotationID].buffer)[count] << std::endl; std::cout << "velocity: " << (*outputs[velocityID].buffer)[count] << std::endl; std::cout << std::endl; } }//object valid else { (*outputs[rotationID].buffer)[count] = nilObject; (*outputs[velocityID].buffer)[count] = nilObject; } }//calculate_behavior }; #endif Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.am 6 Aug 2004 13:24:22 -0000 1.12 --- Makefile.am 4 Feb 2005 14:46:38 -0000 1.13 *************** *** 29,33 **** Recommandation.cc \ SignTracking.cc \ ! MultiSignTracking.cc libBehaviors_la_LDFLAGS = -release $(LT_RELEASE) --- 29,34 ---- Recommandation.cc \ SignTracking.cc \ ! MultiSignTracking.cc \ ! Goto.cc libBehaviors_la_LDFLAGS = -release $(LT_RELEASE) |
|
From: Carle C. <car...@us...> - 2005-01-31 20:49:05
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21012 Modified Files: extractMarieCommandBehavior.cpp newMarieCommandBehavior.cpp Log Message: add behavior's parameters support Index: extractMarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandBehavior.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** extractMarieCommandBehavior.cpp 2 Jan 2005 14:43:57 -0000 1.2 --- extractMarieCommandBehavior.cpp 31 Jan 2005 20:48:33 -0000 1.3 *************** *** 46,52 **** * @input_description The MarieCommandBehavior object * ! * @output_name ROBOTFLOW_ACTIVATION * @output_description RobotFlow activation vector * @output_type Vector<int> * END*/ --- 46,56 ---- * @input_description The MarieCommandBehavior object * ! * @output_name RF_ACTIVATION_VECTOR * @output_description RobotFlow activation vector * @output_type Vector<int> + * + * @output_name PARAMS_VECTOR + * @output_description Parameters (String format) vector + * @output_type Vector<String> * END*/ *************** *** 64,67 **** --- 68,74 ---- //outputs int m_activationID; + + //outputs + int m_parametersID; public: *************** *** 75,79 **** //outputs ! m_activationID = addOutput("ROBOTFLOW_ACTIVATION"); } --- 82,89 ---- //outputs ! m_activationID = addOutput("RF_ACTIVATION_VECTOR"); ! ! //outputs ! m_parametersID = addOutput("PARAMS_VECTOR"); } *************** *** 85,89 **** //create behavior activation vector (RobotFlow) ! Vector<int> *vect = Vector<int>::alloc(Behavior::get_behavior_size()); //get known behavior names --- 95,102 ---- //create behavior activation vector (RobotFlow) ! Vector<int> *vectActivations = Vector<int>::alloc(Behavior::get_behavior_size()); ! ! //create behavior activation vector (RobotFlow) ! Vector<String> *vectParams = Vector<String>::alloc(Behavior::get_behavior_size()); //get known behavior names *************** *** 91,111 **** const std::map<std::string, bool> &activationMap = command->getActivationMap(); //copy activation values if they exists, else set activation to false (0) ! for (int i = 0; i < vect->size(); i++) { //check if behavior exists if (activationMap.find(behaviorNames[i]) != activationMap.end()) { ! (*vect)[i] = (int) command->getActivation(behaviorNames[i]); } else { //default, not activated ! (*vect)[i] = 0; } } //output result ! out[count] = ObjectRef(vect); } --- 104,130 ---- const std::map<std::string, bool> &activationMap = command->getActivationMap(); + const std::map<std::string, std::string> ¶metersMap = command->getParametersMap(); //copy activation values if they exists, else set activation to false (0) ! for (int i = 0; i < vectActivations->size(); i++) { //check if behavior exists if (activationMap.find(behaviorNames[i]) != activationMap.end()) { ! (*vectActivations)[i] = (int) command->getActivation(behaviorNames[i]); } else { //default, not activated ! (*vectActivations)[i] = 0; } + + (*vectParams)[i] = command->getParameters(behaviorNames[i]); } //output result ! (*outputs[m_activationID].buffer)[count] = ObjectRef(vectActivations); ! (*outputs[m_parametersID].buffer)[count] = ObjectRef(vectParams); ! ! } Index: newMarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandBehavior.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** newMarieCommandBehavior.cpp 2 Jan 2005 14:43:58 -0000 1.2 --- newMarieCommandBehavior.cpp 31 Jan 2005 20:48:33 -0000 1.3 *************** *** 50,53 **** --- 50,57 ---- * @input_description true if the specified behavior is activated * + * @input_name BEHAVIOR_PARAMETERS + * @input_type String + * @input_description Behavior's parameters in String form (seperated by space) + * * @output_name COMMAND_BEHAVIOR * @output_description Output MARIE BehaviorCommand data object *************** *** 66,69 **** --- 70,74 ---- int m_behaviorNameID; int m_behaviorActivationID; + int m_behaviorParametersID; //outputs int m_behaviorCommandID; *************** *** 78,81 **** --- 83,87 ---- m_behaviorNameID = addInput("BEHAVIOR_NAME"); m_behaviorActivationID = addInput("BEHAVIOR_ACTIVATION"); + m_behaviorParametersID = addInput("BEHAVIOR_PARAMETERS"); //outputs *************** *** 88,100 **** ObjectRef BehaviorNameValue = getInput(m_behaviorNameID,count); ObjectRef BehaviorActivationValue = getInput(m_behaviorActivationID,count); ! if (!BehaviorNameValue->isNil() && !BehaviorActivationValue->isNil()) { RCPtr<String> name = BehaviorNameValue; RCPtr<Bool> activation = BehaviorActivationValue; MarieCommandBehavior *cb = new MarieCommandBehavior(); cb->setActivation(name->val(), activation->val()); out[count] = ObjectRef(cb); --- 94,109 ---- ObjectRef BehaviorNameValue = getInput(m_behaviorNameID,count); ObjectRef BehaviorActivationValue = getInput(m_behaviorActivationID,count); + ObjectRef BehaviorParametersValue = getInput(m_behaviorParametersID,count); ! if (!BehaviorNameValue->isNil() && !BehaviorActivationValue->isNil() && !BehaviorParametersValue->isNil()) { RCPtr<String> name = BehaviorNameValue; RCPtr<Bool> activation = BehaviorActivationValue; + RCPtr<String> parameters = BehaviorParametersValue; MarieCommandBehavior *cb = new MarieCommandBehavior(); cb->setActivation(name->val(), activation->val()); + cb->setParameters(name->val(), parameters->val()); out[count] = ObjectRef(cb); |
|
From: Dominic L. <ma...@us...> - 2005-01-23 21:09:52
|
Update of /cvsroot/robotflow/RobotFlow/Player/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3611 Modified Files: PlayerVision.cc Log Message: getting image width and height properly Index: PlayerVision.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerVision.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PlayerVision.cc 2 Jan 2005 14:43:59 -0000 1.7 --- PlayerVision.cc 23 Jan 2005 21:09:42 -0000 1.8 *************** *** 102,106 **** ! ComponentsData *cData = new ComponentsData; m_cell_count = 0; m_rect_count = 0; --- 102,106 ---- ! ComponentsData *cData = new ComponentsData(m_blobfinderProxy->width,m_blobfinderProxy->height); m_cell_count = 0; m_rect_count = 0; |
|
From: Dominic L. <ma...@us...> - 2005-01-23 21:05:26
|
Update of /cvsroot/robotflow/RobotFlow/FSM/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2501 Modified Files: FSMGenerator.cc Log Message: Added std namespace Index: FSMGenerator.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/FSM/src/FSMGenerator.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FSMGenerator.cc 2 Jan 2005 14:43:56 -0000 1.5 --- FSMGenerator.cc 23 Jan 2005 21:05:16 -0000 1.6 *************** *** 759,762 **** --- 759,763 ---- out << "#include \"BufferedNode.h\""<< endl; out << "#include \"net_types.h\""<< endl << endl; + out << "using namespace std;"<<endl<<endl; out << "class " << m_FSMName.c_str() << ";" << endl << endl; out << "DECLARE_NODE(" << m_FSMName.c_str() << ")" << endl << endl; |
|
From: Carle C. <car...@us...> - 2005-01-05 00:45:53
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28172 Modified Files: newMarieDataMap.cpp Log Message: Modification to store map values for primitive types (int, float, string) in a string format instead of FD format Index: newMarieDataMap.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataMap.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** newMarieDataMap.cpp 2 Jan 2005 14:43:58 -0000 1.2 --- newMarieDataMap.cpp 5 Jan 2005 00:45:30 -0000 1.3 *************** *** 90,94 **** string key = iter->first; stringstream value; ! value << iter->second; dMap->addElement(key,value.str()); } --- 90,98 ---- string key = iter->first; stringstream value; ! ! //CC: Modification to store int, float, string in a string format instead of FD format ! //value << iter->second; ! (iter->second)->prettyPrint(value); ! dMap->addElement(key,value.str()); } |
|
From: Dominic L. <ma...@us...> - 2005-01-02 14:44:56
|
Update of /cvsroot/robotflow/RobotFlow/Control/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19423/Control/src Modified Files: EVID30_PID.cc GenericPID.cc JoystickControl.cc Saturation.cc Log Message: removing all "using namespace std;" in headers. Bumped version to 0.2.6. Preparing for the RobotFlow namespace. Index: GenericPID.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Control/src/GenericPID.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GenericPID.cc 4 Jun 2002 18:07:44 -0000 1.6 --- GenericPID.cc 2 Jan 2005 14:43:55 -0000 1.7 *************** *** 26,29 **** --- 26,31 ---- #include <unistd.h> + using namespace std; + class GenericPID; Index: Saturation.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Control/src/Saturation.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Saturation.cc 26 Apr 2002 22:29:21 -0000 1.3 --- Saturation.cc 2 Jan 2005 14:43:55 -0000 1.4 *************** *** 24,27 **** --- 24,29 ---- #include <unistd.h> + using namespace std; + class Saturation; Index: EVID30_PID.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Control/src/EVID30_PID.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EVID30_PID.cc 8 Dec 2003 21:32:21 -0000 1.1 --- EVID30_PID.cc 2 Jan 2005 14:43:55 -0000 1.2 *************** *** 6,9 **** --- 6,11 ---- #include <unistd.h> + using namespace std; + class EVID30_PID; Index: JoystickControl.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Control/src/JoystickControl.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JoystickControl.cc 8 Dec 2003 21:32:21 -0000 1.1 --- JoystickControl.cc 2 Jan 2005 14:43:55 -0000 1.2 *************** *** 24,27 **** --- 24,29 ---- #include "Vector.h" + using namespace std; + class JoystickControl; |
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19423/MARIE/src Modified Files: MarieCommandBehavior.cpp MarieCommandCamera.cpp MarieCommandJoystick.cpp MarieCommandMotor.cpp MarieDataBumper.cpp MarieDataCamera.cpp MarieDataIR.cpp MarieDataLaser.cpp MarieDataMap.cpp MarieDataNull.cpp MarieDataOdometry.cpp MarieDataRaw.cpp MarieDataSonar.cpp MarieLoad.cpp MariePeek.cpp MariePull.cpp MariePush.cpp MarieRequestSystem.cpp MarieSave.cpp extractMarieCommandBehavior.cpp extractMarieCommandCamera.cpp extractMarieCommandJoystick.cpp extractMarieCommandMotor.cpp extractMarieDataBumper.cpp extractMarieDataCamera.cpp extractMarieDataIR.cpp extractMarieDataLaser.cpp extractMarieDataMap.cpp extractMarieDataOdometry.cpp extractMarieDataRaw.cpp extractMarieDataSonar.cpp extractMarieRequestSystem.cpp isMarieDataNull.cpp newMarieCommandBehavior.cpp newMarieCommandCamera.cpp newMarieCommandJoystick.cpp newMarieCommandMotor.cpp newMarieDataBumper.cpp newMarieDataCamera.cpp newMarieDataIR.cpp newMarieDataLaser.cpp newMarieDataMap.cpp newMarieDataOdometry.cpp newMarieDataRaw.cpp newMarieDataSonar.cpp newMarieRequestSystem.cpp Log Message: removing all "using namespace std;" in headers. Bumped version to 0.2.6. Preparing for the RobotFlow namespace. Index: newMarieDataMap.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataMap.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataMap.cpp 22 Sep 2004 14:47:42 -0000 1.1 --- newMarieDataMap.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 24,27 **** --- 24,29 ---- #include "CompositeType.h" + using namespace std; + namespace marie { Index: extractMarieDataIR.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataIR.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** extractMarieDataIR.cpp 2 Nov 2004 14:10:05 -0000 1.2 --- extractMarieDataIR.cpp 2 Jan 2005 14:43:57 -0000 1.3 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: extractMarieRequestSystem.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieRequestSystem.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieRequestSystem.cpp 29 Oct 2004 14:07:20 -0000 1.1 --- extractMarieRequestSystem.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 23,26 **** --- 23,28 ---- #include <string> + using namespace std; + namespace marie { Index: MarieDataBumper.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataBumper.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieDataBumper.cpp 29 Oct 2004 14:07:20 -0000 1.2 --- MarieDataBumper.cpp 2 Jan 2005 14:43:57 -0000 1.3 *************** *** 25,28 **** --- 25,30 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: MarieDataSonar.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataSonar.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataSonar.cpp 29 Oct 2004 14:07:20 -0000 1.4 --- MarieDataSonar.cpp 2 Jan 2005 14:43:57 -0000 1.5 *************** *** 25,28 **** --- 25,31 ---- #include "MarieXMLDataFactory.h" + + using namespace std; + namespace marie { Index: extractMarieCommandJoystick.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandJoystick.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieCommandJoystick.cpp 28 Oct 2004 18:11:48 -0000 1.1 --- extractMarieCommandJoystick.cpp 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: MarieDataOdometry.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataOdometry.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataOdometry.cpp 29 Oct 2004 14:07:20 -0000 1.4 --- MarieDataOdometry.cpp 2 Jan 2005 14:43:57 -0000 1.5 *************** *** 24,27 **** --- 24,30 ---- #include "MarieXMLDataFactory.h" + + using namespace std; + namespace marie { Index: MarieDataCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataCamera.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataCamera.cpp 29 Oct 2004 14:07:20 -0000 1.4 --- MarieDataCamera.cpp 2 Jan 2005 14:43:57 -0000 1.5 *************** *** 25,28 **** --- 25,30 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: MarieCommandJoystick.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandJoystick.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieCommandJoystick.cpp 29 Oct 2004 14:07:20 -0000 1.3 --- MarieCommandJoystick.cpp 2 Jan 2005 14:43:57 -0000 1.4 *************** *** 25,28 **** --- 25,30 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: extractMarieDataOdometry.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataOdometry.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieDataOdometry.cpp 28 Oct 2004 20:30:07 -0000 1.1 --- extractMarieDataOdometry.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: extractMarieDataCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataCamera.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieDataCamera.cpp 28 Oct 2004 20:30:07 -0000 1.1 --- extractMarieDataCamera.cpp 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: newMarieDataBumper.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataBumper.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataBumper.cpp 29 Oct 2004 14:07:20 -0000 1.1 --- newMarieDataBumper.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: MariePush.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MariePush.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MariePush.cpp 14 Jun 2004 14:15:26 -0000 1.1 --- MariePush.cpp 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 27,30 **** --- 27,32 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: MariePeek.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MariePeek.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MariePeek.cpp 10 Aug 2004 19:59:36 -0000 1.4 --- MariePeek.cpp 2 Jan 2005 14:43:57 -0000 1.5 *************** *** 27,30 **** --- 27,32 ---- #include "MarieObject.h" + using namespace std; + namespace marie { Index: extractMarieDataMap.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataMap.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** extractMarieDataMap.cpp 1 Nov 2004 18:52:30 -0000 1.2 --- extractMarieDataMap.cpp 2 Jan 2005 14:43:58 -0000 1.3 *************** *** 29,32 **** --- 29,34 ---- #include "CompositeType.h" + using namespace std; + namespace marie { Index: newMarieDataIR.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataIR.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataIR.cpp 29 Oct 2004 14:07:20 -0000 1.1 --- newMarieDataIR.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: extractMarieCommandMotor.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandMotor.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieCommandMotor.cpp 28 Oct 2004 18:11:48 -0000 1.1 --- extractMarieCommandMotor.cpp 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: MarieDataNull.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataNull.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieDataNull.cpp 10 Jun 2004 01:00:22 -0000 1.2 --- MarieDataNull.cpp 2 Jan 2005 14:43:57 -0000 1.3 *************** *** 24,27 **** --- 24,30 ---- #include "MarieXMLDataFactory.h" + + using namespace std; + namespace marie { Index: extractMarieDataRaw.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataRaw.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieDataRaw.cpp 29 Oct 2004 14:07:20 -0000 1.1 --- extractMarieDataRaw.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: newMarieCommandMotor.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandMotor.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieCommandMotor.cpp 28 Oct 2004 18:11:48 -0000 1.1 --- newMarieCommandMotor.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: MarieCommandMotor.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandMotor.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieCommandMotor.cpp 29 Oct 2004 14:07:20 -0000 1.5 --- MarieCommandMotor.cpp 2 Jan 2005 14:43:57 -0000 1.6 *************** *** 25,28 **** --- 25,30 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: MarieDataMap.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataMap.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieDataMap.cpp 29 Oct 2004 14:07:20 -0000 1.2 --- MarieDataMap.cpp 2 Jan 2005 14:43:57 -0000 1.3 *************** *** 26,29 **** --- 26,31 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: extractMarieDataSonar.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataSonar.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** extractMarieDataSonar.cpp 2 Nov 2004 14:10:05 -0000 1.2 --- extractMarieDataSonar.cpp 2 Jan 2005 14:43:58 -0000 1.3 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: extractMarieCommandCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandCamera.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieCommandCamera.cpp 28 Oct 2004 15:03:30 -0000 1.1 --- extractMarieCommandCamera.cpp 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: newMarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandBehavior.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieCommandBehavior.cpp 26 Oct 2004 19:47:05 -0000 1.1 --- newMarieCommandBehavior.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: extractMarieDataBumper.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataBumper.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieDataBumper.cpp 29 Oct 2004 14:07:20 -0000 1.1 --- extractMarieDataBumper.cpp 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: extractMarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandBehavior.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieCommandBehavior.cpp 28 Oct 2004 15:03:29 -0000 1.1 --- extractMarieCommandBehavior.cpp 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: MarieDataIR.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataIR.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieDataIR.cpp 29 Oct 2004 14:07:20 -0000 1.2 --- MarieDataIR.cpp 2 Jan 2005 14:43:57 -0000 1.3 *************** *** 26,29 **** --- 26,31 ---- #include "Vector.h" + using namespace std; + namespace marie { Index: extractMarieDataLaser.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataLaser.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** extractMarieDataLaser.cpp 1 Nov 2004 18:52:30 -0000 1.2 --- extractMarieDataLaser.cpp 2 Jan 2005 14:43:57 -0000 1.3 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: newMarieCommandJoystick.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandJoystick.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieCommandJoystick.cpp 28 Oct 2004 18:11:48 -0000 1.1 --- newMarieCommandJoystick.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: MarieLoad.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieLoad.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieLoad.cpp 17 Jun 2004 13:52:52 -0000 1.5 --- MarieLoad.cpp 2 Jan 2005 14:43:57 -0000 1.6 *************** *** 27,30 **** --- 27,32 ---- #include "MarieObject.h" + using namespace std; + namespace marie { Index: newMarieDataSonar.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataSonar.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataSonar.cpp 28 Oct 2004 20:30:07 -0000 1.1 --- newMarieDataSonar.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: isMarieDataNull.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/isMarieDataNull.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** isMarieDataNull.cpp 1 Nov 2004 13:20:05 -0000 1.1 --- isMarieDataNull.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 2,5 **** --- 2,8 ---- #include "MarieDataNull.h" + + using namespace std; + namespace marie { Index: newMarieDataLaser.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataLaser.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataLaser.cpp 28 Oct 2004 20:30:07 -0000 1.1 --- newMarieDataLaser.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: newMarieDataOdometry.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataOdometry.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataOdometry.cpp 28 Oct 2004 20:30:07 -0000 1.1 --- newMarieDataOdometry.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: newMarieDataCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataCamera.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** newMarieDataCamera.cpp 28 Oct 2004 20:30:07 -0000 1.2 --- newMarieDataCamera.cpp 2 Jan 2005 14:43:58 -0000 1.3 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: newMarieCommandCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandCamera.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** newMarieCommandCamera.cpp 29 Oct 2004 14:07:20 -0000 1.2 --- newMarieCommandCamera.cpp 2 Jan 2005 14:43:58 -0000 1.3 *************** *** 24,27 **** --- 24,29 ---- #include <string> + using namespace std; + namespace marie { Index: newMarieDataRaw.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataRaw.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataRaw.cpp 29 Oct 2004 14:07:20 -0000 1.1 --- newMarieDataRaw.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: MarieCommandCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandCamera.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MarieCommandCamera.cpp 29 Oct 2004 14:07:20 -0000 1.7 --- MarieCommandCamera.cpp 2 Jan 2005 14:43:57 -0000 1.8 *************** *** 26,29 **** --- 26,31 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: MarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandBehavior.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieCommandBehavior.cpp 29 Oct 2004 14:07:20 -0000 1.3 --- MarieCommandBehavior.cpp 2 Jan 2005 14:43:57 -0000 1.4 *************** *** 27,30 **** --- 27,32 ---- #include "Vector.h" + using namespace std; + namespace marie { Index: newMarieRequestSystem.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieRequestSystem.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** newMarieRequestSystem.cpp 29 Oct 2004 14:07:20 -0000 1.4 --- newMarieRequestSystem.cpp 2 Jan 2005 14:43:58 -0000 1.5 *************** *** 23,26 **** --- 23,28 ---- #include <string> + using namespace std; + namespace marie { Index: MariePull.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MariePull.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MariePull.cpp 10 Aug 2004 19:59:36 -0000 1.4 --- MariePull.cpp 2 Jan 2005 14:43:57 -0000 1.5 *************** *** 27,30 **** --- 27,32 ---- #include "MarieObject.h" + using namespace std; + namespace marie { Index: MarieDataLaser.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataLaser.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieDataLaser.cpp 29 Oct 2004 14:07:20 -0000 1.5 --- MarieDataLaser.cpp 2 Jan 2005 14:43:57 -0000 1.6 *************** *** 26,29 **** --- 26,31 ---- #include "Vector.h" + using namespace std; + namespace marie { Index: MarieSave.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieSave.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieSave.cpp 14 Jun 2004 14:15:26 -0000 1.3 --- MarieSave.cpp 2 Jan 2005 14:43:57 -0000 1.4 *************** *** 27,30 **** --- 27,32 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: MarieDataRaw.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataRaw.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataRaw.cpp 29 Oct 2004 14:07:20 -0000 1.4 --- MarieDataRaw.cpp 2 Jan 2005 14:43:57 -0000 1.5 *************** *** 26,29 **** --- 26,31 ---- #include "Vector.h" + using namespace std; + namespace marie { Index: MarieRequestSystem.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieRequestSystem.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieRequestSystem.cpp 29 Oct 2004 14:07:20 -0000 1.2 --- MarieRequestSystem.cpp 2 Jan 2005 14:43:57 -0000 1.3 *************** *** 25,28 **** --- 25,30 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { |
Update of /cvsroot/robotflow/RobotFlow/Behaviors/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19423/Behaviors/src Modified Files: Avoid.cc Behavior.cc BehaviorSelection.cc Direct.cc DirectArbiter.cc DirectList.cc DirectPolygon.cc DirectSquare.cc DirectTriangle.cc Exploitation.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: removing all "using namespace std;" in headers. Bumped version to 0.2.6. Preparing for the RobotFlow namespace. Index: NoCommand.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/NoCommand.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NoCommand.cc 3 Dec 2003 20:48:42 -0000 1.2 --- NoCommand.cc 2 Jan 2005 14:43:55 -0000 1.3 *************** *** 21,24 **** --- 21,26 ---- + using namespace std; + class NoCommand; Index: DirectList.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/DirectList.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DirectList.cc 24 Apr 2002 02:04:45 -0000 1.1 --- DirectList.cc 2 Jan 2005 14:43:54 -0000 1.2 *************** *** 17,20 **** --- 17,22 ---- #include "DirectList.h" + using namespace std; + DirectCommand::DirectCommand() { x = 0; Index: Rest.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Rest.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Rest.cc 18 Apr 2002 20:18:50 -0000 1.2 --- Rest.cc 2 Jan 2005 14:43:55 -0000 1.3 *************** *** 21,24 **** --- 21,26 ---- #include "Exploitation.h" + using namespace std; + class Rest; Index: MinimumDistance.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/MinimumDistance.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MinimumDistance.cc 8 Dec 2003 21:32:21 -0000 1.1 --- MinimumDistance.cc 2 Jan 2005 14:43:54 -0000 1.2 *************** *** 6,9 **** --- 6,11 ---- #include "Vector.h" + using namespace std; + class MinimumDistance; Index: Exploitation.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Exploitation.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Exploitation.cc 2 Aug 2004 15:30:25 -0000 1.3 --- Exploitation.cc 2 Jan 2005 14:43:54 -0000 1.4 *************** *** 17,20 **** --- 17,22 ---- #include "Exploitation.h" + using namespace std; + Exploitation::Exploitation(int max_element) : m_max_element(max_element) { Index: DirectArbiter.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/DirectArbiter.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DirectArbiter.cc 8 Dec 2003 21:32:21 -0000 1.1 --- DirectArbiter.cc 2 Jan 2005 14:43:54 -0000 1.2 *************** *** 7,10 **** --- 7,12 ---- #include <math.h> + using namespace std; + class DirectArbiter; Index: DirectPolygon.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/DirectPolygon.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DirectPolygon.cc 8 Dec 2003 21:32:21 -0000 1.1 --- DirectPolygon.cc 2 Jan 2005 14:43:54 -0000 1.2 *************** *** 7,10 **** --- 7,12 ---- #include <math.h> + using namespace std; + class DirectPolygon; Index: Avoid.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Avoid.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Avoid.cc 18 Apr 2002 20:18:50 -0000 1.2 --- Avoid.cc 2 Jan 2005 14:43:54 -0000 1.3 *************** *** 20,23 **** --- 20,25 ---- #include "Behavior.h" + using namespace std; + class Avoid; Index: RandomTurn.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/RandomTurn.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RandomTurn.cc 1 Aug 2003 05:31:31 -0000 1.3 --- RandomTurn.cc 2 Jan 2005 14:43:55 -0000 1.4 *************** *** 22,25 **** --- 22,27 ---- #include <time.h> + using namespace std; + // Random number from [0, x[ #define randRange(x) ((int) ((((float)rand()/RAND_MAX)*(x)))) Index: Recommandation.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Recommandation.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Recommandation.cc 14 May 2004 14:09:48 -0000 1.1 --- Recommandation.cc 2 Jan 2005 14:43:55 -0000 1.2 *************** *** 6,9 **** --- 6,11 ---- #include "Recommandation.h" + using namespace std; + DECLARE_TYPE(Recommandation) Index: MoveAndTurn.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/MoveAndTurn.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MoveAndTurn.cc 4 Aug 2003 02:05:51 -0000 1.1 --- MoveAndTurn.cc 2 Jan 2005 14:43:54 -0000 1.2 *************** *** 21,24 **** --- 21,26 ---- #include <time.h> + using namespace std; + class MoveAndTurn; Index: Direct.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Direct.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Direct.cc 18 Apr 2002 20:18:50 -0000 1.2 --- Direct.cc 2 Jan 2005 14:43:54 -0000 1.3 *************** *** 23,26 **** --- 23,28 ---- #include <math.h> + using namespace std; + class Direct; Index: DirectTriangle.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/DirectTriangle.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DirectTriangle.cc 8 Dec 2003 21:32:21 -0000 1.1 --- DirectTriangle.cc 2 Jan 2005 14:43:54 -0000 1.2 *************** *** 7,10 **** --- 7,12 ---- #include <math.h> + using namespace std; + class DirectTriangle; Index: MultiSignTracking.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/MultiSignTracking.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MultiSignTracking.cc 2 Nov 2004 15:47:47 -0000 1.3 --- MultiSignTracking.cc 2 Jan 2005 14:43:54 -0000 1.4 *************** *** 23,26 **** --- 23,28 ---- #include "ComponentsData.h" + using namespace std; + class MultiSignTracking; Index: Inhibition.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Inhibition.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Inhibition.cc 18 Apr 2002 20:18:50 -0000 1.2 --- Inhibition.cc 2 Jan 2005 14:43:54 -0000 1.3 *************** *** 20,23 **** --- 20,24 ---- #include "BufferedNode.h" + using namespace std; class Inhibition; Index: Subsumption.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Subsumption.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Subsumption.cc 18 Apr 2002 20:18:50 -0000 1.2 --- Subsumption.cc 2 Jan 2005 14:43:55 -0000 1.3 *************** *** 20,23 **** --- 20,25 ---- #include "BufferedNode.h" + using namespace std; + class Subsumption; Index: SafeVelocity.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/SafeVelocity.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SafeVelocity.cc 18 Apr 2002 20:18:50 -0000 1.2 --- SafeVelocity.cc 2 Jan 2005 14:43:55 -0000 1.3 *************** *** 21,24 **** --- 21,27 ---- #include "Exploitation.h" + + using namespace std; + class SafeVelocity; Index: Grasp.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Grasp.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Grasp.cc 8 Dec 2003 21:32:21 -0000 1.1 --- Grasp.cc 2 Jan 2005 14:43:54 -0000 1.2 *************** *** 8,11 **** --- 8,12 ---- #include <math.h> //fabs() + using namespace std; class Grasp; Index: SignTracking.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/SignTracking.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SignTracking.cc 16 Aug 2004 19:43:43 -0000 1.2 --- SignTracking.cc 2 Jan 2005 14:43:55 -0000 1.3 *************** *** 23,26 **** --- 23,29 ---- #include "ComponentsData.h" + + using namespace std; + class SignTracking; Index: BehaviorSelection.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/BehaviorSelection.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BehaviorSelection.cc 14 May 2004 14:09:48 -0000 1.4 --- BehaviorSelection.cc 2 Jan 2005 14:43:54 -0000 1.5 *************** *** 25,28 **** --- 25,30 ---- #include "Recommandation.h" + using namespace std; + class BehaviorSelection; Index: DirectSquare.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/DirectSquare.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DirectSquare.cc 8 Dec 2003 21:32:21 -0000 1.1 --- DirectSquare.cc 2 Jan 2005 14:43:54 -0000 1.2 *************** *** 7,10 **** --- 7,12 ---- #include <math.h> + using namespace std; + class DirectSquare; Index: NewBehavior.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/NewBehavior.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** NewBehavior.cc 15 Mar 2004 14:58:30 -0000 1.4 --- NewBehavior.cc 2 Jan 2005 14:43:55 -0000 1.5 *************** *** 22,25 **** --- 22,27 ---- #include "Vector.h" + using namespace std; + class NewBehavior; Index: Behavior.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Behavior.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Behavior.cc 2 Aug 2004 15:29:17 -0000 1.5 --- Behavior.cc 2 Jan 2005 14:43:54 -0000 1.6 *************** *** 18,21 **** --- 18,23 ---- //#include "Vector.h" + using namespace std; + Vector<string>& Behavior::get_behaviors() { static Vector<string> behavior_names(0); |
Update of /cvsroot/robotflow/RobotFlow/MARIE/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19423/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: removing all "using namespace std;" in headers. Bumped version to 0.2.6. Preparing for the RobotFlow namespace. Index: MarieDataBumper.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataBumper.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieDataBumper.h 4 Aug 2004 17:49:49 -0000 1.1 --- MarieDataBumper.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 41,48 **** //from BufferedNode ! MarieDataBumper(string nodeName, ParameterSet params); virtual void calculate(int output_id, int count, Buffer &out); ! virtual void printOn(ostream &out) const; ! virtual void readFrom(istream &in=cin); virtual void copyDataAbstract(DataAbstract *data); --- 41,48 ---- //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); virtual void copyDataAbstract(DataAbstract *data); Index: MarieCommandMotor.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandMotor.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieCommandMotor.h 30 May 2004 12:34:07 -0000 1.1 --- MarieCommandMotor.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 42,49 **** //from BufferedNode ! MarieCommandMotor(string nodeName, ParameterSet params); virtual void calculate(int output_id, int count, Buffer &out); ! virtual void printOn(ostream &out) const; ! virtual void readFrom(istream &in=cin); virtual void copyDataAbstract(DataAbstract *data); --- 42,49 ---- //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); virtual void copyDataAbstract(DataAbstract *data); Index: MariePeek.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MariePeek.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MariePeek.h 14 Jun 2004 18:36:35 -0000 1.1 --- MariePeek.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 39,43 **** public: ! MariePeek(string nodeName, ParameterSet params); void calculate(int output_id, int count, Buffer &out); }; --- 39,43 ---- public: ! MariePeek(std::string nodeName, ParameterSet params); void calculate(int output_id, int count, Buffer &out); }; Index: MarieCommandJoystick.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandJoystick.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieCommandJoystick.h 29 Jul 2004 18:30:03 -0000 1.1 --- MarieCommandJoystick.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 41,48 **** //from BufferedNode ! MarieCommandJoystick(string nodeName, ParameterSet params); virtual void calculate(int output_id, int count, Buffer &out); ! virtual void printOn(ostream &out) const; ! virtual void readFrom(istream &in=cin); virtual void copyDataAbstract(DataAbstract *data); --- 41,48 ---- //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); virtual void copyDataAbstract(DataAbstract *data); Index: MarieLoad.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieLoad.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieLoad.h 30 May 2004 12:34:07 -0000 1.1 --- MarieLoad.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 39,43 **** public: ! MarieLoad(string nodeName, ParameterSet params); void calculate(int output_id, int count, Buffer &out); }; --- 39,43 ---- public: ! MarieLoad(std::string nodeName, ParameterSet params); void calculate(int output_id, int count, Buffer &out); }; Index: MarieObject.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieObject.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieObject.h 30 May 2004 12:34:07 -0000 1.1 --- MarieObject.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 53,57 **** public: ! MarieObject(string nodeName, ParameterSet params) : BufferedNode(nodeName,params) {} virtual void copyDataAbstract(DataAbstract *data) = 0; --- 53,57 ---- public: ! MarieObject(std::string nodeName, ParameterSet params) : 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.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieDataSonar.h 30 May 2004 12:34:07 -0000 1.1 --- MarieDataSonar.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 40,47 **** //from BufferedNode ! MarieDataSonar(string nodeName, ParameterSet params); virtual void calculate(int output_id, int count, Buffer &out); ! virtual void printOn(ostream &out) const; ! virtual void readFrom(istream &in=cin); virtual void copyDataAbstract(DataAbstract *data); --- 40,47 ---- //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); virtual void copyDataAbstract(DataAbstract *data); Index: MarieCommandCamera.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandCamera.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieCommandCamera.h 24 Aug 2004 17:34:24 -0000 1.2 --- MarieCommandCamera.h 2 Jan 2005 14:43:57 -0000 1.3 *************** *** 41,48 **** //from BufferedNode ! MarieCommandCamera(string nodeName, ParameterSet params); virtual void calculate(int output_id, int count, Buffer &out); ! virtual void printOn(ostream &out) const; ! virtual void readFrom(istream &in=cin); virtual void copyDataAbstract(DataAbstract *data); --- 41,48 ---- //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); virtual void copyDataAbstract(DataAbstract *data); Index: MarieDataIR.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataIR.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieDataIR.h 4 Aug 2004 17:49:49 -0000 1.1 --- MarieDataIR.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 41,48 **** //from BufferedNode ! MarieDataIR(string nodeName, ParameterSet params); virtual void calculate(int output_id, int count, Buffer &out); ! virtual void printOn(ostream &out) const; ! virtual void readFrom(istream &in=cin); virtual void copyDataAbstract(DataAbstract *data); --- 41,48 ---- //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); virtual void copyDataAbstract(DataAbstract *data); Index: MarieDataCamera.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataCamera.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieDataCamera.h 30 May 2004 12:34:07 -0000 1.1 --- MarieDataCamera.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 41,48 **** //from BufferedNode ! MarieDataCamera(string nodeName, ParameterSet params); virtual void calculate(int output_id, int count, Buffer &out); ! virtual void printOn(ostream &out) const; ! virtual void readFrom(istream &in=cin); virtual void copyDataAbstract(DataAbstract *data); --- 41,48 ---- //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); virtual void copyDataAbstract(DataAbstract *data); Index: MarieDataLaser.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataLaser.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieDataLaser.h 30 May 2004 12:34:07 -0000 1.1 --- MarieDataLaser.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 41,48 **** //from BufferedNode ! MarieDataLaser(string nodeName, ParameterSet params); virtual void calculate(int output_id, int count, Buffer &out); ! virtual void printOn(ostream &out) const; ! virtual void readFrom(istream &in=cin); virtual void copyDataAbstract(DataAbstract *data); --- 41,48 ---- //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); virtual void copyDataAbstract(DataAbstract *data); Index: MarieDataOdometry.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataOdometry.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieDataOdometry.h 30 May 2004 12:34:07 -0000 1.1 --- MarieDataOdometry.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 40,47 **** //from BufferedNode ! MarieDataOdometry(string nodeName, ParameterSet params); virtual void calculate(int output_id, int count, Buffer &out); ! virtual void printOn(ostream &out) const; ! virtual void readFrom(istream &in=cin); virtual void copyDataAbstract(DataAbstract *data); --- 40,47 ---- //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); virtual void copyDataAbstract(DataAbstract *data); Index: MarieDataRaw.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataRaw.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieDataRaw.h 22 Jul 2004 21:00:52 -0000 1.1 --- MarieDataRaw.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 41,48 **** //from BufferedNode ! MarieDataRaw(string nodeName, ParameterSet params); virtual void calculate(int output_id, int count, Buffer &out); ! virtual void printOn(ostream &out) const; ! virtual void readFrom(istream &in=cin); virtual void copyDataAbstract(DataAbstract *data); --- 41,48 ---- //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); virtual void copyDataAbstract(DataAbstract *data); Index: MarieRequestSystem.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieRequestSystem.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieRequestSystem.h 22 Sep 2004 19:47:07 -0000 1.1 --- MarieRequestSystem.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 41,48 **** //from BufferedNode ! MarieRequestSystem(string nodeName, ParameterSet params); virtual void calculate(int output_id, int count, Buffer &out); ! virtual void printOn(ostream &out) const; ! virtual void readFrom(istream &in=cin); virtual void copyDataAbstract(DataAbstract *data); --- 41,48 ---- //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); virtual void copyDataAbstract(DataAbstract *data); Index: MariePull.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MariePull.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MariePull.h 14 Jun 2004 14:15:25 -0000 1.1 --- MariePull.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 39,43 **** public: ! MariePull(string nodeName, ParameterSet params); void calculate(int output_id, int count, Buffer &out); }; --- 39,43 ---- public: ! MariePull(std::string nodeName, ParameterSet params); void calculate(int output_id, int count, Buffer &out); }; Index: MarieSave.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieSave.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieSave.h 30 May 2004 12:34:07 -0000 1.1 --- MarieSave.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 35,39 **** public: ! MarieSave(string nodeName, ParameterSet params); void calculate(int output_id, int count, Buffer &out); --- 35,39 ---- public: ! MarieSave(std::string nodeName, ParameterSet params); void calculate(int output_id, int count, Buffer &out); Index: MarieDataNull.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataNull.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieDataNull.h 7 Jun 2004 15:10:10 -0000 1.1 --- MarieDataNull.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 41,48 **** //from BufferedNode ! MarieDataNull(string nodeName, ParameterSet params); virtual void calculate(int output_id, int count, Buffer &out); ! virtual void printOn(ostream &out) const; ! virtual void readFrom(istream &in=cin); virtual void copyDataAbstract(DataAbstract *data); --- 41,48 ---- //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); virtual void copyDataAbstract(DataAbstract *data); Index: MarieCommandBehavior.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandBehavior.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieCommandBehavior.h 30 May 2004 12:34:07 -0000 1.1 --- MarieCommandBehavior.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 40,47 **** //from BufferedNode ! MarieCommandBehavior(string nodeName, ParameterSet params); virtual void calculate(int output_id, int count, Buffer &out); ! virtual void printOn(ostream &out) const; ! virtual void readFrom(istream &in=cin); virtual void copyDataAbstract(DataAbstract *data); --- 40,47 ---- //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); virtual void copyDataAbstract(DataAbstract *data); Index: MarieDataMap.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataMap.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieDataMap.h 22 Sep 2004 13:55:53 -0000 1.1 --- MarieDataMap.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 40,47 **** //from BufferedNode ! MarieDataMap(string nodeName, ParameterSet params); virtual void calculate(int output_id, int count, Buffer &out); ! virtual void printOn(ostream &out) const; ! virtual void readFrom(istream &in=cin); virtual void copyDataAbstract(DataAbstract *data); --- 40,47 ---- //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); virtual void copyDataAbstract(DataAbstract *data); Index: MariePush.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MariePush.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MariePush.h 14 Jun 2004 14:15:25 -0000 1.1 --- MariePush.h 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 35,39 **** public: ! MariePush(string nodeName, ParameterSet params); void calculate(int output_id, int count, Buffer &out); --- 35,39 ---- public: ! MariePush(std::string nodeName, ParameterSet params); void calculate(int output_id, int count, Buffer &out); |
|
From: Dominic L. <ma...@us...> - 2005-01-02 14:44:50
|
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); /** |
|
From: Dominic L. <ma...@us...> - 2005-01-02 14:44:49
|
Update of /cvsroot/robotflow/RobotFlow/Devices/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19423/Devices/include Modified Files: LaserDevice.h SICKLMS200.h SNCRZ30.h Log Message: removing all "using namespace std;" in headers. Bumped version to 0.2.6. Preparing for the RobotFlow namespace. Index: SNCRZ30.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/include/SNCRZ30.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SNCRZ30.h 26 Aug 2004 20:05:47 -0000 1.9 --- SNCRZ30.h 2 Jan 2005 14:43:55 -0000 1.10 *************** *** 32,36 **** public: ! SNCRZ30(string nodeName, ParameterSet params); ~SNCRZ30(); --- 32,36 ---- public: ! SNCRZ30(std::string nodeName, ParameterSet params); ~SNCRZ30(); Index: LaserDevice.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/include/LaserDevice.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LaserDevice.h 29 Apr 2002 01:17:15 -0000 1.1 --- LaserDevice.h 2 Jan 2005 14:43:55 -0000 1.2 *************** *** 19,23 **** public: // Constructor ! LaserDevice(string serial_port); // Destructor --- 19,23 ---- public: // Constructor ! LaserDevice(std::string serial_port); // Destructor *************** *** 87,91 **** pthread_t m_Receiving_thread; pthread_mutex_t m_list_lock; ! list<string> m_received; }; --- 87,91 ---- pthread_t m_Receiving_thread; pthread_mutex_t m_list_lock; ! std::list<std::string> m_received; }; Index: SICKLMS200.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/include/SICKLMS200.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SICKLMS200.h 29 Apr 2002 01:17:15 -0000 1.1 --- SICKLMS200.h 2 Jan 2005 14:43:55 -0000 1.2 *************** *** 12,16 **** public: ! SICKLMS200(string nodeName, ParameterSet params); ~SICKLMS200(); virtual void calculate(int output_id, int count, Buffer &out); --- 12,16 ---- public: ! SICKLMS200(std::string nodeName, ParameterSet params); ~SICKLMS200(); virtual void calculate(int output_id, int count, Buffer &out); |
