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

Timestamp:

Aug 21, 2006, 10:57:35 PM (18 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.cc (modified) (2 diffs)

trunk/src/lib/lang/new_object_list.cc

@@ -23 +23 @@
     : _id(-1), _name(className)
 {
-  if (NewObjectListBase::_classes == NULL)
-    NewObjectListBase::_classes = new cSet;
+  if (NewObjectListBase::_classesByID == NULL)
+  {
+    NewObjectListBase::_classesByID = new classIDMap;
+    assert (NewObjectListBase::_classesByName == NULL);
+    NewObjectListBase::_classesByName = new classNameMap;
+  }
+  assert(!NewObjectListBase::classNameExists(className) && "Classes should only be included once, and no two classes should have the same name/ID (key value)");
 
-
-  assert(!NewObjectListBase::classNameExists(className) && "Classes should not be included once, and no two classes should have the same name (key value)");
 
   this->_id = NewObjectListBase::_idCounter++;
 
+  (*NewObjectListBase::_classesByID)[this->_id] = this;
+  (*NewObjectListBase::_classesByName)[this->_name] = this;
 }
 
 NewObjectListBase::~NewObjectListBase()
 {
+  NewObjectListBase::_classesByName->erase(this->_name);
+  NewObjectListBase::_classesByID->erase(this->_id);
 
+  if (NewObjectListBase::_classesByID->empty())
+  {
+    delete NewObjectListBase::_classesByID;
+    NewObjectListBase::_classesByID = NULL;
+    assert(NewObjectListBase::_classesByName != NULL);
+    delete NewObjectListBase::_classesByName;
+    NewObjectListBase::_classesByName = NULL;
+  }
 }
 
 int NewObjectListBase::_idCounter = 0;
-NewObjectListBase::cSet* NewObjectListBase::_classes = NULL;
+NewObjectListBase::classIDMap* NewObjectListBase::_classesByID = NULL;
+NewObjectListBase::classNameMap* NewObjectListBase::_classesByName = NULL;
 
 
@@ -50 +66 @@
 bool NewObjectListBase::classNameExists(const std::string& name)
 {
-  cSet::iterator it;
-  for (it = NewObjectListBase::_classes->begin(); it != NewObjectListBase::_classes->end(); it++)
-    if(*it != NULL && (*it)->name() != name)
-      return true;
-  return false;
+  return (NewObjectListBase::_classesByName->find(name) != NewObjectListBase::_classesByName->end());
+  //  classNameMap::iterator it;
+  //   for (it = NewObjectListBase::_classesByID->begin(); it != NewObjectListBase::_classesByID->end(); it++)
+  //     if(*it != NULL && (*it)->name() != name)
+  //       return true;
+  //   return false;
 }
+
+
+/**
+ * @brief Converts an ID into a ClassName String.
+ * @param classID The ID to convert.
+ * @return The ClassName or an empty string if the ID was not found.
+ */
+const std::string& NewObjectListBase::IDToString(int classID)
+{
+  assert (NewObjectListBase::_classesByID != NULL);
+  NewObjectListBase::classIDMap::iterator it = NewObjectListBase::_classesByID->find(classID);
+  if (it != NewObjectListBase::_classesByID->end())
+    return (*it).second->name();
+  else
+  {
+    static std::string empty;
+    return empty;
+  }
+}
+
+
+/**
+ * @brief Converts a String into an ID
+ * @param className the Name of the Class to search for
+ * @return The Classes ID if found, -1 otherwise.
+ */
+int NewObjectListBase::StringToID(const std::string& className)
+{
+  assert (NewObjectListBase::_classesByName != NULL);
+  NewObjectListBase::classNameMap::iterator it = NewObjectListBase::_classesByName->find(className);
+  if (it != NewObjectListBase::_classesByName->end())
+    return (*it).second->id();
+  else
+    return -1;
+}
+