Remove ellipse domain option from VoronoiVisual, removing the arma requirement

Author: sebsjames

examples/CMakeLists.txt

@@ -408,6 +408,33 @@ target_link_libraries(draw_triangles_intersections OpenGL::GL glfw Freetype::Fre
 add_executable(triangle_intersect triangle_intersect.cpp)
 target_link_libraries(triangle_intersect OpenGL::GL glfw Freetype::Freetype)
 
+add_executable(voronoi_random voronoi_random.cpp)
+target_link_libraries(voronoi_random OpenGL::GL glfw Freetype::Freetype)
+
+add_executable(voronoi_boundary voronoi_boundary.cpp)
+target_link_libraries(voronoi_boundary OpenGL::GL glfw Freetype::Freetype)
+
+add_executable(voronoi_rectangular voronoi_rectangular.cpp)
+target_link_libraries(voronoi_rectangular OpenGL::GL glfw Freetype::Freetype)
+
+add_executable(voronoi_vectordata voronoi_vectordata.cpp)
+target_link_libraries(voronoi_vectordata OpenGL::GL glfw Freetype::Freetype)
+
+add_executable(voronoi_function voronoi_function.cpp)
+target_link_libraries(voronoi_function OpenGL::GL glfw Freetype::Freetype)
+
+add_executable(voronoi_function_flat voronoi_function_flat.cpp)
+target_link_libraries(voronoi_function_flat OpenGL::GL glfw Freetype::Freetype)
+
+add_executable(voronoi_fixed voronoi_fixed.cpp)
+target_link_libraries(voronoi_fixed OpenGL::GL glfw Freetype::Freetype)
+
+add_executable(voronoi_fixed_xz voronoi_fixed_xz.cpp)
+target_link_libraries(voronoi_fixed_xz OpenGL::GL glfw Freetype::Freetype)
+
+add_executable(voronoi_fixed_nearlyz voronoi_fixed_nearlyz.cpp)
+target_link_libraries(voronoi_fixed_nearlyz OpenGL::GL glfw Freetype::Freetype)
+
 add_executable(rectangle rectangle.cpp)
 target_link_libraries(rectangle OpenGL::GL glfw Freetype::Freetype)
 
@@ -531,44 +558,15 @@ endif()
 add_executable(show_boundingboxes show_boundingboxes.cpp)
 target_link_libraries(show_boundingboxes OpenGL::GL glfw Freetype::Freetype)
 
-if(ARMADILLO_FOUND)
-  # if have compound-ray header
-  add_executable(cray_eye cray_eye.cpp)
-  target_link_libraries(cray_eye OpenGL::GL glfw Freetype::Freetype)
+# if have compound-ray header
+add_executable(cray_eye cray_eye.cpp)
+target_link_libraries(cray_eye OpenGL::GL glfw Freetype::Freetype)
 
-  # use of principle component analysis from arma in this example
+if(ARMADILLO_FOUND)
+  # Make use of principle component analysis from arma in this example
   add_executable(ellipse_pca ellipse_pca.cpp)
   target_link_libraries(ellipse_pca ${ARMADILLO_LIBRARY} ${ARMADILLO_LIBRARIES} OpenGL::GL glfw Freetype::Freetype)
-
-  # Voronoi code now also uses arma
-  add_executable(voronoi_random voronoi_random.cpp)
-  target_link_libraries(voronoi_random ${ARMADILLO_LIBRARY} ${ARMADILLO_LIBRARIES} OpenGL::GL glfw Freetype::Freetype)
-
-  add_executable(voronoi_boundary voronoi_boundary.cpp)
-  target_link_libraries(voronoi_boundary ${ARMADILLO_LIBRARY} ${ARMADILLO_LIBRARIES} OpenGL::GL glfw Freetype::Freetype)
-
-  add_executable(voronoi_rectangular voronoi_rectangular.cpp)
-  target_link_libraries(voronoi_rectangular ${ARMADILLO_LIBRARY} ${ARMADILLO_LIBRARIES} OpenGL::GL glfw Freetype::Freetype)
-
-  add_executable(voronoi_vectordata voronoi_vectordata.cpp)
-  target_link_libraries(voronoi_vectordata ${ARMADILLO_LIBRARY} ${ARMADILLO_LIBRARIES} OpenGL::GL glfw Freetype::Freetype)
-
-  add_executable(voronoi_function voronoi_function.cpp)
-  target_link_libraries(voronoi_function ${ARMADILLO_LIBRARY} ${ARMADILLO_LIBRARIES} OpenGL::GL glfw Freetype::Freetype)
-
-  add_executable(voronoi_function_flat voronoi_function_flat.cpp)
-  target_link_libraries(voronoi_function_flat ${ARMADILLO_LIBRARY} ${ARMADILLO_LIBRARIES} OpenGL::GL glfw Freetype::Freetype)
-
-  add_executable(voronoi_fixed voronoi_fixed.cpp)
-  target_link_libraries(voronoi_fixed ${ARMADILLO_LIBRARY} ${ARMADILLO_LIBRARIES} OpenGL::GL glfw Freetype::Freetype)
-
-  add_executable(voronoi_fixed_xz voronoi_fixed_xz.cpp)
-  target_link_libraries(voronoi_fixed_xz ${ARMADILLO_LIBRARY} ${ARMADILLO_LIBRARIES} OpenGL::GL glfw Freetype::Freetype)
-
-  add_executable(voronoi_fixed_nearlyz voronoi_fixed_nearlyz.cpp)
-  target_link_libraries(voronoi_fixed_nearlyz ${ARMADILLO_LIBRARY} ${ARMADILLO_LIBRARIES} OpenGL::GL glfw Freetype::Freetype)
-
-endif(ARMADILLO_FOUND)
+endif()
 
 add_executable(trace_boundary trace_boundary.cpp)
 target_link_libraries(trace_boundary OpenGL::GL glfw Freetype::Freetype)

mplot/VoronoiVisual.h

@@ -18,8 +18,6 @@
 #include <map>
 #include <set>
 
-#include <armadillo>
-
 #include <sm/vec>
 #include <sm/range>
 #include <sm/quaternion>
@@ -126,6 +124,13 @@ namespace mplot
                 this->boundary.resize (this->num_boundary_points, cent2.plus_one_dim());
 
                 if (this->dom_shape == domain_shape::ellipsoid) {
+                    throw std::runtime_error ("Elliptic domain shapes not supported");
+                    /*
+                     * Here is an approach using arma::princomp, but I don't want the arma
+                     * dependency, as elliptic boundaries are not as useful to me as traced
+                     * boundaries. This code awaits sm::pca::compute().
+                     */
+#if 0
                     // Find ellipse parameters for the data. First place data in an arma::mat, offsetting by the centroid
                     arma::Mat<float> x (dcoords_ptr->size(), 2);
                     for (unsigned int i = 0; i < dcoords_ptr->size(); ++i) {
@@ -149,7 +154,7 @@ namespace mplot
                         sm::vec<float, 2> bp = el_rotn * sm::vec<float, 2>{ a * std::cos (phi), b * std::sin (phi) }  + cent2;
                         this->boundary[i] = bp.plus_one_dim();
                     }
-
+#endif
                 } else { // circular boundary
                     float l = max_len + this->border_width;
                     for (unsigned int i = 0; i < this->num_boundary_points; ++i) {

mplot/compoundray/EyeVisual.h

@@ -7,8 +7,6 @@
 #include <array>
 #include <vector>
 
-#include <armadillo>
-
 #include <sm/mathconst>
 #include <sm/vec>
 #include <sm/range>