Changeset 9677 in orxonox.OLD

Timestamp:

Aug 21, 2006, 11:40:41 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: much better ID nutrition

Location:

trunk/src/lib/lang

Files:

• Makefile.am (modified) (1 diff)
• new_object_list.cc (modified) (4 diffs)
• new_object_list.h (modified) (1 diff)
• test_object_list.cc (modified) (2 diffs)

trunk/src/lib/lang/Makefile.am

@@ -29 +29 @@
                 test_object_list.cc
 
+test_object_list_DEPENDENCIES = libORXlang.a
+
 test_object_list_LDADD = \
                 $(MAINSRCDIR)/util/libORXutils.a \

trunk/src/lib/lang/new_object_list.cc

@@ -23 +23 @@
     : _name(className)
 {
+
+
   if (NewObjectListBase::_classesByID == NULL)
   {
@@ -33 +35 @@
   if (id != -1)
   {
-    assert(!NewObjectListBase::classIDExists(id) && "Classes should only be included once, and no two classes should have the same ID (key value)");
+    this->_id = id;
   }
   else
   {
     this->_id = NewObjectListBase::_classesByID->size();
+    // searching for a free ID
+    while (NewObjectListBase::classIDExists(_id)) ++id;
   }
+  assert(!NewObjectListBase::classIDExists(id) && "Classes should only be included once, and no two classes should have the same ID (key value)");
+
+  /// Some Output, that will fall out later
+  std::cout << "register new ObjectList " << className << " ID: " << this->_id << std::endl;
 
   (*NewObjectListBase::_classesByID)[this->_id] = this;
@@ -52 +60 @@
 NewObjectListBase::~NewObjectListBase()
 {
+  assert (NewObjectListBase::_classesByName != NULL && NewObjectListBase::_classesByID != NULL);
+
+  std::cout << "Erasing: " << this->_name << " "<< this->_id  << std::endl;
+
+  std::cout << "SIZE OF _classByID: " << NewObjectListBase::_classesByID->size() << std::endl;
+  std::cout << "SIZE OF _classByName: " << NewObjectListBase::_classesByName->size() << std::endl;
+
   NewObjectListBase::_classesByName->erase(this->_name);
   NewObjectListBase::_classesByID->erase(this->_id);
@@ -67 +82 @@
 NewObjectListBase::classIDMap* NewObjectListBase::_classesByID = NULL;
 NewObjectListBase::classNameMap* NewObjectListBase::_classesByName = NULL;
-
-
 
 /**

trunk/src/lib/lang/new_object_list.h

@@ -19 +19 @@
 #define NewObjectListDefinition(ClassName) \
    NewObjectList<ClassName> ClassName::objectList(#ClassName)
+
+#define NewObjectListDefinitionID(ClassName, ID) \
+   NewObjectList<ClassName> ClassName::objectList(#ClassName, ID)
 
 

trunk/src/lib/lang/test_object_list.cc

@@ -43 +43 @@
   //ObjectListDeclaration(Test);
 };
-NewObjectListDefinition(Test);
+NewObjectListDefinitionID(Test, 0);
 
 Test::Test()
@@ -70 +70 @@
   NewObjectListDeclaration(Bone);
 };
-NewObjectListDefinition(Bone);
+NewObjectListDefinitionID(Bone, -1);
 
 int main()