Changes in src/atom_bondedparticle.cpp [d74077:952f38]

File:

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

src/atom_bondedparticle.cpp

@@ -13 +13 @@
 #include "element.hpp"
 #include "lists.hpp"
-#include "log.hpp"
-#include "verbose.hpp"
+#include "Helpers/Log.hpp"
+#include "Helpers/Verbose.hpp"
 
 /** Constructor of class BondedParticle.
@@ -152 +152 @@
   NoBonds = CountBonds();
   //Log() << Verbose(3) << "Walker " << *this << ": " << (int)this->type->NoValenceOrbitals << " > " << NoBonds << "?" << endl;
-  if ((int)(getType()->NoValenceOrbitals) > NoBonds) { // we have a mismatch, check all bonding partners for mismatch
+  if ((int)(type->NoValenceOrbitals) > NoBonds) { // we have a mismatch, check all bonding partners for mismatch
     for (BondList::const_iterator Runner = ListOfBonds.begin(); Runner != ListOfBonds.end(); (++Runner)) {
       OtherWalker = (*Runner)->GetOtherAtom(this);
       OtherNoBonds = OtherWalker->CountBonds();
       //Log() << Verbose(3) << "OtherWalker " << *OtherWalker << ": " << (int)OtherWalker->type->NoValenceOrbitals << " > " << OtherNoBonds << "?" << endl;
-      if ((int)(OtherWalker->getType()->NoValenceOrbitals) > OtherNoBonds) { // check if possible candidate
+      if ((int)(OtherWalker->type->NoValenceOrbitals) > OtherNoBonds) { // check if possible candidate
         if ((CandidateBond == NULL) || (ListOfBonds.size() > OtherWalker->ListOfBonds.size())) { // pick the one with fewer number of bonds first
           CandidateBond = (*Runner);
@@ -189 +189 @@
 };
 
-std::ostream & BondedParticle::operator << (std::ostream &ost) const
-{
-  ParticleInfo::operator<<(ost);
-  ost << "," << getPosition();
-  return ost;
-}
-
-std::ostream & operator << (std::ostream &ost, const BondedParticle &a)
-{
-  a.ParticleInfo::operator<<(ost);
-  ost << "," << a.getPosition();
-  return ost;
-}
-