Changes in src/moleculelist.cpp [24a5e0:ead4e6]

File:

• src/moleculelist.cpp (modified) (14 diffs)

src/moleculelist.cpp

@@ -141 +141 @@
 void MoleculeListClass::Enumerate(ostream *out)
 {
-  element* Elemental = NULL;
   atom *Walker = NULL;
-  int Counts[MAX_ELEMENTS];
+  periodentafel *periode = World::getInstance().getPeriode();
+  std::map<atomicNumber_t,unsigned int> counts;
   double size=0;
   Vector Origin;
@@ -155 +155 @@
     Origin.Zero();
     for (MoleculeList::iterator ListRunner = ListOfMolecules.begin(); ListRunner != ListOfMolecules.end(); ListRunner++) {
-      // reset element counts
-      for (int j = 0; j<MAX_ELEMENTS;j++)
-        Counts[j] = 0;
       // count atoms per element and determine size of bounding sphere
       size=0.;
@@ -163 +160 @@
       while (Walker->next != (*ListRunner)->end) {
         Walker = Walker->next;
-        Counts[Walker->type->Z]++;
+        counts[Walker->type->getNumber()]++;
         if (Walker->x.DistanceSquared(&Origin) > size)
           size = Walker->x.DistanceSquared(&Origin);
@@ -169 +166 @@
       // output Index, Name, number of atoms, chemical formula
       (*out) << ((*ListRunner)->ActiveFlag ? "*" : " ") << (*ListRunner)->IndexNr << "\t" << (*ListRunner)->name << "\t\t" << (*ListRunner)->AtomCount << "\t";
-      Elemental = (*ListRunner)->elemente->end;
-      while(Elemental->previous != (*ListRunner)->elemente->start) {
-        Elemental = Elemental->previous;
-        if (Counts[Elemental->Z] != 0)
-          (*out) << Elemental->symbol << Counts[Elemental->Z];
+
+      std::map<atomicNumber_t,unsigned int>::reverse_iterator iter;
+      for(iter=counts.rbegin(); iter!=counts.rend();++iter){
+        atomicNumber_t Z =(*iter).first;
+        (*out) << periode->FindElement(Z)->getSymbol() << (*iter).second;
       }
       // Center and size
@@ -215 +212 @@
   // remove src
   ListOfMolecules.remove(srcmol);
-  World::get()->destroyMolecule(srcmol);
+  World::getInstance().destroyMolecule(srcmol);
   return true;
 };
@@ -580 +577 @@
   stringstream line;
   atom *Walker = NULL;
-  element *runner = NULL;
+  periodentafel *periode=World::getInstance().getPeriode();
 
   // open file for the force factors
@@ -590 +587 @@
     //output << prefix << "Forces" << endl;
     for (MoleculeList::iterator ListRunner = ListOfMolecules.begin(); ListRunner != ListOfMolecules.end(); ListRunner++) {
-      runner = (*ListRunner)->elemente->start;
-      while (runner->next != (*ListRunner)->elemente->end) { // go through every element
-        runner = runner->next;
-        if ((*ListRunner)->ElementsInMolecule[runner->Z]) { // if this element got atoms
+      periodentafel::const_iterator elemIter;
+      for(elemIter=periode->begin();elemIter!=periode->end();++elemIter){
+          if ((*ListRunner)->ElementsInMolecule[(*elemIter).first]) { // if this element got atoms
           Walker = (*ListRunner)->start;
           while (Walker->next != (*ListRunner)->end) { // go through every atom of this element
             Walker = Walker->next;
-            if (Walker->type->Z == runner->Z) {
+            if (Walker->type->getNumber() == (*elemIter).first) {
               if ((Walker->GetTrueFather() != NULL) && (Walker->GetTrueFather() != Walker)) {// if there is a rea
                 //Log() << Verbose(0) << "Walker is " << *Walker << " with true father " << *( Walker->GetTrueFather()) << ", it
@@ -750 +746 @@
 void MoleculeListClass::DissectMoleculeIntoConnectedSubgraphs(const periodentafel * const periode, config * const configuration)
 {
-  molecule *mol = World::get()->createMolecule();
+  molecule *mol = World::getInstance().createMolecule();
   atom *Walker = NULL;
   atom *Advancer = NULL;
@@ -775 +771 @@
     }
     // remove the molecule
-    World::get()->destroyMolecule(*MolRunner);
+    World::getInstance().destroyMolecule(*MolRunner);
     ListOfMolecules.erase(MolRunner);
   }
@@ -797 +793 @@
   molecule **molecules = Malloc<molecule *>(MolCount, "config::Load() - **molecules");
   for (int i=0;i<MolCount;i++) {
-    molecules[i] = World::get()->createMolecule();
+    molecules[i] = World::getInstance().createMolecule();
     molecules[i]->ActiveFlag = true;
     strncpy(molecules[i]->name, mol->name, MAXSTRINGSIZE);
@@ -895 +891 @@
   OBSERVE;
   molecule *mol = NULL;
-  mol = World::get()->createMolecule();
+  mol = World::getInstance().createMolecule();
   insert(mol);
 };
@@ -904 +900 @@
   char filename[MAXSTRINGSIZE];
   Log() << Verbose(0) << "Format should be XYZ with: ShorthandOfElement\tX\tY\tZ" << endl;
-  mol = World::get()->createMolecule();
+  mol = World::getInstance().createMolecule();
   do {
     Log() << Verbose(0) << "Enter file name: ";
@@ -962 +958 @@
       mol = *ListRunner;
       ListOfMolecules.erase(ListRunner);
-      World::get()->destroyMolecule(mol);
+      World::getInstance().destroyMolecule(mol);
       break;
     }
@@ -1009 +1005 @@
   // remove the leaf itself
   if (Leaf != NULL) {
-    World::get()->destroyMolecule(Leaf);
+    World::getInstance().destroyMolecule(Leaf);
     Leaf = NULL;
   }