Changes in src/Atom/atom.hpp [d05088:8cc22f]

File:

• src/Atom/atom.hpp (modified) (4 diffs)

src/Atom/atom.hpp ¶

@@ -25 +25 @@
 #include "atom_bondedparticle.hpp"
 #include "atom_graphnode.hpp"
-#include "atom_observable.hpp"
 #include "atom_particleinfo.hpp"
 #include "Atom/TesselPoint.hpp"
 #include "types.hpp"
 
-#include "CodePatterns/Observer/Observer.hpp"
 #include "CodePatterns/enumeration.hpp"
 
@@ -46 +44 @@
  * Class incorporates position, type
  */
-class atom :
-            public GraphNode,
-            public BondedParticle,
-            public TesselPoint
-{
+class atom : public GraphNode, public BondedParticle, public TesselPoint {
   friend atom* NewAtom(atomId_t);
   friend void  DeleteAtom(atom*);
-
-  atom *father;   //!< In many-body bond order fragmentations points to originating atom
-  int *sort;      //!< sort criteria
-
 public:
+    atom *father;   //!< In many-body bond order fragmentations points to originating atom
+    int *sort;      //!< sort criteria
 
   /** Clones this atom.
@@ -138 +130 @@
    */
   const atom *GetTrueFather() const;
-
-  /** Const getter for the atoms father.
-   *
-   * \return father of this atom
-   */
-  atom * const getFather() const
-  { return father; }
-
-  /** Sets the father for this atom.
-   *
-   * \param _father ptr to father atom
-   */
-  void setFather(atom * const _father);
 
   /** Compares the indices of \a this atom with a given \a ptr.
@@ -249 +228 @@
     void unsetMolecule();
 
-//    virtual void update(Observable *publisher);
-//    virtual void recieveNotification(Observable *publisher, Notification_ptr notification);
-    virtual void subjectKilled(Observable *publisher);
 
   private: