Commit Graph

385 Commits

Author SHA1 Message Date
Philipp Möller caf3cce0d1 Silence unused parameter warnings. Leave the ones from the test-suite
that could signal incomplete tests.
2012-06-22 14:22:16 +00:00
Sébastien Loriot a627ccd880 doc typo 2012-05-14 12:00:40 +00:00
Laurent Rineau 5acc79e554 Add comments to explain what happens with the use of Default Dt_3 2012-04-23 16:54:47 +00:00
Laurent Rineau 95bec3999c Use Unique_has_map instead of std::map (patch from Andreas Fabri)
The gain on copies of T2 or T3 is the following:


afabri@klimt /cygdrive/c/cgal/next/Triangulation_3/benchmark/Triangulation_3
$ ./copy 1000000 2
36.806 sec

afabri@klimt /cygdrive/c/cgal/next/Triangulation_3/benchmark/Triangulation_3
$ ./copy 1000000 2
4.865 sec

The benchmarck copy.cpp is the following (not commited):

#define  CGAL_T3_HASH
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Delaunay_triangulation_3.h>
#include <CGAL/Timer.h>
#include <CGAL/point_generators_3.h>


#include <iostream>
#include <fstream>
#include <string>
#include <vector>

typedef CGAL::Exact_predicates_inexact_constructions_kernel  K;
typedef CGAL::Delaunay_triangulation_3<K> Delaunay;
typedef K::Point_3                                     Point;
typedef CGAL::Creator_uniform_3<double,Point>  Creator;



int main(int argc, char **argv)
{
  int n=1000000;
  int rep=100;
  if (argc>=2)
    n=atoi(argv[1]);
  if (argc>=3)
    rep=atoi(argv[2]);
  std::vector<Point> points;
  points.reserve(n);  
  CGAL::Random_points_in_sphere_3<Point,Creator> g(1);
  CGAL::copy_n( g, n, std::back_inserter(points));
  Delaunay original;
  original.insert(points.begin(),points.end());
  
  double res = 0;
  for (int r=0;r<rep;++r){
    CGAL::Timer t;    t.start();
    Delaunay delaunay=original;
    t.stop();
    res+=t.time();
  }

  std::cout << res << std::endl;
            
  return 0;
}
2012-03-30 12:37:19 +00:00
Sébastien Loriot fdac8b38d6 doc bugfix: class Delaunay_triangulation_3 inherits from 2012-03-07 16:21:06 +00:00
Sébastien Loriot 498c0a6e1e Make the insert-by-range function more permissive
The condition is now to be convertible to the point type, pair<point,info>,...
This was the behavior before the insert-by-range-with-info methods were
introduced.
2012-01-24 17:25:20 +00:00
Laurent Rineau a37c74d534 Add license files, per package 2012-01-16 15:54:22 +00:00
Laurent Rineau 2af2160942 Turn \ccLicenseQPL into \ccLicenseGPL 2012-01-13 17:13:55 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Laurent Rineau cc081c16cf Fix: RegularTriangulationTraits_3::Bare_point
Bug fixes in specification. The Regular_triangulation_3 template, does
require that its template parameter Gt has a nested type Gt::Bare_point.
2011-12-09 13:22:21 +00:00
Laurent Rineau 7df0200a6b Reintegrate /branches/features/Power_test_3-VC_64bit-GF into next. 2011-11-17 17:11:42 +00:00
Laurent Rineau 99a1dc531e merge changes from next 2011-11-17 17:02:32 +00:00
Laurent Rineau 93486787c3 The inside of ccPkgDescription must not contain black lines between macros
Otherwise that inserts a buggy "<p>" tag in the package overview where the
doctype does not allow it.
2011-11-15 19:16:23 +00:00
Laurent Rineau c7ca93c07e Include <CGAL/glu.h> before any use of GLU 2011-11-09 14:24:17 +00:00
Laurent Rineau 3089c5d022 Revert that patch. Andreas agreed that he should not have commited that to
next before the branch ShewchuckKernel-GF is tested in candidates

Reverted commit:
  | ------------------------------------------------------------------------
  | r66076 | afabri | 2011-10-26 21:29:58 +0200 (Wed, 26 Oct 2011) | 1 line
  | Changed paths:
  |    M /branches/next/Triangulation_3/include/CGAL/internal/Static_filters/Power_test_3.h
  | 
  | Split the operator in two functions to avoid an ICE for VC++ 64bit release compilations
  | ------------------------------------------------------------------------
