Commit Graph

242 Commits

Author SHA1 Message Date
Pierre Alliez 56029678b1 reduce img sizes. 2010-04-01 18:57:21 +00:00
Andreas Fabri a732f53af6 Comment usage of MKL as it uses a wrapper from an experimental package 2010-03-26 08:32:15 +00:00
Nader Salman 59322188ac Added a missing #include <CGAL/Surface_mesh_traits_generator_3.h> 2010-03-18 09:12:11 +00:00
Sébastien Loriot 1382b9552d Add non-documented interface for APSS reconstruction.
Remove no longer needed Fast_orthogonal_k_neighbor_search (changes integrated in Orthogonal_k_neighbor_search)
2010-02-23 16:01:49 +00:00
Sylvain Pion 85dc12f2a7 Remove empty lines at beginning and end of files
(apply Scripts/developer_scripts/remove_empty_lines.pl).
2010-02-01 12:55:28 +00:00
Pierre Alliez f6cad1bfe3 simplify tests by removing AABB tree business.
remove word "error" in console output.
2010-01-29 15:02:17 +00:00
Laurent Rineau df4f43b09c Merged revisions 53827-53828,53838,53840-53841 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53827 | lrineau | 2010-01-27 15:35:38 +0100 (Wed, 27 Jan 2010) | 15 lines
  
  Merge from trunk: 
    | ------------------------------------------------------------------------
    | r53821 | afabri | 2010-01-27 14:48:02 +0100 (Wed, 27 Jan 2010) | 1 line
    | 
    | Add random_shuffle to the high level functions
    | ------------------------------------------------------------------------
    | r53823 | afabri | 2010-01-27 14:50:23 +0100 (Wed, 27 Jan 2010) | 1 line
    | 
    | Remove random_shuffle from insert(b,e) functions as spatial_sort does it now
    | ------------------------------------------------------------------------
    | r53826 | afabri | 2010-01-27 15:24:29 +0100 (Wed, 27 Jan 2010) | 1 line
    | 
    | Remove random_shuffle from insert(b,e) functions as spatial_sort does it now
    | ------------------------------------------------------------------------
........
  r53828 | lrineau | 2010-01-27 15:37:25 +0100 (Wed, 27 Jan 2010) | 8 lines
  
  Merge from trunk:
    | ------------------------------------------------------------------------
    | r53822 | hemmer | 2010-01-27 14:50:01 +0100 (Wed, 27 Jan 2010) | 2 lines
    | 
    | use CGAL::cpp0x for tuple
    | 
    | ------------------------------------------------------------------------
........
  r53838 | lrineau | 2010-01-27 17:15:22 +0100 (Wed, 27 Jan 2010) | 2 lines
  
  Fix FindMKL: mkl_intel_thread does not have the suffix lp64 on Intel 64.
........
  r53840 | lrineau | 2010-01-27 17:16:34 +0100 (Wed, 27 Jan 2010) | 3 lines
  
  Fix FindTAUCS: if TAUCS_INCLUDE_DIR is set to "", then the following
  find_path(TAUCS_INCLUDE_DIR ...) does nothing.
........
  r53841 | lrineau | 2010-01-27 17:17:38 +0100 (Wed, 27 Jan 2010) | 2 lines
  
  Fix the detection of configured programs.
........
2010-01-27 16:43:07 +00:00
Laurent Rineau b4ab5b9a23 Merged revisions 53726-53727,53786 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53726 | lrineau | 2010-01-22 14:11:32 +0100 (Fri, 22 Jan 2010) | 7 lines
  
  Merge from CGAL-3.5-branch:
    | ------------------------------------------------------------------------
    | r50580 | lsaboret | 2009-07-13 11:50:06 +0200 (Mon, 13 Jul 2009) | 1 line
    | 
    | Removed APSS from CGAL 3.5
    | ------------------------------------------------------------------------
........
  r53727 | lrineau | 2010-01-22 14:18:09 +0100 (Fri, 22 Jan 2010) | 1 line
  
  I forgot those files (remove APSS).
