Changes in src/molecule.cpp [a7aebd:833b15]

File:

• src/molecule.cpp (modified) (8 diffs)

src/molecule.cpp

@@ -49 +49 @@
 #include "CodePatterns/enumeration.hpp"
 #include "CodePatterns/Log.hpp"
-#include "CodePatterns/Observer/Notification.hpp"
 #include "config.hpp"
 #include "Descriptors/AtomIdDescriptor.hpp"
@@ -147 +146 @@
   OBSERVE;
   if(atomIdPool.reserveId(newNr)){
-    _lastchangedatom = target;
     NOTIFY(AtomNrChanged);
     if (oldNr != -1)  // -1 is reserved and indicates no number
@@ -209 +207 @@
 {
   OBSERVE;
+  NOTIFY(AtomRemoved);
   const_iterator iter = loc;
   ++iter;
   atom * const _atom = const_cast<atom *>(*loc);
-  {
-    _lastchangedatom = _atom;
-    NOTIFY(AtomRemoved);
-  }
   atomIds.erase( _atom->getId() );
   {
@@ -231 +226 @@
 {
   OBSERVE;
-  {
-    _lastchangedatom = key;
-    NOTIFY(AtomRemoved);
-  }
+  NOTIFY(AtomRemoved);
   const_iterator iter = find(key);
   if (iter != end()){
@@ -255 +247 @@
   OBSERVE;
   NOTIFY(AtomInserted);
-  _lastchangedatom = key;
   std::pair<iterator,bool> res = atomIds.insert(key->getId());
   if (res.second) { // push atom if went well
@@ -646 +637 @@
 /** Destroys all atoms inside this molecule.
  */
-void removeAtomsinMolecule(molecule *&_mol)
+void molecule::removeAtomsinMolecule()
 {
   // remove each atom from world
-  for(molecule::iterator AtomRunner = _mol->begin(); !_mol->empty(); AtomRunner = _mol->begin())
+  for(iterator AtomRunner = begin(); !empty(); AtomRunner = begin())
     World::getInstance().destroyAtom(*AtomRunner);
-  // make sure that pointer os not usable
-  _mol = NULL;
 };
 
@@ -985 +974 @@
     for(const_iterator iter = begin(); iter != end(); ++iter)
       center += (*iter)->getPosition();
-    if (begin() != end())
-      center *= 1./(double)size();
+    center *= 1./(double)size();
     for(const_iterator iter = begin(); iter != end(); ++iter) {
       const Vector &position = (*iter)->getPosition();
@@ -1007 +995 @@
 }
 
-void molecule::update(Observable *publisher)
-{
-  ASSERT(0, "molecule::update() - did not sign on for any general updates.");
-}
-
-void molecule::recieveNotification(Observable *publisher, Notification_ptr notification)
-{
-  const atom * const _atom = dynamic_cast<atom *>(publisher);
-  if ((_atom != NULL) && containsAtom(_atom)) {
-#ifdef LOG_OBSERVER
-    observerLog().addMessage() << "++ Update of Observer "<< observerLog().getName(static_cast<Observer *>(this))
-          << " received notification from atom " << _atom->getId() << " for channel "
-          << notification->getChannelNo() << ".";
-#endif
-    switch (notification->getChannelNo()) {
-      case AtomObservable::PositionChanged:
-      {
-        // emit others about one of our atoms moved
-        _lastchangedatom = const_cast<atom *>(_atom);
-        OBSERVE;
-        NOTIFY(AtomMoved);
-        break;
-      }
-      default:
-        ASSERT( 0, "molecule::recieveNotification() - we did not sign up for channel "
-            +toString(notification->getChannelNo()));
-        break;
-    }
-  }
-}
-
-void molecule::subjectKilled(Observable *publisher)
-{
-  // do nothing, atom does it all
-}
-
-
 // construct idpool
 CONSTRUCT_IDPOOL(atomId_t, continuousId)