Changeset 5e70aa

Timestamp:

Sep 1, 2016, 8:35:29 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Gui_Fixes

Children:

70436b

Parents:

564621

Message:

FIX: FragmentationResultContainer did not clear cycles on clear().

Location:

src/Fragmentation/Summation/Containers

Files:

• FragmentationResultContainer.cpp (modified) (2 diffs)
• FragmentationResultContainer.hpp (modified) (1 diff)

src/Fragmentation/Summation/Containers/FragmentationResultContainer.cpp

@@ -50 +50 @@
 {
   OBSERVE;
-  ASSERT( ResultsType == BothRanges,
+  ASSERT( (ResultsType == BothRanges) || (keysets.KeySets.empty()),
       "FragmentationResultContainer::addFullResults() - mixing full and short range is not in the cards.");
   ASSERT( _keysets.KeySets.size() == _forcekeysets.KeySets.size(),
@@ -79 +79 @@
 {
   OBSERVE;
-  ASSERT( (ResultsType == ShortRangeOnly) || (keysets.KeySets.empty()) ,
+  ASSERT( (ResultsType == ShortRangeOnly) || (keysets.KeySets.empty()),
       "FragmentationResultContainer::addFullResults() - mixing full and short range is not in the cards.");
   ASSERT( _keysets.KeySets.size() == _forcekeysets.KeySets.size(),

src/Fragmentation/Summation/Containers/FragmentationResultContainer.hpp

@@ -126 +126 @@
     keysets.clear();
     forcekeysets.clear();
+    cycles.clear();
     shortrangedata.clear();
     summedshortrange.clear();