........
  r53786 | lrineau | 2010-01-25 23:36:18 +0100 (Mon, 25 Jan 2010) | 1 line
  
  Remove APSS from CGAL-3.6.
  The old code is now in
  /branches/unsorted-branches/Surface_reconstruction_points_3-with-APSS/
........
2010-01-26 09:30:46 +00:00
Laurent Rineau 6e731a1656 Merged revisions 53711,53718,53720,53724-53725,53728-53729,53731 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53711 | lrineau | 2010-01-20 21:36:47 +0100 (Wed, 20 Jan 2010) | 2 lines
  
  Fix for Debian: Qt4 QGLViewer library is /usr/lib*/libqglviewer-qt4.so
........
  r53718 | lrineau | 2010-01-21 17:57:41 +0100 (Thu, 21 Jan 2010) | 10 lines
  
  Merge from trunk:
    |  New Revision: 53717
    |  Author: afabri
    |  Date: 2010-01-21 17:51:49 +0100 (Thu, 21 Jan 2010)
    |  
    |  Log message:
    |  
    |  Add operator for MSVC 2005/2008 to avoid a matching ambiguity
........
  r53720 | lrineau | 2010-01-21 18:06:33 +0100 (Thu, 21 Jan 2010) | 2 lines
  
  Merge r53719 from trunk (VC workaround)
........
  r53724 | lrineau | 2010-01-22 13:34:50 +0100 (Fri, 22 Jan 2010) | 10 lines
  
  Merge from trunk:
    |  New Revision: 53723
    |  Author: afabri
    |  Date: 2010-01-22 13:28:06 +0100 (Fri, 22 Jan 2010)
    |  
    |  Log message:
    |  
    |  Just FK would be nicer, but VC 2005 messes it up with an FK in a base class when compiling degenerate_test.cpp
    | 
........
  r53725 | lrineau | 2010-01-22 13:44:11 +0100 (Fri, 22 Jan 2010) | 2 lines
  
  Cartesian<float> gives warnings (about truncation from double to float).
........
  r53728 | lrineau | 2010-01-22 14:26:40 +0100 (Fri, 22 Jan 2010) | 2 lines
  
  Fix bashism ==
........
  r53729 | lrineau | 2010-01-22 15:10:25 +0100 (Fri, 22 Jan 2010) | 3 lines
  
  Re-add g++-3.4 in the list of supported compilers (to be synced with the
  testsuite and the CGAL web site).
........
  r53731 | lrineau | 2010-01-22 16:09:52 +0100 (Fri, 22 Jan 2010) | 11 lines
  
  Merge fmo trunk:
    | ------------------------------------------------------------------------
    | r53730 | afabri | 2010-01-22 16:07:59 +0100 (Fri, 22 Jan 2010) | 1 line
    | Changed paths:
    |    M /trunk/Spatial_searching/doc_tex/Spatial_searching/intro.tex
    |    M /trunk/Spatial_searching/doc_tex/Spatial_searching/main.tex
    | 
    | Moved ccAuthor right after the title
    | ------------------------------------------------------------------------
    | 
........
2010-01-22 15:16:54 +00:00
Laurent Rineau 5e4c755bdb Merged revisions 53668-53669,53678-53679,53682-53686 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53668 | yvinec | 2010-01-19 11:00:41 +0100 (Tue, 19 Jan 2010) | 3 lines
  
  added changes for Mesh_3
........
  r53669 | yvinec | 2010-01-19 11:04:38 +0100 (Tue, 19 Jan 2010) | 3 lines
  
  fixed page layout in Changes for Mesh_3
........
  r53678 | spion | 2010-01-20 13:32:36 +0100 (Wed, 20 Jan 2010) | 2 lines
  
  Link AK_d and reorder to have Modular close to NT.
