songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
105,300 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

273 Commits

Author SHA1 Message Date
Clement Jamin b43f28c6ab Renamed p_could_lock_zone + use NULL instead of 0 + CGAL_TRIANGULATION_3_PROFILING 2013-06-05 13:44:34 +02:00
Clement Jamin dbe1c9c597 Reversed the "facet_not_in_its_cz" variables by removing the "not" 2013-05-28 15:56:22 +02:00
Clement Jamin 2a7c402c07 Regular_triangulation_3 is now parallel (insert/remove) 2013-04-10 18:08:53 +02:00
Clement Jamin 44b8217d54 New/modified constructors for triangulations. 
Can now take a lock data structure as parameter.
 2013-02-19 10:39:39 +01:00
Clement Jamin bce43fbb8e Improved the way parallelism is handle in Mesh_3/Triangulation_3 
Added a better support for parallelism in Triangulation_3.
Simplified how to enable/disable concurrency in Mesh_3.
Moved the Compact_container stategies to a new file.
 2013-02-15 18:07:43 +01:00
Clement Jamin eb2ed63d8b Changed the way we activate concurrency in Triangulation_3 + Code clean-up 2013-02-11 19:12:30 +01:00
Laurent Rineau 70bf8d7e88 New branch to add c->circumcenter (and the verson with cache) to RT3 2013-02-07 19:07:42 +01:00
Clément Jamin 1c664776c9 The parallel version can now be built with GCC 2012-07-10 16:53:34 +00:00
Clément Jamin 41f9cbe411 Sequential Mesh_3 can now be compiled by GCC. 2012-07-09 15:44:58 +00:00
Clément Jamin 40f602fea9 Minor changes (comments, etc.) 2012-06-21 12:03:03 +00:00
Clément Jamin b268598665 Replace LINKED_WITH_TBB by CGAL_LINKED_WITH_TBB. 2012-06-13 09:33:08 +00:00
Clément Jamin b948543cc6 Use of a Tag (template parameter) to activate/deactivate concurrency in Mesh_3, instead of #ifdef macros. 2012-06-09 08:52:37 +00:00
Clément Jamin dfbddff185 Bugfixes + some clean-up 2012-05-30 14:49:02 +00:00
Clément Jamin a0a92cdf64 The problem "A facet is not in conflict with its refinement point" (can occur in sequential version too) is now solved => we switch to exact computation (for the dual) when it happens. 
Note: don't try to #define CGAL_MESH_3_DO_NOT_LOCK_INFINITE_VERTEX, it doesn't work yet.
 2012-04-04 07:05:46 +00:00
Clément Jamin 4fdf647428 "Re-tabulation" 2012-03-28 08:30:32 +00:00
Clément Jamin da923ba811 Forget about yesterday. There was a studid mutex making the whole thing nearly sequential. 
Anyway, now the refinement of the facets is parallel. The speedup is around 2-3 on a 12-core CPU. Can do better, but at least it shows it's not sequential.
The refinement of the cells is not parallel, yet.
One last thing: the program needs to be restarted between two refinements (should be fixed soon).
 2012-03-23 18:05:24 +00:00
Clément Jamin 4ccf8e0447 First working parallel version. It's not faster than the sequential one, but not slower neither (depends if you're optimistic or not). The good news is that we found all (?) the sections to protect or to make thread-local. 2012-03-22 17:07:03 +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 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +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 2c2ce21536 remove commented lines from example. 
int -> size_type
 2011-03-04 07:12:17 +00:00
Sébastien Loriot af6f99ed1a protect code using insert points with info by range using macro 
CGAL_TRIANGULATION_3_DONT_INSERT_RANGE_OF_POINTS_WITH_INFO
 2011-01-10 17:54:57 +00:00
Sébastien Loriot 3181ed9401 merge only the code to insert points with info by range from the branch 
/branches/experimental-packages/Triangulation_insert_with_info/Triangulation_3
 2011-01-10 16:00:51 +00:00
