Changes in src/Parser/TremoloParser.cpp [d74077:e97a44]

File:

• src/Parser/TremoloParser.cpp (modified) (6 diffs)

src/Parser/TremoloParser.cpp

@@ -9 +9 @@
 
 #include "Helpers/Assert.hpp"
+#include "Helpers/Log.hpp"
+#include "Helpers/Verbose.hpp"
 #include "TremoloParser.hpp"
 #include "World.hpp"
@@ -21 +23 @@
 
 using namespace std;
-using namespace boost;
 
 /**
@@ -99 +100 @@
  */
 void TremoloParser::save(ostream* file) {
+  DoLog(0) && (Log() << Verbose(0) << "Saving changes to tremolo." << std::endl);
+
   vector<atom*>::iterator atomIt;
   vector<string>::iterator it;
@@ -140 +143 @@
       case TremoloKey::x :
         // for the moment, assume there are always three dimensions
-        *file << currentAtom->at(0) << "\t";
-        *file << currentAtom->at(1) << "\t";
-        *file << currentAtom->at(2) << "\t";
+        *file << currentAtom->x[0] << "\t";
+        *file << currentAtom->x[1] << "\t";
+        *file << currentAtom->x[2] << "\t";
         break;
       case TremoloKey::u :
         // for the moment, assume there are always three dimensions
-        *file << currentAtom->AtomicVelocity[0] << "\t";
-        *file << currentAtom->AtomicVelocity[1] << "\t";
-        *file << currentAtom->AtomicVelocity[2] << "\t";
+        *file << currentAtom->v[0] << "\t";
+        *file << currentAtom->v[1] << "\t";
+        *file << currentAtom->v[2] << "\t";
         break;
       case TremoloKey::Type :
@@ -225 +228 @@
   string word;
   int oldId;
-  double tmp;
 
   lineStream << line;
@@ -233 +235 @@
       case TremoloKey::x :
         // for the moment, assume there are always three dimensions
-        for (int i=0;i<NDIM;i++) {
-          lineStream >> tmp;
-          newAtom->set(i, tmp);
-        }
+        lineStream >> newAtom->x[0];
+        lineStream >> newAtom->x[1];
+        lineStream >> newAtom->x[2];
         break;
       case TremoloKey::u :
         // for the moment, assume there are always three dimensions
-        lineStream >> newAtom->AtomicVelocity[0];
-        lineStream >> newAtom->AtomicVelocity[1];
-        lineStream >> newAtom->AtomicVelocity[2];
+        lineStream >> newAtom->v[0];
+        lineStream >> newAtom->v[1];
+        lineStream >> newAtom->v[2];
         break;
       case TremoloKey::Type :