Changeset 9675 in orxonox.OLD for trunk/src/lib/lang/new_object_list.h

Timestamp:

Aug 21, 2006, 10:57:35 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more Implementation of Functionality.
Introduced map for fast search of ID/Name pairs.
This will also be used to speedup the Factory create-process

File:

• trunk/src/lib/lang/new_object_list.h (modified) (4 diffs)

trunk/src/lib/lang/new_object_list.h

@@ -9 +9 @@
 
 #include "type_info.h"
-#include <set>
+#include <map>
 #include <list>
-#include <vector>
 #include <string>
 
@@ -33 +32 @@
 
 public:
-  int id() const { return _id; };
-  const std::string& name() const { return _name; };
+  inline int id() const { return _id; };
+  inline const std::string& name() const { return _name; };
   bool operator==(int id) const { return _id == id; };
   bool operator==(const std::string& name) const { return _name == name; };
@@ -40 +39 @@
 
   /// Comparing operators.
-  bool compareName(const NewObjectListBase& more) const { return this->_name < more.name(); };
-  bool compareID(const NewObjectListBase& more) const { return this->_id < more.id(); };
+//   struct CompareID  {
+//     bool operator()(const NewObjectListBase* less, const NewObjectListBase* more) { return less->id() < more->id(); };
+//   };
+//   struct CompareName{
+//     bool operator()(const NewObjectListBase* less, const NewObjectListBase* more) { return less->name() < more->name(); };
+//   };
 
   virtual void debug() const = 0;
@@ -63 +66 @@
 
 protected:
-  typedef std::set<NewObjectListBase*>     cSet;    //!< The Generic Set.
-  typedef std::vector<NewObjectListBase*>  cVector; //!< The
+  typedef std::map<int, NewObjectListBase*> classIDMap;    //!< The Generic Map.
+  typedef std::map<std::string, NewObjectListBase*> classNameMap;//!< The Generic Map.
 
   int                           _id;                //!< The ID of the class.
   std::string                   _name;              //!< The Name of the Class.
 
-  cVector                       _typeOfList;        //!< A List of all classes this class is derived of, and the class itself, ordered by age of addition.
-  cSet                          _typeOfSet;         //!< A Set of all classes this is derived from and the class itself (for isA).
 private:
 
   static int                    _idCounter;         //!< A counter, that gives all classes a Unique ClassID. Access to this Variable is to be Thread-Safe.
-  static cSet*                  _classes;           //!< A Set of all the classes in existance.
+  static classIDMap*            _classesByID;       //!< A Map of all the classes in existance.
+  static classNameMap*          _classesByName;     //!< A Map of all the classes in existance.
   static std::list<std::string> _classNames;        //!< A list of all the registered ClassNames.
 };