2011-10-27 13:57:12 +00:00
Andreas Fabri 1c055d6951 Split the operator in two functions to avoid an ICE for VC++ 64bit release compilations 2011-10-26 19:29:58 +00:00
Andreas Fabri 706e98cd3b Workaround for ICE on VC++ generating 64bit code 2011-10-14 13:04:06 +00:00
Sébastien Loriot 554f62d411 remove executable property from copyright files 2011-10-03 08:18:16 +00:00
Andreas Fabri d10a333947 Add a file with the copyright holder(s) to the package_info 2011-09-29 20:45:16 +00:00
Laurent Rineau fdb7ea6c6b prepare ccPkgHowToCiteCgal for CGAL-3.10 (in 2012) 2011-09-28 16:15:05 +00:00
Philipp Möller f9b288db90 Merged branch ^/branches/features/gsoc2011-copy_n-pmoeller.
Small feature page: https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Replace_copy_n
2011-08-26 14:34:10 +00:00
Laurent Rineau b7c33d7b2e Add a comment to mark the end of move_if_no_collision
The function body of Triangulation_3<Gt,Tds>::move_if_no_collision is so
long that comments should be added to mark blocks ends. For now, mark the
end of the function body.
2011-08-24 13:39:51 +00:00
Laurent Rineau 7ea9ad85a8 fix previous commit (bug in the test) 2011-07-28 17:00:13 +00:00
Laurent Rineau 1fb7632ec3 Fix a bug in finite_adjacent_vertices when dimension()==1.
When tr.dimension()==1, tr.finite_adjacent_vertices(...) and
tr.finite_incident_edges(...) returned infinite things.
2011-07-28 16:53:11 +00:00
Andreas Fabri e8fb926dae Add missing return statements 2011-06-29 14:19:27 +00:00
Laurent Rineau ac9877372d Update all PkgDescription files to CGAL-3.9 2011-06-27 14:31:45 +00:00
Laurent Rineau 78b2f8ba39 Remove the use of QT ASSISTANT in CMakeLists.txt (not actually used) 2011-06-14 14:02:42 +00:00
Sébastien Loriot cc9929b7de qualify boost::bind to avoid ambiguity on windows. 2011-06-08 06:36:55 +00:00
Olivier Devillers 6fd6e90317 merge with next 2011-06-07 07:54:52 +00:00
Sébastien Loriot 985612cf88 BUGFIX: Info must be default constructible and assignable (as the model are) 2011-06-03 10:17:34 +00:00
Sébastien Loriot ca13392880 CGAL -> \cgal\ 2011-05-30 12:36:57 +00:00
Sébastien Loriot 98ddbf9c7e merge packages Spatial_sorting, Triangulation_2 and Triangulation_3 from branch spatial_sorting-add_info-sloriot 2011-05-24 15:48:31 +00:00
Sébastien Loriot 53e733188a merge trunk into next 2011-05-03 16:13:05 +00:00
Sébastien Loriot 040cd39d85 typo 2011-05-03 16:06:09 +00:00
Olivier Devillers 583ab24cd4 precision in the doc 2011-05-03 15:48:24 +00:00
Laurent Rineau 3c02e07b23 Try to fix my last revision about cmake_policy, with CMake-2.6.x
CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
x.y.z is greater than the current CMake version.
2011-04-28 17:45:22 +00:00
Laurent Rineau c97205f085 Global handling of CMake policies (second part)
We declare 
  cmake_minimum_required(VERSION 2.6.2)
but we also use
  cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.

That way, we no longer need any declaration of specific policies.

Those two lines must be present and maintained in all our CMakeLists.txt
files (the one for the libraries, and also the one for examples and demos,
and maybe tests).
2011-04-28 10:55:56 +00:00
Laurent Rineau 0631943153 Uniform capitalization in our CMake script: use lowercase for commands 2011-04-28 10:36:18 +00:00
Laurent Rineau ca5c92e034 Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
  - change cmake_minimum_required to VERSION 2.6.2
  - no longer any need for the policy CMP0003 (was for 2.4.x)
  - no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
2011-04-27 17:58:27 +00:00
Andreas Fabri 202c401d41 Add a simple benchmark 2011-04-01 14:00:13 +00:00
Monique Teillaud 8aab5c616e added Fei (Sophie) Che as developer of the new demo 2011-03-20 14:46:59 +00:00
Laurent Rineau 87996f5a12 Allow to test the Static_filters kernel alone. 2011-03-15 15:53:42 +00:00
Laurent Rineau b21de1d014 port to Windows 2011-03-15 14:44:00 +00:00
Andreas Fabri 8dfaa75cfa Add \ccPkgDemo 2011-03-08 07:54:00 +00:00
Sébastien Loriot 2c2ce21536 remove commented lines from example.
int -> size_type
2011-03-04 07:12:17 +00:00
Sébastien Loriot c1ff39de9a fix documentation from branch (code merged in r60697) 2011-02-28 17:22:38 +00:00
Sébastien Loriot 2889b6ad28 no deprecated warning in tests testing move_point 2011-02-28 13:31:13 +00:00
Laurent Rineau da95064578 Update the \ccPkgHowToCiteCgal tag for CGAL-3.8 (2011). 2011-02-24 15:21:10 +00:00
Sébastien Loriot 7605aa0891 remove generated file and remove warnings 2011-02-23 10:00:48 +00:00
Andreas Fabri be782ec8e3 Use CGAL::abs instead of fabs 2011-02-16 15:53:26 +00:00