Changeset 8d5db8 for src/Fragmentation/Homology/unittests

Timestamp:

Oct 2, 2016, 1:49:57 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Fix_FitPotential_needs_atomicnumbers

Children:

a13e21

Parents:

f6f761

git-author:

Frederik Heber <heber@…> (10/02/16 13:24:41)

git-committer:

Frederik Heber <heber@…> (10/02/16 13:49:57)

Message:

MPQCData additionally stores the atomic number per nuclei.

• in case of DoSampleValenceOnly the charge does not represent the atomic number and moreover it is no longer unique. However, we need this unique association for fitting potentials to the fragment results.
• TESTFIX: needed to adapt HomologyContainerUnitTest which uses FragmentStub.
• TESTFIX: needed to adapt FragmentUnitTest.

Location:

src/Fragmentation/Homology/unittests

Files:

• HomologyContainerUnitTest.cpp (modified) (3 diffs)
• stubs/FragmentStub.cpp (modified) (2 diffs)

src/Fragmentation/Homology/unittests/HomologyContainerUnitTest.cpp

@@ -93 +93 @@
   Fragment::position_t pos(3, 0.);
   Fragment::positions_t positions(1, pos);
+  Fragment::atomicnumbers_t atomicnumbers(1,1.);
   Fragment::charges_t charges(1,1.);
-  Fragment dummy(positions, charges);
+  Fragment dummy(positions, atomicnumbers, charges);
   charges[0] = 6.;
   positions[0][0] = 1.;
-  Fragment dummy1(positions, charges);
+  Fragment dummy1(positions, atomicnumbers, charges);
   positions[0][0] = 2.;
-  Fragment dummy2(positions, charges);
+  Fragment dummy2(positions, atomicnumbers, charges);
   HomologyContainer::value_t value1;
   value1.fragment = dummy1;
@@ -133 +134 @@
   Fragment::position_t pos(3, 0.);
   Fragment::positions_t positions(1, pos);
+  Fragment::atomicnumbers_t atomicnumbers(1,1.);
   Fragment::charges_t charges(1,1.);
-  Fragment dummy(positions, charges);
+  Fragment dummy(positions, atomicnumbers, charges);
   HomologyContainer::value_t value;
   value.fragment = dummy;
@@ -158 +160 @@
   Fragment::position_t pos(3, 0.);
   Fragment::positions_t positions(1, pos);
+  Fragment::atomicnumbers_t atomicnumbers(1,1.);
   Fragment::charges_t charges(1,1.);
-  Fragment dummy(positions, charges);
+  Fragment dummy(positions, atomicnumbers, charges);
   HomologyContainer::value_t value;
   value.fragment = dummy;

src/Fragmentation/Homology/unittests/stubs/FragmentStub.cpp

@@ -56 +56 @@
  *
  * @param _positions given positions
+ * @param _atomicnumbers given atomic numbers
  * @param _charges given charges
  */
-Fragment::Fragment(const positions_t &_positions, const charges_t &_charges)
+Fragment::Fragment(
+    const positions_t &_positions,
+    const atomicnumbers_t &_atomicnumbers,
+    const charges_t &_charges)
 {}
 
@@ -94 +98 @@
 Fragment::positions_t Fragment::getPositions() const
 { return positions_t(); }
+
+/** Getter for all stored atomic numbers.
+ *
+ * @return vector of atomic numbers
+ */
+Fragment::atomicnumbers_t Fragment::getAtomicNumbers() const
+{ return atomicnumbers_t(); }
 
 /** Getter for all stored charges.