Changes in src/unittests/ShapeUnittest.cpp [997784:6d750f]

File:

• src/unittests/ShapeUnittest.cpp (modified) (4 diffs)

src/unittests/ShapeUnittest.cpp

@@ -17 +17 @@
 
 #include "Shapes/Shape.hpp"
+#include "Shapes/BaseShapes.hpp"
 #include "vector.cpp"
 
@@ -24 +25 @@
 void ShapeUnittest::setUp()
 {
-  v000 =  0*e1+0*e2+0*e3;
-  v100 =  1*e1+0*e2+0*e3;
-  v200 = -1*e1+0*e2+0*e3;
-  v010 =  0*e1+1*e2+0*e3;
-  v110 =  1*e1+1*e2+0*e3;
-  v210 = -1*e1+1*e2+0*e3;
-  v020 =  0*e1-1*e2+0*e3;
-  v120 =  1*e1-1*e2+0*e3;
-  v220 = -1*e1-1*e2+0*e3;
-  v001 =  0*e1+0*e2+1*e3;
-  v101 =  1*e1+0*e2+1*e3;
-  v201 = -1*e1+0*e2+1*e3;
-  v011 =  0*e1+1*e2+1*e3;
-  v111 =  1*e1+1*e2+1*e3;
-  v211 = -1*e1+1*e2+1*e3;
-  v021 =  0*e1-1*e2+1*e3;
-  v121 =  1*e1-1*e2+1*e3;
-  v221 = -1*e1-1*e2+1*e3;
-  v002 =  0*e1+0*e2-1*e3;
-  v102 =  1*e1+0*e2-1*e3;
-  v202 = -1*e1+0*e2-1*e3;
-  v012 =  0*e1+1*e2-1*e3;
-  v112 =  1*e1+1*e2-1*e3;
-  v212 = -1*e1+1*e2-1*e3;
-  v022 =  0*e1-1*e2-1*e3;
-  v122 =  1*e1-1*e2-1*e3;
-  v222 = -1*e1-1*e2-1*e3;
+  v000 =  0*unitVec[0]+0*unitVec[1]+0*unitVec[2];
+  v100 =  1*unitVec[0]+0*unitVec[1]+0*unitVec[2];
+  v200 = -1*unitVec[0]+0*unitVec[1]+0*unitVec[2];
+  v010 =  0*unitVec[0]+1*unitVec[1]+0*unitVec[2];
+  v110 =  1*unitVec[0]+1*unitVec[1]+0*unitVec[2];
+  v210 = -1*unitVec[0]+1*unitVec[1]+0*unitVec[2];
+  v020 =  0*unitVec[0]-1*unitVec[1]+0*unitVec[2];
+  v120 =  1*unitVec[0]-1*unitVec[1]+0*unitVec[2];
+  v220 = -1*unitVec[0]-1*unitVec[1]+0*unitVec[2];
+  v001 =  0*unitVec[0]+0*unitVec[1]+1*unitVec[2];
+  v101 =  1*unitVec[0]+0*unitVec[1]+1*unitVec[2];
+  v201 = -1*unitVec[0]+0*unitVec[1]+1*unitVec[2];
+  v011 =  0*unitVec[0]+1*unitVec[1]+1*unitVec[2];
+  v111 =  1*unitVec[0]+1*unitVec[1]+1*unitVec[2];
+  v211 = -1*unitVec[0]+1*unitVec[1]+1*unitVec[2];
+  v021 =  0*unitVec[0]-1*unitVec[1]+1*unitVec[2];
+  v121 =  1*unitVec[0]-1*unitVec[1]+1*unitVec[2];
+  v221 = -1*unitVec[0]-1*unitVec[1]+1*unitVec[2];
+  v002 =  0*unitVec[0]+0*unitVec[1]-1*unitVec[2];
+  v102 =  1*unitVec[0]+0*unitVec[1]-1*unitVec[2];
+  v202 = -1*unitVec[0]+0*unitVec[1]-1*unitVec[2];
+  v012 =  0*unitVec[0]+1*unitVec[1]-1*unitVec[2];
+  v112 =  1*unitVec[0]+1*unitVec[1]-1*unitVec[2];
+  v212 = -1*unitVec[0]+1*unitVec[1]-1*unitVec[2];
+  v022 =  0*unitVec[0]-1*unitVec[1]-1*unitVec[2];
+  v122 =  1*unitVec[0]-1*unitVec[1]-1*unitVec[2];
+  v222 = -1*unitVec[0]-1*unitVec[1]-1*unitVec[2];
 }
 
