Fix includes as the .h files got moved

This commit is contained in:
Andreas Fabri 2014-09-18 12:13:31 +02:00
parent 26dd5c6f20
commit 18ebcb62f2
12 changed files with 40 additions and 41 deletions

View File

@ -2,22 +2,24 @@ namespace CGAL {
/*! /*!
\mainpage User Manual \mainpage User Manual
\anchor Chapter_PACKAGE_NAME \anchor Chapter_ConeBasedSpannerss
\anchor chaptermine
\cgalAutoToc \cgalAutoToc
\author AUTHOR1, AUTHOR2 \author Weisheng Si and Quincy Tse
This chapter describes the ... This chapter describes the ...
\section secmydefinitions Definitions \section sec_CBS_mydefinitions Definitions
Section on definitions here ... 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 ... The following example shows ...
\cgalExample{Cone_spanners_2/theta_io.cpp}
*/ */
} /* namespace CGAL */ } /* namespace CGAL */

View File

@ -1,4 +1,4 @@
@INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS} @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/ \ INPUT = ${CMAKE_SOURCE_DIR}/Cone_spanners_2/doc/Cone_spanners_2/ \
${CMAKE_SOURCE_DIR}/Cone_spanners_2/include ${CMAKE_SOURCE_DIR}/Cone_spanners_2/include

View File

