Changeset ef9df36 for src/vectorunittest.cpp

Timestamp:

Aug 19, 2009, 12:23:05 PM (16 years ago)

Author:

Frederik Heber <heber@…>

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, Candidate_v1.7.0, 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:

99c484

Parents:

658efb

Message:

VectorUnitTest extended to Projections and Line intersection, some subsequent bug fixes.

• VectorUnitTest is now under noinst_PROGRAMS, not installed in bin anymore
• VectorUnitTest: EuclidianTest split up into EuclidianScalarProductTest,EuclidianNormTest,EuclidianDistancesTest,EuclidianDistancesTest
• New VectorUnitTests: ProjectionTest and LineIntersectionTest
• BUGFIX: Vector::GetIntersectionWithPlane() - bug due to LineVector renaming (LineVector, LineVector2 -> Origin, LineVector), used LineVector instead of Origin (LineVector however is now relative to Origin!)
• BUGFIX: Vector::GetIntersectionOfTwoLinesOnPlane() - completely rewritten, algorithm was non-sense or at least not understood.

Note: VectorUnitTest is running fine.

File:

• src/vectorunittest.cpp (modified) (8 diffs)

src/vectorunittest.cpp

@@ -25 +25 @@
 void VectorTest::setUp()
 {
+  zero.Init(0.,0.,0.);
+  unit.Init(1.,0.,0.);
+  otherunit.Init(0.,1.,0.);
+  notunit.Init(0.,1.,1.);
+  two.Init(2.,1.,0.);
 };
 