@@ -113 +114 @@
   CPPUNIT_ASSERT(Everywhere().isInside(v122));
   CPPUNIT_ASSERT(Everywhere().isInside(v222));
+
+  CPPUNIT_ASSERT(Cuboid().isInside(v000));
+  CPPUNIT_ASSERT(Cuboid().isInside(v100));
+  CPPUNIT_ASSERT(Cuboid().isInside(v200));
+  CPPUNIT_ASSERT(Cuboid().isInside(v010));
+  CPPUNIT_ASSERT(Cuboid().isInside(v110));
+  CPPUNIT_ASSERT(Cuboid().isInside(v210));
+  CPPUNIT_ASSERT(Cuboid().isInside(v020));
+  CPPUNIT_ASSERT(Cuboid().isInside(v120));
+  CPPUNIT_ASSERT(Cuboid().isInside(v220));
+  CPPUNIT_ASSERT(Cuboid().isInside(v001));
+  CPPUNIT_ASSERT(Cuboid().isInside(v101));
+  CPPUNIT_ASSERT(Cuboid().isInside(v201));
+  CPPUNIT_ASSERT(Cuboid().isInside(v011));
+  CPPUNIT_ASSERT(Cuboid().isInside(v111));
+  CPPUNIT_ASSERT(Cuboid().isInside(v211));
+  CPPUNIT_ASSERT(Cuboid().isInside(v021));
+  CPPUNIT_ASSERT(Cuboid().isInside(v121));
+  CPPUNIT_ASSERT(Cuboid().isInside(v221));
+  CPPUNIT_ASSERT(Cuboid().isInside(v002));
+  CPPUNIT_ASSERT(Cuboid().isInside(v102));
+  CPPUNIT_ASSERT(Cuboid().isInside(v202));
+  CPPUNIT_ASSERT(Cuboid().isInside(v012));
+  CPPUNIT_ASSERT(Cuboid().isInside(v112));
+  CPPUNIT_ASSERT(Cuboid().isInside(v212));
+  CPPUNIT_ASSERT(Cuboid().isInside(v022));
+  CPPUNIT_ASSERT(Cuboid().isInside(v122));
+  CPPUNIT_ASSERT(Cuboid().isInside(v222));
+
+  CPPUNIT_ASSERT(Sphere().isInside(v000));
+  CPPUNIT_ASSERT(Sphere().isInside(v100));
+  CPPUNIT_ASSERT(Sphere().isInside(v200));
+  CPPUNIT_ASSERT(Sphere().isInside(v010));
+  CPPUNIT_ASSERT(!Sphere().isInside(v110));
+  CPPUNIT_ASSERT(!Sphere().isInside(v210));
+  CPPUNIT_ASSERT(Sphere().isInside(v020));
+  CPPUNIT_ASSERT(!Sphere().isInside(v120));
+  CPPUNIT_ASSERT(!Sphere().isInside(v220));
+  CPPUNIT_ASSERT(Sphere().isInside(v001));
+  CPPUNIT_ASSERT(!Sphere().isInside(v101));
+  CPPUNIT_ASSERT(!Sphere().isInside(v201));
+  CPPUNIT_ASSERT(!Sphere().isInside(v011));
+  CPPUNIT_ASSERT(!Sphere().isInside(v111));
+  CPPUNIT_ASSERT(!Sphere().isInside(v211));
+  CPPUNIT_ASSERT(!Sphere().isInside(v021));
+  CPPUNIT_ASSERT(!Sphere().isInside(v121));
+  CPPUNIT_ASSERT(!Sphere().isInside(v221));
+  CPPUNIT_ASSERT(Sphere().isInside(v002));
+  CPPUNIT_ASSERT(!Sphere().isInside(v102));
+  CPPUNIT_ASSERT(!Sphere().isInside(v202));
+  CPPUNIT_ASSERT(!Sphere().isInside(v012));
+  CPPUNIT_ASSERT(!Sphere().isInside(v112));
+  CPPUNIT_ASSERT(!Sphere().isInside(v212));
+  CPPUNIT_ASSERT(!Sphere().isInside(v022));
+  CPPUNIT_ASSERT(!Sphere().isInside(v122));
+  CPPUNIT_ASSERT(!Sphere().isInside(v222));
+}
+
+void ShapeUnittest::surfaceTest(){
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v000));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v100));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v200));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v010));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v110));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v210));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v020));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v120));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v220));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v001));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v101));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v201));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v011));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v111));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v211));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v021));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v121));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v221));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v002));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v102));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v202));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v012));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v112));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v212));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v022));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v122));
+  CPPUNIT_ASSERT(!Nowhere().isOnSurface(v222));
+
+  CPPUNIT_ASSERT(!Cuboid().isOnSurface(v000));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v100));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v200));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v010));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v110));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v210));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v020));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v120));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v220));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v001));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v101));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v201));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v011));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v111));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v211));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v021));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v121));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v221));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v002));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v102));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v202));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v012));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v112));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v212));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v022));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v122));
+  CPPUNIT_ASSERT(Cuboid().isOnSurface(v222));
+
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v000));
+  CPPUNIT_ASSERT(Sphere().isOnSurface(v100));
+  CPPUNIT_ASSERT(Sphere().isOnSurface(v200));
+  CPPUNIT_ASSERT(Sphere().isOnSurface(v010));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v110));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v210));
+  CPPUNIT_ASSERT(Sphere().isOnSurface(v020));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v120));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v220));
+  CPPUNIT_ASSERT(Sphere().isOnSurface(v001));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v101));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v201));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v011));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v111));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v211));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v021));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v121));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v221));
+  CPPUNIT_ASSERT(Sphere().isOnSurface(v002));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v102));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v202));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v012));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v112));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v212));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v022));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v122));
+  CPPUNIT_ASSERT(!Sphere().isOnSurface(v222));
 }
 
