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

57882 Commits

Author SHA1 Message Date
Clement Jamin 614add44be Added a trace in verbose mode 2015-01-13 15:27:21 +01:00
Clement Jamin 3d32a77b97 Merge branch 'Tangential_complex-cjamin-old' into Tangential_complex-cjamin 2015-01-12 18:00:47 +01:00
Clement Jamin dfc8038579 Add code to load points from a file (commented) 2015-01-12 17:57:29 +01:00
Clement Jamin c32373e75b Rename variable to avoid confusion + remove useless initialization 2015-01-12 17:49:25 +01:00
Clement Jamin d775cde6e6 Better bug fix 
Handles the case where an existing point is at the same place as
the point we're trying to insert.
 2015-01-12 17:47:09 +01:00
Clement Jamin f320bdee43 Temporary bug fix 
Do not insert a point when an already existing point in at the same place.
TODO: something better when the weight is different.
 2015-01-12 14:56:03 +01:00
Clement Jamin af405ac7a6 Add output_full_cell 2015-01-12 14:51:21 +01:00
Clement Jamin 10f7b688eb Add output_weighted_point 2015-01-12 11:10:33 +01:00
Clement Jamin 0b33b86e99 Fix the FIXMEs: "infinite vertex is NOT at index 0 a priori" 
(cherry picked from commit bb654aec95)
 2015-01-12 08:51:11 +01:00
Clement Jamin bb654aec95 Fix the FIXMEs: "infinite vertex is NOT at index 0 a priori" 2015-01-12 08:49:47 +01:00
Clement Jamin fde42657b3 Merge branch 'Tangential_complex-cjamin-old' into Tangential_complex-cjamin 2015-01-09 15:06:07 +01:00
Clement Jamin 43d81bb12b Missing param 2015-01-09 15:02:46 +01:00
Mael Rouxel-Labbé 7a11937b97 Fixed TDS's incident_faces() using the wrong index for the first vertex 
(and added consts)

(cherry picked from commit e312d7ddae0188ed0d99b4247f73871a57124f41)
 2015-01-09 14:57:46 +01:00
Mael Rouxel-Labbé e301781a26 Fixed TDS's incident_faces() using the wrong index for the first vertex 
(and added consts)

(cherry picked from commit e312d7ddae0188ed0d99b4247f73871a57124f41)
 2015-01-06 16:56:13 +01:00
Clement Jamin 1885d666c7 Added new refresh strategy + better benchmark 2014-12-19 12:04:56 +01:00
Clement Jamin 786f40d376 "fix_inconsistencies" now returns the number of steps it took 2014-12-19 07:16:31 +01:00
Clement Jamin 7bcf0e6e3b Add sparsification to the benchmark 2014-12-18 22:00:26 +01:00
Clement Jamin 035f87a65f Minor optimizations + comments 2014-12-18 21:58:34 +01:00
Clement Jamin 785ac9690c Update PCH 2014-12-18 21:58:06 +01:00
Clement Jamin 248c4b915d Comment mutexes out since we don't use them for now 2014-12-18 20:46:30 +01:00
Clement Jamin dfbf887751 Add TBB_USE_THREADING_TOOL in debug mode 2014-12-18 20:29:19 +01:00
Clement Jamin b11c4cc8ff Add a benchmark 2014-12-18 20:26:02 +01:00
Clement Jamin 26b312938e Merge branch 'Tangential_complex-cjamin-old' into Tangential_complex-cjamin 2014-12-18 11:08:10 +01:00
Clement Jamin 2f4bb69e0a Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2014-12-18 10:59:01 +01:00
Clement Jamin d605eff325 Restore 4-space identations 2014-12-18 10:24:44 +01:00
Clement Jamin 315ffdcbc8 Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus 2014-12-18 09:32:23 +01:00
Clement Jamin 68a4eb92af Added the ability to limit the number of points loaded from a file 2014-12-18 09:21:28 +01:00
Sébastien Loriot ce6342d629 Merge remote-tracking branch 'origin/Stream_support-fix_reading_double-GF' 
improve reading double from streams on windows

Tested in CGAL-4.6-Ic-79
Approved by the release manager
 2014-12-17 22:36:46 +01:00
Laurent Rineau 515ff77960 Merge branch 'Surface_mesher-fix_a_warning-lrineau' 
Fix a warning.

Tested in CGAL-4.6-Ic-79. Approved by the Release Manager.
 2014-12-17 17:10:37 +01:00
Laurent Rineau 602383e15b Merge branch 'Mesh_3-fix_Implicit_mesh_domain_3_default_bound-lrineau' 
Bug fix in Mesh_3

Approved by the Release Manager. Tested in CGAL-4.6-Ic-79.
 2014-12-17 17:09:20 +01:00
Laurent Rineau c043a0dca9 Merge branch 'Installation-Boost_DEBUG-lrineau' 
Add Boost_DEBUG as a CMake advanced option.
 2014-12-17 17:08:43 +01:00
Laurent Rineau 9debd6a471 Merge branch 'CGAL-various_fixes-lrineau' 
s/const static/static const/

Tested in CGAL-4.6-Ic-79. Approved by the Release Manager.
 2014-12-17 17:07:57 +01:00
