Changes in / [014475:8f822c]

Location:

src

Files:

• Line.cpp (modified) (1 diff)
• Line.hpp (modified) (1 diff)
• Makefile.am (modified) (3 diffs)
• Shapes/BaseShapes.cpp (added)
• Shapes/BaseShapes.hpp (added)
• Shapes/BaseShapes_impl.hpp (added)
• Shapes/Shape.cpp (added)
• Shapes/Shape.hpp (added)
• Shapes/ShapeOps.cpp (added)
• Shapes/ShapeOps.hpp (added)
• Shapes/ShapeOps_impl.hpp (added)
• Shapes/Shape_impl.hpp (added)
• unittests/LineUnittest.cpp (modified) (1 diff)
• unittests/LineUnittest.hpp (modified) (2 diffs)
• unittests/Makefile.am (modified) (3 diffs)
• unittests/ShapeUnittest.cpp (added)
• unittests/ShapeUnittest.hpp (added)

src/Line.cpp

@@ -215 +215 @@
 }
 
+std::vector<Vector> Line::getSphereIntersections() const{
+  std::vector<Vector> res;
+
+  // line is kept in normalized form, so we can skip a lot of calculations
+  double discriminant = 1-origin->NormSquared();
+  // we might have 2, 1 or 0 solutions, depending on discriminant
+  if(discriminant>=0){
+    if(discriminant==0){
+      res.push_back(*origin);
+    }
+    else{
+      Vector helper = sqrt(discriminant)*(*direction);
+      res.push_back(*origin+helper);
+      res.push_back(*origin-helper);
+    }
+  }
+  return res;
+}
+
 Line makeLineThrough(const Vector &x1, const Vector &x2){
   if(x1==x2){

src/Line.hpp

@@ -38 +38 @@
   Plane getOrthogonalPlane(const Vector &origin) const;
 
+  std::vector<Vector> getSphereIntersections() const;
+
 private:
   std::auto_ptr<Vector> origin;

src/Makefile.am

@@ -122 +122 @@
   Patterns/Observer.hpp \
   Patterns/Singleton.hpp
+  
+SHAPESOURCE = \
+  Shapes/BaseShapes.cpp \
+  Shapes/Shape.cpp \
+  Shapes/ShapeOps.cpp
+SHAPEHEADER = \
+  Shapes/BaseShapes.hpp \
+  Shapes/Shape.hpp \
+  Shapes/ShapeOps.hpp
+  
 
 DESCRIPTORSOURCE = Descriptors/AtomDescriptor.cpp \
@@ -147 +157 @@
   ${PATTERNSOURCE} \
   ${PARSERSOURCE} \
+  ${SHAPESOURCE} \
   ${DESCRIPTORSOURCE} \
   ${HELPERSOURCE} \
@@ -194 +205 @@
   ${PARSERHEADER} \
   ${PATTERNHEADER} \
+  ${SHAPEHEADER} \
   ${DESCRIPTORHEADER} \
   bond.hpp \

src/unittests/LineUnittest.cpp

@@ -353 +353 @@
   CPPUNIT_ASSERT_EQUAL(fixture,zeroVec);
 }
+
+void LineUnittest::sphereIntersectionTest(){
+  {
+    std::vector<Vector> res = la1->getSphereIntersections();
+    CPPUNIT_ASSERT_EQUAL(res.size(),(size_t)2);
+    CPPUNIT_ASSERT(testDirection(res[0],e1));
+    CPPUNIT_ASSERT(testDirection(res[1],e1));
+    CPPUNIT_ASSERT(res[0]!=res[1]);
+  }
+
+  {
+    std::vector<Vector> res = la2->getSphereIntersections();
+    CPPUNIT_ASSERT_EQUAL(res.size(),(size_t)2);
+    CPPUNIT_ASSERT(testDirection(res[0],e2));
+    CPPUNIT_ASSERT(testDirection(res[1],e2));
+    CPPUNIT_ASSERT(res[0]!=res[1]);
+  }
+
+  {
+    std::vector<Vector> res = la3->getSphereIntersections();
+    CPPUNIT_ASSERT_EQUAL(res.size(),(size_t)2);
+    CPPUNIT_ASSERT(testDirection(res[0],e3));
+    CPPUNIT_ASSERT(testDirection(res[1],e3));
+    CPPUNIT_ASSERT(res[0]!=res[1]);
+  }
+
+  {
+    std::vector<Vector> res = lp1->getSphereIntersections();
+    CPPUNIT_ASSERT_EQUAL(res.size(),(size_t)2);
+    CPPUNIT_ASSERT((res[0]==e1) || (res[0]==e2));
+    CPPUNIT_ASSERT((res[1]==e1) || (res[1]==e2));
+    CPPUNIT_ASSERT(res[0]!=res[1]);
+  }
+
+  {
+    std::vector<Vector> res = lp2->getSphereIntersections();
+    CPPUNIT_ASSERT_EQUAL(res.size(),(size_t)2);
+    CPPUNIT_ASSERT((res[0]==e2) || (res[0]==e3));
+    CPPUNIT_ASSERT((res[1]==e2) || (res[1]==e3));
+    CPPUNIT_ASSERT(res[0]!=res[1]);
+  }
+
+  {
+    std::vector<Vector> res = lp3->getSphereIntersections();
+    CPPUNIT_ASSERT_EQUAL(res.size(),(size_t)2);
+    CPPUNIT_ASSERT((res[0]==e3) || (res[0]==e1));
+    CPPUNIT_ASSERT((res[1]==e3) || (res[1]==e1));
+    CPPUNIT_ASSERT(res[0]!=res[1]);
+  }
+}

src/unittests/LineUnittest.hpp

@@ -22 +22 @@
   CPPUNIT_TEST ( intersectionTest );
   CPPUNIT_TEST ( rotationTest );
+  CPPUNIT_TEST ( sphereIntersectionTest );
   CPPUNIT_TEST_SUITE_END();
 
@@ -33 +34 @@
   void intersectionTest();
   void rotationTest();
+  void sphereIntersectionTest();
 
 private:

src/unittests/Makefile.am

@@ -38 +38 @@
   periodentafelTest \
   PlaneUnittest \
+  ShapeUnittest \
   SingletonTest \
   StackClassUnitTest \
@@ -83 +84 @@
   periodentafelTest.cpp \
   PlaneUnittest.cpp \
+  ShapeUnittest.cpp \
   SingletonTest.cpp \
   stackclassunittest.cpp \
@@ -210 +212 @@
 PlaneUnittest_LDADD = ${ALLLIBS}
 
+ShapeUnittest_SOURCES = UnitTestMain.cpp ShapeUnittest.cpp ShapeUnittest.hpp
+ShapeUnittest_LDADD = ${ALLLIBS}
+
 SingletonTest_SOURCES = UnitTestMain.cpp SingletonTest.cpp SingletonTest.hpp
 SingletonTest_LDADD = ${ALLLIBS} $(BOOST_LIB) ${BOOST_THREAD_LIB}