Context Navigation

-              r658efb
+              ref9df36
  * \param *PlaneNormal Plane's normal vector
  * \param *PlaneOffset Plane's offset vector
  * \param *LineVector first vector of line
  * \param *LineVector2 second vector of line
+ * \param *Origin first vector of line
+ * \param *LineVector second vector of line
  * \return true -  \a this contains intersection point on return, false - line is parallel to plane
  */
 …
   Direction.CopyVector(LineVector);
   Direction.SubtractVector(Origin);
+  //*out << Verbose(4) << "INFO: Direction is " << Direction << "." << endl;
   factor = Direction.ScalarProduct(PlaneNormal);
   if (factor < MYEPSILON) { // Uniqueness: line parallel to plane?
 …
+  }
   helper.CopyVector(PlaneOffset);
   helper.SubtractVector(LineVector);
+  helper.SubtractVector(Origin);
   factor = helper.ScalarProduct(PlaneNormal)/factor;
   //factor = Origin->ScalarProduct(PlaneNormal)*(-PlaneOffset->ScalarProduct(PlaneNormal))/(Direction.ScalarProduct(PlaneNormal));
   Direction.Scale(factor);
+  CopyVector(LineVector);
+  CopyVector(Origin);
+  //*out << Verbose(4) << "INFO: Scaled direction is " << Direction << "." << endl;
   AddVector(&Direction);
 …
   helper.SubtractVector(PlaneOffset);
   if (helper.ScalarProduct(PlaneNormal) < MYEPSILON) {
     *out << Verbose(2) << "INFO: Intersection at " << *this << " is good." << endl;
+    //*out << Verbose(2) << "INFO: Intersection at " << *this << " is good." << endl;
     return true;
   } else {
 …
 /** Calculates the intersection of the two lines that are both on the same plane.
+ * Note that we do not check whether they are on the same plane. Vector is calculated with respecy to second line.
+ * We construct auxiliary plane with its vector normal to one line direction and the PlaneNormal, then a vector
+ * from the first line's offset onto the plane. Finally, scale by factor is 1/cos(angle(line1,line2..)) = 1/SP(...), and
+ * project onto the first line's direction and add its offset.
  * \param *out output stream for debugging
  * \param *Line1a first vector of first line
 …
 bool Vector::GetIntersectionOfTwoLinesOnPlane(ofstream *out, Vector *Line1a, Vector *Line1b, Vector *Line2a, Vector *Line2b, const Vector *PlaneNormal)
+{
+  double factor1, factor2;
+  Vector helper, Line, LineNormal, *OtherNormal = NULL;
+  const Vector *Normal;
+  bool result = false;
+  // create Plane normal vector
+  if (PlaneNormal == NULL) {
+    OtherNormal = new Vector(0.,0.,0.);
+    if (!OtherNormal->MakeNormalVector(Line1a, Line1b, Line2a))
+      if (!OtherNormal->MakeNormalVector(Line1a, Line1b, Line2b)) {
+        *out << Verbose(1) << "ERROR: GetIntersectionOfTwoLinesOnPlane() cannot create a normal of the plane, everything is linear dependent." << endl;
+        return false;
+      }
+    Normal = OtherNormal;
+  } else
+    Normal = PlaneNormal;
+  *out << Verbose(3) << "INFO: Normal of plane is " << *Normal << "." << endl;
+  // check if lines are parallel
+  helper.CopyVector(Line2b);
+  helper.SubtractVector(Line2a);
+  if (fabs(helper.ScalarProduct(Normal)) < MYEPSILON) {
+    *out << Verbose(1) << "Lines " << helper << " and " << Line << " are parallel, no cross point!" << endl;
+    result = false;
+  } else {
+    helper.CopyVector(Line2a);
+    helper.SubtractVector(Line1a);
+    factor1 = helper.ScalarProduct(Normal);
+    helper.CopyVector(Line2b);
+    helper.SubtractVector(Line1a);
+    factor2 = helper.ScalarProduct(Normal);
+    if (fabs(factor2) > MYEPSILON) {
+      CopyVector(Line2a);
+      helper.Scale(factor1/factor2);
+      AddVector(&helper);
+  bool result = true;
+  Vector Direction, OtherDirection;
+  Vector AuxiliaryNormal;
+  Vector Distance;
+  const Vector *Normal = NULL;
+  Vector *ConstructedNormal = NULL;
+  bool FreeNormal = false;
+  // construct both direction vectors
+  Zero();
+  Direction.CopyVector(Line1b);
+  Direction.SubtractVector(Line1a);
+  if (Direction.IsZero())
+    return false;
+  OtherDirection.CopyVector(Line2b);
+  OtherDirection.SubtractVector(Line2a);
+  if (OtherDirection.IsZero())
+    return false;
+  Direction.Normalize();
+  OtherDirection.Normalize();
+  //*out << Verbose(4) << "INFO: Normalized Direction " << Direction << " and OtherDirection " << OtherDirection << "." << endl;
+  if (fabs(OtherDirection.ScalarProduct(&Direction) - 1.) < MYEPSILON) { // lines are parallel
+    if ((Line1a == Line2a) || (Line1a == Line2b))
+      CopyVector(Line1a);
+    else if ((Line1b == Line2b) || (Line1b == Line2b))
+        CopyVector(Line1b);
+    else
+      return false;
+    *out << Verbose(4) << "INFO: Intersection is " << *this << "." << endl;
+    return true;
+  } else {
+    // check whether we have a plane normal vector
+    if (PlaneNormal == NULL) {
+      ConstructedNormal = new Vector;
+      ConstructedNormal->MakeNormalVector(&Direction, &OtherDirection);
+      Normal = ConstructedNormal;
+      FreeNormal = true;
+    } else
+      Normal = PlaneNormal;
+    AuxiliaryNormal.MakeNormalVector(&OtherDirection, Normal);
+    //*out << Verbose(4) << "INFO: PlaneNormal is " << *Normal << " and AuxiliaryNormal " << AuxiliaryNormal << "." << endl;
+    Distance.CopyVector(Line2a);
+    Distance.SubtractVector(Line1a);
+    //*out << Verbose(4) << "INFO: Distance is " << Distance << "." << endl;
+    if (Distance.IsZero()) {
+      // offsets are equal, match found
+      CopyVector(Line1a);
       result = true;
     } else {
+      Zero();
+      result = false;
+      CopyVector(Distance.Projection(&AuxiliaryNormal));
+      //*out << Verbose(4) << "INFO: Projected Distance is " << *this << "." << endl;
+      double factor = Direction.ScalarProduct(&AuxiliaryNormal);
+      //*out << Verbose(4) << "INFO: Scaling factor is " << factor << "." << endl;
+      Scale(1./(factor*factor));
+      //*out << Verbose(4) << "INFO: Scaled Distance is " << *this << "." << endl;
+      CopyVector(Projection(&Direction));
+      //*out << Verbose(4) << "INFO: Distance, projected into Direction, is " << *this << "." << endl;
+      if (this->IsZero())
+        result = false;
+      else
+        result = true;
+      AddVector(Line1a);
+    }
+  }
+  if (OtherNormal != NULL)
+    delete(OtherNormal);
+    if (FreeNormal)
+      delete(ConstructedNormal);
+  }
+  if (result)
+    *out << Verbose(4) << "INFO: Intersection is " << *this << "." << endl;
   return result;
 …
 /** Calculates the projection of a vector onto another \a *y.
  * \param *y array to second vector
+ * \return \f$\langle x, y \rangle\f$
+ */
+double Vector::Projection(const Vector *y) const
+{
+  return (ScalarProduct(y));
+ */
+void Vector::ProjectIt(const Vector *y)
+{
+  Vector helper(*y);
+  helper.Scale(-(ScalarProduct(y)));
+  AddVector(&helper);
+};
+/** Calculates the projection of a vector onto another \a *y.
+ * \param *y array to second vector
+ * \return Vector
+ */
+Vector Vector::Projection(const Vector *y) const
+{
+  Vector helper(*y);
+  helper.Scale((ScalarProduct(y)/y->NormSquared()));
+  return helper;
 };
 …
 };
+/** Checks whether vector is normal to \a *normal.
+ * @return true - vector is normalized, false - vector is not
+ */
+bool Vector::IsNormalTo(const Vector *normal) const
+{
+  if (ScalarProduct(normal) < MYEPSILON)
+    return true;
+  else
+    return false;
+};
 /** Calculates the angle between this and another vector.
  * \param *y array to second vector
 …
+{
   double norm1 = Norm(), norm2 = y->Norm();
   double angle = 1;
+  double angle = -1;
   if ((fabs(norm1) > MYEPSILON) && (fabs(norm2) > MYEPSILON))
     angle = this->ScalarProduct(y)/norm1/norm2;
 …
   // normalise this vector with respect to axis
   a.CopyVector(this);
+  a.Scale(Projection(axis));
+  SubtractVector(&a);
+  a.ProjectOntoPlane(axis);
   // construct normal vector
   y.MakeNormalVector(axis,this);
 …
   // add part in axis direction
   AddVector(&a);
+};
+/** Compares vector \a to vector \a b component-wise.
+ * \param a base vector
+ * \param b vector components to add
+ * \return a == b
+ */
+bool operator==(const Vector& a, const Vector& b)
+{
+  bool status = true;
+  for (int i=0;i<NDIM;i++)
+    status = status && (fabs(a.x[i] - b.x[i]) < MYEPSILON);
+  return status;
 };
 …
   x2.SubtractVector(y2);
   if ((fabs(x1.Norm()) < MYEPSILON) || (fabs(x2.Norm()) < MYEPSILON) || (fabs(x1.Angle(&x2)) < MYEPSILON)) {
     cout << Verbose(4) << "Given vectors are linear dependent." << endl;
+    cout << Verbose(4) << "WARNING: Given vectors are linear dependent." << endl;
     return false;
+  }
 …
   Zero();
   if ((fabs(x1.Norm()) < MYEPSILON) || (fabs(x2.Norm()) < MYEPSILON) || (fabs(x1.Angle(&x2)) < MYEPSILON)) {
     cout << Verbose(4) << "Given vectors are linear dependent." << endl;
+    cout << Verbose(4) << "WARNING: Given vectors are linear dependent." << endl;
     return false;
+  }
 …
 /** Calculates orthonormal vector to one given vectors.
  * Just subtracts the projection onto the given vector from this vector.
+ * The removed part of the vector is Vector::Projection()
  * \param *x1 vector
  * \return true - success, false - vector is zero
 …
+{
   bool result = false;
   double factor = y1->Projection(this)/y1->Norm()/y1->Norm();
+  double factor = y1->ScalarProduct(this)/y1->NormSquared();
   Vector x1;
   x1.CopyVector(y1);
 …
 };
 /** Determines paramter needed to multiply this vector to obtain intersection point with plane defined by \a *A, \a *B and \a *C.
+/** Determines parameter needed to multiply this vector to obtain intersection point with plane defined by \a *A, \a *B and \a *C.
  * \param *A first plane vector
  * \param *B second plane vector
 …
 //  cout << "C " << C->Projection(this) << "\t";
 //  cout << endl;
   return A->Projection(this);
+  return A->ScalarProduct(this);
 };
 …
   for (int i=NDIM;i--;)
     this->x[i] = y->x[i];
+}
+/** Copy vector \a y componentwise.
+ * \param y vector
+ */
+void Vector::CopyVector(const Vector y)
+{
+  for (int i=NDIM;i--;)
+    this->x[i] = y.x[i];
+}

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset ef9df36 for src/vector.cpp

Legend:

src/vector.cpp

Download in other formats: