Changeset 9681 in orxonox.OLD

Timestamp:

Aug 22, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

cleanup

Location:

trunk/src/lib/lang

Files:

• new_class_id.cc (modified) (2 diffs)
• new_class_id.h (modified) (2 diffs)
• new_object_list.cc (modified) (3 diffs)
• new_object_list.h (modified) (5 diffs)
• test_object_list.cc (modified) (2 diffs)

trunk/src/lib/lang/new_class_id.cc

@@ -35 +35 @@
 NewClassID::~NewClassID ()
 {
-  //  assert(_objectList != NULL);
   ClassList::iterator it;
   for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
@@ -42 +41 @@
     delete (*it)._iterator;
   }
-  //_objectList->unregisterObject(this->_iterators);
 }
 

trunk/src/lib/lang/new_class_id.h

@@ -14 +14 @@
 
 
-
-
 //! A class to dynamically allocate ClassID's and support a isA operator
 class NewClassID
@@ -22 +20 @@
   NewClassID();
   ~NewClassID();
-
 
   int leafClassID() const { return _classes.front()._objectList->id(); }

trunk/src/lib/lang/new_object_list.cc

@@ -20 +20 @@
 
 
+/**
+ * @brief Constructor, that creates an ObjectList while checking (development mode) for uniqueness of all Keys (names and ID's)
+ * @param className The Name of the Class to create an ObjectList for.
+ * @param id The ID if you like, or -1 otherwise.
+ * @return a new NewObejctList
+ */
 NewObjectListBase::NewObjectListBase(const std::string& className, int id)
     : _name(className)
 {
-
-
   if (NewObjectListBase::_classesByID == NULL)
   {
@@ -46 +50 @@
 
   /// Some Output, that will fall out later
-  std::cout << "register new ObjectList " << className << " ID: " << this->_id << std::endl;
+  //std::cout << "register new ObjectList " << className << " ID: " << this->_id << std::endl;
 
   (*NewObjectListBase::_classesByID)[this->_id] = this;
@@ -61 +65 @@
 {
   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);

trunk/src/lib/lang/new_object_list.h

@@ -12 +12 @@
 #include <list>
 #include <string>
+#include <iostream>
 
 
@@ -129 +130 @@
 //// IMPLEMENTATION /////
 /////////////////////////
+/**
+ * @brief creates a new NewObjectList
+ * @param name The name of the Class.
+ * @param id The ID of the class if desired, or -1 if an id should be assigned automatically.
+ */
 template <class T>
 NewObjectList<T>::NewObjectList(const std::string& name, int id)
@@ -134 +140 @@
 {}
 
+/**
+ * @brief deletes the NewObjectList.
+ */
 template <class T>
 NewObjectList<T>::~NewObjectList()
 {
-  // assert(_objects.empty());
+  if (!_objects.empty())
+  {
+    std::cout << "There are still Object in the ObjectList of " << this->name() << "(id:" << this->id() << ")\n";
+    this->debug();
+  }
 }
 
@@ -151 +164 @@
 
 template <class T>
-    NewObjectListBase::IteratorBase* NewObjectList<T>::registerObject(T* object)
+NewObjectListBase::IteratorBase* NewObjectList<T>::registerObject(T* object)
 {
   this->_objects.push_front(object);
@@ -164 +177 @@
 }
 
-#include <iostream>
 
 template <class T>

trunk/src/lib/lang/test_object_list.cc

@@ -64 +64 @@
   {
     this->registerObject(this, Bone::objectList);
-    this->_id.listInheritance();
+    //this->_id.listInheritance();
     std::cout << "LeafID:" << this->_id.leafClassID() << std::endl;
 
@@ -79 +79 @@
 int main()
 {
-  for (unsigned int i = 0; i < 20; ++i)
+#define ITERATIONS 20
+#define COUNT 100
+  for (unsigned int i = 0; i < ITERATIONS; ++i)
   {
     std::cout<< i <<  std::endl ;
-    Bone* test = new Bone[10000];
-    // delete[]test;
+    Bone* test = new Bone[COUNT];
+    delete[]test;
   }
   //   char tmp[100];