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

78 Commits

Author SHA1 Message Date
Clement Jamin 4958fcc746 Merge branch 'Tangential_complex-cjamin-old' into Tangential_complex-cjamin 2016-06-01 13:35:18 +02:00
Laurent Rineau 683fa43b69 Fix -Wconversion warnings (g++-5.3.1 Fedora 23) 2016-04-21 16:41:14 +02:00
Laurent Rineau 6eacaa7868 cosmetic fix: display the iterations on 1 line only 2016-01-05 17:41:56 +01:00
Clement Jamin 42f726bf24 Merge branch 'Tangential_complex-cjamin-old' into Tangential_complex-cjamin 2015-12-08 17:34:59 +01:00
Clement Jamin 77e6772aa7 Use Real_timer in Mesh_3 since the algorithms might be parallel 
And update the doc accordingly
 2015-10-08 15:26:50 +02:00
Clement Jamin 1c70482064 Merge branch 'Tangential_complex-cjamin-old' into Tangential_complex-cjamin 2015-07-20 12:19:54 +02:00
Philipp Möller 4f8e76b074 Boost.Lambda is not used here anymore 2015-04-13 16:47:00 +02:00
Clement Jamin fcbc96fbf8 Rename WallClockTimer => Wall_clock_timer 
(internal timer using TBB timers if available)
 2014-09-24 16:14:17 +02:00
Clement Jamin aa1aa597bb Restore commit a09ed468 with a bug fix 
"Thread-safe version of incident_cells and incident_facets"
 2014-07-15 20:13:30 +02:00
Clement Jamin db6db80096 Fix identation 2014-07-15 18:11:31 +02:00
Andreas Fabri 3aefde776a Move a function body in the class definition to avoid an ICE with VC12 2014-07-09 15:30:16 +02:00
Clement Jamin 0a4267b7ce Temporarily revert "Thread-safe version of incident_cells and incident_facets" 2014-07-03 15:41:02 +02:00
Clement Jamin a09ed46810 Thread-safe version of incident_cells and incident_facets 2014-06-23 10:45:26 +02:00
Clement Jamin 9f5927af61 Move function from C3T3_helpers to TDS 
Move C3T3_helpers::get_incident_cells_without_using_tds_data to TDS::incident_cells_threadsafe
 2014-06-23 08:21:09 +02:00
Clement Jamin 451e6e9cff Missing typename/using/etc. 2014-06-13 13:46:12 +02:00
Clement Jamin d6693f3319 Replaced some C++11 lambda functions by functors 2014-06-04 16:46:20 +02:00
Clement Jamin 7145f7db0b Replaced some C++11 lambda functions by functors +change mutex (static=>member) 2014-06-03 18:18:12 +02:00
Clement Jamin ca2a2878b4 Clean-up temporary/debug code 2014-05-23 15:34:27 +02:00
Clement Jamin 5576570846 Clean-up temporary/debug code 2014-05-23 14:42:51 +02:00
Clement Jamin 27dccd8710 Missing CGAL_ prefix 2014-05-20 19:14:55 +02:00
Clement Jamin 157cd0465f Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 
Conflicts:
	Mesh_3/demo/Mesh_3/Mesh_3_optimization_plugin_cgal_code.cpp
	Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
	Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
	Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
	Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
	Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
	Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h
	Mesh_3/include/CGAL/Mesh_3/config.h
	Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
	Mesh_3/include/CGAL/exude_mesh_3.h
	Mesh_3/test/Mesh_3/test_meshing_utilities.h
	Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h
 2014-03-10 17:01:03 +01:00
Laurent Rineau 6561b0d811 Fix warnings 
- Twice unused typedefs (because their uses were commented)
- Once member variables initialized in wrong order
 2013-10-24 17:22:42 +02:00
Jane Tournois 245250dfad do not test inside_protecting_balls for ODT and Lloyd because it slows down the algorithm and never happens for Lloyd and ODT (experimentally tested. Maybe it can happen some day...) 2013-10-02 12:59:03 +02:00
Jane Tournois e59c57f08e make sure that global optimizers (lloyd and odt) don't move vertices inside protecting balls 2013-09-23 16:53:44 +02:00
Clement Jamin 0270e3f03d Fixes for GCC 2013-09-19 19:48:51 +02:00
Clement Jamin bc360c8b13 Changes for GCC compilation + removed some trailing spaces 2013-06-07 17:40:53 +02:00
Clement Jamin 127926aa14 Proof-reading + minor changes 
Renamed unlock_all_tls_locked_locations => unlock_all_points_locked_by_this_thread
 2013-05-28 15:07:20 +02:00