........
  r53679 | lrineau | 2010-01-20 13:37:23 +0100 (Wed, 20 Jan 2010) | 9 lines
  
  Merge from trunk:
    | New Revision: 53666
    |  Author: sloriot
    |  Date: 2010-01-19 08:41:16 +0100 (Tue, 19 Jan 2010)
    |  
    |  Log message:
    |  
    | remove warnings
........
  r53682 | lrineau | 2010-01-20 14:31:41 +0100 (Wed, 20 Jan 2010) | 2 lines
  
  Simplify the URL to CORE, so that "_" is not in the URL (Pb with manual tools)
........
  r53683 | lrineau | 2010-01-20 14:42:23 +0100 (Wed, 20 Jan 2010) | 3 lines
  
  Fix the package description of AK (fix the bib label and the version of
  CGAL)
........
  r53684 | lrineau | 2010-01-20 14:45:53 +0100 (Wed, 20 Jan 2010) | 1 line
  
  clean PkgDescription.tex
........
  r53685 | lrineau | 2010-01-20 15:01:09 +0100 (Wed, 20 Jan 2010) | 3 lines
  
  - Update PkgDexcription.tex to year 2010.
  - Add manual-3.6.bib
........
  r53686 | lrineau | 2010-01-20 15:03:10 +0100 (Wed, 20 Jan 2010) | 1 line
  
  Update the biblio shipped in manual tools, using manual-3.6.bib
........
2010-01-20 14:07:18 +00:00
Laurent Rineau 0bb0211b72 Merged revisions 53436,53440-53441,53444,53446,53448-53449,53463,53466-53468,53470,53472,53474-53476,53478,53481-53482,53484,53491-53492 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.5-branch

........
  r53436 | lrineau | 2009-12-16 00:14:31 +0100 (Wed, 16 Dec 2009) | 6 lines
  
  Merge from trunk:
     r52128 | efif | 2009-10-05 10:42:51 +0200 (Mon, 05 Oct 2009) | 1 line
  
     fixed inclusion of boost propert_map.hpp
........
  r53440 | teillaud | 2009-12-16 10:19:53 +0100 (Wed, 16 Dec 2009) | 7 lines
  
  fixed label for bibtex entry
  (same as commit 53439 in trunk)
  
  -This line, and those below, will be ignored--
  
  M    Circular_kernel_3/PkgDescription.tex
........
  r53441 | teillaud | 2009-12-16 10:26:05 +0100 (Wed, 16 Dec 2009) | 2 lines
  
  fixed bibtex label
........
  r53444 | teillaud | 2009-12-16 10:36:51 +0100 (Wed, 16 Dec 2009) | 2 lines
  
  fixed bibtex label
........
  r53446 | teillaud | 2009-12-16 10:43:05 +0100 (Wed, 16 Dec 2009) | 4 lines
  
  (same as commit 53445 in trunk)
  changed a few labels, to comply with labelling bugs of some packages in their PkgDescription.tex
........
  r53448 | teillaud | 2009-12-16 10:58:31 +0100 (Wed, 16 Dec 2009) | 4 lines
  
  (same as commit 53447 in trunk)
  new version after changes in bib source file
........
  r53449 | lrineau | 2009-12-16 15:05:59 +0100 (Wed, 16 Dec 2009) | 2 lines
  
  Changes for 3.5.1
........
  r53463 | lrineau | 2009-12-17 09:55:34 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  Fix a typo (thanks to AF).
........
  r53466 | teillaud | 2009-12-17 14:00:12 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  fixed bibtex entry
........
  r53467 | lrineau | 2009-12-17 14:08:42 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  Updates after Monique's suggestions.
........
  r53468 | lrineau | 2009-12-17 14:13:00 +0100 (Thu, 17 Dec 2009) | 7 lines
  
  Backport from trunk:
     | ------------------------------------------------------------------------
     | r52189 | fcacciola | 2009-10-07 17:44:30 +0200 (Wed, 07 Oct 2009) | 1 line
     | 
     | TAUCS downloading fixes
     | ------------------------------------------------------------------------
