Changeset a1a532 for molecuilder/src/World.cpp

Timestamp:

Feb 25, 2010, 10:50:54 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

2e6496

Parents:

bb89b9

Message:

moved Iterators for the World to a seperate file

File:

• molecuilder/src/World.cpp (modified) (7 diffs)

molecuilder/src/World.cpp

@@ -49 +49 @@
   mol = new molecule(periode);
   molecules_deprecated->insert(mol);
-  molecules.insert(mol);
+  assert(!molecules.count(currMoleculeId));
+  molecules[currMoleculeId++] = mol;
   mol->signOn(this);
   return mol;
@@ -58 +59 @@
   OBSERVE;
   atom *res = NewAtom();
+  assert(!atoms.count(currAtomId));
   res->setId(currAtomId++);
   res->setWorld(this);
@@ -66 +68 @@
 int World::registerAtom(atom *atom){
   OBSERVE;
+  assert(!atoms.count(currAtomId));
   atom->setId(currAtomId++);
   atom->setWorld(this);
@@ -107 +110 @@
 /******************************* Iterators ********************************/
 
-World::AtomIterator::AtomIterator(){
-  state = World::get()->atomEnd();
-}
-
-World::AtomIterator::AtomIterator(AtomDescriptor _descr, World* _world) :
-    descr(_descr.get_impl()),
-    world(_world),
-    index(0)
-{
-  state = world->atoms.begin();
-  advanceState();
-}
-
-World::AtomIterator::AtomIterator(const AtomIterator& rhs) :
-    state(rhs.state),
-    descr(rhs.descr),
-    index(rhs.index),
-    world(rhs.world)
-  {}
-
-World::AtomIterator& World::AtomIterator::operator=(const AtomIterator& rhs)
-{
-  if(&rhs!=this){
-    state=rhs.state;
-    descr=rhs.descr;
-    index=rhs.index;
-    world=rhs.world;
-  }
-  return *this;
-}
-
-World::AtomIterator& World::AtomIterator::operator++(){
-  ++state;
-  ++index;
-  advanceState();
-  return *this;
-}
-
-World::AtomIterator World::AtomIterator::operator++(int){
-  AtomIterator res(*this);
-  ++(*this);
-  return res;
-}
-
-bool World::AtomIterator::operator==(const AtomIterator& rhs){
-  return state==rhs.state;
-}
-
-bool World::AtomIterator::operator==(const World::AtomList::iterator& rhs){
-  return state==rhs;
-}
-
-bool World::AtomIterator::operator!=(const AtomIterator& rhs){
-  return state!=rhs.state;
-}
-
-bool World::AtomIterator::operator!=(const World::AtomList::iterator& rhs){
-  return state!=rhs;
-}
-
-atom* World::AtomIterator::operator*(){
-  return (*state).second;
-}
-
-void World::AtomIterator::advanceState(){
-  while((state!=world->atoms.end()) && (!descr->predicate(*state))){
-    ++state;
-    ++index;
-  }
-}
-
-int World::AtomIterator::getCount(){
-  return index;
-}
+/*
+ * Actual Implementation of the iterators can be found in WorldIterators.cpp
+ */
 
 World::AtomIterator World::getAtomIter(AtomDescriptor descr){
@@ -186 +118 @@
 }
 
-World::AtomList::iterator World::atomEnd(){
+World::AtomSet::iterator World::atomEnd(){
   return atoms.end();
 }
@@ -200 +132 @@
 World::World() :
     currAtomId(0),
+    currMoleculeId(0),
     periode(new periodentafel),
     molecules_deprecated(new MoleculeListClass),
-    atoms()
+    atoms(),
+    molecules()
 {
   molecules_deprecated->signOn(this);
@@ -211 +145 @@
   delete molecules_deprecated;
   delete periode;
-  AtomList::iterator iter;
+  AtomSet::iterator iter;
   for(iter=atoms.begin();iter!=atoms.end();++iter){
     DeleteAtom((*iter).second);