@@ -360 +503 @@
   }
 
+  {
+    Shape s1 = Sphere() && Cuboid(); // should be the same as Sphere
+
+    CPPUNIT_ASSERT(s1.isInside(v000));
+    CPPUNIT_ASSERT(s1.isInside(v100));
+    CPPUNIT_ASSERT(s1.isInside(v200));
+    CPPUNIT_ASSERT(s1.isInside(v010));
+    CPPUNIT_ASSERT(!s1.isInside(v110));
+    CPPUNIT_ASSERT(!s1.isInside(v210));
+    CPPUNIT_ASSERT(s1.isInside(v020));
+    CPPUNIT_ASSERT(!s1.isInside(v120));
+    CPPUNIT_ASSERT(!s1.isInside(v220));
+    CPPUNIT_ASSERT(s1.isInside(v001));
+    CPPUNIT_ASSERT(!s1.isInside(v101));
+    CPPUNIT_ASSERT(!s1.isInside(v201));
+    CPPUNIT_ASSERT(!s1.isInside(v011));
+    CPPUNIT_ASSERT(!s1.isInside(v111));
+    CPPUNIT_ASSERT(!s1.isInside(v211));
+    CPPUNIT_ASSERT(!s1.isInside(v021));
+    CPPUNIT_ASSERT(!s1.isInside(v121));
+    CPPUNIT_ASSERT(!s1.isInside(v221));
+    CPPUNIT_ASSERT(s1.isInside(v002));
+    CPPUNIT_ASSERT(!s1.isInside(v102));
+    CPPUNIT_ASSERT(!s1.isInside(v202));
+    CPPUNIT_ASSERT(!s1.isInside(v012));
+    CPPUNIT_ASSERT(!s1.isInside(v112));
+    CPPUNIT_ASSERT(!s1.isInside(v212));
+    CPPUNIT_ASSERT(!s1.isInside(v022));
+    CPPUNIT_ASSERT(!s1.isInside(v122));
+    CPPUNIT_ASSERT(!s1.isInside(v222));
+
+    CPPUNIT_ASSERT(!s1.isOnSurface(v000));
+    CPPUNIT_ASSERT(s1.isOnSurface(v100));
+    CPPUNIT_ASSERT(s1.isOnSurface(v200));
+    CPPUNIT_ASSERT(s1.isOnSurface(v010));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v110));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v210));
+    CPPUNIT_ASSERT(s1.isOnSurface(v020));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v120));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v220));
+    CPPUNIT_ASSERT(s1.isOnSurface(v001));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v101));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v201));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v011));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v111));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v211));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v021));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v121));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v221));
+    CPPUNIT_ASSERT(s1.isOnSurface(v002));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v102));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v202));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v012));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v112));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v212));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v022));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v122));
+    CPPUNIT_ASSERT(!s1.isOnSurface(v222));
+
+
+    Shape s2 = Sphere() || Cuboid(); // Should be same as Cuboid
+
+    CPPUNIT_ASSERT(s2.isInside(v000));
+    CPPUNIT_ASSERT(s2.isInside(v100));
+    CPPUNIT_ASSERT(s2.isInside(v200));
+    CPPUNIT_ASSERT(s2.isInside(v010));
+    CPPUNIT_ASSERT(s2.isInside(v110));
+    CPPUNIT_ASSERT(s2.isInside(v210));
+    CPPUNIT_ASSERT(s2.isInside(v020));
+    CPPUNIT_ASSERT(s2.isInside(v120));
+    CPPUNIT_ASSERT(s2.isInside(v220));
+    CPPUNIT_ASSERT(s2.isInside(v001));
+    CPPUNIT_ASSERT(s2.isInside(v101));
+    CPPUNIT_ASSERT(s2.isInside(v201));
+    CPPUNIT_ASSERT(s2.isInside(v011));
+    CPPUNIT_ASSERT(s2.isInside(v111));
+    CPPUNIT_ASSERT(s2.isInside(v211));
+    CPPUNIT_ASSERT(s2.isInside(v021));
+    CPPUNIT_ASSERT(s2.isInside(v121));
+    CPPUNIT_ASSERT(s2.isInside(v221));
+    CPPUNIT_ASSERT(s2.isInside(v002));
+    CPPUNIT_ASSERT(s2.isInside(v102));
+    CPPUNIT_ASSERT(s2.isInside(v202));
+    CPPUNIT_ASSERT(s2.isInside(v012));
+    CPPUNIT_ASSERT(s2.isInside(v112));
+    CPPUNIT_ASSERT(s2.isInside(v212));
+    CPPUNIT_ASSERT(s2.isInside(v022));
+    CPPUNIT_ASSERT(s2.isInside(v122));
+    CPPUNIT_ASSERT(s2.isInside(v222));
+
+    CPPUNIT_ASSERT(!s2.isOnSurface(v000));
+    CPPUNIT_ASSERT(s2.isOnSurface(v100));
+    CPPUNIT_ASSERT(s2.isOnSurface(v200));
+    CPPUNIT_ASSERT(s2.isOnSurface(v010));
+    CPPUNIT_ASSERT(s2.isOnSurface(v110));
+    CPPUNIT_ASSERT(s2.isOnSurface(v210));
+    CPPUNIT_ASSERT(s2.isOnSurface(v020));
+    CPPUNIT_ASSERT(s2.isOnSurface(v120));
+    CPPUNIT_ASSERT(s2.isOnSurface(v220));
+    CPPUNIT_ASSERT(s2.isOnSurface(v001));
+    CPPUNIT_ASSERT(s2.isOnSurface(v101));
+    CPPUNIT_ASSERT(s2.isOnSurface(v201));
+    CPPUNIT_ASSERT(s2.isOnSurface(v011));
+    CPPUNIT_ASSERT(s2.isOnSurface(v111));
+    CPPUNIT_ASSERT(s2.isOnSurface(v211));
+    CPPUNIT_ASSERT(s2.isOnSurface(v021));
+    CPPUNIT_ASSERT(s2.isOnSurface(v121));
+    CPPUNIT_ASSERT(s2.isOnSurface(v221));
+    CPPUNIT_ASSERT(s2.isOnSurface(v002));
+    CPPUNIT_ASSERT(s2.isOnSurface(v102));
+    CPPUNIT_ASSERT(s2.isOnSurface(v202));
+    CPPUNIT_ASSERT(s2.isOnSurface(v012));
+    CPPUNIT_ASSERT(s2.isOnSurface(v112));
+    CPPUNIT_ASSERT(s2.isOnSurface(v212));
+    CPPUNIT_ASSERT(s2.isOnSurface(v022));
+    CPPUNIT_ASSERT(s2.isOnSurface(v122));
+    CPPUNIT_ASSERT(s2.isOnSurface(v222));
+  }
+
 }