........
  r53470 | teillaud | 2009-12-17 14:17:35 +0100 (Thu, 17 Dec 2009) | 3 lines
  
  last fixes
  (same as commit 53469 in trunk)
........
  r53472 | teillaud | 2009-12-17 14:22:03 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  bug fix
........
  r53474 | teillaud | 2009-12-17 14:25:28 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  last version for 3.5.1 (I hope!)
........
  r53475 | lrineau | 2009-12-17 14:49:28 +0100 (Thu, 17 Dec 2009) | 9 lines
  
  Backport from trunk:
    | ------------------------------------------------------------------------
    | r52190 | fcacciola | 2009-10-07 17:47:28 +0200 (Wed, 07 Oct 2009) | 1 line
    | Changed paths:
    |    M /trunk/wininst/developer_scripts/script_cgal_3_5.nsi
    | 
    | TAUCS downloading fixes
    | ------------------------------------------------------------------------
........
  r53476 | lrineau | 2009-12-17 15:35:29 +0100 (Thu, 17 Dec 2009) | 1 line
  
  Fix the anchor name s/Pkg::/Pkg:/
........
  r53478 | lrineau | 2009-12-17 16:36:11 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  Change the URL field to NOTE in how_to_cite_cgal.bib.
........
  r53481 | lrineau | 2009-12-17 17:14:24 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  Update to 3.5.1
........
  r53482 | lrineau | 2009-12-17 17:15:24 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  If one uses the NOTE field, one needs to quote it with \url! (Thanks to Sylvain Pion)
........
  r53484 | lrineau | 2009-12-17 18:27:09 +0100 (Thu, 17 Dec 2009) | 1 line
  
  Revert last commits, which required the use of the url or hyperred packages.
........
  r53491 | lrineau | 2009-12-18 15:40:11 +0100 (Fri, 18 Dec 2009) | 4 lines
  
  Fix the bug where plugins are put in CGAL_ROOT/lib/ instead of
  the current working directory, when CGAL is build with WITH_DEMOS and
  WITH_EXAMPLES.
........
  r53492 | lrineau | 2009-12-18 15:41:21 +0100 (Fri, 18 Dec 2009) | 4 lines
  
  Fix the bug where plugins are put in CGAL_ROOT/lib/ instead of
  the current working directory, when CGAL is build with WITH_DEMOS and
  WITH_EXAMPLES.
........
2009-12-18 14:52:14 +00:00
Nader Salman ee14f8aaa3 Updated the PkgDescription.tex 2009-12-04 12:57:17 +00:00
Laurent Rineau ed3ba834fe Use the fwd declaration header for Filtered_kernel. 2009-11-25 14:45:46 +00:00
Nader Salman b0f068fca3 Added #include <CGAL/trace.h> where needed. 2009-11-05 15:16:51 +00:00
Sylvain Pion 89ddee6c69 Remove Laurent Saboret from the maintainer files. 2009-10-21 07:56:06 +00:00
Stéphane Tayeb a7c00d7595 Add #include<trace.h> where needed (i think i broke that when i worked on *_assertions.h files) 2009-10-16 08:50:48 +00:00
Gaël Guennebaud cc2181e205 #include <CGAL/trace.h> where needed 2009-10-15 12:08:25 +00:00
Stéphane Tayeb 8dceee4164 Add include<CGAL/assertions.h> in *_assertion files. 2009-10-07 13:16:13 +00:00
Stéphane Tayeb 770492c1c7 Use new version of script create_assertions.sh to generate *_assertions.h files.
Diffs are:
 * #undef added
 * in old files, (void)0 is replaced by static_cast<void>(0)
 * in old files, lines as "#  define CGAL_xxx_assertion 1" are added
 * in point_set_processing_assertions.h, surface_mesh_parameterization_assertions.h, surface_reconstruction_points_assertions.h, "|| defined(CGAL_NDEBUG)" is replaced by "|| defined (NDEBUG)"
 * protective macros (if any) are removed
 * included files if any (<CGAL/assertions.h>, <CGAL/trace.h>) are removed
