Changeset be20db for src

Timestamp:

Oct 3, 2016, 11:13:32 AM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Fix_FitPotential_needs_atomicnumbers

Children:

0b7036

Parents:

c93e58

git-author:

Frederik Heber <heber@…> (10/03/16 10:35:00)

git-committer:

Frederik Heber <heber@…> (10/03/16 11:13:32)

Message:

ParticleType_t is now an unsigned int.

• this allows direct use of atomicNumber_t and also signed integers dont' make much sense for a particle type, i.e. an id.

Location:

src

Files:

• FunctionApproximation/Extractors.cpp (modified) (1 diff)
• FunctionApproximation/Extractors.hpp (modified) (2 diffs)
• FunctionApproximation/FunctionArgument.hpp (modified) (1 diff)
• Potentials/CompoundPotential.cpp (modified) (2 diffs)
• Potentials/PotentialTrainer.cpp (modified) (2 diffs)
• Potentials/SerializablePotential.hpp (modified) (1 diff)
• documentation/constructs/potentials.dox (modified) (2 diffs)

src/FunctionApproximation/Extractors.cpp

@@ -96 +96 @@
 Extractors::elementcounts_t 
 Extractors::_detail::getElementCounts(
-    const Fragment::charges_t elements
+    const Fragment::atomicnumbers_t elements
   )
 {
   elementcounts_t elementcounts;
-  for (Fragment::charges_t::const_iterator elementiter = elements.begin();
+  for (Fragment::atomicnumbers_t::const_iterator elementiter = elements.begin();
       elementiter != elements.end(); ++elementiter) {
     // insert new element

src/FunctionApproximation/Extractors.hpp

@@ -39 +39 @@
 
   typedef size_t count_t;
-  typedef Fragment::charge_t element_t;
+  typedef Fragment::atomicNumber_t element_t;
   typedef std::map< element_t, count_t> elementcounts_t;
   typedef std::map< element_t, chargeiters_t > elementtargets_t;
   typedef std::vector< chargeiters_t > targets_per_combination_t;
   //!> typedef for particle designation
-  typedef int ParticleType_t;
+  typedef unsigned int ParticleType_t;
   //!> typedef for a vector of particle designations
   typedef std::vector<ParticleType_t> ParticleTypes_t;
@@ -59 +59 @@
      */
     elementcounts_t getElementCounts(
-        const Fragment::charges_t elements
+        const Fragment::atomicnumbers_t elements
         );
 

src/FunctionApproximation/FunctionArgument.hpp

@@ -33 +33 @@
   typedef std::pair<size_t, size_t> indices_t;
   //!> typedef for the underlying type of the particle
-  typedef int ParticleType_t;
+  typedef unsigned int ParticleType_t;
   //!> typedef for the two particle types of the argument
   typedef std::pair<ParticleType_t, ParticleType_t> types_t;

src/Potentials/CompoundPotential.cpp

@@ -70 +70 @@
         potential->getParticleTypes();
 
-    // create charges
-    Fragment::charges_t charges;
-    charges.resize(types.size());
-    std::transform(types.begin(), types.end(),
-        charges.begin(), boost::lambda::_1);
     // convert into count map
-    Extractors::elementcounts_t counts_per_charge =
-        Extractors::_detail::getElementCounts(charges);
-//    ASSERT( !counts_per_charge.empty(),
-//        "getFirstGraphwithSpecifiedElements() - charge counts are empty?");
-    LOG(2, "DEBUG: counts_per_charge is " << counts_per_charge << ".");
+    Extractors::elementcounts_t counts_per_element =
+        Extractors::_detail::getElementCounts(types);
+//    ASSERT( !counts_per_element.empty(),
+//        "getFirstGraphwithSpecifiedElements() - element counts are empty?");
+    LOG(2, "DEBUG: counts_per_element is " << counts_per_element << ".");
 
     // check whether graph contains suitable types
-    Extractors::elementcounts_t::const_iterator countiter = counts_per_charge.begin();
-    for (; countiter != counts_per_charge.end(); ++countiter)
+    Extractors::elementcounts_t::const_iterator countiter = counts_per_element.begin();
+    for (; countiter != counts_per_element.end(); ++countiter)
       if (!graph.hasGreaterEqualTimesAtomicNumber(
           static_cast<size_t>(countiter->first),
@@ -91 +86 @@
         break;
     // if we have a match for every count, store model
-    if( countiter == counts_per_charge.end()) {
+    if( countiter == counts_per_element.end()) {
       LOG(1, "INFO: Potential " << potentialiter->first << " matches with fragment.");
       models.push_back(static_cast<FunctionModel*>(potential));

src/Potentials/PotentialTrainer.cpp

@@ -198 +198 @@
   ASSERT( !types.empty(),
       "getFirstGraphwithSpecifiedElements() - charges is empty?");
-  // create charges
-  Fragment::charges_t charges;
-  charges.resize(types.size());
-  std::transform(types.begin(), types.end(),
-      charges.begin(), boost::lambda::_1);
+
   // convert into count map
-  Extractors::elementcounts_t counts_per_charge =
-      Extractors::_detail::getElementCounts(charges);
-  ASSERT( !counts_per_charge.empty(),
-      "getFirstGraphwithSpecifiedElements() - charge counts are empty?");
-  LOG(1, "DEBUG: counts_per_charge is " << counts_per_charge << ".");
+  Extractors::elementcounts_t counts_per_element =
+      Extractors::_detail::getElementCounts(types);
+  ASSERT( !counts_per_element.empty(),
+      "getFirstGraphwithSpecifiedElements() - element counts are empty?");
+  LOG(1, "DEBUG: counts_per_element is " << counts_per_element << ".");
   // we want to check each (unique) key only once
   HomologyContainer::const_key_iterator olditer = homologies.key_end();
@@ -221 +217 @@
     // check whether we have the same set of atomic numbers
     const HomologyGraph::nodes_t &nodes = (*iter).getNodes();
-    Extractors::elementcounts_t nodes_counts_per_charge;
+    Extractors::elementcounts_t nodes_counts_per_element;
     for (HomologyGraph::nodes_t::const_iterator nodeiter = nodes.begin();
         nodeiter != nodes.end(); ++nodeiter) {
       const Extractors::element_t elem = nodeiter->first.getAtomicNumber();
       const std::pair<Extractors::elementcounts_t::iterator, bool> inserter =
-          nodes_counts_per_charge.insert( std::make_pair(elem, (Extractors::count_t)nodeiter->second ) );
+          nodes_counts_per_element.insert( std::make_pair(elem, (Extractors::count_t)nodeiter->second ) );
       if (!inserter.second)
         inserter.first->second += (Extractors::count_t)nodeiter->second;
     }
-    LOG(1, "DEBUG: Node (" << *iter << ")'s counts_per_charge is " << nodes_counts_per_charge << ".");
-    if (counts_per_charge == nodes_counts_per_charge)
+    LOG(1, "DEBUG: Node (" << *iter << ")'s counts_per_element is " << nodes_counts_per_element << ".");
+    if (counts_per_element == nodes_counts_per_element)
       return *iter;
   }

src/Potentials/SerializablePotential.hpp

@@ -39 +39 @@
 public:
   //!> typedef for particle designation
-  typedef int ParticleType_t;
+  typedef unsigned int ParticleType_t;
   //!> typedef for a vector of particle designations
   typedef std::vector<ParticleType_t> ParticleTypes_t;

src/documentation/constructs/potentials.dox

@@ -158 +158 @@
  *  HomologyContainer homologies;
  *  const HomologyGraph graph = getSomeGraph(homologies);
- *  Fragment::charges_t h2o;
+ *  Fragment::atomicnumbers_t h2o;
  *  h2o += 8,1,1;
  *  // TrainingData needs so called Extractors to get the required distances
@@ -165 +165 @@
  *      boost::bind(&Extractors::gatherDistancesFromFragment,
  *          boost::bind(&Fragment::getPositions, _1),
- *          boost::bind(&Fragment::getCharges, _1),
+ *          boost::bind(&Fragment::getAtomicNumbers, _1),
  *          boost::cref(h2o),
  *          _2)