Laurent Rineau eea1755591 Merge the candidate branch of 
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Rt::vertices_inside_conflict_zone
in trunk.
 2010-12-21 16:36:04 +00:00
Laurent Rineau 96162627aa Merge the following small features in trunk: 
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Remove_cluster
  https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Structural_filtering

Merge also a partial support of:
  https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Rt::vertices_inside_conflict_zone
    (vertices_inside_conflict_zone" is added in Regular_triangulation_3,  without documenting it)
 2010-12-10 17:02:10 +00:00
Stéphane Tayeb ca4f9f11e8 Add an overload of insert_in_hole() in class Regular_triangulation_3 to ensure that hidden points are properly treated. 2010-08-04 15:36:38 +00:00
Sébastien Loriot 599b23129e missing using 2010-07-08 09:04:57 +00:00
Stéphane Tayeb 771b6f1b79 Fix bug on g++-4.5 -std=c++0x: use int[3] instead of unsigned char[3] to store vertex indices. 2010-07-07 11:26:48 +00:00
Sébastien Loriot 238f5a8479 change a private into protecter to have access to hidden_tester in derived class 
add a using find_conflicts so that can call T3 version from class inheriting from DT or RT
 2010-06-25 21:13:06 +00:00
Andreas Fabri d185e4152f Finally use ptrdiff_t as return type for insert(beg, end) 2010-06-23 13:35:35 +00:00
Andreas Fabri b456cdb994 int -> size_type/std::size_t 2010-06-21 20:31:19 +00:00
Andreas Fabri 97c2754da5 As the insertion of points in a regular triangulation can reduce the number of vertices we have to replace size_t with ptrdiff_t 2010-06-21 16:06:01 +00:00
Andreas Fabri c79a1ebbf6 int -> size_type/std::size_t 2010-06-21 14:12:02 +00:00
Laurent Rineau 8679a3911e Merged revisions 56835,56864-56870,56876,56895-56897 via svnmerge from 
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r56835 | lrineau | 2010-06-17 12:56:52 +0200 (Thu, 17 Jun 2010) | 6 lines
  
  Remove the constructor Gmpfr(long double) on Microsoft Visual C++. A big
  comment in the source code explains why.
  
  The testsuite will check that the construction of Gmpfr from a long double
  on MSVC still works and produces the right Gmpfr.
........
  r56864 | afabri | 2010-06-18 11:04:47 +0200 (Fri, 18 Jun 2010) | 1 line
  
  Use tie from boost::
........
  r56865 | afabri | 2010-06-18 11:11:49 +0200 (Fri, 18 Jun 2010) | 1 line
  
  Use bind from boost::
........
  r56866 | afabri | 2010-06-18 11:38:50 +0200 (Fri, 18 Jun 2010) | 1 line
  
  Use bind from boost:: (detected in Mesh_3 VC10 testsuite)
........
  r56867 | lrineau | 2010-06-18 11:39:24 +0200 (Fri, 18 Jun 2010) | 3 lines
  
  cmake-2.8.2rc2 is out.
  /bigobj is necessary
........
  r56868 | afabri | 2010-06-18 11:52:37 +0200 (Fri, 18 Jun 2010) | 1 line
  
  Add #include <fstream>
........
  r56869 | afabri | 2010-06-18 11:55:33 +0200 (Fri, 18 Jun 2010) | 1 line
  
  Shorten filename as with path it exceeds easily 256 letters which poor Visual C++ can't handle
........
  r56870 | afabri | 2010-06-18 12:24:30 +0200 (Fri, 18 Jun 2010) | 1 line
  
  Use tie from boost::
........
  r56876 | lrineau | 2010-06-18 16:40:36 +0200 (Fri, 18 Jun 2010) | 3 lines
  
  New try to fix the issue of Gmpfr(long double) with MSVC and libmpfr-1.dll
  compiled by Mingw.
........
  r56895 | lrineau | 2010-06-20 23:16:40 +0200 (Sun, 20 Jun 2010) | 3 lines
  
  Using boost::bind is not sufficient" "bind" without qualifier was
  ambiguous, according to MSVC2010, with std::bind (from C++0x).
........
  r56896 | lrineau | 2010-06-20 23:18:29 +0200 (Sun, 20 Jun 2010) | 3 lines
  
  Qualify "bind" with "boost::", to avoid the ambiguity (according to
  MSVC2010), with std::bind (C++0x).
........
  r56897 | lrineau | 2010-06-20 23:19:17 +0200 (Sun, 20 Jun 2010) | 2 lines
  
  Stupid typo!
........
 2010-06-20 21:48:20 +00:00
Sébastien Loriot 52317dd49f add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE 
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
 2010-06-09 07:37:13 +00:00
Laurent Rineau 7e87099363 Merge the branch /branches/candidate-packages/Triangulation_3 
- Work from:
    Pedro Machado Manhaes de Castro <Pedro.Machado@sophia.inria.fr>
    Olivier Devillers <Olivier.Devillers@sophia.inria.fr>
- The work is:
    - displacement for 3D triangulation (Olivier and Pedro)
         https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Move_T2T3
 2010-05-31 08:48:09 +00:00
Andreas Fabri beaff6d265 Add 'using' statement for ansi-compliance 2010-05-11 07:08:10 +00:00
Laurent Rineau c4d182b8c7 Oops. Typo. 
Locate testing was not testing the right headers.
 2010-05-08 11:35:32 +00:00
Laurent Rineau 2257b8b2ab Fix for strict-ansi compliance 2010-05-08 11:24:59 +00:00
Andreas Fabri 6edc1c3f73 Remove random_shuffle from insert(b,e) functions as spatial_sort does it now 2010-01-27 13:50:23 +00:00
Sylvain Pion d09319501c Use canonical form for for-loops over iterator ranges. 2009-11-10 12:53:07 +00:00
Sylvain Pion 0e456b39d7 Remove useless comment. 2009-09-23 18:39:08 +00:00
Sylvain Pion 443277dab0 Pass Cell_handle and Vertex_handle by value instead of by const&. This undoes : 
r19107 | afabri | 2003-10-17 10:49:19 +0200 (Ven 17 oct 2003) | 2 lignes
    Added const& for gaining performance

which was justified at the time by the fact that on VC++, handles encapsulated iterators.
 2009-08-17 15:11:03 +00:00
Sylvain Pion 57603f0b3b Allow CGAL::Default for the TDS parameters of the three main triangulation classes. 
(patch extracted from the Triangulation_3_Location_policy branch as it is mostly orthogonal)
 2009-08-17 09:48:07 +00:00
Sylvain Pion 919321e300 Give the TDS the ability to store a more general Cell_data in cells, 
than just an implicit access to a conflict_flag.
 2009-08-11 20:05:42 +00:00
Sylvain Pion 395b1d569e Remove white spaces at end of lines. 2009-08-04 13:36:15 +00:00
Sylvain Pion ffedfc0d58 Add some locate() and insert() convenient overloads, taking the start hint as a 
Vertex_handle (instead of the Cell_handle currently).
 2009-07-24 21:57:38 +00:00
Sylvain Pion 7df2a2df3b Remover short name macros. See PR 1551. 2009-04-21 18:34:14 +00:00
Monique Teillaud ba9b7b7143 incident_vertices(vertex) renamed as adjacent_vertices() 
old name left for backward compatibility (and old functions still tested)
 2009-04-08 10:06:32 +00:00
Sylvain Pion 4aa1cb057a Remove my email adress from header files. 2008-10-11 20:21:08 +00:00
Manuel Caroli 7918617ae4 removed Conflict_tester_for_find_conflicts_[2|3] that were redundant 
to Conflict_tester_[2|3]
 2008-07-04 09:35:56 +00:00
Manuel Caroli 7f70bb34c1 moved identical remove helper functions from 
Delaunay_triangulation_3 and Regular_triangulation_3
to Triangulation_3
 2008-07-03 12:11:31 +00:00
Manuel Caroli 3a6da39537 introduced a visitor Vertex_remover and modified the functions called by remove 
such that they are equal in both 
Delaunay_triangulation_3 and Regular_triangulation_3
 2008-07-02 15:03:25 +00:00
Sylvain Pion 2d5de17427 Slight optimization in draw_dual() 2008-04-30 08:16:19 +00:00
Sylvain Pion b0f2c77fdc Remove casts to Oriented_side. 
They are useless since we merged the various enum types.
 2008-04-09 12:35:10 +00:00
Sylvain Pion a47abc28d1 Use <boost/bind.hpp> instead of <CGAL/functional.h>. 2008-03-10 01:21:00 +00:00
Sylvain Pion 88ed563f44 Remove some workarounds for SunPRO + RW's STL: 
CGAL_CFG_MISSING_TEMPLATE_VECTOR_CONSTRUCTORS_BUG
CGAL_CFG_RWSTD_NO_MEMBER_TEMPLATES  (partially so far)
CGAL_make_vector
CGAL_make_list
 2008-01-03 14:50:13 +00:00
Sylvain Pion b197e42c61 Slight optimization 2007-06-11 16:19:24 +00:00
Sylvain Pion ffcaac6112 Make SunCC happier. 2007-04-18 07:51:26 +00:00
Sylvain Pion ae242392dc Use CGAL_make_vector() 2007-04-02 20:19:14 +00:00
Christophe Delage 4bfb9c5b0f Bug reported by Daniel Russel. 
RT3::find_conflict did not check if the point it's given is hidden before calling
T3::find_conflicts.

Fixed.
 2007-03-30 12:15:50 +00:00
Christophe Delage a7f0ead112 Triangulation_3 iterator range insert and constructors now 
use spatial_sort.
Examples and demos now call range insert when possible.
 2007-03-30 09:30:22 +00:00
Andreas Fabri 52b4bda7af removed unused parameters 2007-03-20 08:34:26 +00:00
Andreas Fabri ff4e4038bd Get rid of warning C4355: 'this' : used in base member initializer list 2007-02-05 21:36:08 +00:00
Nico Kruithof dd96d5559d removed extra template argument from find_conflicts to make SUN happy again. 2006-09-27 08:01:05 +00:00
Nico Kruithof 245a988b26 Coded one generic insert for Delaunay and regular. 2006-09-18 15:35:02 +00:00
Nico Kruithof 6841f56078 Adding the test where the Delaunay triangulation and a (unweighted) 
regular triangulation are compared. Also added vertices_in_conflict
to Regular_triangulation_3.h for that.
 2006-09-12 07:31:24 +00:00
Nico Kruithof 386b39ab4c Weighted_points that are inserted multiple times in the regular 
triangulation are discarded (instead of being inserted). This is
consistent with the behaviour of Triangulation_3 and
Delaunay_triangulation_3. See also change in the docs by Monique.
 2006-08-25 09:48:07 +00:00
Nico Kruithof 9c781b9d34 Merged find_conflicts_{2|3} into find_conflicts. 
Deprecated find_conflicts_{2|3}.
 2006-08-25 09:25:33 +00:00
Christophe Delage b6dfec3274 when changing the prototype of RT3::remove_2D(), the old one was left over, 
causing a warning.
 2006-03-13 08:11:56 +00:00
Laurent Saboret db6a8f948c Change CVS keywords to SVN style 2006-02-16 14:30:13 +00:00
Laurent Saboret 1aad55d4cb Change CVS keywords to SVN style 2006-02-14 10:08:15 +00:00
Laurent Saboret ee07ad352c Move packages to trunk root 2006-02-14 08:58:20 +00:00