Changes in src/atom.cpp [215df0:a80241]

File:

• src/atom.cpp (modified) (9 diffs)

src/atom.cpp

@@ -4 +4 @@
  *
  */
+
+#include "Helpers/MemDebug.hpp"
 
 #include "atom.hpp"
@@ -14 +16 @@
 #include "vector.hpp"
 #include "World.hpp"
+#include "molecule.hpp"
 
 /************************************* Functions for class atom *************************************/
@@ -21 +24 @@
  */
 atom::atom() :
-  previous(NULL), next(NULL), father(this), sort(&nr)
+  father(this), sort(&nr), mol(0)
 {
   node = &x;  // TesselPoint::x can only be referenced from here
@@ -29 +32 @@
  */
 atom::atom(atom *pointer) :
-    ParticleInfo(pointer),
-    previous(NULL), next(NULL), father(pointer), sort(&nr)
+    ParticleInfo(pointer),father(pointer), sort(&nr)
 {
   type = pointer->type;  // copy element of atom
@@ -37 +39 @@
   FixedIon = pointer->FixedIon;
   node = &x;
+  mol = 0;
 };
 
 atom *atom::clone(){
   atom *res = new atom(this);
-  res->previous=0;
-  res->next=0;
   res->father = this;
   res->sort = &res->nr;
@@ -50 +51 @@
   res->FixedIon = FixedIon;
   res->node = &x;
+  res->mol = 0;
   World::getInstance().registerAtom(res);
   return res;
@@ -59 +61 @@
 atom::~atom()
 {
-  unlink(this);
+  removeFromMolecule();
+  for(BondList::iterator iter=ListOfBonds.begin(); iter!=ListOfBonds.end();){
+    // deleting the bond will invalidate the iterator !!!
+    bond *bond =*(iter++);
+    delete(bond);
+  }
 };
 
@@ -272 +279 @@
 {
   if (ComponentNr != NULL)
-    Free(&ComponentNr);
-  ComponentNr = Malloc<int>(ListOfBonds.size()+1, "atom::InitComponentNumbers: *ComponentNr");
+    delete[](ComponentNr);
+  ComponentNr = new int[ListOfBonds.size()+1];
   for (int i=ListOfBonds.size()+1;i--;)
     ComponentNr[i] = -1;
@@ -312 +319 @@
 }
 
+void atom::setMolecule(molecule *_mol){
+  // take this atom from the old molecule
+  removeFromMolecule();
+  mol = _mol;
+  if(!mol->containsAtom(this)){
+    mol->AddAtom(this);
+  }
+}
+
+void atom::removeFromMolecule(){
+  if(mol){
+    if(mol->containsAtom(this)){
+      mol->erase(this);
+    }
+    mol=0;
+  }
+}
+
+
 atom* NewAtom(atomId_t _id){
   atom * res =new atom();