Changeset 8d5db8 for src/Fragmentation/Summation/SetValues/Fragment.cpp

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.

File:

• src/Fragmentation/Summation/SetValues/Fragment.cpp (modified) (6 diffs)

src/Fragmentation/Summation/SetValues/Fragment.cpp

@@ -54 +54 @@
 {}
 
-Fragment::Fragment(const positions_t &_positions, const charges_t &_charges)
+Fragment::Fragment(
+    const positions_t &_positions,
+    const atomicnumbers_t &_atomicnumbers,
+    const charges_t &_charges)
 {
   ASSERT( _positions.size() == _charges.size(),
       "Fragment::Fragment() - given charges and positions don't match in size.");
   positions_t::const_iterator piter = _positions.begin();
+  atomicnumbers_t::const_iterator aiter = _atomicnumbers.begin();
   charges_t::const_iterator citer = _charges.begin();
-  for (;piter != _positions.end(); ++piter, ++citer)
-    nuclei.push_back( make_pair( *piter, *citer) );
+  for (;piter != _positions.end(); ++piter, ++aiter, ++citer)
+    nuclei.push_back( createNucleus(*piter, *aiter, *citer) );
 }
 
@@ -121 +125 @@
 }
 
+Fragment::atomicnumbers_t Fragment::getAtomicNumbers() const
+{
+  atomicnumbers_t positions;
+  for (nuclei_t::const_iterator iter = nuclei.begin();
+      iter != nuclei.end(); ++iter)
+    positions.push_back(iter->second.first);
+  return positions;
+}
+
 Fragment::charges_t Fragment::getCharges() const
 {
@@ -126 +139 @@
   for (nuclei_t::const_iterator iter = nuclei.begin();
       iter != nuclei.end(); ++iter)
-    charges.push_back(iter->second);
+    charges.push_back(iter->second.second);
   return charges;
 }
 
-Fragment::nucleus_t Fragment::createNucleus(const position_t &position, const double charge)
-{
-  return nucleus_t( make_pair( position, charge ) );
+Fragment::nucleus_t Fragment::createNucleus(
+    const position_t &position,
+    const atomicNumber_t &atomicnumber,
+    const double charge)
+{
+  return nucleus_t( make_pair( position, std::make_pair(atomicnumber, charge) ) );
 }
 
@@ -174 +190 @@
 std::ostream & operator<<(std::ostream &ost, const Fragment::nucleus_t &n)
 {
-  ost << n.first << " with charge " << n.second;
+  ost << n.first << " with Z of " << n.second.first << " charge " << n.second.second;
   return ost;
 }
@@ -183 +199 @@
   // check positions
   status &= Fragment::isPositionEqual(a.first, b.first);
-  status &= fabs(a.second - b.second) < std::numeric_limits<double>::epsilon();
+  status &= (a.second.first == b.second.first);
+  status &= fabs(a.second.second - b.second.second) < std::numeric_limits<double>::epsilon();
   return status;
 }
@@ -190 +207 @@
 {
   Fragment::positions_t positions;
+  Fragment::atomicnumbers_t atomicnumbers;
   Fragment::charges_t charges;
-  Fragment returnvalue(positions, charges);
+  Fragment returnvalue(positions, atomicnumbers, charges);
   return returnvalue;
 }