Changeset c739b3 for src/Fragmentation/Summation/SetValues/SamplingGridProperties.hpp

Timestamp:

Jun 8, 2016, 10:45:27 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Children:

6369bc

Parents:

e34888

git-author:

Frederik Heber <heber@…> (06/06/16 14:28:05)

git-committer:

Frederik Heber <heber@…> (06/08/16 22:45:27)

Message:

Extended SamplingGridProperties::isCompatible() to allow more finely resolved grids, added ::isEquivalent().

• isEquivalent contains the old check and we replaced isCompatible() by it.

File:

• src/Fragmentation/Summation/SetValues/SamplingGridProperties.hpp (modified) (2 diffs)

src/Fragmentation/Summation/SetValues/SamplingGridProperties.hpp

@@ -56 +56 @@
    * \return true - are compatible, false - else
    */
-  bool isCompatible(const SamplingGridProperties &_props) const
+  bool isCompatible(const SamplingGridProperties &_props) const;
+
+  /** Checks whether another instance is equivalent with this one, i.e. they have
+   * the same grid.
+   *
+   * \param _props other properties to check against
+   * \return true - are compatible, false - else
+   */
+  bool isEquivalent(const SamplingGridProperties &_props) const
   {
-    return level == _props.level;
+    return (*this) == _props;
   }
 
@@ -140 +148 @@
    *
    * \param _props other grid to compare extension to
-   * \return surplus levels
+   * \return surplus levels, may be fractional
    */
-  int getSurplusLevel(const SamplingGridProperties &_props) const;
+  double getSurplusLevel(const SamplingGridProperties &_props) const;
 
 public: