Changes in / [adb5cda:401f90]

File:

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

src/Parser/TremoloParser.cpp

@@ -100 +100 @@
 FormatParser< tremolo >::~FormatParser() 
 {
-  std::cerr << "Clearing usedFields." << std::endl;
+  LOG(1, "INFO: Clearing usedFields.");
   usedFields.clear();
   additionalAtomData.clear();
@@ -118 +118 @@
   // reset atomIdMap, for we now get new serials
   atomIdMap.clear();
-        std::cerr << "Clearing usedFields." << std::endl;
+  LOG(1, "INFO: Clearing usedFields.");
   usedFields.clear();
 
@@ -225 +225 @@
  */
 void FormatParser< tremolo >::saveLine(ostream* file, atom* currentAtom) {
-  //vector<string>::iterator it;
-  // TODO: Is unique for FormatParser< tremolo >::usedFields still required?
-  vector<string>::iterator it = unique(usedFields.begin(), usedFields.end()); // skips all duplicates in the vector
+  vector<string>::iterator it;
 
   TremoloKey::atomDataKey currentField;
@@ -349 +347 @@
 
   lineStream << line.substr(offset);
-        std::cerr << "Clearing usedFields in parseAtomDataKeysLine." << std::endl;
+  LOG(1, "INFO: Clearing usedFields in parseAtomDataKeysLine.");
   usedFields.clear();
   while (lineStream.good()) {
@@ -388 +386 @@
   stringstream lineStream;
   atom* newAtom = World::getInstance().createAtom();
-  TremoloAtomInfoContainer *atomInfo = NULL;
-  additionalAtomData[newAtom->getId()] = TremoloAtomInfoContainer(); // fill with default values
-  atomInfo = &additionalAtomData[newAtom->getId()];
+  const atomId_t atomid = newAtom->getId();
+  additionalAtomData[atomid] = TremoloAtomInfoContainer(); // fill with default values
+  TremoloAtomInfoContainer *atomInfo = &additionalAtomData[atomid];
   TremoloKey::atomDataKey currentField;
   ConvertTo<double> toDouble;
@@ -446 +444 @@
         ASSERT(tok_iter != tokens.end(), "FormatParser< tremolo >::readAtomDataLine() - no value for "+keyName+"!");
         LOG(4, "INFO: Parsing key " << keyName << " with next token " << *tok_iter);
-        atomIdMap[toInt(*tok_iter)] = newAtom->getId();
+        atomIdMap[toInt(*tok_iter)] = atomid;
         tok_iter++;
         break;
@@ -457 +455 @@
         }
         readNeighbors(&lineStream,
-            atoi(it->substr(it->find("=") + 1, 1).c_str()), newAtom->getId());
+            atoi(it->substr(it->find("=") + 1, 1).c_str()), atomid);
         break;
       default :
@@ -467 +465 @@
     }
   }
-  if (newmol != NULL) {
-    //LOG(0, "New Atom: " << *newAtom << " with type " << newAtom->getType()->getName());
+  LOG(3, "INFO: Parsed atom " << atomid << ".");
+  if (newmol != NULL)
     newmol->AddAtom(newAtom);
-  }
 }
 
@@ -651 +648 @@
           ++tok_iter) {
         if ((*tok_iter).find("particle_type") != string::npos) {
-          LOG(3, "INFO: found line '" << line << "' containing keyword 'particle_type'.");
+          LOG(3, "INFO: found token '" << *tok_iter << "' containing keyword 'particle_type'.");
           tokenizer token((*tok_iter), equalitysep);
           ASSERT(token.begin() != token.end(),
@@ -660 +657 @@
         }
         if ((*tok_iter).find("element_name") != string::npos) {
-          LOG(3, "INFO: found line '" << line << "' containing keyword 'element_name'.");
+          LOG(3, "INFO: found token '" << *tok_iter << "' containing keyword 'element_name'.");
           tokenizer token((*tok_iter), equalitysep);
           ASSERT(token.begin() != token.end(),
@@ -677 +674 @@
         }
       } else {
-        ELOG(1, "INFO: Desired element " << element_type << " is not known." );
+        ELOG(3, "Line does not contain both 'particle_type' and 'element_name' as keys." );
       }
     }