Merge branch 'cleanup/intersection-headers' into 'master'

[intersection] move algorithms to sub-folder

See merge request DennisGlaeser/frackit!35

frackit/intersection/CMakeLists.txt

 install(FILES
-algo_cylsurface_disk.hh
-algo_cylsurface_planargeom.hh
-algo_cylsurface_quadrilateral.hh
-algo_disk_disk.hh
-algo_disk_line.hh
-algo_face_disk.hh
-algo_face_planargeom.hh
-algo_face_quadrilateral.hh
-algo_find_touching_points.hh
-algo_planargeom_line.hh
-algo_planargeom_planargeom.hh
-algo_plane_line.hh
-algo_plane_plane.hh
-algo_quadrilateral_disk.hh
-algo_quadrilateral_line.hh
-algo_quadrilateral_quadrilateral.hh
-algo_segment_segment.hh
-algo_shell_disk.hh
 emptyintersection.hh
 intersect.hh
 intersectionangle.hh

frackit/intersection/algorithms/CMakeLists.txt

+install(FILES
+algo_cylsurface_disk.hh
+algo_cylsurface_planargeom.hh
+algo_cylsurface_quadrilateral.hh
+algo_disk_disk.hh
+algo_disk_line.hh
+algo_face_disk.hh
+algo_face_planargeom.hh
+algo_face_quadrilateral.hh
+algo_find_touching_points.hh
+algo_planargeom_line.hh
+algo_planargeom_planargeom.hh
+algo_plane_line.hh
+algo_plane_plane.hh
+algo_quadrilateral_disk.hh
+algo_quadrilateral_line.hh
+algo_quadrilateral_quadrilateral.hh
+algo_segment_segment.hh
+algo_shell_disk.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/frackit/intersection/algorithms)

frackit/intersection/algo_cylsurface_disk.hh → frackit/intersection/algorithms/algo_cylsurface_disk.hh

@@ -27,7 +27,7 @@
 #include <frackit/geometry/disk.hh>
 #include <frackit/geometry/cylindersurface.hh>
 
-#include "intersectiontraits.hh"
+#include <frackit/intersection/intersectiontraits.hh>
 #include "algo_cylsurface_planargeom.hh"
 
 namespace Frackit {

frackit/intersection/algo_cylsurface_planargeom.hh → frackit/intersection/algorithms/algo_cylsurface_planargeom.hh

@@ -40,8 +40,8 @@
 #include <frackit/geometry/cylindersurface.hh>
 #include <frackit/common/extractdimension.hh>
 
-#include "intersectiontraits.hh"
-#include "emptyintersection.hh"
+#include <frackit/intersection/intersectiontraits.hh>
+#include <frackit/intersection/emptyintersection.hh>
 
 namespace Frackit {
 namespace IntersectionAlgorithms {

frackit/intersection/algo_cylsurface_quadrilateral.hh → frackit/intersection/algorithms/algo_cylsurface_quadrilateral.hh

@@ -30,7 +30,7 @@
 #include <frackit/geometry/quadrilateral.hh>
 #include <frackit/geometry/cylindersurface.hh>
 
-#include "intersectiontraits.hh"
+#include <frackit/intersection/intersectiontraits.hh>
 #include "algo_cylsurface_planargeom.hh"
 
 namespace Frackit {

frackit/intersection/algo_disk_line.hh → frackit/intersection/algorithms/algo_disk_line.hh

@@ -31,7 +31,7 @@
 #include <frackit/geometry/line.hh>
 #include <frackit/precision/precision.hh>
 
-#include "intersectiontraits.hh"
+#include <frackit/intersection/intersectiontraits.hh>
 #include "algo_planargeom_line.hh"
 
 namespace Frackit {

frackit/intersection/algo_face_disk.hh → frackit/intersection/algorithms/algo_face_disk.hh

@@ -24,8 +24,8 @@
 #ifndef FRACKIT_FACE_DISK_INTERSECTION_HH
 #define FRACKIT_FACE_DISK_INTERSECTION_HH
 
+#include <frackit/intersection/intersectiontraits.hh>
 #include "algo_face_planargeom.hh"
-#include "intersectiontraits.hh"
 
 namespace Frackit {
 namespace IntersectionAlgorithms {

frackit/intersection/algo_face_planargeom.hh → frackit/intersection/algorithms/algo_face_planargeom.hh

@@ -36,9 +36,9 @@
 #include <frackit/occ/breputilities.hh>
 #include <frackit/common/extractctype.hh>
 
+#include <frackit/intersection/intersectiontraits.hh>
+#include <frackit/intersection/emptyintersection.hh>
 #include "algo_find_touching_points.hh"
-#include "intersectiontraits.hh"
-#include "emptyintersection.hh"
 
 namespace Frackit {
 namespace IntersectionAlgorithms {

frackit/intersection/algo_face_quadrilateral.hh → frackit/intersection/algorithms/algo_face_quadrilateral.hh

@@ -24,8 +24,8 @@
 #ifndef FRACKIT_FACE_QUADRILATERAL_INTERSECTION_HH
 #define FRACKIT_FACE_QUADRILATERAL_INTERSECTION_HH
 
+#include <frackit/intersection/intersectiontraits.hh>
 #include "algo_face_planargeom.hh"
-#include "intersectiontraits.hh"
 
 namespace Frackit {
 namespace IntersectionAlgorithms {

frackit/intersection/algo_find_touching_points.hh → frackit/intersection/algorithms/algo_find_touching_points.hh

@@ -26,6 +26,7 @@
 
 #include <algorithm>
 #include <stdexcept>
+#include <vector>
 
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Face.hxx>

frackit/intersection/algo_planargeom_line.hh → frackit/intersection/algorithms/algo_planargeom_line.hh

@@ -33,8 +33,8 @@
 #include <frackit/occ/breputilities.hh>
 #include <frackit/precision/precision.hh>
 
-#include "intersectiontraits.hh"
-#include "emptyintersection.hh"
+#include <frackit/intersection/intersectiontraits.hh>
+#include <frackit/intersection/emptyintersection.hh>
 #include "algo_plane_line.hh"
 
 namespace Frackit {

frackit/intersection/algo_planargeom_planargeom.hh → frackit/intersection/algorithms/algo_planargeom_planargeom.hh

@@ -34,8 +34,8 @@
 #include <frackit/geometry/plane.hh>
 #include <frackit/common/extractdimension.hh>
 
-#include "intersectiontraits.hh"
-#include "emptyintersection.hh"
+#include <frackit/intersection/intersectiontraits.hh>
+#include <frackit/intersection/emptyintersection.hh>
 
 #include "algo_segment_segment.hh"
 #include "algo_plane_plane.hh"

frackit/intersection/algo_plane_line.hh → frackit/intersection/algorithms/algo_plane_line.hh

@@ -38,8 +38,8 @@
 #include <frackit/occ/breputilities.hh>
 #include <frackit/occ/gputilities.hh>
 
-#include "intersectiontraits.hh"
-#include "emptyintersection.hh"
+#include <frackit/intersection/intersectiontraits.hh>
+#include <frackit/intersection/emptyintersection.hh>
 
 namespace Frackit {
 namespace IntersectionAlgorithms {

frackit/intersection/algo_plane_plane.hh → frackit/intersection/algorithms/algo_plane_plane.hh

@@ -35,8 +35,8 @@
 #include <frackit/precision/precision.hh>
 #include <frackit/occ/gputilities.hh>
 
-#include "intersectiontraits.hh"
-#include "emptyintersection.hh"
+#include <frackit/intersection/intersectiontraits.hh>
+#include <frackit/intersection/emptyintersection.hh>
 
 namespace Frackit {
 namespace IntersectionAlgorithms {

frackit/intersection/algo_quadrilateral_disk.hh → frackit/intersection/algorithms/algo_quadrilateral_disk.hh

@@ -30,6 +30,7 @@
 #include <frackit/geometry/quadrilateral.hh>
 #include <frackit/geometry/disk.hh>
 
+#include <frackit/intersection/intersectiontraits.hh>
 #include "algo_planargeom_planargeom.hh"
 
 namespace Frackit {

frackit/intersection/algo_quadrilateral_line.hh → frackit/intersection/algorithms/algo_quadrilateral_line.hh

@@ -29,7 +29,7 @@
 #include <frackit/geometry/quadrilateral.hh>
 #include <frackit/geometry/line.hh>
 
-#include "intersectiontraits.hh"
+#include <frackit/intersection/intersectiontraits.hh>
 #include "algo_planargeom_line.hh"
 
 namespace Frackit {

frackit/intersection/algo_quadrilateral_quadrilateral.hh → frackit/intersection/algorithms/algo_quadrilateral_quadrilateral.hh

@@ -29,6 +29,7 @@
 #include <frackit/precision/precision.hh>
 #include <frackit/geometry/quadrilateral.hh>
 
+#include <frackit/intersection/intersectiontraits.hh>
 #include "algo_planargeom_planargeom.hh"
 
 namespace Frackit {

frackit/intersection/algo_segment_segment.hh → frackit/intersection/algorithms/algo_segment_segment.hh

@@ -37,8 +37,8 @@
 #include <frackit/precision/precision.hh>
 #include <frackit/occ/breputilities.hh>
 
-#include "intersectiontraits.hh"
-#include "emptyintersection.hh"
+#include <frackit/intersection/intersectiontraits.hh>
+#include <frackit/intersection/emptyintersection.hh>
 
 namespace Frackit {
 namespace IntersectionAlgorithms {

frackit/intersection/algo_shell_disk.hh → frackit/intersection/algorithms/algo_shell_disk.hh

@@ -33,9 +33,9 @@
 #include <frackit/geometry/disk.hh>
 #include <frackit/occ/breputilities.hh>
 
+#include <frackit/intersection/intersectiontraits.hh>
+#include <frackit/intersection/emptyintersection.hh>
 #include "algo_find_touching_points.hh"
-#include "intersectiontraits.hh"
-#include "emptyintersection.hh"
 
 namespace Frackit {
 namespace IntersectionAlgorithms {