Changeset 6c6d84

Timestamp:

Aug 20, 2009, 11:35:19 AM (16 years ago)

Author:

Saskia Metzler <metzler@…>

Children:

bc3953

Parents:

84b811

Message:

Ticket 16: Unit tests for Vector::RotateVector(), additionally fixing the function

Location:

molecuilder/src

Files:

• vector.cpp (modified) (2 diffs)
• vectorunittest.cpp (modified) (2 diffs)
• vectorunittest.hpp (modified) (1 diff)

molecuilder/src/vector.cpp

@@ -467 +467 @@
 };
 
-/** Rotates the vector around the axis given by \a *axis by an angle of \a alpha.
+/** Rotates the vector relative to the origin around the axis given by \a *axis by an angle of \a alpha.
  * \param *axis rotation axis
  * \param alpha rotation angle in radian
@@ -478 +478 @@
   a.ProjectOntoPlane(axis);
   // construct normal vector
-  y.MakeNormalVector(axis,this);
+  bool rotatable = y.MakeNormalVector(axis,&a);
+  // The normal vector cannot be created if there is linar dependency.
+  // Then the vector to rotate is on the axis and any rotation leads to the vector itself.
+  if (!rotatable) {
+    return;
+  }
   y.Scale(Norm());
   // scale normal vector by sine and this vector by cosine
   y.Scale(sin(alpha));
-  Scale(cos(alpha));
+  a.Scale(cos(alpha));
+  CopyVector(Projection(axis));
   // add scaled normal vector onto this vector
   AddVector(&y);

molecuilder/src/vectorunittest.cpp

@@ -55 +55 @@
 void VectorTest::SimpleAlgebraTest()
 {
-  Vector helper;
   double factor;
+  // copy vector
+  fixture.Init(2.,3.,4.);
+  CPPUNIT_ASSERT_EQUAL( Vector(2.,3.,4.), fixture );
   // summation and scaling
-  helper.CopyVector(&zero);
-  helper.AddVector(&unit);
-  CPPUNIT_ASSERT_EQUAL( true, helper.IsOne() );
-  helper.CopyVector(&zero);
-  helper.SubtractVector(&unit);
-  CPPUNIT_ASSERT_EQUAL( true, helper.IsOne() );
-  CPPUNIT_ASSERT_EQUAL( false, helper.IsZero() );
-  helper.CopyVector(&zero);
-  helper.AddVector(&zero);
-  CPPUNIT_ASSERT_EQUAL( true, helper.IsZero() );
-  helper.CopyVector(&notunit);
-  helper.SubtractVector(&otherunit);
-  CPPUNIT_ASSERT_EQUAL( true, helper.IsOne() );
-  helper.CopyVector(&unit);
-  helper.AddVector(&otherunit);
-  CPPUNIT_ASSERT_EQUAL( false, helper.IsOne() );
-  helper.CopyVector(&notunit);
-  helper.SubtractVector(&unit);
-  helper.SubtractVector(&otherunit);
-  CPPUNIT_ASSERT_EQUAL( false, helper.IsZero() );
-  helper.CopyVector(&unit);
-  helper.Scale(0.98);
-  CPPUNIT_ASSERT_EQUAL( false, helper.IsOne() );
-  helper.CopyVector(&unit);
-  helper.Scale(1.);
-  CPPUNIT_ASSERT_EQUAL( true, helper.IsOne() );
-  helper.CopyVector(&unit);
+  fixture.CopyVector(&zero);
+  fixture.AddVector(&unit);
+  CPPUNIT_ASSERT_EQUAL( true, fixture.IsOne() );
+  fixture.CopyVector(&zero);
+  fixture.SubtractVector(&unit);
+  CPPUNIT_ASSERT_EQUAL( true, fixture.IsOne() );
+  CPPUNIT_ASSERT_EQUAL( false, fixture.IsZero() );
+  fixture.CopyVector(&zero);
+  fixture.AddVector(&zero);
+  CPPUNIT_ASSERT_EQUAL( true, fixture.IsZero() );
+  fixture.CopyVector(&notunit);
+  fixture.SubtractVector(&otherunit);
+  CPPUNIT_ASSERT_EQUAL( true, fixture.IsOne() );
+  fixture.CopyVector(&unit);
+  fixture.AddVector(&otherunit);
+  CPPUNIT_ASSERT_EQUAL( false, fixture.IsOne() );
+  fixture.CopyVector(&notunit);
+  fixture.SubtractVector(&unit);
+  fixture.SubtractVector(&otherunit);
+  CPPUNIT_ASSERT_EQUAL( false, fixture.IsZero() );
+  fixture.CopyVector(&unit);
+  fixture.Scale(0.98);
+  CPPUNIT_ASSERT_EQUAL( false, fixture.IsOne() );
+  fixture.CopyVector(&unit);
+  fixture.Scale(1.);
+  CPPUNIT_ASSERT_EQUAL( true, fixture.IsOne() );
+  fixture.CopyVector(&unit);
   factor = 0.98;
-  helper.Scale(factor);
-  CPPUNIT_ASSERT_EQUAL( false, helper.IsOne() );
-  helper.CopyVector(&unit);
+  fixture.Scale(factor);
+  CPPUNIT_ASSERT_EQUAL( false, fixture.IsOne() );
+  fixture.CopyVector(&unit);
   factor = 1.;
-  helper.Scale(factor);
-  CPPUNIT_ASSERT_EQUAL( true, helper.IsOne() );
+  fixture.Scale(factor);
+  CPPUNIT_ASSERT_EQUAL( true, fixture.IsOne() );
 };
 
@@ -183 +185 @@
 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 );
+  CPPUNIT_ASSERT_EQUAL( true, fixture.GetIntersectionWithPlane((ofstream *)&cout, &unit, &zero, &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_EQUAL( true, helper.GetIntersectionWithPlane((ofstream *)&cout, &otherunit, &two, &unit, &notunit) );
-  CPPUNIT_ASSERT_EQUAL( Vector(0., 1., 1.), helper );
+  CPPUNIT_ASSERT_EQUAL( true, fixture.GetIntersectionWithPlane((ofstream *)&cout, &otherunit, &two, &unit, &notunit) );
+  CPPUNIT_ASSERT_EQUAL( Vector(0., 1., 1.), fixture );
 
   // four vectors equal to zero
-  CPPUNIT_ASSERT_EQUAL( false, helper.GetIntersectionOfTwoLinesOnPlane((ofstream *)&cout, &zero, &zero, &zero, &zero, NULL) );
-  CPPUNIT_ASSERT_EQUAL( zero, helper );
+  CPPUNIT_ASSERT_EQUAL( false, fixture.GetIntersectionOfTwoLinesOnPlane((ofstream *)&cout, &zero, &zero, &zero, &zero, NULL) );
+  CPPUNIT_ASSERT_EQUAL( zero, fixture );
 
   // four vectors equal to unit
-  CPPUNIT_ASSERT_EQUAL( false, helper.GetIntersectionOfTwoLinesOnPlane((ofstream *)&cout, &unit, &unit, &unit, &unit, NULL) );
-  CPPUNIT_ASSERT_EQUAL( zero, helper );
+  CPPUNIT_ASSERT_EQUAL( false, fixture.GetIntersectionOfTwoLinesOnPlane((ofstream *)&cout, &unit, &unit, &unit, &unit, NULL) );
+  CPPUNIT_ASSERT_EQUAL( zero, fixture );
 
   // two equal lines
-  CPPUNIT_ASSERT_EQUAL( true, helper.GetIntersectionOfTwoLinesOnPlane((ofstream *)&cout, &unit, &two, &unit, &two, NULL) );
-  CPPUNIT_ASSERT_EQUAL( unit, helper );
+  CPPUNIT_ASSERT_EQUAL( true, fixture.GetIntersectionOfTwoLinesOnPlane((ofstream *)&cout, &unit, &two, &unit, &two, NULL) );
+  CPPUNIT_ASSERT_EQUAL( unit, fixture );
 
   // 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 );
+  CPPUNIT_ASSERT_EQUAL( true, fixture.GetIntersectionOfTwoLinesOnPlane((ofstream *)&cout, &unit, &two, &unit, &otherunit, NULL) );
+  CPPUNIT_ASSERT_EQUAL( unit, fixture );
 
   // 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 );
+  CPPUNIT_ASSERT_EQUAL( true, fixture.GetIntersectionOfTwoLinesOnPlane((ofstream *)&cout, &unit, &zero, &zero, &two, NULL) );
+  CPPUNIT_ASSERT_EQUAL( zero, fixture );
 
   // 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 );
-};
+  CPPUNIT_ASSERT_EQUAL( true, fixture.GetIntersectionOfTwoLinesOnPlane((ofstream *)&cout, &unit, &two, &zero, &otherunit, NULL) );
+  CPPUNIT_ASSERT_EQUAL( Vector(0., -1., 0.), fixture );
+};
+
+/** UnitTest for vector rotations.
+ */
+void VectorTest::VectorRotationTest()
+{
+  fixture.Init(-1.,0.,0.);
+
+  // zero vector does not change
+  fixture.CopyVector(&zero);
+  fixture.RotateVector(&unit, 1.);
+  CPPUNIT_ASSERT_EQUAL( zero, fixture );
+
+  fixture.RotateVector(&two, 1.);
+  CPPUNIT_ASSERT_EQUAL( zero,  fixture);
+
+  // vector on axis does not change
+  fixture.CopyVector(&unit);
+  fixture.RotateVector(&unit, 1.);
+  CPPUNIT_ASSERT_EQUAL( unit, fixture );
+
+  fixture.RotateVector(&unit, 1.);
+  CPPUNIT_ASSERT_EQUAL( unit, fixture );
+
+  // rotations
+  fixture.CopyVector(&otherunit);
+  fixture.RotateVector(&unit, M_PI);
+  CPPUNIT_ASSERT_EQUAL( Vector(0.,-1.,0.), fixture );
+
+  fixture.CopyVector(&otherunit);
+  fixture.RotateVector(&unit, 2. * M_PI);
+  CPPUNIT_ASSERT_EQUAL( otherunit, fixture );
+
+  fixture.CopyVector(&otherunit);
+  fixture.RotateVector(&unit, 0);
+  CPPUNIT_ASSERT_EQUAL( otherunit, fixture );
+
+  fixture.Init(0.,0.,1.);
+  fixture.RotateVector(&notunit, M_PI);
+  CPPUNIT_ASSERT_EQUAL( otherunit, fixture );
+}
+
 
 /********************************************** Main routine **************************************/

