songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update namespace RS_2 to OTR_2 in include files

This commit is contained in:
Simon Giraudot 2016-02-19 09:21:18 +01:00
parent aeaf85f35f
commit 694fc35b89
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Cost.h
View File

@ -17,13 +17,13 @@
// //
// Author(s) : Fernando de Goes, Pierre Alliez, Ivo Vigan, Clément Jamin // Author(s) : Fernando de Goes, Pierre Alliez, Ivo Vigan, Clément Jamin
#ifndef CGAL_RS2_COST_H_ #ifndef CGAL_OTR2_COST_H_
#define CGAL_RS2_COST_H_ #define CGAL_OTR2_COST_H_
#include <algorithm> #include <algorithm>
namespace CGAL { namespace CGAL {
namespace RS_2 { namespace OTR_2 {
template <class FT> template <class FT>
class Cost class Cost
@ -107,4 +107,4 @@ public:
} } // namespaces } } // namespaces
#endif // CGAL_RS2_COST_H_ #endif // CGAL_OTR2_COST_H_

2
Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_edge_2.h
View File

@ -21,7 +21,7 @@
#define CGAL_RECONSTRUCTION_EDGE_2_H_ #define CGAL_RECONSTRUCTION_EDGE_2_H_
namespace CGAL { namespace CGAL {
namespace RS_2 { namespace OTR_2 {
template<class FT, class Edge, class Vertex_handle, class Face_handle> template<class FT, class Edge, class Vertex_handle, class Face_handle>
class Reconstruction_edge_2 { class Reconstruction_edge_2 {

10
Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_face_base_2.h
View File

@ -20,8 +20,8 @@
#ifndef CGAL_RECONSTRUCTION_FACE_BASE_2_H_ #ifndef CGAL_RECONSTRUCTION_FACE_BASE_2_H_
#define CGAL_RECONSTRUCTION_FACE_BASE_2_H_ #define CGAL_RECONSTRUCTION_FACE_BASE_2_H_
#include <CGAL/RS_2/Cost.h> #include <CGAL/OTR_2/Cost.h>
#include <CGAL/RS_2/Sample.h> #include <CGAL/OTR_2/Sample.h>
#include <CGAL/Triangulation_face_base_2.h> #include <CGAL/Triangulation_face_base_2.h>
#include <vector> #include <vector>
@ -29,7 +29,7 @@
/// \cond SKIP_IN_MANUAL /// \cond SKIP_IN_MANUAL
namespace CGAL { namespace CGAL {
namespace RS_2 { namespace OTR_2 {
/// The Reconstruction_face_base_2 class is the default /// The Reconstruction_face_base_2 class is the default
/// vertex class of the Reconstruction_face_base_2 class. /// vertex class of the Reconstruction_face_base_2 class.
@ -54,8 +54,8 @@ public:
}; };
typedef typename Traits_::FT FT; typedef typename Traits_::FT FT;
typedef RS_2::Cost<FT> Cost_; typedef OTR_2::Cost<FT> Cost_;
typedef RS_2::Sample<Traits_> Sample_; typedef OTR_2::Sample<Traits_> Sample_;
typedef std::vector<Sample_*> Sample_vector; typedef std::vector<Sample_*> Sample_vector;
private: private:

20
Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_triangulation_2.h
View File

@ -21,11 +21,11 @@
#define CGAL_RECONSTRUCTION_TRIANGULATION_2_H #define CGAL_RECONSTRUCTION_TRIANGULATION_2_H
// local // local
#include <CGAL/RS_2/Sample.h> #include <CGAL/OTR_2/Sample.h>
#include <CGAL/RS_2/Reconstruction_edge_2.h> #include <CGAL/OTR_2/Reconstruction_edge_2.h>
#include <CGAL/RS_2/Cost.h> #include <CGAL/OTR_2/Cost.h>
#include <CGAL/RS_2/Reconstruction_vertex_base_2.h> #include <CGAL/OTR_2/Reconstruction_vertex_base_2.h>
#include <CGAL/RS_2/Reconstruction_face_base_2.h> #include <CGAL/OTR_2/Reconstruction_face_base_2.h>
// CGAL // CGAL
#include <CGAL/basic.h> #include <CGAL/basic.h>
@ -51,7 +51,7 @@
#define EPS 1e-15 #define EPS 1e-15
namespace CGAL { namespace CGAL {
namespace RS_2 { namespace OTR_2 {
/// \internal /// \internal
/// The Reconstruction_triangulation_2 class /// The Reconstruction_triangulation_2 class
@ -112,14 +112,14 @@ public:
typedef std::vector<Edge> Edge_vector; typedef std::vector<Edge> Edge_vector;
typedef RS_2::Cost<FT> Cost_; typedef OTR_2::Cost<FT> Cost_;
typedef RS_2::Sample<Traits_> Sample_; typedef OTR_2::Sample<Traits_> Sample_;
typedef std::vector<Sample_*> Sample_vector; typedef std::vector<Sample_*> Sample_vector;
typedef typename Sample_vector::const_iterator Sample_vector_const_iterator; typedef typename Sample_vector::const_iterator Sample_vector_const_iterator;
typedef RS_2::Sample_with_priority<Sample_> PSample; typedef OTR_2::Sample_with_priority<Sample_> PSample;
typedef std::priority_queue<PSample, std::vector<PSample>, typedef std::priority_queue<PSample, std::vector<PSample>,
RS_2::greater_priority<PSample> > SQueue; OTR_2::greater_priority<PSample> > SQueue;
typedef Reconstruction_edge_2<FT, Edge, typedef Reconstruction_edge_2<FT, Edge,
Vertex_handle, Face_handle> Rec_edge_2; Vertex_handle, Face_handle> Rec_edge_2;

6
Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_vertex_base_2.h
View File

@ -21,10 +21,10 @@
#define CGAL_RECONSTRUCTION_VERTEX_BASE_2_H_ #define CGAL_RECONSTRUCTION_VERTEX_BASE_2_H_
#include <CGAL/Triangulation_vertex_base_2.h> #include <CGAL/Triangulation_vertex_base_2.h>
#include <CGAL/RS_2/Sample.h> #include <CGAL/OTR_2/Sample.h>
namespace CGAL { namespace CGAL {
namespace RS_2 { namespace OTR_2 {
/// The Reconstruction_vertex_base_2 class is the default /// The Reconstruction_vertex_base_2 class is the default
/// vertex class of the Reconstruction_triangulation_2 class. /// vertex class of the Reconstruction_triangulation_2 class.
@ -42,7 +42,7 @@ class Reconstruction_vertex_base_2 : public Vb
public: public:
typedef Vb Base; typedef Vb Base;
typedef typename Traits_::FT FT; typedef typename Traits_::FT FT;
typedef RS_2::Sample<Traits_> Sample_; typedef OTR_2::Sample<Traits_> Sample_;
typedef typename Traits_::Point_2 Point; typedef typename Traits_::Point_2 Point;
typedef typename Base::Face_handle Face_handle; typedef typename Base::Face_handle Face_handle;

8
Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Sample.h
View File

@ -17,14 +17,14 @@
// //
// Author(s) : Fernando de Goes, Pierre Alliez, Ivo Vigan, Clément Jamin // Author(s) : Fernando de Goes, Pierre Alliez, Ivo Vigan, Clément Jamin
#ifndef CGAL_RS2_SAMPLE_H #ifndef CGAL_OTR2_SAMPLE_H
#define CGAL_RS2_SAMPLE_H #define CGAL_OTR2_SAMPLE_H
/// \cond SKIP_IN_MANUAL /// \cond SKIP_IN_MANUAL
namespace CGAL { namespace CGAL {
namespace RS_2 { namespace OTR_2 {
template <class Traits_> template <class Traits_>
class Sample class Sample
@ -141,4 +141,4 @@ struct greater_priority
} } //end namespaces } } //end namespaces
#endif // CGAL_RS2_SAMPLE_H #endif // CGAL_OTR2_SAMPLE_H