center tables in doc and fix typos

This commit is contained in:
Sébastien Loriot 2013-05-14 09:05:42 +02:00
parent c2dbdcec8f
commit 41e1b9c120
1 changed files with 74 additions and 70 deletions

View File

@ -170,7 +170,6 @@ The function `CGAL::segment_from_sdf_values` computes a segmentation of the mesh
Note that these SDF values can be any set of scalar value associated with each facet as long as they have been normalized between 0 and 1. Note that these SDF values can be any set of scalar value associated with each facet as long as they have been normalized between 0 and 1.
This function allows to use the same SDF values several times but with different parameters for segmentation stage. This function allows to use the same SDF values several times but with different parameters for segmentation stage.
The output is the number of segments and a property map which associates to each facet its segment-id (an integer between 0 and number-of-segments - 1). The output is the number of segments and a property map which associates to each facet its segment-id (an integer between 0 and number-of-segments - 1).
\note A segment is a set of connected facets which are placed under same the cluster after the graph-cut step. Note that the number of clusters given as input of the function and the number of partitions in the final segmentation (computed by the function) are not equal in general. \note A segment is a set of connected facets which are placed under same the cluster after the graph-cut step. Note that the number of clusters given as input of the function and the number of partitions in the final segmentation (computed by the function) are not equal in general.
\subsubsection Example_2 Example: Segmentation from SDF Values \subsubsection Example_2 Example: Segmentation from SDF Values
@ -195,11 +194,12 @@ We provide performance results of `CGAL::compute_sdf_values` and `CGAL::segment_
These results are taken on Intel i7 3.2 Ghz laptop with 8 GB RAM, compiled by Visual C++ 2010 with /O2 option. These results are taken on Intel i7 3.2 Ghz laptop with 8 GB RAM, compiled by Visual C++ 2010 with /O2 option.
Performance of `CGAL::compute_sdf_values` with 25 rays (in ms): Performance of `CGAL::compute_sdf_values` with 25 rays (in ms):
<center>
<table border="1"> <table border="1">
<tr> <tr>
<td> Number of triangles </td> <td> Number of triangles </td>
<td> `Simple_cartesian<double>` </td> <td> `Simple_cartesian<double>` </td>
<td> `Exact_predicates_inexact_construction` (`EPICK`) </td> <td> `Exact_predicates_inexact_constructions_kernel` (`EPICK`) </td>
<td> `EPICK` with `Fast_sdf_calculation_mode = false` </td> <td> `EPICK` with `Fast_sdf_calculation_mode = false` </td>
</tr> </tr>
<tr> <tr>
@ -221,16 +221,17 @@ Performance of `CGAL::compute_sdf_values` with 25 rays (in ms):
<td> 169,279 </td> <td> 169,279 </td>
</tr> </tr>
</table> </table>
</center>
Performance of `CGAL::segment_from_sdf_values` (in ms): Performance of `CGAL::segment_from_sdf_values` (in ms):
<center>
<table border="1"> <table border="1">
<tr> <tr>
<td> Number of triangles </td> <td> Number of triangles </td>
<td> Number of levels (2) </td> <td> Number of levels = 2 </td>
<td> Number of levels (5) </td> <td> Number of levels = 5 </td>
<td> Number of levels (10) </td> <td> Number of levels = 10 </td>
<td> Number of levels (15) </td> <td> Number of levels = 15 </td>
</tr> </tr>
<tr> <tr>
<td> 5,558 </td> <td> 5,558 </td>
@ -254,18 +255,20 @@ Performance of `CGAL::segment_from_sdf_values` (in ms):
<td> 23,408 </td> <td> 23,408 </td>
</tr> </tr>
</table> </table>
</center>
We also provide an implementation that uses <a href="http://pub.ist.ac.at/~vnk/software.html">MaxFlow software</a> instead of `boost::boykov_kolmogorov_max_flow`. We also provide an implementation that uses <a href="http://pub.ist.ac.at/~vnk/software.html">MaxFlow software</a> instead of `boost::boykov_kolmogorov_max_flow`.
It can be activated by defining `CGAL_USE_BOYKOV_KOLMOGOROV_MAXFLOW_SOFTWARE`. It can be activated by defining `CGAL_USE_BOYKOV_KOLMOGOROV_MAXFLOW_SOFTWARE`.
Performance of `CGAL::segment_from_sdf_values` with this implementation (in ms): Performance of `CGAL::segment_from_sdf_values` with this implementation (in ms):
<center>
<table border="1"> <table border="1">
<tr> <tr>
<td> Number of triangles </td> <td> Number of triangles </td>
<td> Number of levels (2) </td> <td> Number of levels = 2 </td>
<td> Number of levels (5) </td> <td> Number of levels = 5 </td>
<td> Number of levels (10) </td> <td> Number of levels = 10 </td>
<td> Number of levels (15) </td> <td> Number of levels = 15 </td>
</tr> </tr>
<tr> <tr>
<td> 5,558 </td> <td> 5,558 </td>
@ -289,8 +292,9 @@ Performance of `CGAL::segment_from_sdf_values` with this implementation (in ms):
<td> 3,947 </td> <td> 3,947 </td>
</tr> </tr>
</table> </table>
</center>
<br>
\section Surface_mesh_segmentationImplementationhistory Implementation History \section Surface_mesh_segmentationImplementationhistory Implementation History
The initial implementation of this package is the result of the work of Ilker during the 2012 season The initial implementation of this package is the result of the work of Ilker during the 2012 season