molecuilder/src/vectorunittest.hpp

@@ -27 +27 @@
     CPPUNIT_TEST ( ProjectionTest );
     CPPUNIT_TEST ( LineIntersectionTest );
+    CPPUNIT_TEST ( VectorRotationTest );
     CPPUNIT_TEST_SUITE_END();
 
 public:
-      void setUp();
-      void tearDown();
+    void setUp();
+    void tearDown();
 
-     void UnityTest();
-     void OperatorAlgebraTest();
-     void SimpleAlgebraTest();
-     void EuclidianScalarProductTest();
-     void EuclidianNormTest();
-     void EuclidianDistancesTest();
-     void EuclidianAnglesTest();
-     void ProjectionTest();
-     void LineIntersectionTest();
+    void UnityTest();
+    void OperatorAlgebraTest();
+    void SimpleAlgebraTest();
+    void EuclidianScalarProductTest();
+    void EuclidianNormTest();
+    void EuclidianDistancesTest();
+    void EuclidianAnglesTest();
+    void ProjectionTest();
+    void LineIntersectionTest();
+    void VectorRotationTest();
 
 private:
-     Vector zero;
-     Vector unit;
-     Vector otherunit;
-     Vector notunit;
-     Vector two;
+    // vector to execute tests on, may be modified during run
+    Vector fixture;
+    // never modify these during run, other tests might rely on them
+    Vector zero;
+    Vector unit;
+    Vector otherunit;
+    Vector notunit;
+    Vector two;
 };