Changeset 0e2190 for molecuilder/src/vector.cpp

Timestamp:

Aug 3, 2009, 6:58:46 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

f4a346

Parents:

4e4940 (diff), e8de2e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ConcaveHull' of ​ssh://heber@192.168.194.2/home/metzler/workspace/espack into ConcaveHull

Conflicts:

molecuilder/src/atom.cpp
molecuilder/src/boundary.cpp
molecuilder/src/boundary.hpp
molecuilder/src/linkedcell.cpp
molecuilder/src/linkedcell.hpp
molecuilder/src/molecules.hpp
molecuilder/src/vector.hpp

• added Saskia Metzler's code that finds whether a point is in- or outside.
• The code is not yet incorporated, but I rather want to continue with merging TesselationRefactoring first.

File:

• molecuilder/src/vector.cpp (modified) (2 diffs)

molecuilder/src/vector.cpp

@@ -348 +348 @@
 };
 
+/** Checks whether vector has all components zero.
+ * @return true - vector is zero, false - vector is not
+ */
+bool Vector::IsNull()
+{
+  return (fabs(x[0]+x[1]+x[2]) < MYEPSILON);
+};
+
 /** Calculates the angle between this and another vector.
  * \param *y array to second vector
@@ -456 +464 @@
 };
 
-ostream& operator<<(ostream& ost,Vector& m)
+ostream& operator<<(ostream& ost, const Vector& m)
 {
   ost << "(";