Changeset 0ee99dc for molecuilder/src/vector.hpp

Timestamp:

Aug 8, 2009, 7:19:23 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

51abbe

Parents:

e0521b

Message:

BUGFIXES to some vector functions.

• Vector::MakeNormalVector() ... Projection lacks ../Norm()/Norm() and hence produced wrong vector.
• Vector::GetIntersectionWithPlane() - checks for uniqueness and Bronstein formula removed and correct one implemented.
• Vector::GetIntersectionOfTwoLinesOnPlane() - Bronstein formula removed, correct procedure implemented.
• Vector::IsNull() is const function.

File:

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

molecuilder/src/vector.hpp

@@ -28 +28 @@
   double NormSquared() const;
   double Angle(const Vector *y) const;
-  bool IsNull();
+  bool IsNull() const;
 
   void AddVector(const Vector *y);
@@ -51 +51 @@
   void LinearCombinationOfVectors(const Vector *x1, const Vector *x2, const Vector *x3, double *factors);
   double CutsPlaneAt(Vector *A, Vector *B, Vector *C);
-  bool GetIntersectionWithPlane(ofstream *out, Vector *PlaneNormal, Vector *PlaneOffset, Vector *LineVector, Vector *LineVector2);
-  bool GetIntersectionOfTwoLinesOnPlane(ofstream *out, Vector *Line1a, Vector *Line1b, Vector *Line2a, Vector *Line2b);
+  bool GetIntersectionWithPlane(ofstream *out, Vector *PlaneNormal, Vector *PlaneOffset, Vector *Origin, Vector *LineVector);
+  bool GetIntersectionOfTwoLinesOnPlane(ofstream *out, Vector *Line1a, Vector *Line1b, Vector *Line2a, Vector *Line2b, const Vector *Normal = NULL);
   bool GetOneNormalVector(const Vector *x1);
   bool MakeNormalVector(const Vector *y1);