Laurent Rineau 057924e1d4 Merge remote-tracking branch 'origin/releases/CGAL-4.5-branch' 
That merges the following:
  | commit 5dbfeec3ae
  | Merge: fc407cf 5b9be0f
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Fri Dec 12 15:29:51 2014 +0100
  |
  |     Merge branch 'BSO_2-fix_kernel_conflict-local' into releases/CGAL-4.5-branch
  |
  |     Tested in CGAL-4.5.1-Ic-171
  |
  | commit fc407cfebf
  | Merge: bd2c6f8 0c6153c
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Mon Dec 1 17:38:48 2014 +0100
  |
  |     Merge branch 'Mesh_3-fix_with_time_stamps-GF' into releases/CGAL-4.5-branch
  |
  |     Bug-fix in Mesh_3 with time stamps.
  |
  |     Tested in CGAL-4.5.1-Ic-168.
  |     Approved by the Release Manager.
  |
  | commit bd2c6f890f
  | Merge: ad53e42 c904f77
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:04:55 2014 +0100
  |
  |     Merge branch BGL-make_property_map_lightweight-For_4.5_bugfix-GF' into releases/CGAL-4.5-branch
  |
  |     Bug fix: a property map was not lightweight.
  |
  |     Tested in CGAL-4.5.1-Ic-167.
  |     Approved by the Release Manager.
  |
  | commit ad53e42fb3
  | Merge: 044660e b281d86
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:03:30 2014 +0100
  |
  |     Merge remote-tracking branch 'remotes/origin/BGL-fix_example-GF' into releases/CGAL-4.5-branch
  |
  |     Fix the example examples/BGL_triangulation_2/emst.cpp:
  |     the filtered (finite) triangulation was not used.
  |
  |     Tested in CGAL-4.5.1-Ic-167.
  |     Approved by the Release Manager.
  |
  | commit 044660eb48
  | Merge: a096cdf 4464116
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:01:50 2014 +0100
  |
  |     Merge branch 'CGAL-fix_sse2_mingw-lrineau' into releases/CGAL-4.5-branch
  |
  |     Fix the SSE macros when MinGW is used.
  |
  |     Tested in CGAL-4.5.1-Ic-167.
  |     Approved by the Release Manager.

Tested in CGAL-4.6-Ic-79.
 2014-12-17 17:05:01 +01:00
Laurent Rineau 2a69e0f0c2 Merge branch 'GraphicsView-try_export_to_SVG-lrineau' 
New function DemosMainWindow::exportSVG

Tested in CGAL-4.6-Ic-79. Approved by the Release Manager.
 2014-12-17 16:59:55 +01:00
Clement Jamin 2cb94870d3 Forgot to remove this sentence 2014-12-17 16:15:06 +01:00
Guillaume Damiand 936338896f Merge branch 'Kernel_23-const-bugfix-gdamiand' 
Add const for TRANSLATION, ROTATION, SCALING, REFLECTION, IDENTITY variables.

Tested in CGAL-4.6-Ic-79.
Approved by the release manager.
 2014-12-17 14:53:42 +01:00
Clement Jamin f6971fbed3 Doc clean-up: remove \cgalModifXXX 2014-12-16 17:05:24 +01:00
Laurent Rineau 58d504f744 The demo are collected on MSVC2012-Release-32bits 2014-12-16 16:31:10 +01:00
Sébastien Loriot 79d2f2383c update changes 2014-12-16 11:52:59 +01:00
Sébastien Loriot cecd1464d9 Merge remote-tracking branch 'gsoc/gsoc2014-Convex_hull_3_dual-jmeyron' 
Add functions to compute the finite intersection of halfspaces
  See Features/Small_Features/Halfspace_intersection

Tested in 4.6-Ic-76
Approved by the release manager
 2014-12-16 11:44:55 +01:00
Sébastien Loriot 12a9027ed9 Merge remote-tracking branch 'origin/BG-split_graph_into_polylines-GF' 
The extract polyhedron boundary now extract maximal polylines from
  the set of boundary edges. End point are vertices of degree != 2
  For convenience the function used to build these maximal polylines
  is put into include/CGAL/boost/graph/split_graph_into_polylines.h

Tested in 4.6-Ic-76
Approved by the release manager
 2014-12-16 11:40:11 +01:00
Guillaume Damiand bff2e043dc Initialize consts. 2014-12-16 10:30:14 +01:00
Guillaume Damiand 540bd54356 Merge branch 'Kernel_23-add_const-gdamiand' 
Add const for variables TRANSLATION, ROTATION, SCALING, REFLECTION, IDENTITY.
Approved by the release manager.
 2014-12-15 18:02:50 +01:00
Jane Tournois 18941ef053 fix documentation about how to install TBB on Windows 2014-12-15 16:09:14 +01:00
Jane Tournois f3ab2cf92d Merge branch 'to-be-tested/Triangulation_3-determinism-gf' 
make Triangulation_3 deterministic from platform to platform
on degenerate cases

Approved by the release manager
 2014-12-15 14:01:45 +01:00
Clement Jamin 61c208a0d2 Merge branch 'Tangential_complex-cjamin-old' into Tangential_complex-cjamin 2014-12-15 13:33:43 +01:00
Jane Tournois 02f8805e98 Merge branch 'master' of ssh://scm.cgal.org/var/git/cgal 2014-12-15 13:03:47 +01:00
Clement Jamin 3557c38245 Remove unused variables 2014-12-12 16:41:00 +01:00
Clement Jamin 8b09933752 Forgot to add the StdAfx files 2014-12-12 16:39:15 +01:00
Clement Jamin f9bef00845 Added load_points_from_file 2014-12-12 16:37:09 +01:00