From 18ebcb62f23b6f45bcd73f595e54bffea5937339 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 18 Sep 2014 12:13:31 +0200 Subject: [PATCH] Fix includes as the .h files got moved --- .../doc/Cone_spanners_2/Cone_spanners_2.txt | 14 ++++++---- .../doc/Cone_spanners_2/Doxyfile.in | 2 +- .../Cone_spanners_2/PackageDescription.txt | 28 +++++++++---------- .../Cone_spanners_2/dijkstra_theta.cpp | 3 +- .../Cone_spanners_2/exact_theta_io.cpp | 6 ++-- .../examples/Cone_spanners_2/theta_io.cpp | 5 ++-- .../include/CGAL/Cone_spanners_2.h | 5 ++-- .../CGAL/Cone_spanners_2/Plane_Scan_Tree.h | 4 +-- .../CGAL/Cone_spanners_2/_Plane_Scan_Tree.h | 2 +- .../include/CGAL/Gnuplot_output_2.h | 2 +- Cone_spanners_2/include/CGAL/Theta_graph_2.h | 6 ++-- Cone_spanners_2/include/CGAL/Yao_graph_2.h | 4 +-- 12 files changed, 40 insertions(+), 41 deletions(-) mode change 100755 => 100644 Cone_spanners_2/examples/Cone_spanners_2/dijkstra_theta.cpp mode change 100755 => 100644 Cone_spanners_2/examples/Cone_spanners_2/exact_theta_io.cpp mode change 100755 => 100644 Cone_spanners_2/examples/Cone_spanners_2/theta_io.cpp mode change 100755 => 100644 Cone_spanners_2/include/CGAL/Cone_spanners_2.h mode change 100755 => 100644 Cone_spanners_2/include/CGAL/Cone_spanners_2/Plane_Scan_Tree.h mode change 100755 => 100644 Cone_spanners_2/include/CGAL/Cone_spanners_2/_Plane_Scan_Tree.h mode change 100755 => 100644 Cone_spanners_2/include/CGAL/Gnuplot_output_2.h mode change 100755 => 100644 Cone_spanners_2/include/CGAL/Theta_graph_2.h mode change 100755 => 100644 Cone_spanners_2/include/CGAL/Yao_graph_2.h diff --git a/Cone_spanners_2/doc/Cone_spanners_2/Cone_spanners_2.txt b/Cone_spanners_2/doc/Cone_spanners_2/Cone_spanners_2.txt index 726d4abed9d..a1667cfeb60 100644 --- a/Cone_spanners_2/doc/Cone_spanners_2/Cone_spanners_2.txt +++ b/Cone_spanners_2/doc/Cone_spanners_2/Cone_spanners_2.txt @@ -2,22 +2,24 @@ namespace CGAL { /*! \mainpage User Manual -\anchor Chapter_PACKAGE_NAME -\anchor chaptermine +\anchor Chapter_ConeBasedSpannerss + \cgalAutoToc -\author AUTHOR1, AUTHOR2 +\author Weisheng Si and Quincy Tse This chapter describes the ... -\section secmydefinitions Definitions +\section sec_CBS_mydefinitions Definitions Section on definitions here ... -\section secmyexamples Examples +\section sec_CBS_myexamples Examples -\subsection myFirstExample First Example +\subsection CBS_myFirstExample First Example The following example shows ... +\cgalExample{Cone_spanners_2/theta_io.cpp} + */ } /* namespace CGAL */ diff --git a/Cone_spanners_2/doc/Cone_spanners_2/Doxyfile.in b/Cone_spanners_2/doc/Cone_spanners_2/Doxyfile.in index 9000b24ffa7..aa60f2ec9b1 100755 --- a/Cone_spanners_2/doc/Cone_spanners_2/Doxyfile.in +++ b/Cone_spanners_2/doc/Cone_spanners_2/Doxyfile.in @@ -1,4 +1,4 @@ @INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS} -PROJECT_NAME = "CGAL ${CGAL_CREATED_VERSION_NUM} - Put title of project here" +PROJECT_NAME = "CGAL ${CGAL_CREATED_VERSION_NUM} - Code-Based Spanners" INPUT = ${CMAKE_SOURCE_DIR}/Cone_spanners_2/doc/Cone_spanners_2/ \ ${CMAKE_SOURCE_DIR}/Cone_spanners_2/include diff --git a/Cone_spanners_2/doc/Cone_spanners_2/PackageDescription.txt b/Cone_spanners_2/doc/Cone_spanners_2/PackageDescription.txt index 181cf36f676..96e05d05c82 100644 --- a/Cone_spanners_2/doc/Cone_spanners_2/PackageDescription.txt +++ b/Cone_spanners_2/doc/Cone_spanners_2/PackageDescription.txt @@ -1,30 +1,30 @@ // PRETTY PACKAGE NAME should equal the project title in Doxyfile.in -/// \defgroup PkgPACKAGE PRETTY PACKAGE NAME Reference -/// \defgroup PkgPACKAGEConcepts Concepts -/// \ingroup PkgPACKAGE +/// \defgroup PkgConeBasedSpanners Cone-Based Spanners Reference +/// \defgroup PkgConeBasedSpannersConcepts Concepts +/// \ingroup PkgConeBasedSpanners -/// \defgroup PkgPACKAGEAlgorithmClasses Algorithm Classes -/// \ingroup PkgPACKAGE +/// \defgroup PkgConeBasedSpannersAlgorithmClasses Algorithm Classes +/// \ingroup PkgConeBasedSpanners -/// \defgroup PkgPACKAGETraitsClasses Traits Classes -/// \ingroup PkgPACKAGE +/// \defgroup PkgConeBasedSpannersTraitsClasses Traits Classes +/// \ingroup PkgConeBasedSpanners -/// \defgroup PkgPACKAGEMiscellaneous Miscellaneous -/// \ingroup PkgPACKAGE +/// \defgroup PkgConeBasedSpannersMiscellaneous Miscellaneous +/// \ingroup PkgConeBasedSpanners /*! -\addtogroup PkgPACKAGE +\addtogroup PkgConeBasedSpanners \todo check generated documentation -\cgalPkgDescriptionBegin{PACKAGE NAME,PkgPACKAGESummary} +\cgalPkgDescriptionBegin{Cone-Based Spanners,PkgConeBasedSpannersSummary} \cgalPkgPicture{pkg-small.png} \cgalPkgSummaryBegin -\cgalPkgAuthors{PACKAGE AUTHOR} -\cgalPkgDesc{PACKAGE DESCRIPTION. +\cgalPkgAuthors{Weisheng Si and Quincy Tse} +\cgalPkgDesc{ConeBasedSpanners DESCRIPTION. The package provides ... } -\cgalPkgManuals{Chapter_PACKAGE_NAME,PkgPACKAGE} +\cgalPkgManuals{Chapter_ConeBasedSpanners,PkgConeBasedSpanners} \cgalPkgSummaryEnd \cgalPkgShortInfoBegin diff --git a/Cone_spanners_2/examples/Cone_spanners_2/dijkstra_theta.cpp b/Cone_spanners_2/examples/Cone_spanners_2/dijkstra_theta.cpp old mode 100755 new mode 100644 index 3a43759baa8..2229b1e0d82 --- a/Cone_spanners_2/examples/Cone_spanners_2/dijkstra_theta.cpp +++ b/Cone_spanners_2/examples/Cone_spanners_2/dijkstra_theta.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -40,7 +39,7 @@ #include -#include "Theta_graph_2.h" +#include using namespace boost; diff --git a/Cone_spanners_2/examples/Cone_spanners_2/exact_theta_io.cpp b/Cone_spanners_2/examples/Cone_spanners_2/exact_theta_io.cpp old mode 100755 new mode 100644 index 114a3844c49..7fc236802a3 --- a/Cone_spanners_2/examples/Cone_spanners_2/exact_theta_io.cpp +++ b/Cone_spanners_2/examples/Cone_spanners_2/exact_theta_io.cpp @@ -31,13 +31,11 @@ #include #include -#include - #include #include -#include "Theta_graph_2.h" -#include "gnuplot_output_2.h" +#include +#include // select the kernel type typedef CGAL::Exact_predicates_exact_constructions_kernel_with_sqrt Kernel; diff --git a/Cone_spanners_2/examples/Cone_spanners_2/theta_io.cpp b/Cone_spanners_2/examples/Cone_spanners_2/theta_io.cpp old mode 100755 new mode 100644 index ebacab7c06c..c74ab6aec3c --- a/Cone_spanners_2/examples/Cone_spanners_2/theta_io.cpp +++ b/Cone_spanners_2/examples/Cone_spanners_2/theta_io.cpp @@ -31,14 +31,13 @@ #include #include -#include #include #include #include -#include "Theta_graph_2.h" -#include "gnuplot_output_2.h" +#include +#include // select the kernel type typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; diff --git a/Cone_spanners_2/include/CGAL/Cone_spanners_2.h b/Cone_spanners_2/include/CGAL/Cone_spanners_2.h old mode 100755 new mode 100644 index d4bd88fce1d..ea17bd8de12 --- a/Cone_spanners_2/include/CGAL/Cone_spanners_2.h +++ b/Cone_spanners_2/include/CGAL/Cone_spanners_2.h @@ -31,7 +31,7 @@ // if leda::real is used, pls modify the following definition #define CGAL_USE_CORE 1 -#include "_cxx0x_hack.h" +#include #include #include @@ -47,7 +47,8 @@ namespace CGAL { -/** @brief An abstract base class for different cone-based spanner graphs with a given set of +/** \ingroup PkgConeBasedSpanners + * @brief An abstract base class for different cone-based spanner graphs with a given set of * 2D points. * * Directed,undirected and bidirectional graphs are supported. For differences among these diff --git a/Cone_spanners_2/include/CGAL/Cone_spanners_2/Plane_Scan_Tree.h b/Cone_spanners_2/include/CGAL/Cone_spanners_2/Plane_Scan_Tree.h old mode 100755 new mode 100644 index 39446066659..01ddb284aa0 --- a/Cone_spanners_2/include/CGAL/Cone_spanners_2/Plane_Scan_Tree.h +++ b/Cone_spanners_2/include/CGAL/Cone_spanners_2/Plane_Scan_Tree.h @@ -28,14 +28,14 @@ #ifndef CGAL_PLANE_SCAN_TREE_2_H #define CGAL_PLANE_SCAN_TREE_2_H -#include "_cxx0x_hack.h" +#include #include #include #include #include -#include "_Plane_Scan_Tree.h" +#include namespace CGAL { diff --git a/Cone_spanners_2/include/CGAL/Cone_spanners_2/_Plane_Scan_Tree.h b/Cone_spanners_2/include/CGAL/Cone_spanners_2/_Plane_Scan_Tree.h old mode 100755 new mode 100644 index 03ed85f11ee..2538aef2907 --- a/Cone_spanners_2/include/CGAL/Cone_spanners_2/_Plane_Scan_Tree.h +++ b/Cone_spanners_2/include/CGAL/Cone_spanners_2/_Plane_Scan_Tree.h @@ -26,7 +26,7 @@ #ifndef CGAL__PLANE_SCAN_TREE_2_H #define CGAL__PLANE_SCAN_TREE_2_H -#include "_cxx0x_hack.h" +#include #include diff --git a/Cone_spanners_2/include/CGAL/Gnuplot_output_2.h b/Cone_spanners_2/include/CGAL/Gnuplot_output_2.h old mode 100755 new mode 100644 index 577f06ece74..fa37ff82bbe --- a/Cone_spanners_2/include/CGAL/Gnuplot_output_2.h +++ b/Cone_spanners_2/include/CGAL/Gnuplot_output_2.h @@ -28,7 +28,7 @@ #ifndef GNUPLOT_OUTPUT_2_H #define GNUPLOT_OUTPUT_2_H -#include "_cxx0x_hack.h" +#include #include #include diff --git a/Cone_spanners_2/include/CGAL/Theta_graph_2.h b/Cone_spanners_2/include/CGAL/Theta_graph_2.h old mode 100755 new mode 100644 index fa5d0f4f7a8..95f1555910c --- a/Cone_spanners_2/include/CGAL/Theta_graph_2.h +++ b/Cone_spanners_2/include/CGAL/Theta_graph_2.h @@ -27,7 +27,7 @@ #ifndef CGAL_THETA_GRAPH_2_H #define CGAL_THETA_GRAPH_2_H -#include "_cxx0x_hack.h" +#include #include #include @@ -39,8 +39,8 @@ #include #include -#include "Cone_spanners_2.h" -#include "Plane_Scan_Tree.h" +#include +#include namespace CGAL { diff --git a/Cone_spanners_2/include/CGAL/Yao_graph_2.h b/Cone_spanners_2/include/CGAL/Yao_graph_2.h old mode 100755 new mode 100644 index 9207e3614e6..6af1165b6c9 --- a/Cone_spanners_2/include/CGAL/Yao_graph_2.h +++ b/Cone_spanners_2/include/CGAL/Yao_graph_2.h @@ -28,7 +28,7 @@ #ifndef CGAL_YAO_GRAPH_2_H #define CGAL_YAO_GRAPH_2_H -#include "_cxx0x_hack.h" +#include #include #include @@ -40,7 +40,7 @@ #include #include -#include "Cone_spanners_2.h" +#include namespace CGAL {