Changes in / [bdedb1:b9b604]

Location:

src

Files:

• Makefile.am (modified) (3 diffs)
• Parser/ChangeTracker.cpp (added)
• Parser/ChangeTracker.hpp (added)
• Parser/FormatParser.cpp (added)
• Parser/FormatParser.hpp (added)
• Parser/TremoloParser.cpp (added)
• Parser/TremoloParser.hpp (added)
• Parser/XyzParser.cpp (added)
• Parser/XyzParser.hpp (added)
• atom_bondedparticle.cpp (modified) (1 diff)
• atom_bondedparticle.hpp (modified) (1 diff)
• atom_particleinfo.cpp (modified) (1 diff)
• bond.cpp (modified) (2 diffs)
• unittests/Makefile.am (modified) (3 diffs)
• unittests/ParserUnitTest.cpp (added)
• unittests/ParserUnitTest.hpp (added)
• unittests/SingletonTest.cpp (modified) (1 diff)

src/Makefile.am

@@ -50 +50 @@
                             
 
+PARSERSOURCE = Parser/ChangeTracker.cpp Parser/FormatParser.cpp Parser/TremoloParser.cpp Parser/XyzParser.cpp
+PARSERHEADER = Parser/ChangeTracker.hpp Parser/FormatParser.hpp Parser/TremoloParser.hpp Parser/XyzParser.hpp
+
 PATTERNSOURCE = Patterns/Observer.cpp
 PATTERNHEADER = Patterns/Cacheable.hpp \
@@ -98 +101 @@
                  ${ATOMSOURCE} \
                  ${PATTERNSOURCE} \
+                 ${PARSERSOURCE} \
                  ${UISOURCE} \
                  ${DESCRIPTORSOURCE} \
@@ -140 +144 @@
           ${ANALYSISHEADER} \
           ${ATOMHEADER} \
+          ${PARSERHEADER} \
           ${PATTERNHEADER} \
           ${UIHEADER} \

src/atom_bondedparticle.cpp

@@ -74 +74 @@
       *BondFile << nr << "\t" << (*Runner)->GetOtherAtom(this)->nr << "\n";
 };
+
+/**
+ * Adds a bond between this bonded particle and another. Does nothing if this
+ * bond already exists.
+ *
+ * \param bonding partner
+ */
+void BondedParticle::addBond(BondedParticle* Partner) {
+  if (IsBondedTo(Partner)) {
+    return;
+  }
+
+  bond* newBond = new bond((atom*) this, (atom*) Partner, 1, 0);
+  RegisterBond(newBond);
+  Partner->RegisterBond(newBond);
+}
 
 /** Puts a given bond into atom::ListOfBonds.

src/atom_bondedparticle.hpp

@@ -37 +37 @@
   virtual ~BondedParticle();
 
+  void addBond(BondedParticle* Partner);
   bool RegisterBond(bond *Binder);
   bool UnregisterBond(bond *Binder);

src/atom_particleinfo.cpp

@@ -16 +16 @@
     nr(pointer->nr),
     Name(pointer->Name)
-    {}
+    {
+      if (Name == NULL)
+        Name = " ";
+    }
 
 

src/bond.cpp

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

src/unittests/Makefile.am

@@ -32 +32 @@
   PlaneUnittest \
   ObserverTest \
+  ParserUnitTest \
   SingletonTest \
   StackClassUnitTest \
@@ -73 +74 @@
   PlaneUnittest.cpp \
   ObserverTest.cpp \
+  ParserUnitTest.cpp \
   SingletonTest.cpp \
   stackclassunittest.cpp \
@@ -204 +206 @@
 AtomDescriptorTest_LDADD = ${ALLLIBS}
 
+ParserUnitTest_SOURCES = UnitTestMain.cpp ParserUnitTest.cpp ParserUnitTest.hpp
+ParserUnitTest_LDADD = ${ALLLIBS}
+
 manipulateAtomsTest_SOURCES = UnitTestMain.cpp manipulateAtomsTest.cpp manipulateAtomsTest.hpp
 manipulateAtomsTest_LDADD = ${ALLLIBS}

src/unittests/SingletonTest.cpp

@@ -52 +52 @@
     count1++;
   }
-  // explicit copy constructor to catch if thsi is ever called
+  // explicit copy constructor to catch if this is ever called
   SingletonStub2(const SingletonStub2&){
     CPPUNIT_FAIL    ( "Copy constructor of Singleton called" );