@ -1,30 +1,30 @@
// PRETTY PACKAGE NAME should equal the project title in Doxyfile.in // PRETTY PACKAGE NAME should equal the project title in Doxyfile.in
/// \defgroup PkgPACKAGE PRETTY PACKAGE NAME Reference /// \defgroup PkgConeBasedSpanners Cone-Based Spanners Reference
/// \defgroup PkgPACKAGEConcepts Concepts /// \defgroup PkgConeBasedSpannersConcepts Concepts
/// \ingroup PkgPACKAGE /// \ingroup PkgConeBasedSpanners
/// \defgroup PkgPACKAGEAlgorithmClasses Algorithm Classes /// \defgroup PkgConeBasedSpannersAlgorithmClasses Algorithm Classes
/// \ingroup PkgPACKAGE /// \ingroup PkgConeBasedSpanners
/// \defgroup PkgPACKAGETraitsClasses Traits Classes /// \defgroup PkgConeBasedSpannersTraitsClasses Traits Classes
/// \ingroup PkgPACKAGE /// \ingroup PkgConeBasedSpanners
/// \defgroup PkgPACKAGEMiscellaneous Miscellaneous /// \defgroup PkgConeBasedSpannersMiscellaneous Miscellaneous
/// \ingroup PkgPACKAGE /// \ingroup PkgConeBasedSpanners
/*! /*!
\addtogroup PkgPACKAGE \addtogroup PkgConeBasedSpanners
\todo check generated documentation \todo check generated documentation
\cgalPkgDescriptionBegin{PACKAGE NAME,PkgPACKAGESummary} \cgalPkgDescriptionBegin{Cone-Based Spanners,PkgConeBasedSpannersSummary}
\cgalPkgPicture{pkg-small.png} \cgalPkgPicture{pkg-small.png}
\cgalPkgSummaryBegin \cgalPkgSummaryBegin
\cgalPkgAuthors{PACKAGE AUTHOR} \cgalPkgAuthors{Weisheng Si and Quincy Tse}
\cgalPkgDesc{PACKAGE DESCRIPTION. \cgalPkgDesc{ConeBasedSpanners DESCRIPTION.
The package provides ... } The package provides ... }
\cgalPkgManuals{Chapter_PACKAGE_NAME,PkgPACKAGE} \cgalPkgManuals{Chapter_ConeBasedSpanners,PkgConeBasedSpanners}
\cgalPkgSummaryEnd \cgalPkgSummaryEnd
\cgalPkgShortInfoBegin \cgalPkgShortInfoBegin

View File

@ -28,7 +28,6 @@
#include <fstream> #include <fstream>
#include <iterator> #include <iterator>
#include <string> #include <string>
#include <CGAL/basic.h>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
@ -40,7 +39,7 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include "Theta_graph_2.h" #include <CGAL/Theta_graph_2.h>
using namespace boost; using namespace boost;

View File

@ -31,13 +31,11 @@
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <CGAL/basic.h>
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/graph/adjacency_list.hpp> #include <boost/graph/adjacency_list.hpp>
#include "Theta_graph_2.h" #include <CGAL/Theta_graph_2.h>
#include "gnuplot_output_2.h" #include <CGAL/gnuplot_output_2.h>
// select the kernel type // select the kernel type
typedef CGAL::Exact_predicates_exact_constructions_kernel_with_sqrt Kernel; typedef CGAL::Exact_predicates_exact_constructions_kernel_with_sqrt Kernel;

5
Cone_spanners_2/examples/Cone_spanners_2/theta_io.cpp Executable file → Normal file
View File

@ -31,14 +31,13 @@
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <CGAL/basic.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/graph/adjacency_list.hpp> #include <boost/graph/adjacency_list.hpp>
#include "Theta_graph_2.h" #include <CGAL/Theta_graph_2.h>
#include "gnuplot_output_2.h" #include <CGAL/gnuplot_output_2.h>
// select the kernel type // select the kernel type
typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;

5
Cone_spanners_2/include/CGAL/Cone_spanners_2.h Executable file → Normal file
View File

@ -31,7 +31,7 @@
// if leda::real is used, pls modify the following definition // if leda::real is used, pls modify the following definition
#define CGAL_USE_CORE 1 #define CGAL_USE_CORE 1
#include "_cxx0x_hack.h" #include <CGAL/Cone_spanners_2/_cxx0x_hack.h>
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
@ -47,7 +47,8 @@
namespace CGAL { 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. * 2D points.
* *
* Directed,undirected and bidirectional graphs are supported. For differences among these * Directed,undirected and bidirectional graphs are supported. For differences among these

View File

@ -28,14 +28,14 @@
#ifndef CGAL_PLANE_SCAN_TREE_2_H #ifndef CGAL_PLANE_SCAN_TREE_2_H
#define CGAL_PLANE_SCAN_TREE_2_H #define CGAL_PLANE_SCAN_TREE_2_H
#include "_cxx0x_hack.h" #include <CGAL/Cone_spanners_2/_cxx0x_hack.h>
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <cstring> #include <cstring>
#include "_Plane_Scan_Tree.h" #include <CGAL/Cone_spanners_2/_Plane_Scan_Tree.h>
namespace CGAL { namespace CGAL {

View File

@ -26,7 +26,7 @@
#ifndef CGAL__PLANE_SCAN_TREE_2_H #ifndef CGAL__PLANE_SCAN_TREE_2_H
#define CGAL__PLANE_SCAN_TREE_2_H #define CGAL__PLANE_SCAN_TREE_2_H
#include "_cxx0x_hack.h" #include <CGAL/Cone_spanners_2/_cxx0x_hack.h>
#include <stdexcept> #include <stdexcept>

2
Cone_spanners_2/include/CGAL/Gnuplot_output_2.h Executable file → Normal file
View File

@ -28,7 +28,7 @@
#ifndef GNUPLOT_OUTPUT_2_H #ifndef GNUPLOT_OUTPUT_2_H
#define GNUPLOT_OUTPUT_2_H #define GNUPLOT_OUTPUT_2_H
#include "_cxx0x_hack.h" #include <CGAL/Cone_spanners_2/_cxx0x_hack.h>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>

6
Cone_spanners_2/include/CGAL/Theta_graph_2.h Executable file → Normal file
View File

@ -27,7 +27,7 @@
#ifndef CGAL_THETA_GRAPH_2_H #ifndef CGAL_THETA_GRAPH_2_H
#define CGAL_THETA_GRAPH_2_H #define CGAL_THETA_GRAPH_2_H
#include "_cxx0x_hack.h" #include <CGAL/Cone_spanners_2/_cxx0x_hack.h>
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
@ -39,8 +39,8 @@
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/graph/adjacency_list.hpp> #include <boost/graph/adjacency_list.hpp>
#include "Cone_spanners_2.h" #include <CGAL/Cone_spanners_2.h>
#include "Plane_Scan_Tree.h" #include <CGAL/Cone_spanners_2/Plane_Scan_Tree.h>
namespace CGAL { namespace CGAL {

4
Cone_spanners_2/include/CGAL/Yao_graph_2.h Executable file → Normal file
View File

@ -28,7 +28,7 @@
#ifndef CGAL_YAO_GRAPH_2_H #ifndef CGAL_YAO_GRAPH_2_H
#define CGAL_YAO_GRAPH_2_H #define CGAL_YAO_GRAPH_2_H
#include "_cxx0x_hack.h" #include <CGAL/Cone_spanners_2/_cxx0x_hack.h>
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
@ -40,7 +40,7 @@
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/graph/adjacency_list.hpp> #include <boost/graph/adjacency_list.hpp>
#include "Cone_spanners_2.h" #include <CGAL/Cone_spanners_2.h>
namespace CGAL { namespace CGAL {