diff --git a/Packages/Triangulation_2/examples/Triangulation_2/Makefile b/Packages/Triangulation_2/examples/Triangulation_2/Makefile index d900222fb38..2743c0195ec 100644 --- a/Packages/Triangulation_2/examples/Triangulation_2/Makefile +++ b/Packages/Triangulation_2/examples/Triangulation_2/Makefile @@ -58,12 +58,15 @@ terrain : terrain.o regular : regular.o $(CGAL_CXX) -o regular regular.o $(LDFLAGS) +constrained : constrained.o + $(CGAL_CXX) -o constrained constrained.o $(LDFLAGS) + clean: rm -rf *~ *.o *.obj core tr realclean: clean rm -rf points example voronoi colored_face triangulation_prog1 \ - terrain regular *.exe \ + terrain regular constrained *.exe \ Program* Compiler* Error* error.txt diff --git a/Packages/Triangulation_2/examples/Triangulation_2/data/poisson b/Packages/Triangulation_2/examples/Triangulation_2/data/poisson new file mode 100644 index 00000000000..b87d3bff6f2 --- /dev/null +++ b/Packages/Triangulation_2/examples/Triangulation_2/data/poisson @@ -0,0 +1,17 @@ +16 +-0.25 0.0 -0.5 1.0 +-0.25 0.0 -0.5 -1.0 +-0.5 1.0 0.0 0.5 +-0.5 -1.0 0.0 -0.5 + 0.0 0.5 0.5 1.0 + 0.0 -0.5 0.5 -1.0 + 0.5 1.0 1.0 0.0 + 0.5 -1.0 1.0 0.0 + 0.25 0.0 0.5 0.5 +0.25 0.0 0.5 -0.5 +0.5 0.5 0.75 0.0 +0.5 -0.5 0.75 0.0 +-0.25 0.0 -0.5 0.5 +-0.25 0.0 -0.5 -0.5 +-0.5 0.5 -0.75 0.0 +-0.5 -0.5 -0.75 0.0 \ No newline at end of file diff --git a/Packages/Triangulation_2/examples/Triangulation_2/data/replay b/Packages/Triangulation_2/examples/Triangulation_2/data/replay deleted file mode 100644 index 289a24781a1..00000000000 --- a/Packages/Triangulation_2/examples/Triangulation_2/data/replay +++ /dev/null @@ -1,7 +0,0 @@ -6 -0.528 -0.3245 1 0.891 -0.0825 1 --0.748 -0.451 1 -0.022 -0.4895 1 -0.5115 0.055 1 -0.55 -0.0715 1 --0.682 0.374 1 -0.165 0.363 1 -0.737 0.4125 1 -0.264 0.1485 1 --0.4345 0.913 1 -0.0605 0.55 1 diff --git a/Packages/Triangulation_2/examples/Triangulation_2/points.C b/Packages/Triangulation_2/examples/Triangulation_2/points.C index 96de1fbc3df..6c2daf5c899 100644 --- a/Packages/Triangulation_2/examples/Triangulation_2/points.C +++ b/Packages/Triangulation_2/examples/Triangulation_2/points.C @@ -15,35 +15,22 @@ typedef CGAL::Triangulation_default_data_structure_2 Tds; typedef CGAL::Triangulation_2 Triangulation; typedef CGAL::Delaunay_triangulation_2 Delaunay_triangulation; -int main(int, char* argv[]) +int main() { - Triangulation T; - PVector V; - - std::ifstream data(argv[1]); - + std::ifstream data("data/points.cin"); if(data.bad()){ - std::cout << "Problem with file " << argv[1] << std::endl; + std::cout << "Problem with file " << "data/points.cin" << std::endl; } data >> V; - std::cout << V.size() << std::endl; - - int count = 0; + std::cout << V.size() << " points read " << std::endl; std::cout << "Start insertion" << std::endl; for(int i = 0; i