Changes in / [ee7e25:b5c2d7]

Location:

src

Files:

• molecule_graph.cpp (modified) (2 diffs)
• unittests/bondgraphunittest.cpp (modified) (7 diffs)
• unittests/bondgraphunittest.hpp (modified) (3 diffs)

src/molecule_graph.cpp

@@ -149 +149 @@
         for (LC->n[2] = 0; LC->n[2] < LC->N[2]; LC->n[2]++) {
           const LinkedCell::LinkedNodes *List = LC->GetCurrentCell();
-//          Log() << Verbose(2) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << " containing " << List->size() << " points." << endl;
+          //Log() << Verbose(2) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << " containing " << List->size() << " points." << endl;
           if (List != NULL) {
             for (LinkedCell::LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
               Walker = AtomMap[(*Runner)->nr];
-//              Log() << Verbose(0) << "Current Atom is " << *Walker << "." << endl;
+              //Log() << Verbose(0) << "Current Atom is " << *Walker << "." << endl;
               // 3c. check for possible bond between each atom in this and every one in the 27 cells
               for (n[0] = -1; n[0] <= 1; n[0]++)
@@ -159 +159 @@
                   for (n[2] = -1; n[2] <= 1; n[2]++) {
                     const LinkedCell::LinkedNodes *OtherList = LC->GetRelativeToCurrentCell(n);
-//                    Log() << Verbose(2) << "Current relative cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << " containing " << List->size() << " points." << endl;
+                    //Log() << Verbose(2) << "Current relative cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << " containing " << List->size() << " points." << endl;
                     if (OtherList != NULL) {
                       for (LinkedCell::LinkedNodes::const_iterator OtherRunner = OtherList->begin(); OtherRunner != OtherList->end(); OtherRunner++) {
                         if ((*OtherRunner)->nr > Walker->nr) {
                           OtherWalker = AtomMap[(*OtherRunner)->nr];
-//                          Log() << Verbose(0) << "Current other Atom is " << *OtherWalker << "." << endl;
+                          //Log() << Verbose(1) << "Checking distance " << OtherWalker->x.PeriodicDistanceSquared(&(Walker->x), cell_size) << " against typical bond length of " << bonddistance*bonddistance << "." << endl;
+                          (BG->*minmaxdistance)(Walker, OtherWalker, MinDistance, MaxDistance, IsAngstroem);
                           const double distance = OtherWalker->x.PeriodicDistanceSquared(&(Walker->x), cell_size);
-//                          Log() << Verbose(1) << "Checking distance " << distance << " against typical bond length of " << bonddistance*bonddistance << "." << endl;
-                          (BG->*minmaxdistance)(Walker, OtherWalker, MinDistance, MaxDistance, IsAngstroem);
                           const bool status = (distance <= MaxDistance * MaxDistance) && (distance >= MinDistance * MinDistance);
-//                          Log() << Verbose(1) << "MinDistance is " << MinDistance << " and MaxDistance is " << MaxDistance << "." << endl;
-                          if (OtherWalker->father->nr > Walker->father->nr) {
-                            if (status) { // create bond if distance is smaller
-//                              Log() << Verbose(1) << "Adding Bond between " << *Walker << " and " << *OtherWalker << " in distance " << sqrt(distance) << "." << endl;
-                              AddBond(Walker->father, OtherWalker->father, 1); // also increases molecule::BondCount
-                            } else {
-//                              Log() << Verbose(1) << "Not Adding: distance too great." << endl;
-                            }
+                          if ((OtherWalker->father->nr > Walker->father->nr) && (status)) { // create bond if distance is smaller
+                            //Log() << Verbose(1) << "Adding Bond between " << *Walker << " and " << *OtherWalker << " in distance " << sqrt(distance) << "." << endl;
+                            AddBond(Walker->father, OtherWalker->father, 1); // also increases molecule::BondCount
                           } else {
-//                            Log() << Verbose(1) << "Not Adding: Wrong order of labels." << endl;
+                            //Log() << Verbose(1) << "Not Adding: Wrong label order or distance too great." << endl;
                           }
                         }

src/unittests/bondgraphunittest.cpp

@@ -20 +20 @@
 #include "bondgraph.hpp"
 #include "element.hpp"
-#include "log.hpp"
 #include "molecule.hpp"
 #include "periodentafel.hpp"
@@ -43 +42 @@
   hydrogen = new element;
   hydrogen->Z = 1;
-  hydrogen->CovalentRadius = 0.23;
-  hydrogen->VanDerWaalsRadius = 1.09;
   strcpy(hydrogen->name, "hydrogen");
   strcpy(hydrogen->symbol, "H");
   carbon = new element;
-  carbon->Z = 2;
-  carbon->CovalentRadius = 0.68;
-  carbon->VanDerWaalsRadius = 1.7;
+  carbon->Z = 1;
   strcpy(carbon->name, "carbon");
   strcpy(carbon->symbol, "C");
@@ -63 +58 @@
   TestMolecule = new molecule(tafel);
   Walker = new atom();
-  Walker->type = carbon;
+  Walker->type = hydrogen;
   Walker->node->Init(1., 0., 1. );
   TestMolecule->AddAtom(Walker);
   Walker = new atom();
-  Walker->type = carbon;
+  Walker->type = hydrogen;
   Walker->node->Init(0., 1., 1. );
   TestMolecule->AddAtom(Walker);
   Walker = new atom();
-  Walker->type = carbon;
+  Walker->type = hydrogen;
   Walker->node->Init(1., 1., 0. );
   TestMolecule->AddAtom(Walker);
   Walker = new atom();
-  Walker->type = carbon;
+  Walker->type = hydrogen;
   Walker->node->Init(0., 0., 0. );
   TestMolecule->AddAtom(Walker);
@@ -83 +78 @@
 
   // create a small file with table
-  dummyname = new string("dummy.dat");
   filename = new string("test.dat");
   ofstream test(filename->c_str());
@@ -99 +93 @@
   remove(filename->c_str());
   delete(filename);
-  delete(dummyname);
   delete(BG);
 
@@ -121 +114 @@
 /** UnitTest for BondGraphTest::ConstructBondGraph().
  */
-void BondGraphTest::ConstructGraphFromTableTest()
+void BondGraphTest::ConstructGraphTest()
 {
   atom *Walker = TestMolecule->start->next;
@@ -127 +120 @@
   CPPUNIT_ASSERT( TestMolecule->end != Walker );
   CPPUNIT_ASSERT_EQUAL( true , BG->LoadBondLengthTable(*filename) );
-  CPPUNIT_ASSERT_EQUAL( true , BG->ConstructBondGraph(TestMolecule) );
-  CPPUNIT_ASSERT_EQUAL( true , Walker->IsBondedTo(Runner) );
-};
-
-/** UnitTest for BondGraphTest::ConstructBondGraph().
- */
-void BondGraphTest::ConstructGraphFromCovalentRadiiTest()
-{
-  atom *Walker = TestMolecule->start->next;
-  atom *Runner = TestMolecule->end->previous;
-  CPPUNIT_ASSERT( TestMolecule->end != Walker );
-  CPPUNIT_ASSERT_EQUAL( false , BG->LoadBondLengthTable(*dummyname) );
   CPPUNIT_ASSERT_EQUAL( true , BG->ConstructBondGraph(TestMolecule) );
   CPPUNIT_ASSERT_EQUAL( true , Walker->IsBondedTo(Runner) );

src/unittests/bondgraphunittest.hpp

@@ -23 +23 @@
     CPPUNIT_TEST_SUITE( BondGraphTest) ;
     CPPUNIT_TEST ( LoadTableTest );
-    CPPUNIT_TEST ( ConstructGraphFromTableTest );
-    CPPUNIT_TEST ( ConstructGraphFromCovalentRadiiTest );
+    CPPUNIT_TEST ( ConstructGraphTest );
     CPPUNIT_TEST_SUITE_END();
 
@@ -31 +30 @@
       void tearDown();
       void LoadTableTest();
-      void ConstructGraphFromTableTest();
-      void ConstructGraphFromCovalentRadiiTest();
+      void ConstructGraphTest();
 
 private:
@@ -43 +41 @@
       BondGraph *BG;
       string *filename;
-      string *dummyname;
 };