Changeset 8a91f5

Timestamp:

Oct 20, 2016, 8:52:32 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Fix_IndependentFragmentGrids

Children:

8d6a44

Parents:

1e6cf0

git-author:

Frederik Heber <heber@…> (09/22/16 05:46:50)

git-committer:

Frederik Heber <heber@…> (10/20/16 20:52:32)

Message:

FIX: (Orthogonal)Summation::Sum() summed small fragments then large ones.

• added rbegin() and rend() to SetValueMap's interface.
• this fails for the new individual fragment SamplingGrids because there we assume that we always sum a grid of smaller extension onto a larger one. now, we go in reverse order through the list of setvalues and sum from largest down to smallest.

Location:

src/Fragmentation/Summation

Files:

• OrthogonalSummation_impl.hpp (modified) (1 diff)
• SetValueMap.hpp (modified) (3 diffs)
• Summation_impl.hpp (modified) (1 diff)

src/Fragmentation/Summation/OrthogonalSummation_impl.hpp

@@ -72 +72 @@
 {
   T sum(zeroinstance);
-  for(typename SetValueMap<T>::const_iterator iter = setvalues.begin();
-      (iter != setvalues.end()) && (iter->first->size() <= level); ++iter) {
+  // go from largest fragments to smallest
+  for(typename SetValueMap<T>::const_reverse_iterator iter = setvalues.rbegin();
+      iter != setvalues.rend(); ++iter) {
+    if (iter->first->size() > level)
+      continue;
     const T tempvalue = (iter->second)->getContribution();
     sum += tempvalue;

src/Fragmentation/Summation/SetValueMap.hpp

@@ -111 +111 @@
   //!> typedef to const iterator of internal map such that easy const traversal is possible
   typedef typename Lookup_t::const_iterator const_iterator;
+  //!> typedef to const iterator of internal map such that easy const traversal is possible
+  typedef typename Lookup_t::const_reverse_iterator const_reverse_iterator;
 
-  /** Getter for first node of iternal map.
+  /** Getter for first node of internal map.
    *
    * @return Lookup::begin()
@@ -120 +122 @@
   }
 
-  /** Getter for last and one node of iternal map.
+  /** Getter for last and one node of internal map.
    *
    * @return Lookup::end()
@@ -127 +129 @@
     return Lookup.end();
   }
+
+  /** Getter for last node of internal map.
+   *
+   * @return Lookup::rbegin()
+   */
+  const_reverse_iterator rbegin() const {
+    return Lookup.rbegin();
+  }
+
+  /** Getter for one before first node of internal map.
+   *
+   * @return Lookup::rend()
+   */
+  const_reverse_iterator rend() const {
+    return Lookup.rend();
+  }
 };
 

src/Fragmentation/Summation/Summation_impl.hpp

@@ -73 +73 @@
 {
   T sum(zeroinstance);
-  for(typename SetValueMap<T>::const_iterator iter = setvalues.begin();
-      (iter != setvalues.end()) && (iter->first->size() <= level); ++iter) {
+  for(typename SetValueMap<T>::const_reverse_iterator iter = setvalues.rbegin();
+      iter != setvalues.rend(); ++iter) {
+    if (iter->first->size() > level)
+      continue;
     const T tempvalue = (iter->second)->getValue();
     sum += tempvalue;