Changeset 27ac00 for src

Timestamp:

Jun 2, 2010, 9:05:47 AM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

190326, 76c0d6, a7c344, cb16fe, d466f0

Parents:

5589858

git-author:

Tillmann Crueger <crueger@…> (05/28/10 12:44:09)

git-committer:

Tillmann Crueger <crueger@…> (06/02/10 09:05:47)

Message:

Made the line-plane intersection method take a line instead of two vectors

Location:

src

Files:

• Exceptions/MultipleSolutionsException.hpp (added)
• Plane.cpp (modified) (2 diffs)
• Plane.hpp (modified) (1 diff)
• tesselation.cpp (modified) (4 diffs)
• unittests/PlaneUnittest.cpp (modified) (2 diffs)
• unittests/PlaneUnittest.hpp (modified) (2 diffs)
• unittests/vectorunittest.cpp (modified) (1 diff)
• unittests/vectorunittest.hpp (modified) (1 diff)

src/Plane.cpp

@@ -15 +15 @@
 #include <cmath>
 #include "Line.hpp"
+#include "Exceptions/MultipleSolutionsException.hpp"
 
 /**
@@ -147 +148 @@
  * \return true -  \a this contains intersection point on return, false - line is parallel to plane (even if in-plane)
  */
-Vector Plane::GetIntersection(const Vector &Origin, const Vector &LineVector) const
+Vector Plane::GetIntersection(const Line& line) const
 {
   Info FunctionInfo(__func__);
   Vector res;
 
-  // find intersection of a line defined by Offset and Direction with a  plane defined by triangle
-  Vector Direction = LineVector - Origin;
-  Direction.Normalize();
-  Log() << Verbose(1) << "INFO: Direction is " << Direction << "." << endl;
-  //Log() << Verbose(1) << "INFO: PlaneNormal is " << *PlaneNormal << " and PlaneOffset is " << *PlaneOffset << "." << endl;
-  double factor1 = Direction.ScalarProduct(*normalVector.get());
-  if (fabs(factor1) < MYEPSILON) { // Uniqueness: line parallel to plane?
-    Log() << Verbose(1) << "BAD: Line is parallel to plane, no intersection." << endl;
-    throw LinearDependenceException(__FILE__,__LINE__);
-  }
-
-  double factor2 = Origin.ScalarProduct(*normalVector.get());
-  if (fabs(factor2-offset) < MYEPSILON) { // Origin is in-plane
-    Log() << Verbose(1) << "GOOD: Origin of line is in-plane." << endl;
-    res = Origin;
-    return res;
-  }
-
+  double factor1 = getNormal().ScalarProduct(line.getDirection());
+  if(fabs(factor1)<MYEPSILON){
+    // the plane is parallel... under all circumstances this is bad luck
+    // we no have either no or infinite solutions
+    if(isContained(line.getOrigin())){
+      throw MultipleSolutionsException<Vector>(__FILE__,__LINE__,line.getOrigin());
+    }
+    else{
+      throw LinearDependenceException(__FILE__,__LINE__);
+    }
+  }
+
+  double factor2 = getNormal().ScalarProduct(line.getOrigin());
   double scaleFactor = (offset-factor2)/factor1;
 
-  //factor = Origin->ScalarProduct(PlaneNormal)*(-PlaneOffset->ScalarProduct(PlaneNormal))/(Direction.ScalarProduct(PlaneNormal));
-  Direction.Scale(scaleFactor);
-  res = Origin + Direction;
-  Log() << Verbose(1) << "INFO: Scaled direction is " << Direction << "." << endl;
-
-  // test whether resulting vector really is on plane
-  ASSERT(fabs(res.ScalarProduct(*normalVector) - offset) < MYEPSILON,
-         "Calculated line-Plane intersection does not lie on plane.");
+  res = line.getOrigin() + scaleFactor * line.getDirection();
+
+  // tests to make sure the resulting vector really is on plane and line
+  ASSERT(isContained(res),"Calculated line-Plane intersection does not lie on plane.");
+  ASSERT(line.isContained(res),"Calculated line-Plane intersection does not lie on line.");
   return res;
 };

src/Plane.hpp

@@ -51 +51 @@
 
   // some calculations
-  Vector GetIntersection(const Vector &Origin, const Vector &LineVector) const;
+  Vector GetIntersection(const Line &Line) const;
 
   Vector mirrorVector(const Vector &rhs) const;

src/tesselation.cpp

