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

reconciled conflict

This commit is contained in:
Daniel Russel 2007-03-19 04:07:28 +00:00
parent 8b443d9ca7
commit c428d0070d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,9 +92,9 @@ int main(int, char *[]) {
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,5)), Point pt(rp<F>(r, r.get_int(0,3)),
rp<F>(r, r.get_int(0,5)), rp<F>(r, r.get_int(0,3)),
rp<F>(r, r.get_int(0,5))); rp<F>(r, r.get_int(0,3)));
std::cout << pt << std::endl; std::cout << pt << std::endl;
tr.active_points_3_table_handle()->insert(pt); tr.active_points_3_table_handle()->insert(pt);
if (i == 10) { if (i == 10) {
@ -121,6 +121,7 @@ int main(int, char *[]) {
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.5; ++i){ for (int i=0; i< nump/2.5; ++i){
Point pt = Point(Bare_point(rp<F>(r, r.get_int(0,5)), Point pt = Point(Bare_point(rp<F>(r, r.get_int(0,5)),
rp<F>(r, r.get_int(0,5)), rp<F>(r, r.get_int(0,5)),