Changeset ac6d04 for src/base/index.hpp

Timestamp:

Apr 10, 2012, 1:55:49 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

a40eea

Parents:

d24c2f

Message:

Merge recent changes of the vmg library into ScaFaCos.

Includes a fix for the communication problems on Jugene.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1666 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• src/base/index.hpp (modified) (2 diffs)

src/base/index.hpp

@@ -57 +57 @@
   }
 
+  bool IsComponentwiseLess(const Index& other) const
+  {
+    return this->i[0] < other.i[0]
+        && this->i[1] < other.i[1]
+        && this->i[2] < other.i[2];
+  }
+
+  bool IsComponentwiseLessOrEqual(const Index& other) const
+  {
+    return this->i[0] <= other.i[0]
+        && this->i[1] <= other.i[1]
+        && this->i[2] <= other.i[2];
+  }
+
+  bool IsComponentwiseGreater(const Index& other) const
+  {
+    return this->i[0] > other.i[0]
+        && this->i[1] > other.i[1]
+        && this->i[2] > other.i[2];
+  }
+
+  bool IsComponentwiseGreaterOrEqual(const Index& other) const
+  {
+    return this->i[0] >= other.i[0]
+        && this->i[1] >= other.i[1]
+        && this->i[2] >= other.i[2];
+  }
+
   Index MaxComponentwise(const Index& rhs) const
   {
@@ -67 +95 @@
   }
 
-  Index& Clamp(const Index& lower_bound, const Index& upper_bound)
-  {
+  Index Clamp(const Index& lower_bound, const Index& upper_bound) const
+  {
+    Index index(*this);
     for (int j=0; j<3; ++j) {
-      i[j] = std::max(i[j], lower_bound[j]);
-      i[j] = std::min(i[j], upper_bound[j]);
+      index.i[j] = std::max(index.i[j], lower_bound[j]);
+      index.i[j] = std::min(index.i[j], upper_bound[j]);
     }
-
-    return *this;
+    return index;
   }