Changeset c9b843 for src/Fragmentation/Summation/SetValues/SamplingGrid.cpp

Timestamp:

May 18, 2016, 10:03:09 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Children:

c805f7

Parents:

706d48

git-author:

Frederik Heber <heber@…> (03/10/16 14:52:28)

git-committer:

Frederik Heber <heber@…> (05/18/16 22:03:09)

Message:

Moved getNearestLowerGridPoint and ..Higher:: from SamplingGrid to SamplingGridProperties.

• we only use functions from ..Properties anyway.

File:

• src/Fragmentation/Summation/SetValues/SamplingGrid.cpp (modified) (1 diff)

src/Fragmentation/Summation/SetValues/SamplingGrid.cpp

@@ -272 +272 @@
     return 0.;
 }
-
-double SamplingGrid::getNearestLowerGridPoint(
-    const double value, const size_t axis) const
-{
-  const double length = getTotalLengthPerAxis(axis);
-  if ((fabs(length) < std::numeric_limits<double>::epsilon()) || (getGridPointsPerAxis() == 0))
-    return begin[axis];
-  if ((value - end[axis]) > -std::numeric_limits<double>::epsilon()*1.e4)
-    return end[axis];
-  const double offset = value - begin[axis];
-  if (offset < std::numeric_limits<double>::epsilon()*1.e4)
-    return begin[axis];
-  // modify value a little if value actually has been on a grid point but
-  // perturbed by numerical rounding: here up, as we always go lower
-  const double factor =
-      floor((double)getGridPointsPerAxis()*(offset/length)
-          +std::numeric_limits<double>::epsilon()*1.e4);
-  return begin[axis]+factor*getDeltaPerAxis(axis);
-}
-
-double SamplingGrid::getNearestHigherGridPoint(
-    const double value, const size_t axis) const
-{
-  const double length = getTotalLengthPerAxis(axis);
-  if ((fabs(length) < std::numeric_limits<double>::epsilon()) || (getGridPointsPerAxis() == 0))
-    return end[axis];
-  if ((value - end[axis]) > -std::numeric_limits<double>::epsilon()*1.e4)
-    return end[axis];
-  const double offset = value - begin[axis];
-  if (offset < std::numeric_limits<double>::epsilon()*1.e4)
-    return begin[axis];
-  // modify value a little if value actually has been on a grid point but
-  // perturbed by numerical rounding: here down, as we always go higher
-  const double factor =
-      ceil((double)getGridPointsPerAxis()*(offset/length)
-          -std::numeric_limits<double>::epsilon()*1.e4);
-  return begin[axis]+factor*getDeltaPerAxis(axis);
-}
-
 void SamplingGrid::setWindowSize(
     const double _begin_window[3],