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

File:

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

src/atom.hpp

@@ -27 +27 @@
 #include "atom_particleinfo.hpp"
 #include "atom_trajectoryparticle.hpp"
-#include "TesselPoint.hpp"
+#include "tesselation.hpp"
 #include "types.hpp"
 
@@ -42 +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*);
@@ -52 +52 @@
 
   bool OutputIndexed(ofstream * const out, const int ElementNo, const int AtomNo, const char *comment = NULL) const;
-  bool OutputArrayIndexed(ostream * const out, const int *ElementNo, int *AtomNo, const char *comment = NULL) const;
+  bool OutputArrayIndexed(ostream * const out,const enumeration<const element*>&, int *AtomNo, const char *comment = NULL) const;
   bool OutputXYZLine(ofstream *out) const;
   bool OutputTrajectory(ofstream * const out, const int *ElementNo, int *AtomNo, const int step) const;
@@ -61 +61 @@
 
   void EqualsFather ( const atom *ptr, const atom **res ) const;
+  bool isFather(const atom *ptr);
   void CorrectFather();
   atom *GetTrueFather();
@@ -93 +94 @@
    void removeFromMolecule();
 
-   // Output operator
-   std::ostream & operator << (std::ostream &ost) const;
-
   protected:
 
@@ -122 +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...