Changeset dfed1c for src/base/index.cpp

Timestamp:

Nov 22, 2011, 9:22:10 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

facba0

Parents:

66f24d

Message:

Major vmg update.

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

File:

• src/base/index.cpp (modified) (3 diffs)

src/base/index.cpp

@@ -14 +14 @@
 #include "base/vector.hpp"
 
-using namespace VMG;
+using VMG::Index;
+using VMG::Vector;
+
+Index::Index(const Index& rhs)
+{
+  std::memcpy(this->i, rhs.i, 3*sizeof(int));
+}
 
 Index::Index(const Vector& vec)
@@ -23 +29 @@
 }
 
-Index::Index(const Stencil::iterator& iter)
-{
-  i[0] = iter->m;
-  i[1] = iter->n;
-  i[2] = iter->o;
-}
-
-const Vector Index::operator+(const Vector& rhs) const
+Vector Index::operator+(const Vector& rhs) const
 {
   return Vector(*this) += rhs;
 }
 
-const Vector Index::operator-(const Vector& rhs) const
+Vector Index::operator-(const Vector& rhs) const
 {
   return Vector(*this) -= rhs;
 }
 
-const Vector Index::operator*(const Vector& rhs) const
+Vector Index::operator*(const Vector& rhs) const
 {
   return Vector(*this) *= rhs;
 }
 
-const Vector Index::operator/(const Vector& rhs) const
+Vector Index::operator/(const Vector& rhs) const
 {
   return Vector(*this) /= rhs;
 }
 
-const Vector Index::operator+(const vmg_float& rhs) const
+Vector Index::operator+(const vmg_float& rhs) const
 {
   return Vector(*this) += rhs;
 }
 
-const Vector Index::operator-(const vmg_float& rhs) const
+Vector Index::operator-(const vmg_float& rhs) const
 {
   return Vector(*this) -= rhs;
 }
 
-const Vector Index::operator*(const vmg_float& rhs) const
+Vector Index::operator*(const vmg_float& rhs) const
 {
   return Vector(*this) *= rhs;
 }
 
-const Vector Index::operator/(const vmg_float& rhs) const
+Vector Index::operator/(const vmg_float& rhs) const
 {
   return Vector(*this) /= rhs;
@@ -93 +92 @@
 }
 
-std::ostream& operator<<(std::ostream& out, const Index& base)
+std::ostream& VMG::operator<<(std::ostream& out, const Index& index)
 {
-  return out << "{" << base.X() << " " << base.Y() << " " << base.Z() << "}";
+  out << "{" << index.X() << " " << index.Y() << " " << index.Z() << "}";
+
+  return out;
 }