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

Modifications of examples to follow modif of api.

This commit is contained in:
Guillaume Damiand 2011-10-24 09:55:24 +00:00
parent c3ed4ec5cb
commit 847b2f89f3
10 changed files with 69 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Linear_cell_complex/examples/Linear_cell_complex/exemple_incremental_builder.cpp
View File

@ -94,7 +94,7 @@ public:
} }
}; };
typedef CGAL::Combinatorial_map_with_points<2,3> LCC_3; typedef CGAL::Linear_cell_complex<2,3> LCC_3;
typedef LCC_3::Dart_handle Dart_handle; typedef LCC_3::Dart_handle Dart_handle;
typedef LCC_3::Point Point; typedef LCC_3::Point Point;

2
Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3.cpp
View File

@ -4,7 +4,7 @@
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>
typedef CGAL::Combinatorial_map_with_points<3> LCC_3; typedef CGAL::Linear_cell_complex<3> LCC_3;
typedef LCC_3::Dart_handle Dart_handle; typedef LCC_3::Dart_handle Dart_handle;
typedef LCC_3::Point Point; typedef LCC_3::Point Point;
typedef LCC_3::FT FT; typedef LCC_3::FT FT;

30
Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_with_colored_vertices.cpp
View File

@ -47,7 +47,7 @@ struct Myitem
typedef CGAL::Linear_cell_complex_traits typedef CGAL::Linear_cell_complex_traits
<3, CGAL::Exact_predicates_inexact_constructions_kernel> Traits; <3, CGAL::Exact_predicates_inexact_constructions_kernel> Traits;
typedef CGAL::Combinatorial_map_with_points<3,3,Traits,Myitem> LCC_3; typedef CGAL::Linear_cell_complex<3,3,Traits,Myitem> LCC_3;
typedef LCC_3::Dart_handle Dart_handle; typedef LCC_3::Dart_handle Dart_handle;
typedef LCC_3::Point Point; typedef LCC_3::Point Point;
typedef LCC_3::FT FT; typedef LCC_3::FT FT;
@ -55,20 +55,20 @@ typedef LCC_3::FT FT;
Dart_handle make_iso_cuboid(LCC_3& lcc, const Point& basepoint, FT lg) Dart_handle make_iso_cuboid(LCC_3& lcc, const Point& basepoint, FT lg)
{ {
return lcc.make_hexahedron(basepoint, return lcc.make_hexahedron(basepoint,
LCC_3::Construct_translated_point()(basepoint, LCC_3::Traits::Construct_translated_point()(basepoint,
LCC_3::Vector(lg,0,0)), LCC_3::Traits::Vector(lg,0,0)),
LCC_3::Construct_translated_point()(basepoint, LCC_3::Traits::Construct_translated_point()(basepoint,
LCC_3::Vector(lg,lg,0)), LCC_3::Traits::Vector(lg,lg,0)),
LCC_3::Construct_translated_point()(basepoint, LCC_3::Traits::Construct_translated_point()(basepoint,
LCC_3::Vector(0,lg,0)), LCC_3::Traits::Vector(0,lg,0)),
LCC_3::Construct_translated_point()(basepoint, LCC_3::Traits::Construct_translated_point()(basepoint,
LCC_3::Vector(0,lg,lg)), LCC_3::Traits::Vector(0,lg,lg)),
LCC_3::Construct_translated_point()(basepoint, LCC_3::Traits::Construct_translated_point()(basepoint,
LCC_3::Vector(0,0,lg)), LCC_3::Traits::Vector(0,0,lg)),
LCC_3::Construct_translated_point()(basepoint, LCC_3::Traits::Construct_translated_point()(basepoint,
LCC_3::Vector(lg,0,lg)), LCC_3::Traits::Vector(lg,0,lg)),
LCC_3::Construct_translated_point()(basepoint, LCC_3::Traits::Construct_translated_point()(basepoint,
LCC_3::Vector(lg,lg,lg))); LCC_3::Traits::Vector(lg,lg,lg)));
} }
int main() int main()

2
Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_4.cpp
View File

@ -4,7 +4,7 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
typedef CGAL::Combinatorial_map_with_points<4,5> LCC_4; typedef CGAL::Linear_cell_complex<4,5> LCC_4;
typedef LCC_4::Dart_handle Dart_handle; typedef LCC_4::Dart_handle Dart_handle;
typedef LCC_4::Point Point; typedef LCC_4::Point Point;
typedef LCC_4::Vector Vector; typedef LCC_4::Vector Vector;

2
Linear_cell_complex/examples/Linear_cell_complex/map_3_iterators.cpp
View File

@ -24,7 +24,7 @@
#define NUMBER_OF_LOOP 10 #define NUMBER_OF_LOOP 10
typedef CGAL::Combinatorial_map_with_points<3> CMap_3; typedef CGAL::Linear_cell_complex<3> CMap_3;
typedef CMap_3::Dart_handle Dart_handle; typedef CMap_3::Dart_handle Dart_handle;
int main(int narg, char** argv) int main(int narg, char** argv)

30
Linear_cell_complex/examples/Linear_cell_complex/map_3_subdivision.cpp
View File

