Changes in src/atom.hpp [e41c48:0ba410]

File:

• src/atom.hpp (modified) (5 diffs)

src/atom.hpp

@@ -22 +22 @@
 #include <vector>
 
-#include "Helpers/helpers.hpp"
 #include "atom_atominfo.hpp"
 #include "atom_bondedparticle.hpp"
@@ -28 +27 @@
 #include "atom_particleinfo.hpp"
 #include "atom_trajectoryparticle.hpp"
-#include "TesselPoint.hpp"
+#include "tesselation.hpp"
 #include "types.hpp"
 
@@ -43 +42 @@
  * Class incorporates position, type
  */
-class atom : public TrajectoryParticle, public GraphNode, public BondedParticle, public TesselPoint {
+class atom : public TesselPoint, public TrajectoryParticle, public GraphNode, public BondedParticle, public virtual ParticleInfo, public virtual AtomInfo {
   friend atom* NewAtom(atomId_t);
   friend void  DeleteAtom(atom*);
@@ -92 +91 @@
 
    void setMolecule(molecule*);
-   molecule* getMolecule() const;
+   molecule* getMolecule();
    void removeFromMolecule();
-
-   // Output operator
-   std::ostream & operator << (std::ostream &ost) const;
 
   protected:
@@ -124 +120 @@
 
 /**
- * Global output operator for class atom.
- */
-std::ostream & operator << (std::ostream &ost, const atom &_atom);
-
-/**
  * internal method used by the world. Do not use if you don't know what you are doing.
  * You might get burned...