Commit Graph

408 Commits

Author SHA1 Message Date
Laurent Rineau fcbbe713d5 No longer deprecate Mesh_cell_base_3
Compact_mesh_cell_base_3 has a different API than Mesh_cell_base_3. Unless
one uses the default template parameters, the new API is less
convenient. We cannot deprecate Mesh_cell_base_3 so easily.
2013-10-16 16:34:41 +02:00
Laurent Rineau 3f88b4d746 Merge remote-tracking branch 'origin/Mesh_3-fix_perturber-GF'
- In Mesh_3, fix the sliver perturber
    - the invalidatation of caches,
    - the topological check (in check_surface_mesh) was not enough.

Tested in CGAL-4.3-Ic-194
2013-10-09 14:51:32 +02:00
Laurent Rineau 2c78278fdc Fix a compilation bug with older version of g++, and Boost Lambda
The error was triggered by the following code in CGAL/Mesh_3/C3T3_helpers.h:

  template <typename CellForwardIterator>
  void reset_circumcenter_cache(CellForwardIterator cells_begin,
                            CellForwardIterator cells_end) const
  {
    namespace bl = boost::lambda;
    std::for_each(cells_begin, cells_end,
                  bl::bind(&Cell::invalidate_circumcenter, *bl::_1) );
  }

See for example test results here:
CGAL-4.3-Ic-193/Polyhedron_Demo/TestReport_lrineau_i686_Linux-2.6_g++-4.1.2_CentOS-5.1.gz
2013-10-08 16:55:58 +02:00
Laurent Rineau 85d880efc1 Constify two methods that can be const 2013-10-08 16:54:34 +02:00
Jane Tournois 72deb04640 fix compilation on windows
(cherry picked from commit 8ec9e7e2cfd51edf026807059343b4220093611e)
2013-10-08 16:51:26 +02:00
Laurent Rineau 8edeb9095f Add more comment debug outputs (for future debugging) 2013-10-08 16:11:19 +02:00
Laurent Rineau 7248da1509 Fix the slivers perturber
The testsuite showed that our previous patch was not correct: the sliver
cache is modified by a call to C3T3_helper::min_sliver_in_c3t3_value() when
its parameter use_cache=false. For that reason, the resetting of sliver
caches was not done at the right place in update_mesh_no_topo_change().
2013-10-08 14:23:05 +02:00
Laurent Rineau 55153e58b1 Fix a warning about unused local typedef 2013-10-04 18:01:17 +02:00
Laurent Rineau f06d2057d6 Uniformize my uses of std::setprecision 2013-09-27 17:58:00 +02:00
Laurent Rineau 67b20e8a19 Fix the sliver perturber
- the invalidatation of caches,
- the topological check (in check_surface_mesh) was not enough.
2013-09-27 17:52:57 +02:00
Sébastien Loriot a05c50e83a fix backward compatibility of Mesh_3 with intersection API v1 2013-09-25 18:13:11 +02:00
Andreas Fabri 9ed4f837c3 Merge branch 'CGAL-compilable_headers-GF'
The conflict was about whitesapce
Approved by the release manager

Conflicts:
	Polyhedron/include/CGAL/Polyhedron_copy_3.h
2013-09-23 14:50:17 +02:00
Laurent Rineau 45f2b7634f Merge branch 'Mesh_3-fix_assertion_in_the_protection_code-lrineau'
Fix the test of an assertion in <CGAL/Mesh_3/Protect_edges_sizing_field.h>…

Tested in CGAL-4.3-Ic-174.

Approuved for CGAL-4.3 by the Release Manager.
2013-09-18 15:07:56 +02:00
Laurent Rineau 930a7862d4 Fix the patch when CGAL_NO_ASSERTIONS is defined. 2013-09-17 11:10:42 +02:00
Laurent Rineau 7b6fb384d3 Remove extra semi-colons 2013-09-17 11:03:17 +02:00
Laurent Rineau 34b13affef Try to "fix" an assertion that compares a computed value to another
On the paper, dleft_frac must be greater that 1.0. But with rounding
errors, it can be slightly lower. Let's try to compare it with
1.0-2*ulp(1.0).

I do not like that sort of hack but I do not know what to do best.
2013-09-17 10:58:38 +02:00
Andreas Fabri aa1d4e57f2 Remove unused variable name 2013-09-17 09:36:35 +02:00
Andreas Fabri 6c547e5663 Mainly added includes 2013-09-13 22:24:30 +02:00
Andreas Fabri 3f93665e03 Suppress a VC++ warning with a pragma 2013-09-12 12:49:11 +02:00
Laurent Rineau 7552d76c1b Revert the following commit for that file
| commit 01ee3e94b6
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Tue Jun 25 12:53:24 2013 +0200
  |
  |     Use 'std::istream::operator!()' twice to replace 'operator bool()' (C++11 only)
  |
  |     Fixes a compilation error from clang:
  |
  |     include/CGAL/IO/File_binary_mesh_3.h:39:10: error: no viable conversion from 'std::ostream' (aka 'basic_ostream<char>') to 'bool'
  |       return os << c3t3;
  |              ^~~~~~~~~~

