Changes in src/atom_bondedparticle.cpp [a67d19:791138]

File:

• src/atom_bondedparticle.cpp (modified) (6 diffs)

src/atom_bondedparticle.cpp

@@ -44 +44 @@
 void BondedParticle::OutputBondOfAtom() const
 {
-  DoLog(4) && (Log() << Verbose(4) << "Atom " << Name << "/" << nr << " with " << ListOfBonds.size() << " bonds: " << endl);
+  Log() << Verbose(4) << "Atom " << Name << "/" << nr << " with " << ListOfBonds.size() << " bonds: " << endl;
   int TotalDegree = 0;
   for (BondList::const_iterator Runner = ListOfBonds.begin(); Runner != ListOfBonds.end(); ++Runner) {
-    DoLog(4) && (Log() << Verbose(4) << **Runner << endl);
+    Log() << Verbose(4) << **Runner << endl;
     TotalDegree += (*Runner)->BondDegree;
   }
-  DoLog(4) && (Log() << Verbose(4) << " -- TotalDegree: " << TotalDegree << endl);
+  Log() << Verbose(4) << " -- TotalDegree: " << TotalDegree << endl;
 };
 
@@ -56 +56 @@
  * \param *AdjacencyFile output stream
  */
-void BondedParticle::OutputAdjacency(ofstream * const AdjacencyFile) const
+void BondedParticle::OutputAdjacency(ofstream *AdjacencyFile) const
 {
   *AdjacencyFile << nr << "\t";
@@ -62 +62 @@
     *AdjacencyFile << (*Runner)->GetOtherAtom(this)->nr << "\t";
   *AdjacencyFile << endl;
-};
-
-/** Output of atom::nr along each bond partner per line.
- * Only bonds are printed where atom::nr is smaller than the one of the bond partner.
- * \param *AdjacencyFile output stream
- */
-void BondedParticle::OutputBonds(ofstream * const BondFile) const
-{
-  for (BondList::const_iterator Runner = ListOfBonds.begin(); Runner != ListOfBonds.end(); (++Runner))
-    if (nr < (*Runner)->GetOtherAtom(this)->nr)
-      *BondFile << nr << "\t" << (*Runner)->GetOtherAtom(this)->nr << "\n";
 };
 
@@ -86 +75 @@
       status = true;
     } else {
-      DoeLog(1) && (eLog()<< Verbose(1) << *Binder << " does not contain " << *this << "." << endl);
+      eLog() << Verbose(1) << *Binder << " does not contain " << *this << "." << endl;
     }
   } else {
-    DoeLog(1) && (eLog()<< Verbose(1) << "Binder is " << Binder << "." << endl);
+    eLog() << Verbose(1) << "Binder is " << Binder << "." << endl;
   }
   return status;
@@ -105 +94 @@
       status = true;
     } else {
-      DoeLog(1) && (eLog()<< Verbose(1) << *Binder << " does not contain " << *this << "." << endl);
+      eLog() << Verbose(1) << *Binder << " does not contain " << *this << "." << endl;
     }
   } else {
-    DoeLog(1) && (eLog()<< Verbose(1) << "Binder is " << Binder << "." << endl);
+    eLog() << Verbose(1) << "Binder is " << Binder << "." << endl;
   }
   return status;
@@ -150 +139 @@
       //Log() << Verbose(2) << "Increased bond degree for bond " << *CandidateBond << "." << endl;
     } else {
-      DoeLog(2) && (eLog()<< Verbose(2) << "Could not find correct degree for atom " << *this << "." << endl);
+      eLog() << Verbose(2) << "Could not find correct degree for atom " << *this << "." << endl;
       FalseBondDegree++;
     }