Changeset 564f17 for src/Fragmentation/Homology/HomologyContainer.hpp

Timestamp:

Apr 28, 2021, 10:02:49 PM (5 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

5aa337

Parents:

e0e77e

git-author:

Frederik Heber <frederik.heber@…> (04/18/21 12:23:17)

git-committer:

Frederik Heber <frederik.heber@…> (04/28/21 22:02:49)

Message:

Extended HomologyContainer::value_t by fragment energy.

• renamed energy to contribution to notice all old usages.

File:

• src/Fragmentation/Homology/HomologyContainer.hpp (modified) (5 diffs)

src/Fragmentation/Homology/HomologyContainer.hpp

@@ -60 +60 @@
     Fragment fragment;
     FragmentationEdges::edges_t edges;
-    double energy;
+    double fragmentenergy;
+    double contribution;
     bool containsGrids;
     SamplingGrid charge_distribution;
@@ -66 +67 @@
 
     value_t() :
-      energy(0.),
+      fragmentenergy(0.),
+      contribution(0.),
       containsGrids(false)
     {}
@@ -81 +83 @@
       if (version > 1)
         ar & edges;
-      ar & energy;
+      if (version <= 2)
+        ar & contribution;
+      if (version > 2) {
+        ar & fragmentenergy;
+        ar & contribution;
+      }
       if (version > 0) {
         ar & containsGrids;
@@ -96 +103 @@
       const std::pair<const HomologyGraph, HomologyContainer::value_t> &b);
 
+  static bool compareEnergy(
+      const std::pair<const HomologyGraph, HomologyContainer::value_t> &a,
+      const std::pair<const HomologyGraph, HomologyContainer::value_t> &b);
+
 public:
   typedef std::multimap< HomologyGraph, value_t> container_t;
@@ -229 +240 @@
 
 // version for serialized information associated to HomologyGraph
-BOOST_CLASS_VERSION(HomologyContainer::value_t, 2)
+BOOST_CLASS_VERSION(HomologyContainer::value_t, 3)
 
 #endif /* HOMOLOGYCONTAINER_HPP_ */