Changes in src/Parser/XyzParser.cpp [97ebf8:ab4b55]

File:

• src/Parser/XyzParser.cpp (modified) (2 diffs)

src/Parser/XyzParser.cpp

@@ -44 +44 @@
 
   for (int i = 0; i < numberOfAtoms; i++) {
-    newAtom = World::getInstance().createAtom();
-    *file >> type >> ws >> newAtom->x[0] >> ws >> newAtom->x[1] >> ws >> newAtom->x[2];
-    newAtom->setType(World::getInstance().getPeriode()->FindElement(type));
+    newAtom = World::get()->createAtom();
+    *file >> type >> ws >> newAtom->x.x[0] >> ws >> newAtom->x.x[1] >> ws >> newAtom->x.x[2];
+    newAtom->setType(World::get()->getPeriode()->FindElement(type));
   }
 }
@@ -56 +56 @@
  */
 void XyzParser::save(ostream* file) {
-  *file << World::getInstance().numAtoms() << endl << comment << endl;
+  *file << World::get()->numAtoms() << endl << comment << endl;
 
-  vector<atom*> atoms = World::getInstance().getAllAtoms();
-  for(vector<atom*>::iterator it = atoms.begin(); it != atoms.end(); it++) {
-    *file << fixed << (*it)->getType()->symbol << "\t" << (*it)->x[0] << "\t" << (*it)->x[1] << "\t" << (*it)->x[2] << endl;
+  vector<atom*> atoms = World::get()->getAllAtoms();
+  for(vector<atom*>::iterator it = atoms.begin(); it < atoms.end(); it++) {
+    *file << fixed << (*it)->getType()->symbol << "\t" << (*it)->x.x[0] << "\t" << (*it)->x.x[1] << "\t" << (*it)->x.x[2] << endl;
   }
 }