Changeset 3d9045 for molecuilder/src/vector.cpp

Timestamp:

Dec 29, 2008, 12:29:21 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

95183e

Parents:

eec6c8 (diff), 2ac928 (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://stud64dc-01/home/neuen/workspace/ESPACK into ConcaveHull

Conflicts:

molecuilder/src/boundary.cpp

Fixed the incorporation of write_raster3d_file() ...

File:

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

molecuilder/src/vector.cpp

@@ -219 +219 @@
  * \return \f$\acos\bigl(frac{\langle x, y \rangle}{|x||y|}\bigr)\f$
  */
-double Vector::Angle(const Vector *y) const
+double Vector::Angle(Vector *y) const
 {
   return acos(this->ScalarProduct(y)/Norm()/y->Norm());
@@ -313 +313 @@
 };
 
-/** Prints a 3dim vector to a stream.
- * \param ost output stream
- * \param v Vector to be printed
- * \return output stream
- */
-ostream& operator<<(ostream& ost,Vector& m)
-{
-  ost << "(";
-  for (int i=0;i<NDIM;i++) {
-    ost << m.x[i];
-    if (i != 2)
-      ost << ",";
-  }
-  ost << ")";
+ofstream& operator<<(ofstream& ost,Vector& m)
+{
+        m.Output(&ost);
         return ost;
 };