@@ -442 +442 @@
 
   try {
-    *Intersection = Plane(NormalVector, *(endpoints[0]->node->node)).GetIntersection(*MolCenter, *x);
+    Line centerLine = makeLineThrough(*MolCenter, *x);
+    *Intersection = Plane(NormalVector, *(endpoints[0]->node->node)).GetIntersection(centerLine);
 
     DoLog(1) && (Log() << Verbose(1) << "INFO: Triangle is " << *this << "." << endl);
@@ -482 +483 @@
     return false;
   }
-
-
 }
 ;
@@ -508 +507 @@
   GetCenter(&Direction);
   try {
-    *ClosestPoint = Plane(NormalVector, *(endpoints[0]->node->node)).GetIntersection(*x, Direction);
-  }
-  catch (LinearDependenceException &excp) {
+    Line l = makeLineThrough(*x, Direction);
+    *ClosestPoint = Plane(NormalVector, *(endpoints[0]->node->node)).GetIntersection(l);
+  }
+  catch (MathException &excp) {
     (*ClosestPoint) = (*x);
   }
@@ -533 +533 @@
     Direction = (*endpoints[(i+1)%3]->node->node) - (*endpoints[i%3]->node->node);
     // calculate intersection, line can never be parallel to Direction (is the same vector as PlaneNormal);
-    CrossPoint[i] = Plane(Direction, InPlane).GetIntersection(*(endpoints[i%3]->node->node), *(endpoints[(i+1)%3]->node->node));
+    Line l = makeLineThrough(*(endpoints[i%3]->node->node), *(endpoints[(i+1)%3]->node->node));
+    CrossPoint[i] = Plane(Direction, InPlane).GetIntersection(l);
     CrossDirection[i] = CrossPoint[i] - InPlane;
     CrossPoint[i] -= (*endpoints[i%3]->node->node);  // cross point was returned as absolute vector

src/unittests/PlaneUnittest.cpp

@@ -17 +17 @@
 
 #include "vector.hpp"
+#include "Line.hpp"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( PlaneUnittest );
@@ -201 +202 @@
   CPPUNIT_ASSERT_EQUAL(fixture,-1*e1);
 }
+
+void PlaneUnittest::LineIntersectionTest(){
+  Vector fixture;
+  // plane at (0,0,0) normal to (1,0,0) cuts line from (0,0,0) to (2,1,0) at ???
+  Line l1 = makeLineThrough(zeroVec,Vector(2,1,0));
+  CPPUNIT_ASSERT_NO_THROW(fixture = Plane(e1, zeroVec).GetIntersection(l1) );
+  CPPUNIT_ASSERT_EQUAL( zeroVec, fixture );
+
+  // plane at (2,1,0) normal to (0,1,0) cuts line from (1,0,0) to (0,1,1) at ???
+  Line l2 = makeLineThrough(e1,Vector(0,1,1));
+  CPPUNIT_ASSERT_NO_THROW(fixture = Plane(e2, Vector(2,1,0)).GetIntersection(l2) );
+  CPPUNIT_ASSERT_EQUAL( Vector(0., 1., 1.), fixture );
+}

src/unittests/PlaneUnittest.hpp

@@ -21 +21 @@
   CPPUNIT_TEST ( operationsTest );
   CPPUNIT_TEST ( mirrorTest );
+  CPPUNIT_TEST ( LineIntersectionTest );
   CPPUNIT_TEST_SUITE_END();
 
@@ -32 +33 @@
   void operationsTest();
   void mirrorTest();
+  void LineIntersectionTest();
 
 private:

src/unittests/vectorunittest.cpp

@@ -216 +216 @@
 }
 
-/** UnitTest for line intersections.
- */
-void VectorTest::LineIntersectionTest()
-{
-  // plane at (0,0,0) normal to (1,0,0) cuts line from (0,0,0) to (2,1,0) at ???
-  CPPUNIT_ASSERT_NO_THROW(fixture = Plane(unit, zero).GetIntersection(zero, two) );
-  CPPUNIT_ASSERT_EQUAL( zero, fixture );
-
-  // plane at (2,1,0) normal to (0,1,0) cuts line from (1,0,0) to (0,1,1) at ???
-  CPPUNIT_ASSERT_NO_THROW(fixture = Plane(otherunit, two).GetIntersection( unit, notunit) );
-  CPPUNIT_ASSERT_EQUAL( Vector(0., 1., 1.), fixture );
-
-};
 
 /**

src/unittests/vectorunittest.hpp

@@ -27 +27 @@
     CPPUNIT_TEST ( ProjectionTest );
     CPPUNIT_TEST ( NormalsTest );
-    CPPUNIT_TEST ( LineIntersectionTest );
     CPPUNIT_TEST ( IsInParallelepipedTest );
     CPPUNIT_TEST_SUITE_END();