2009-10-07 07:49:44 +00:00
Laurent Rineau d98e9e7e1b Merged revisions 52137 via svnmerge from
svn+ssh://scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.5-branch

........
  r52137 | lrineau | 2009-10-05 12:58:35 +0200 (Mon, 05 Oct 2009) | 2 lines
  
  Resize pictures that have width>1200
........
2009-10-05 11:06:47 +00:00
Laurent Saboret 5dfcebf277 Optimization:
Use PARDISO *symmetric* solver. It is faster and uses less memory than symmetric one.
2009-10-02 14:04:18 +00:00
Laurent Saboret 1603d0c38f Removed assertions for accurate executions times 2009-10-02 12:59:34 +00:00
Laurent Saboret 744704e814 Port to Linux/g++ 4.3.1 2009-10-02 08:22:04 +00:00
Laurent Saboret 05b7683855 Added support of Intel MKL/Pardiso sparse linear solver:
* Poisson_reconstruction_function::compute_implicit_function() gets a new parameter = the solver to use (TAUCS by default).
* It uses SparseLinearAlgebraTraits_d traits classes and not Taucs_solver anymore.
* poisson_reconstruction example accepts a new parameter -solver = taucs or mkl.
2009-10-01 10:46:44 +00:00
Laurent Saboret e3ad01d00f Fixed compilation warning 2009-09-29 09:49:23 +00:00
Andreas Fabri d0273656ee Add link to demo 2009-09-28 11:59:50 +00:00
Sylvain Pion 5626725230 Remove a bunch of EPS files. 2009-09-18 12:27:38 +00:00
Laurent Saboret 1e9a39e594 Added traces 2009-09-10 16:24:42 +00:00
Laurent Saboret d588cf76ce * Fixed bug introduced in r51683:
(Windows) developers compiling Surface_reconstruction_points_3 with CGAL 3.5 beta 1 need to compile with Surface_mesher package from svn in order to get r51028 bug fix (orientation of reconstructed meshes).
2009-09-10 15:58:55 +00:00
Laurent Saboret 43d43e281f Fixed bug in test suite:
* The bug occured (sometimes) in test suite when calling
> APSS_reconstruction_test data/robocat_deci.off
=> assertion failure "CGAL::Polyhedron_incremental_builder_3<HDS>::
lookup_halfedge(): input error: facet 1462 shares a halfedge from vertex 95 to vertex 808 with facet 1312."
in output_surface_facets_to_polyhedron().
This means that the reconstructed surface is not manifold.

* The reason seems that (on this example) APSS implicit function is not smooth enough for make_surface_mesh().

* The fix was to set APSS smoothness factor to 6 (default is 2).
2009-09-10 10:05:26 +00:00
Laurent Saboret a39138a7a2 Partial fix of assertion failure "(x,y,z) is already inserted on surface" in make_surface_mesh():
* The bug could be reproduce by:
> poisson_reconstruction Compressor_top_clean_65kpoints.pwn out.off -sm_distance 0.75
or
> APSS_reconstruction robocat_deci.off out.off -smooth 6
(try several times)

* The fix is to set Implicit_surface_3's dichotomy error to make_surface_mesh's approximation distance/1000 (instead of /10). This makes make_surface_mesh() behavior more reproductible.

