Changeset d951a5 for src/FunctionApproximation

Timestamp:

Apr 23, 2021, 8:51:43 PM (5 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

1be100

Parents:

0f9eb0

git-author:

Frederik Heber <frederik.heber@…> (03/27/21 14:54:53)

git-committer:

Frederik Heber <frederik.heber@…> (04/23/21 20:51:43)

Message:

FIX: Small changes to ChemicalSpaceEvaluatorAction.

• discarding degree combination before we begin calculating the fragment

energy.

• made the log info more specific and easier to read.
• FIX: CSE used wrong graph when generating the homology graph key.

Location:

src/FunctionApproximation

Files:

• Extractors.cpp (modified) (3 diffs)
• Extractors.hpp (modified) (1 diff)

src/FunctionApproximation/Extractors.cpp

@@ -398 +398 @@
 }
 
-static Extractors::ParticleType_t getParticleTypeToNode(
+Extractors::ParticleType_t Extractors::getParticleTypeToNode(
     const type_index_lookup_t &type_index_lookup,
     const size_t nodeindex)
@@ -404 +404 @@
   const type_index_lookup_t::left_const_iterator typeiter = type_index_lookup.left.find(nodeindex);
   ASSERT( typeiter != type_index_lookup.left.end(),
-      "getParticleTypeToNode() - could not find type to node #"+toString(nodeindex));
+      "Extractors::getParticleTypeToNode() - could not find type to node #"+toString(nodeindex));
   return typeiter->second;
 }
@@ -438 +438 @@
           // we first store edges in a set to ensure their uniqueness (as we encounter
           // each edge two times and we don't know if source and target will be
-          // different the second time encountered)
+          // different the second time encountered).
+          LOG(4, "DEBUG: Adding edge " << sourceindex << "<->" << targetindex << " to set.");
           if (sourceindex < targetindex)
             edge_set.insert( std::make_pair(sourceindex, targetindex) );

src/FunctionApproximation/Extractors.hpp

@@ -117 +117 @@
   }
 
+  Extractors::ParticleType_t getParticleTypeToNode(
+      const type_index_lookup_t &type_index_lookup,
+      const size_t nodeindex);
+
   HomologyGraph createHomologyGraphFromNodes(
       const nodes_t &nodes,