Changeset 8b6ee4

Timestamp:

Oct 27, 2009, 11:45:23 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

55a71b

Parents:

94d0ad

git-author:

Frederik Heber <heber@…> (10/27/09 09:28:07)

git-committer:

Frederik Heber <heber@…> (10/27/09 11:45:23)

Message:

Begun with ticket #4 (shorten constructors) on class atom and class bond.

• note that in bond we removed two constructor definitions which were unnecessary if standard values were given in the definition not in the declaration.

Signed-off-by: Frederik Heber <heber@…>

Location:

molecuilder/src

Files:

• atom.cpp (modified) (1 diff)
• atom_bondedparticle.cpp (modified) (1 diff)
• bond.cpp (modified) (3 diffs)
• bond.hpp (modified) (1 diff)

molecuilder/src/atom.cpp

@@ -16 +16 @@
 /************************************* Functions for class atom *************************************/
 
+
 /** Constructor of class atom.
  */
-atom::atom()
-{
-  father = this;  // generally, father is itself
-  previous = NULL;
-  next = NULL;
-  sort = &nr;
-
-  // set LCNode::Vector to our Vector
-  node = &x;
+atom::atom() : previous(NULL), next(NULL), father(this), sort(&nr)
+{
+  node = &x;  // TesselPoint::x can only be referenced from here
 };
 
 /** Constructor of class atom.
  */
-atom::atom(atom *pointer)
-{
-  previous = NULL;
-  next = NULL;
-  father = pointer;  // generally, father is itself
-
+atom::atom(atom *pointer) : previous(NULL), next(NULL), father(pointer), sort(&nr)
+{
   type = pointer->type;  // copy element of atom
   x.CopyVector(&pointer->x); // copy coordination
   v.CopyVector(&pointer->v); // copy velocity
   FixedIon = pointer->FixedIon;
-  sort = &nr;
   node = &x;
 };

molecuilder/src/atom_bondedparticle.cpp

@@ -15 +15 @@
 /** Constructor of class BondedParticle.
  */
-BondedParticle::BondedParticle(){};
+BondedParticle::BondedParticle()
+{
+};
 
 /** Destructor of class BondedParticle.

molecuilder/src/bond.cpp

@@ -15 +15 @@
 /** Empty Constructor for class bond.
  */
-bond::bond()
+bond::bond() : leftatom(NULL), rightatom(NULL), previous(NULL), next(NULL), HydrogenBond(0), BondDegree(0), nr(-1), Cyclic(false), Type(Undetermined), Used(white)
 {
-  leftatom = NULL;
-  rightatom = NULL;
-  previous = NULL;
-  next = NULL;
-  nr = -1;
-  HydrogenBond = 0;
-  BondDegree = 0;
-  Used = white;
-  Cyclic = false;
-  Type = Undetermined;
 };
 
@@ -35 +25 @@
  * \param number increasing index
  */
-bond::bond(atom *left, atom *right, int degree=1, int number=0)
+bond::bond(atom *left, atom *right, int degree, int number) : leftatom(left), rightatom(right), previous(NULL), next(NULL), HydrogenBond(0), BondDegree(degree), nr(number), Cyclic(false), Type(Undetermined), Used(white)
 {
-  leftatom = left;
-  rightatom = right;
-  previous = NULL;
-  next = NULL;
-  HydrogenBond = 0;
   if ((left != NULL) && (right != NULL)) {
     if ((left->type != NULL) && (left->type->Z == 1))
@@ -48 +33 @@
       HydrogenBond++;
   }
-  BondDegree = degree;
-  nr = number;
-  Used = white;
-  Cyclic = false;
-};
-
-bond::bond(atom *left, atom *right)
-{
-  leftatom = left;
-  rightatom = right;
-  previous = NULL;
-  next = NULL;
-  HydrogenBond = 0;
-  if ((left != NULL) && (right != NULL)) {
-    if ((left->type != NULL) && (left->type->Z == 1))
-      HydrogenBond++;
-    if ((right->type != NULL) && (right->type->Z == 1))
-      HydrogenBond++;
-  }
-  BondDegree = 1;
-  nr = 0;
-  Used = white;
-  Cyclic = false;
 };
 

molecuilder/src/bond.hpp

@@ -53 +53 @@
 
   bond();
-  bond(atom *left, atom *right);
-  bond(atom *left, atom *right, int degree);
-  bond(atom *left, atom *right, int degree, int number);
+  bond(atom *left, atom *right, int degree=1, int number=0);
   ~bond();