Menu
▾
▴
[Robotflow-cvs] RobotFlow/Behaviors/include Behavior.h,1.6,1.7 DirectList.h,1.4,1.5 Exploitation.h,1.5,1.6 ExploitationEntry.h,1.2,1.3 Recommandation.h,1.2,1.3
|
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 |