Clement Jamin 8745b999ad Replaced is_base_of by is_convertible. 2013-05-22 15:15:05 +02:00
Clement Jamin 1f0e994a00 Renamed a few functions + tabs to spaces conversion + benchmark output + minor changes 2013-03-11 15:46:27 +01:00
Clement Jamin 3eae2927e7 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2013-03-04 15:50:57 +01:00
Clement Jamin a8d38a5fed Code clean-up 2013-02-28 19:46:06 +01:00
Clement Jamin b1ed89d8d0 The time limit is now taken into account in parallel optimizers 2013-02-22 17:55:49 +01:00
Clement Jamin 8d5352e15f Better grid lock data structure. 
There is just one grid lock data structure class now, with several specialization.
Moreover, now the type of the lock data structure is only defined in the triangulation.
 2013-02-18 12:58:57 +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
Jane Tournois b1ebef77d2 remove warning 2013-02-07 15:23:30 +01:00
Clement Jamin bea0fef878 Use of WallClockTimer to measure performance 2013-01-18 16:31:08 +01:00
Clement Jamin 7af597cb4f Parallel Mesh_3 can now be compiled with GCC 2013-01-17 14:49:04 +01:00
Clement Jamin 9c5cddbbc3 Global optimizers: better parallel performance 
- We used to have a thread-local variable for cell::TDS_data to make
  incident_cells concurrently callable but it was slow and memory-consuming
  => new incident_cells function which do not use cell::TDS_data
  => faster and lighter
- update_restricted_delaunay now uses parallel_for instead of parallel_do
  (it was quite slow with the implicit oracle)
  => faster (but requires to fill a temporary vector)
 2012-11-28 14:17:59 +01:00
Clement Jamin ab4d97c1e5 The global optimizers are now parallel (needs some intense testing now) 2012-11-21 16:16:47 +01:00
Jane Tournois b14d999868 remove macro CGAL_FREEZE_VERTICES. 
Now freezing is driven by the optimization parameter do_freeze (true by default)
 2012-09-03 15:18:50 +00:00
Jane Tournois 34c8ab7866 fix global optimizers when do_freeze is false and CGAL_FREEZE_VERTICES on 2012-09-03 14:28:25 +00:00
Jane Tournois 48a529b92c remove CGAL_IMPROVE_FREEZE macro. This feature has to be used since we don't have the frozen data member in vertex_bsae anymore 
(we remove frozen vertices from the std::set, or Intrusive_list, of moving vertices)
 2012-09-03 11:03:56 +00:00
Jane Tournois 67325c8f93 fix global optimizers when CGAL_INTRUSIVE_LIST is not defined, and CGAL_FREEZE_VERTICES is. 
We would like to remove frozen vertices from the std::set of moving vertices, and need to update their value (the Vertex_handle's)
 2012-08-31 14:34:35 +00:00
Jane Tournois d34dc048eb tiny cosmetic changes 2012-08-31 14:08:31 +00:00
Jane Tournois 84b6f6a0fe First solution to avoid infinite looping when freeze is on and a very vertices keep moving : 
once the number of moving vertices is smaller than 1% of the total number, and has not changed since last iteration, we stop. 

Optimization returns the code CANT_IMPROVE_ANYMORE (available in Mesh_optimization_return_code)
 2012-08-30 15:54:32 +00:00
Jane Tournois 37eb2ec790 improve std::cerr messages at the end of global optimization 2012-08-30 15:30:49 +00:00
Jane Tournois 7553fccd9f make verbose mode fit in one line width 2012-08-30 15:14:03 +00:00
Jane Tournois dce17a0021 remove CGAL_BIG_MOVES_SET macro 
this feature is now completely activated (one can't go back to the manually sorted list)
 2012-08-28 12:40:41 +00:00
Laurent Rineau 5fdae25b13 Cherry-pick from Mesh_3-experimental-GF 
| ------------------------------------------------------------------------
  | r71473 | lrineau | 2012-08-22 16:22:51 +0200 (Wed, 22 Aug 2012) | 2 lines
  | 
  | Fix warnings -Wreorder and and -Wunused-but-set-variable
  | 
  | ------------------------------------------------------------------------
  | r71472 | lrineau | 2012-08-22 16:18:57 +0200 (Wed, 22 Aug 2012) | 2 lines
  | 
  | Fix wrong C++ constructions that were accepted my MSVC
  | 
  | ------------------------------------------------------------------------
 2012-08-22 14:28:28 +00:00
Jane Tournois 619a69fd75 implement commit r71355 from experimental-GF and remove useless code 2012-08-20 15:43:51 +00:00