@ -22,7 +22,7 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
typedef CGAL::Combinatorial_map_with_points<3> LCC_3; typedef CGAL::Linear_cell_complex<3> LCC_3;
typedef LCC_3::Dart_handle Dart_handle; typedef LCC_3::Dart_handle Dart_handle;
typedef LCC_3::Vertex_attribute Vertex; typedef LCC_3::Vertex_attribute Vertex;
typedef LCC_3::Point Point; typedef LCC_3::Point Point;
@ -177,20 +177,20 @@ void subdivide_map_3(LCC_3& m)
Dart_handle make_iso_cuboid(LCC_3& lcc, const Point& basepoint, FT lg) Dart_handle make_iso_cuboid(LCC_3& lcc, const Point& basepoint, FT lg)
{ {
return lcc.make_hexahedron(basepoint, return lcc.make_hexahedron(basepoint,
LCC_3::Construct_translated_point()(basepoint, LCC_3::Traits::Construct_translated_point()(basepoint,
LCC_3::Vector(lg,0,0)), LCC_3::Traits::Vector(lg,0,0)),
LCC_3::Construct_translated_point()(basepoint, LCC_3::Traits::Construct_translated_point()(basepoint,
LCC_3::Vector(lg,lg,0)), LCC_3::Traits::Vector(lg,lg,0)),
LCC_3::Construct_translated_point()(basepoint, LCC_3::Traits::Construct_translated_point()(basepoint,
LCC_3::Vector(0,lg,0)), LCC_3::Traits::Vector(0,lg,0)),
LCC_3::Construct_translated_point()(basepoint, LCC_3::Traits::Construct_translated_point()(basepoint,
LCC_3::Vector(0,lg,lg)), LCC_3::Traits::Vector(0,lg,lg)),
LCC_3::Construct_translated_point()(basepoint, LCC_3::Traits::Construct_translated_point()(basepoint,
LCC_3::Vector(0,0,lg)), LCC_3::Traits::Vector(0,0,lg)),
LCC_3::Construct_translated_point()(basepoint, LCC_3::Traits::Construct_translated_point()(basepoint,
LCC_3::Vector(lg,0,lg)), LCC_3::Traits::Vector(lg,0,lg)),
LCC_3::Construct_translated_point()(basepoint, LCC_3::Traits::Construct_translated_point()(basepoint,
LCC_3::Vector(lg,lg,lg))); LCC_3::Traits::Vector(lg,lg,lg)));
} }
int main(int narg, char** argv) int main(int narg, char** argv)

2
Linear_cell_complex/examples/Linear_cell_complex/plane_graph_to_map_2.cpp
View File

@ -23,7 +23,7 @@
#include <fstream> #include <fstream>
#include <cstring> #include <cstring>
typedef CGAL::Combinatorial_map_with_points<2,2> Map_2; typedef CGAL::Linear_cell_complex<2,2> Map_2;
typedef Map_2::Dart_handle Dart_handle; typedef Map_2::Dart_handle Dart_handle;
typedef Map_2::Point Point; typedef Map_2::Point Point;

2
Linear_cell_complex/examples/Linear_cell_complex/polyhedron_clear.cpp
View File

@ -67,7 +67,7 @@ void run(const char* fname,const char* info)
bench<Poly_vector>(fname,"vector-based"); bench<Poly_vector>(fname,"vector-based");
typedef CGAL::Linear_cell_complex_min_items<2> Items; typedef CGAL::Linear_cell_complex_min_items<2> Items;
typedef CGAL::Combinatorial_map_with_points<2,3, typedef CGAL::Linear_cell_complex<2,3,
CGAL::Linear_cell_complex_traits<3, Kernel>, CGAL::Linear_cell_complex_traits<3, Kernel>,
Items> LCC; Items> LCC;
bench2<LCC>(fname,"Linear cell complex"); bench2<LCC>(fname,"Linear cell complex");

27
Linear_cell_complex/examples/Linear_cell_complex/test-all
View File

@ -1,22 +1,11 @@
cd debug; make; cd .. make;
debug/map_3_with_points > res.txt 2>&1 ./linear_cell_complex_3 > res.txt 2>&1
debug/map_5_with_points >> res.txt 2>&1 ./linear_cell_complex_4 >> res.txt 2>&1
debug/map_3_with_points_and_colored_vertices >> res.txt 2>&1 ./linear_cell_complex_3_with_colored_vertices >> res.txt 2>&1
debug/map_3_subdivision >> res.txt 2>&1 ./map_3_subdivision >> res.txt 2>&1
debug/map_3_iterators data/aircraft.off >> res.txt 2>&1 ./map_3_iterators data/aircraft.off >> res.txt 2>&1
debug/plane_graph_to_map_2 data/graph1.off >> res.txt 2>&1 ./plane_graph_to_map_2 data/graph1.off >> res.txt 2>&1
debug/voronoi_3 data/small_points >> res.txt 2>&1 ./voronoi_3 data/small_points >> res.txt 2>&1
xxdiff res-valid.txt res.txt
cd release; make; cd ..
release/map_3_with_points > res.txt 2>&1
release/map_5_with_points >> res.txt 2>&1
release/map_3_with_points_and_colored_vertices >> res.txt 2>&1
release/map_3_subdivision >> res.txt 2>&1
release/map_3_iterators data/aircraft.off >> res.txt 2>&1
release/plane_graph_to_map_2 data/graph1.off >> res.txt 2>&1
release/voronoi_3 data/small_points >> res.txt 2>&1
xxdiff res-valid.txt res.txt xxdiff res-valid.txt res.txt

2
Linear_cell_complex/examples/Linear_cell_complex/voronoi_3.cpp
View File

@ -26,7 +26,7 @@
// #include "cgal_map_viewer_vtk.h" // #include "cgal_map_viewer_vtk.h"
typedef CGAL::Combinatorial_map_with_points<3, 3> Map_3; typedef CGAL::Linear_cell_complex<3, 3> Map_3;
typedef Map_3::Dart_handle Dart_handle; typedef Map_3::Dart_handle Dart_handle;
typedef Map_3::Point Point; typedef Map_3::Point Point;