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

More DS -> DS_ renaming (outside include/CGAL as well, to fix the test-suite).

This commit is contained in:
Sylvain Pion 2009-04-30 13:39:06 +00:00
parent f4f4bf4d8a
commit 0f49d58e7d
11 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Boolean_set_operations_2/demo/Boolean_set_operations_2/Qt_widget_X_monotone_circle_segment_2.h
View File

@ -35,13 +35,13 @@ operator<<(CGAL::Qt_widget & widget,
if(arc.is_linear()) if(arc.is_linear())
{ {
typedef Simple_cartesian<double> DK; typedef Simple_cartesian<double> DK;
typedef DK::Segment_2 DS; typedef DK::Segment_2 DS_;
typedef DK::Point_2 DP; typedef DK::Point_2 DP;
double sx = CGAL::to_double(arc.source().x()); double sx = CGAL::to_double(arc.source().x());
double sy = CGAL::to_double(arc.source().y()); double sy = CGAL::to_double(arc.source().y());
double tx = CGAL::to_double(arc.target().x()); double tx = CGAL::to_double(arc.target().x());
double ty = CGAL::to_double(arc.target().y()); double ty = CGAL::to_double(arc.target().y());
DS seg(DP(sx ,sy), DP(tx, ty)); DS_ seg(DP(sx ,sy), DP(tx, ty));
widget << seg; widget << seg;
return (widget); return (widget);
} }

4
Boolean_set_operations_2/demo/Boolean_set_operations_2/Qt_widget_circle_segment_2.h
View File

@ -35,13 +35,13 @@ operator<<(CGAL::Qt_widget & widget,
if(arc.orientation() == COLLINEAR) if(arc.orientation() == COLLINEAR)
{ {
typedef Simple_cartesian<double> DK; typedef Simple_cartesian<double> DK;
typedef DK::Segment_2 DS; typedef DK::Segment_2 DS_;
typedef DK::Point_2 DP; typedef DK::Point_2 DP;
double sx = CGAL::to_double(arc.source().x()); double sx = CGAL::to_double(arc.source().x());
double sy = CGAL::to_double(arc.source().y()); double sy = CGAL::to_double(arc.source().y());
double tx = CGAL::to_double(arc.target().x()); double tx = CGAL::to_double(arc.target().x());
double ty = CGAL::to_double(arc.target().y()); double ty = CGAL::to_double(arc.target().y());
DS seg(DP(sx ,sy), DP(tx, ty)); DS_ seg(DP(sx ,sy), DP(tx, ty));
widget << seg; widget << seg;
return (widget); return (widget);
} }

4
Jet_fitting_3/demo/Jet_fitting_3/SketchSample.cpp
View File

@ -6,7 +6,7 @@
#include "SketchSample.h" #include "SketchSample.h"
SketchSample::SketchSample(Mesh* mesh, DS* ppal_data) { SketchSample::SketchSample(Mesh* mesh, DS_* ppal_data) {
highlight = false; highlight = false;
p_mesh = mesh; p_mesh = mesh;
p_ppal_data = ppal_data; p_ppal_data = ppal_data;
@ -111,7 +111,7 @@ const double* SketchSample::rcoord() {
// //move to sketch // //move to sketch
// void draw_point(Point& P); // void draw_point(Point& P);
// void draw_vector(Point& P, Vector& V); // void draw_vector(Point& P, Vector& V);
// void MakeCallList(DS& L); // void MakeCallList(DS_& L);
void SketchSample::draw_point(Point& P) void SketchSample::draw_point(Point& P)

6
Jet_fitting_3/demo/Jet_fitting_3/SketchSample.h
View File

@ -23,7 +23,7 @@ struct data_line{
{}; {};
}; };
typedef std::list<data_line* > DS; typedef std::list<data_line* > DS_;
typedef std::list<data_line* >::iterator DS_iterator; typedef std::list<data_line* >::iterator DS_iterator;
@ -32,10 +32,10 @@ class SketchSample : public Sketcher {
private: private:
bool highlight; bool highlight;
Mesh* p_mesh; Mesh* p_mesh;
DS* p_ppal_data; DS_* p_ppal_data;
public: public:
SketchSample(Mesh* mesh, DS* ppal_data); SketchSample(Mesh* mesh, DS_* ppal_data);
~SketchSample(); ~SketchSample();

6
Jet_fitting_3/demo/Jet_fitting_3/visu.cpp
View File

@ -15,9 +15,9 @@
#include <cassert> #include <cassert>
Mesh m_mesh; Mesh m_mesh;
DS ppal_data; DS_ ppal_data;
void clean_DS(DS& L) void clean_DS(DS_& L)
{ {
DS_iterator current=L.begin(); DS_iterator current=L.begin();
for (DS_iterator it=++L.begin();it!=L.end();it++) for (DS_iterator it=++L.begin();it!=L.end();it++)
@ -46,7 +46,7 @@ read_line(FILE* file, Point& P1,Point& P2,
fscanf(file, "%lf%lf",&k1,&k2); fscanf(file, "%lf%lf",&k1,&k2);
} }
void load_data_from_file(DS& l, const char* file_res) void load_data_from_file(DS_& l, const char* file_res)
{ {
FILE *file; FILE *file;
if((file = fopen(file_res, "r")) != NULL) if((file = fopen(file_res, "r")) != NULL)

16
Kinetic_data_structures/test/Kinetic_data_structures/random_kds.cpp
View File

@ -30,11 +30,11 @@ int main(int, char *[]) {
if (which ==0) { if (which ==0) {
std::cout << "Checking Delaunay_2" << std::endl; std::cout << "Checking Delaunay_2" << std::endl;
typedef CGAL::Kinetic::Exact_simulation_traits Traits; typedef CGAL::Kinetic::Exact_simulation_traits Traits;
typedef CGAL::Kinetic::Delaunay_triangulation_2<Traits> DS; typedef CGAL::Kinetic::Delaunay_triangulation_2<Traits> DS_;
typedef Traits::Kinetic_kernel::Motion_function F; typedef Traits::Kinetic_kernel::Motion_function F;
typedef Traits::Kinetic_kernel::Point_2 Point; typedef Traits::Kinetic_kernel::Point_2 Point;
Traits tr(0, end_time); Traits tr(0, end_time);
DS ds(tr); DS_ ds(tr);
std::cout << "Points are:\n"; std::cout << "Points are:\n";
for (int i=0; i< nump/1.5; ++i){ for (int i=0; i< nump/1.5; ++i){
@ -58,11 +58,11 @@ int main(int, char *[]) {
std::cout << "Checking Sort" << std::endl; std::cout << "Checking Sort" << std::endl;
typedef CGAL::Kinetic::Exact_simulation_traits Traits; typedef CGAL::Kinetic::Exact_simulation_traits Traits;
typedef CGAL::Kinetic::Sort<Traits> DS; typedef CGAL::Kinetic::Sort<Traits> DS_;
typedef Traits::Kinetic_kernel::Motion_function F; typedef Traits::Kinetic_kernel::Motion_function F;
typedef Traits::Kinetic_kernel::Point_1 Point; typedef Traits::Kinetic_kernel::Point_1 Point;
Traits tr(0, end_time); Traits tr(0, end_time);
DS ds(tr); DS_ ds(tr);
std::cout << "Points are:\n"; std::cout << "Points are:\n";
for (int i=0; i< nump; ++i){ for (int i=0; i< nump; ++i){
Point pt(rp<F>(r, r.get_int(0,5))); Point pt(rp<F>(r, r.get_int(0,5)));
@ -85,11 +85,11 @@ int main(int, char *[]) {
} else if (which == 2) { } else if (which == 2) {
std::cout << "Checking Delaunay_3" << std::endl; std::cout << "Checking Delaunay_3" << std::endl;
typedef CGAL::Kinetic::Exact_simulation_traits Traits; typedef CGAL::Kinetic::Exact_simulation_traits Traits;
typedef CGAL::Kinetic::Delaunay_triangulation_3<Traits> DS; typedef CGAL::Kinetic::Delaunay_triangulation_3<Traits> DS_;
typedef Traits::Kinetic_kernel::Motion_function F; typedef Traits::Kinetic_kernel::Motion_function F;
typedef Traits::Kinetic_kernel::Point_3 Point; typedef Traits::Kinetic_kernel::Point_3 Point;
Traits tr(0, end_time); Traits tr(0, end_time);
DS ds(tr); DS_ ds(tr);
std::cout << "Points are:\n"; std::cout << "Points are:\n";
for (int i=0; i< nump/2; ++i){ for (int i=0; i< nump/2; ++i){
Point pt(rp<F>(r, r.get_int(0,3)), Point pt(rp<F>(r, r.get_int(0,3)),
@ -114,12 +114,12 @@ int main(int, char *[]) {
} else { } else {
std::cout << "Checking regular_3" << std::endl; std::cout << "Checking regular_3" << std::endl;
typedef CGAL::Kinetic::Regular_triangulation_exact_simulation_traits Traits; typedef CGAL::Kinetic::Regular_triangulation_exact_simulation_traits Traits;
typedef CGAL::Kinetic::Regular_triangulation_3<Traits> DS; typedef CGAL::Kinetic::Regular_triangulation_3<Traits> DS_;
typedef Traits::Kinetic_kernel::Motion_function F; typedef Traits::Kinetic_kernel::Motion_function F;
typedef Traits::Kinetic_kernel::Point_3 Bare_point; typedef Traits::Kinetic_kernel::Point_3 Bare_point;
typedef Traits::Kinetic_kernel::Weighted_point_3 Point; typedef Traits::Kinetic_kernel::Weighted_point_3 Point;
Traits tr(0, end_time); Traits tr(0, end_time);
DS ds(tr); DS_ ds(tr);
std::cout << "Points are:\n"; std::cout << "Points are:\n";
for (int i=0; i< nump/2; ++i){ for (int i=0; i< nump/2; ++i){

2
Ridges_3/demo/Ridges_3/SketchSample.cpp
View File

@ -10,7 +10,7 @@
extern double strength_threshold; extern double strength_threshold;
extern double sharpness_threshold; extern double sharpness_threshold;
SketchSample::SketchSample(Mesh* mesh, DS* ridge_data) { SketchSample::SketchSample(Mesh* mesh, DS_* ridge_data) {
highlight = false; highlight = false;
p_mesh = mesh; p_mesh = mesh;
p_ridge_data = ridge_data; p_ridge_data = ridge_data;

6
Ridges_3/demo/Ridges_3/SketchSample.h
View File

@ -30,7 +30,7 @@ struct data_line{
{}; {};
}; };
typedef std::list<data_line* > DS; typedef std::list<data_line* > DS_;
typedef std::list<data_line* >::iterator DS_iterator; typedef std::list<data_line* >::iterator DS_iterator;
@ -38,11 +38,11 @@ class SketchSample : public Sketcher {
private: private:
bool highlight; bool highlight;
Mesh* p_mesh; Mesh* p_mesh;
DS* p_ridge_data; DS_* p_ridge_data;
double mesh_center_x, mesh_center_y, mesh_center_z, mesh_radius; double mesh_center_x, mesh_center_y, mesh_center_z, mesh_radius;
public: public:
SketchSample(Mesh* mesh, DS* ridge_data); SketchSample(Mesh* mesh, DS_* ridge_data);
~SketchSample(); ~SketchSample();

6
Ridges_3/demo/Ridges_3/visu.cpp
View File

@ -17,11 +17,11 @@
#include <string> #include <string>
Mesh m_mesh; Mesh m_mesh;
DS ridge_data; DS_ ridge_data;
double strength_threshold = 0; double strength_threshold = 0;
double sharpness_threshold = 0; double sharpness_threshold = 0;
void clean_DS(DS& L) void clean_DS(DS_& L)
{ {
DS_iterator current=L.begin(); DS_iterator current=L.begin();
for (DS_iterator it=++L.begin();it!=L.end();it++) for (DS_iterator it=++L.begin();it!=L.end();it++)
@ -66,7 +66,7 @@ read_line(std::ifstream& stream_res, int& ridge_type,
} }
} }
void load_data_from_file(DS& l, const char* file_res) void load_data_from_file(DS_& l, const char* file_res)
{ {
std::ifstream stream_res(file_res, std::ifstream::in); std::ifstream stream_res(file_res, std::ifstream::in);
if(!stream_res) { exit(0); } if(!stream_res) { exit(0); }

8
Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/include/Which_diagram.h
View File

@ -28,14 +28,14 @@ CGAL_BEGIN_NAMESPACE
template<class Matching_class> struct Which_diagram; template<class Matching_class> struct Which_diagram;
template<class Gt, class DS, class LTag> template<class Gt, class DS_, class LTag>
struct Which_diagram< Segment_Delaunay_graph_2<Gt,DS,LTag> > struct Which_diagram< Segment_Delaunay_graph_2<Gt,DS_,LTag> >
{ {
typedef Tag_false Is_hierarchy; typedef Tag_false Is_hierarchy;
}; };
template<class Gt, class STag, class DS, class LTag> template<class Gt, class STag, class DS_, class LTag>
struct Which_diagram< Segment_Delaunay_graph_hierarchy_2<Gt,STag,DS,LTag> > struct Which_diagram< Segment_Delaunay_graph_hierarchy_2<Gt,STag,DS_,LTag> >
{ {
typedef Tag_true Is_hierarchy; typedef Tag_true Is_hierarchy;
}; };

6
Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/pdg_typedefs.h
View File

@ -78,11 +78,11 @@ typedef CGAL::Segment_Delaunay_graph_vertex_base_2<ST> Vb;
typedef CGAL::Segment_Delaunay_graph_vertex_base_with_info_2<Vb,int> Vbi; typedef CGAL::Segment_Delaunay_graph_vertex_base_with_info_2<Vb,int> Vbi;
typedef CGAL::Segment_Delaunay_graph_hierarchy_vertex_base_2<Vbi> Vbh; typedef CGAL::Segment_Delaunay_graph_hierarchy_vertex_base_2<Vbi> Vbh;
typedef CGAL::Triangulation_face_base_2<Gt> Fb; typedef CGAL::Triangulation_face_base_2<Gt> Fb;
typedef CGAL::Triangulation_data_structure_2<Vbh,Fb> DS; typedef CGAL::Triangulation_data_structure_2<Vbh,Fb> DS_;
typedef CGAL::Segment_Delaunay_graph_hierarchy_2<Gt,ST,STag,DS> SDG_2; typedef CGAL::Segment_Delaunay_graph_hierarchy_2<Gt,ST,STag,DS_> SDG_2;
//typedef CGAL::Segment_Delaunay_graph_2<Gt,ST,DS> SDG_2; //typedef CGAL::Segment_Delaunay_graph_2<Gt,ST,DS_> SDG_2;
#endif // PDG_TYPEDEFS_H #endif // PDG_TYPEDEFS_H