@@ -36 +41 @@
 void VectorTest::UnityTest()
 {
-  Vector zero(0.,0.,0.);
-  Vector unit(1.,0.,0.);
-  Vector otherunit(1./sqrt(2.),0.,1./sqrt(2.));
-  Vector notunit(0.,1.,1.);
-
   // unity and zero tests
   CPPUNIT_ASSERT_EQUAL( true, zero.IsZero() );
@@ -55 +55 @@
 void VectorTest::SimpleAlgebraTest()
 {
-  Vector zero(0.,0.,0.);
-  Vector unit(1.,0.,0.);
-  Vector otherunit(0.,1.,0.);
-  Vector notunit(0.,1.,1.);
   Vector helper;
   double factor;
-
   // summation and scaling
   helper.CopyVector(&zero);
@@ -104 +99 @@
 void VectorTest::OperatorAlgebraTest()
 {
-  Vector zero(0.,0.,0.);
-  Vector unit(1.,0.,0.);
-  Vector otherunit(0.,1.,0.);
-  Vector notunit(0.,1.,1.);
-
   // summation and scaling
+  CPPUNIT_ASSERT_EQUAL( true, (zero+unit).IsOne() );
   CPPUNIT_ASSERT_EQUAL( true, (zero+unit).IsOne() );
   CPPUNIT_ASSERT_EQUAL( true, (zero-unit).IsOne() );
@@ -119 +110 @@
   CPPUNIT_ASSERT_EQUAL( false, (unit*0.98).IsOne() );
   CPPUNIT_ASSERT_EQUAL( true, (unit*1.).IsOne() );
-};
-
-/** UnitTest for scalar products, norms, distances and angles.
- */
-void VectorTest::EuclidianTest()
-{
-  Vector zero(0.,0.,0.);
-  Vector unit(1.,0.,0.);
-  Vector otherunit(0.,1.,0.);
-  Vector notunit(0.,1.,1.);
-  Vector two(2.,1.,0.);
-
-  // SCP
+
+  CPPUNIT_ASSERT_EQUAL( unit, (zero+unit) );
+  CPPUNIT_ASSERT_EQUAL( Vector(0.,0.,1.), (notunit-otherunit) );
+  CPPUNIT_ASSERT_EQUAL( Vector(-1, 0., 1.), (notunit-unit-otherunit) );
+};
+
+/** UnitTest for scalar products.
+ */
+void VectorTest::EuclidianScalarProductTest()
+{
   CPPUNIT_ASSERT_EQUAL( 0., zero.ScalarProduct(&zero) );
   CPPUNIT_ASSERT_EQUAL( 0., zero.ScalarProduct(&unit) );
@@ -143 +131 @@
   CPPUNIT_ASSERT_EQUAL( 1., two.ScalarProduct(&otherunit) );
   CPPUNIT_ASSERT_EQUAL( 1., two.ScalarProduct(&notunit) );
-
-  // Norms
+}
+
+/** UnitTest for norms.
+ */
+void VectorTest::EuclidianNormTest()
+{
   CPPUNIT_ASSERT_EQUAL( 0., zero.Norm() );
   CPPUNIT_ASSERT_EQUAL( 0., zero.NormSquared() );
@@ -153 +145 @@
   CPPUNIT_ASSERT_EQUAL( 2., notunit.NormSquared() );
   CPPUNIT_ASSERT_EQUAL( sqrt(2.), notunit.Norm() );
-
-  // distances
+}
+
+/** UnitTest for distances.
+ */
+void VectorTest::EuclidianDistancesTest()
+{
   CPPUNIT_ASSERT_EQUAL( 1., zero.Distance(&unit) );
   CPPUNIT_ASSERT_EQUAL( sqrt(2.), otherunit.Distance(&unit) );
@@ -160 +156 @@
   CPPUNIT_ASSERT_EQUAL( 1., otherunit.Distance(&notunit) );
   CPPUNIT_ASSERT_EQUAL( sqrt(5.), two.Distance(&notunit) );
-
-  // Angles
+}
+
+/** UnitTest for angles.
+ */
+void VectorTest::EuclidianAnglesTest()
+{
   CPPUNIT_ASSERT_EQUAL( M_PI, zero.Angle(&unit) );
-};
-
+  CPPUNIT_ASSERT_EQUAL( 0., unit.Angle(&unit) );
+  CPPUNIT_ASSERT_EQUAL( true, fabs(M_PI/2. - otherunit.Angle(&unit)) < MYEPSILON );
+  CPPUNIT_ASSERT_EQUAL( true, fabs(M_PI/2. - unit.Angle(&notunit)) < MYEPSILON );
+  CPPUNIT_ASSERT_EQUAL( true, fabs(M_PI/4. - otherunit.Angle(&notunit)) < MYEPSILON );
+};
+
+/** UnitTest for projections.
+ */
+void VectorTest::ProjectionTest()
+{
+  CPPUNIT_ASSERT_EQUAL( zero, zero.Projection(&unit) );
+  CPPUNIT_ASSERT_EQUAL( zero, otherunit.Projection(&unit) );
+  CPPUNIT_ASSERT_EQUAL( Vector(0.4,0.2,0.),  otherunit.Projection(&two) );
+  CPPUNIT_ASSERT_EQUAL( Vector(0.,1.,0.),  two.Projection(&otherunit) );
+};
+
+/** UnitTest for line intersections.
+ */
+void VectorTest::LineIntersectionTest()
+{
+  Vector helper;
+  // plane at (0,0,0) normal to (1,0,0) cuts line from (0,0,0) to (2,1,0) at ???
+  CPPUNIT_ASSERT_EQUAL( true, helper.GetIntersectionWithPlane((ofstream *)&cout, &unit, &zero, &zero, &two) );
+  CPPUNIT_ASSERT_EQUAL( zero, helper );
+
+  // plane at (2,1,0) normal to (0,1,0) cuts line from (1,0,0) to (0,1,1) at ???
+  CPPUNIT_ASSERT_EQUAL( true, helper.GetIntersectionWithPlane((ofstream *)&cout, &otherunit, &two, &unit, &notunit) );
+  CPPUNIT_ASSERT_EQUAL( Vector(0., 1., 1.), helper );
+
+  // four vectors equal to zero
+  CPPUNIT_ASSERT_EQUAL( false, helper.GetIntersectionOfTwoLinesOnPlane((ofstream *)&cout, &zero, &zero, &zero, &zero, NULL) );
+  CPPUNIT_ASSERT_EQUAL( zero, helper );
+
+  // four vectors equal to unit
+  CPPUNIT_ASSERT_EQUAL( false, helper.GetIntersectionOfTwoLinesOnPlane((ofstream *)&cout, &unit, &unit, &unit, &unit, NULL) );
+  CPPUNIT_ASSERT_EQUAL( zero, helper );
+
+  // two equal lines
+  CPPUNIT_ASSERT_EQUAL( true, helper.GetIntersectionOfTwoLinesOnPlane((ofstream *)&cout, &unit, &two, &unit, &two, NULL) );
+  CPPUNIT_ASSERT_EQUAL( unit, helper );
+
+  // line from (1,0,0) to (2,1,0) cuts line from (1,0,0) to (0,1,0) at ???
+  CPPUNIT_ASSERT_EQUAL( true, helper.GetIntersectionOfTwoLinesOnPlane((ofstream *)&cout, &unit, &two, &unit, &otherunit, NULL) );
+  CPPUNIT_ASSERT_EQUAL( unit, helper );
+
+  // line from (1,0,0) to (0,0,0) cuts line from (0,0,0) to (2,1,0) at ???
+  CPPUNIT_ASSERT_EQUAL( true, helper.GetIntersectionOfTwoLinesOnPlane((ofstream *)&cout, &unit, &zero, &zero, &two, NULL) );
+  CPPUNIT_ASSERT_EQUAL( zero, helper );
+
+  // line from (1,0,0) to (2,1,0) cuts line from (0,0,0) to (0,1,0) at ???
+  CPPUNIT_ASSERT_EQUAL( true, helper.GetIntersectionOfTwoLinesOnPlane((ofstream *)&cout, &unit, &two, &zero, &otherunit, NULL) );
+  CPPUNIT_ASSERT_EQUAL( Vector(0., -1., 0.), helper );
+};
 
 /********************************************** Main routine **************************************/