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

File:

• src/atom_bondedparticle.cpp (modified) (5 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;
 };
 
@@ -75 +75 @@
 };
 
+/**
+ * Adds a bond between this bonded particle and another. Does nothing if this
+ * bond already exists.
+ *
+ * \param bonding partner
+ */
+void BondedParticle::addBond(BondedParticle* Partner) {
+  if (IsBondedTo(Partner)) {
+    return;
+  }
+
+  bond* newBond = new bond((atom*) this, (atom*) Partner, 1, 0);
+  RegisterBond(newBond);
+  Partner->RegisterBond(newBond);
+}
+
 /** Puts a given bond into atom::ListOfBonds.
  * \param *Binder bond to insert
@@ -86 +102 @@
       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 +121 @@
       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 +166 @@
       //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++;
     }