* My guess is that in both implicit functions are not smooth, and that make_surface_mesh's parameters must be tuned to make them appear smooth to the algorithm.
2009-09-10 09:34:16 +00:00
Laurent Saboret 875d360a13 * Bug fix in find_inner_point(): find point (close to) minimum of implicit function instead of random point inside surface 2009-09-10 09:21:10 +00:00
Laurent Saboret 9c10d6e647 Temporary traces: turn on CGAL assertions 2009-09-10 09:19:00 +00:00
Laurent Saboret 4d92a1293a Temporary traces: turn on CGAL assertions 2009-09-10 09:16:24 +00:00
Laurent Saboret 4f375320a0 Fixed bug in make_surface_mesh(implicit surface, sphere, Manifold_tag) when the implicit surface crosses the sphere:
* The bug could be reproduced on Linux/g++ 4.3.1 by:
> poisson_reconstruction Compressor_top_clean_30kpoints.pwn Compressor-poisson.off
or
> APSS_reconstruction robocat_deci.off robocat_deci-apss.off
=> infinite loop that crashes when the process max memory is reached, or
   assertion failure "(x,y,z) is already inserted on surface", or
   assertion failure "A facet is not in conflict with its refinement point"

* The fix was to use Manifold_with_boundary_tag.
2009-09-08 14:08:23 +00:00
Pierre Alliez 937d57808f update barycentric coordinates - thanks Andreas. 2009-09-08 07:03:30 +00:00
Laurent Saboret f26a4c18f0 Fixed assertion failure "tester(d)" in Triangulation_3::find_conflicts() when running the Delaunay refinement:
* To reproduce the bug:
> poisson_reconstruction data/sphere926.pwn sphere926-poisson.off
(try several times)

* The fix is:
- implement Robust_circumcenter_filtered_traits_3::compute_squared_radius_3_object()
- compare denominator with 1E-13 (instead of 1E-14) to switch to exact arithmetic
2009-09-07 17:10:06 +00:00
Laurent Saboret 0a9f6181d5 Fixed infinite loop in Min_sphere_d:
* On Linux/g++, the bug could be reproduced by:
> poisson_reconstruction data/sphere926.pwn sphere926-poisson.off

* The fix was do use Min_sphere_of_spheres_d instead of Min_sphere_d
2009-09-07 14:06:13 +00:00
Laurent Saboret f7e2037760 * Fixed images width (as requested by LR):
set max-width instead of width in HTML.
* Also set width=1.0 for most images in PDF (prettier).
2009-09-03 15:22:38 +00:00
Laurent Saboret 10854a4ba1 Fixed compilation error due to the global change "CGALi" -> "internal". 2009-09-02 13:16:45 +00:00
Laurent Saboret fe8353441a Port to Windows 64 2009-09-02 12:10:05 +00:00
Laurent Saboret be09d80d95 * Bug fix: fixed compatibility of TAUCS/BLAS/LAPACK precompiled libraries with Visual C++ 9.0 2008:
CGAL 3.5 will include TAUCS/BLAS/LAPACK precompiled libraries for Visual C++ 8.0 and 9.0. 
Auto-link is modified accordingly.

* Also fixed compatibility of cgal_test_with_cmake.bat scripts with VC++ 9.0.
2009-08-26 16:23:28 +00:00
Andreas Fabri 5d0c59cbd9 VC++ doesn't know whether Tds is the template parameter or the inherited typedef ... Tds; which is defined in the scope of the base class Triangulation_3 2009-08-25 21:06:46 +00:00
Sylvain Pion 8573fe26ce Rename CGALi to internal. 2009-08-24 17:10:04 +00:00
Laurent Saboret fa8674926a Improved traces 2009-08-24 16:05:20 +00:00
Laurent Saboret ad52daf904 * Finished to implement the changes requested by PA on 08/24.
* Committed Surface_reconstruction_statistics.xls with PA changes committed on 08/24.
* Fixed figures numbering.
2009-08-24 16:00:06 +00:00
Laurent Saboret b81dc194e6 Update images wrt Surface_reconstruction_images.ppt r51238 (as requested by PA) 2009-08-24 12:10:30 +00:00
Laurent Saboret 70ba3ec8c1 Compressed images 2009-08-24 12:08:42 +00:00
Laurent Saboret 5e741020a7 Convert PNG images to JPG to save space in CGAL tarball (requested by SP) 2009-08-24 10:11:30 +00:00
Pierre Alliez f61de989cb minor fixes on performances.tex
(needs more fixes)
2009-08-14 12:07:48 +00:00