The return type of operator<< os std::ostream&, and not bool!
2013-08-07 14:16:39 +02:00
Michael Hemmer 30e0b2d3f3 add missing include 2013-07-25 10:05:24 +02:00
Sébastien Loriot 2dbf0b4bf7 the grid to do inside-test is no longer needed, a better version is now used
the old code can still be accessed in the file:
Operations_on_polyhedra/include/CGAL/Point_inside_polyhedron_3_old.h
2013-07-10 10:42:07 +02:00
Sébastien Loriot 20446fa777 Merge branch 'Mesh_3-using_new_inside_polyhedron-local'
Successfully tested in CGAL-4.3-Ic-85
Approved by the release manager

Conflicts:
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
2013-07-09 17:34:15 +02:00
Clement Jamin 501484f509 Merge branch 'Mesh_3-fix_documentation-cjamin'
Small feature: https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Documentation_fix_in_Mesh_3
Approved by the release manager
2013-07-08 16:09:53 +02:00
Clement Jamin 98cfba361c Fix Rebind_TDS bug
Conflicts:

	Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h
2013-07-05 10:50:17 +02:00
Clement Jamin 97bef9652a Merge branch 'Mesh_3-fix_documentation-cjamin-old' into Mesh_3-fix_documentation-cjamin 2013-07-04 14:41:33 +02:00
Laurent Rineau e3aad4d079 Fix warnings 2013-06-26 14:49:03 +02:00
Laurent Rineau c6a57e79f1 Fix a warning about unused parameters 2013-06-25 17:43:17 +02:00
Laurent Rineau 01ee3e94b6 Use 'std::istream::operator!()' twice to replace 'operator bool()' (C++11 only)
Fixes a compilation error from clang:

include/CGAL/IO/File_binary_mesh_3.h:39:10: error: no viable conversion from 'std::ostream' (aka 'basic_ostream<char>') to 'bool'
  return os << c3t3;
         ^~~~~~~~~~
2013-06-25 12:53:24 +02:00
Sébastien Loriot 4620b38ffd update include path 2013-06-24 17:27:41 +02:00
Laurent Rineau 27f24bd350 Remove two useless functions 2013-06-24 17:00:04 +02:00
Laurent Rineau 9bee0e2f6a Fix a bug when a cycle is covered by only two balls
When the first point of the cycle is inserted, the radius of its ball is
limited by the third of the distance to a "midpoint" of the cycle.
2013-06-24 16:59:45 +02:00
Jane Tournois 1224038bb2 fix license issues 2013-06-24 14:13:08 +02:00
iyaz 5411669c88 Integrate point inside query to Polyhedral_mesh_domain_3 2013-06-24 13:38:44 +02:00
Sébastien Loriot 0f116f968a use the new return type of Intersect_3 2013-06-21 13:14:46 +02:00
Sébastien Loriot 1a8647a195 fix copy-paste error 2013-06-21 12:49:57 +02:00
Sébastien Loriot 5f43373646 use the new return type of intersection 2013-06-21 12:43:37 +02:00
Sébastien Loriot 02bdcc8603 Revert "remove Robust_intersection_traits_new"
This reverts commit 77b6b2e008.
2013-06-21 12:42:12 +02:00
Sébastien Loriot 77b6b2e008 remove Robust_intersection_traits_new 2013-06-21 12:39:52 +02:00
Sébastien Loriot 483440c8f2 use new return type of intersection 2013-06-21 12:39:20 +02:00
Sébastien Loriot d4d3c405fe Exact_type_selector has been renamed Exact_field_selector 2013-06-21 12:37:33 +02:00
Jane Tournois 404f2e0e3c merge 2013-06-21 10:01:19 +01:00
Jane Tournois 4a1f9cc831 deprecate Mesh_cell_base_3 and use Compact_mesh_cell_base_3 in Mesh_triangulation_3.h 2013-06-20 12:29:46 +02:00
Laurent Rineau 62f9bfc040 Fix warnings 2013-06-19 13:08:13 +02:00
Jane Tournois acc845ef65 promote Compact_mesh_vertex_base to Mesh_vertex_base 2013-06-18 17:49:28 +02:00
Sébastien Loriot c09ec2beaa Merge branch 'Kernel-replace_object-pmoeller'
Successfully tested in CGAL-4.3-Ic-59
Approved by the release manager

Conflicts:
	Kernel_23/doc/Kernel_23/CGAL/intersections.h
	Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
	Kernel_d/doc/Kernel_d/Kernel_d.txt
	STL_Extension/doc/STL_Extension/CGAL/iterator.h
2013-06-14 14:26:05 +02:00
Sébastien Loriot 0f8498f3b5 Revert "use relative path in tagfiles, otherwise documentation output cannot be moved"
This reverts commit ea256c954a.

Conflicts:
	Documentation/CMakeLists.txt
2013-06-13 15:21:07 +02:00
Sébastien Loriot ea256c954a use relative path in tagfiles, otherwise documentation output cannot be moved 2013-06-11 12:54:25 +02:00
Laurent Rineau 7b7029fdbc Fix a warning (unused parameter) in Mesh_3 2013-06-05 14:55:22 +02:00
Sébastien Loriot 75ebdeaeeb update the replacement of Object_and_primitive_id ...
... to be a pair< variant<XXX>, Primitive_id > rather than
pair<optional<variant<XXX> >, Primitive_id >

The rational is that the optional around the variant here is not needed
since there is one around the pair.
2013-05-21 18:39:23 +02:00