Changeset 9672 in orxonox.OLD for trunk

Timestamp:

Aug 21, 2006, 5:58:01 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: ClassList objectively implemented. This is not the fastest, but the most modular approach.
Now is the question of redundancy in code writing:
Should the ClassWriter explicitely declare a Class with superclasses, or should on runtime each object decide for itself, as it is done in BaseObject at the moment… questions questions questions…

Location:

trunk/src/lib/lang

Files:

• Makefile.am (modified) (1 diff)
• new_class_id.cc (modified) (2 diffs)
• new_class_id.h (modified) (2 diffs)
• new_object_list.h (modified) (6 diffs)
• test_object_list.cc (modified) (3 diffs)

trunk/src/lib/lang/Makefile.am

@@ -19 +19 @@
 
 
-check_PROGRAMS = test_object_list
+bin_PROGRAMS = test_object_list
 
 test_object_list_SOURCES = \

trunk/src/lib/lang/new_class_id.cc

@@ -26 +26 @@
  */
 NewClassID::NewClassID ()
-    : _objectList(NULL)
 {}
 
@@ -35 +34 @@
 NewClassID::~NewClassID ()
 {
-  assert(_objectList != NULL);
-  _objectList->unregisterObject(this->_iterators);
+  //  assert(_objectList != NULL);
+  std::list<NewObjectListBase::ClassEntry>::iterator it;
+  for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
+    (*it)._objectList->unregisterObject((*it)._iterator);
+  //_objectList->unregisterObject(this->_iterators);
 }
 

trunk/src/lib/lang/new_class_id.h

@@ -26 +26 @@
 
 private:
-  NewObjectListBase*                           _objectList;
-  std::list<NewObjectListBase::IteratorBase*>  _iterators; //!< Iterators to the class-list's positions.
+  std::list<NewObjectListBase::ClassEntry>       _classes;
 };
 
@@ -34 +33 @@
     inline void NewClassID::registerObject(T* object, NewObjectList<T>& objectList)
 {
-  this->_objectList = &objectList;
-  _iterators.push_back(objectList.registerObject(object, this->_objectList));
+  this->_classes.push_back(NewObjectListBase::ClassEntry(&objectList, objectList.registerObject(object)));
+
+  /*  this->_objectList = &objectList;
+  _iterators.push_back(objectList.registerObject(object, this->_objectList));*/
 }
 

trunk/src/lib/lang/new_object_list.h

@@ -25 +25 @@
 public:
   class IteratorBase { };
+  struct ClassEntry{
+    inline ClassEntry (NewObjectListBase* objectList, NewObjectListBase::IteratorBase* iterator) : _objectList(objectList), _iterator(iterator) {}
+    NewObjectListBase*                _objectList;
+    NewObjectListBase::IteratorBase*  _iterator;
+  };
 
 public:
@@ -45 +50 @@
   static const std::list<std::string>&  getClassNames();
 
-  virtual void unregisterObject(std::list<NewObjectListBase::IteratorBase*> _iterators) = 0;
+  virtual void unregisterObject(IteratorBase* _iterators) = 0;
 
 protected:
@@ -91 +96 @@
   {
   public:
-    Iterator(iterator it) { it = it; }
-    typename NewObjectList::iterator it;
+    Iterator(iterator it) { _it = it; }
+    inline iterator& it() { return _it; }
+    typename NewObjectList::iterator _it;
   };
 
@@ -102 +108 @@
   inline const list&      objects() const { return _objects; };
 
-  NewObjectListBase::IteratorBase* registerObject(T* object, NewObjectListBase* objectList);
-  void unregisterObject(const IteratorBase& iterator);
-  virtual void unregisterObject(std::list<NewObjectListBase::IteratorBase*> _iterators) = 0;
+  NewObjectListBase::IteratorBase* registerObject(T* object);
+  void unregisterObject(IteratorBase* iterator);
 
   virtual void debug() const;
@@ -145 +150 @@
 
 template <class T>
-    NewObjectListBase::IteratorBase* NewObjectList<T>::registerObject(T* object, NewObjectListBase* objectList)
+    NewObjectListBase::IteratorBase* NewObjectList<T>::registerObject(T* object)
 {
-  if(this->_typeOfList.empty())
-  {
-    this->_typeOfList.push_back(objectList);
-  }
-
   this->_objects.push_front(object);
   return new Iterator(this->_objects.begin());
@@ -157 +157 @@
 
 template <class T>
-void NewObjectList<T>::unregisterObject(const IteratorBase& iterator)
+void NewObjectList<T>::unregisterObject(IteratorBase* iterator)
 {
-  this->_objects.erase(static_cast<Iterator>(iterator));
+  this->_objects.erase(static_cast<Iterator*>(iterator)->it());
   //_objects.erase(std::find(_objects.begin(), _objects.end(), object));
 }

trunk/src/lib/lang/test_object_list.cc

@@ -10 +10 @@
   bool operator==(const std::string& name) const { return _objectName == name; };
 
+  NewObjectListDeclaration(BaseObject);
+
+
 protected:
+  BaseObject(const std::string& objectName = "") : _objectName(objectName) { this->registerObject(this, objectList); };
   template<class T>
       inline void registerObject(T* object, NewObjectList<T>& objectList) { _id.registerObject(object, objectList); };
@@ -17 +21 @@
   std::string   _objectName;
 
+
 };
+NewObjectListDefinition(BaseObject);
+
 
 class Test : public BaseObject
@@ -53 +60 @@
 {
   Test* test = new Test();
-  test->setName("Testing");
+  test->setName("Test-object");
 
   Test::objectList.debug();
 
-  delete test;
 
   Test::objectList.debug();
   Bone* bone = new Bone();
+  bone->setName("Bone-object");
+
+  std::cout << "Here is debug of all Classes\n";
+  BaseObject::objectList.debug();
   delete bone;
+  delete test;
 
-
-
-  std::cout << NewObjectListBase::classCount() << std::endl;
 }