summaryrefslogtreecommitdiff
path: root/src/Skeleton_blocker
diff options
context:
space:
mode:
authorsalinasd <salinasd@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2014-12-15 17:44:43 +0000
committersalinasd <salinasd@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2014-12-15 17:44:43 +0000
commit6a6651c5a097f5024a42c9912723fe09ba714fe7 (patch)
tree372884c4fa9f15326e44618bf7b3541a606f8e4b /src/Skeleton_blocker
parent03275635bf6f01eab4f5df469fef8e6c5eed7ee7 (diff)
doc
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@353 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Diffstat (limited to 'src/Skeleton_blocker')
-rw-r--r--src/Skeleton_blocker/doc/ds_representation.pngbin42558 -> 36412 bytes
-rw-r--r--src/Skeleton_blocker/doc/ds_representation.svg470
-rw-r--r--src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h18
-rw-r--r--src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h1
-rw-r--r--src/Skeleton_blocker/include/gudhi/Skeleton_blocker_geometric_complex.h2
-rw-r--r--src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h1
-rw-r--r--src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h1
7 files changed, 483 insertions, 10 deletions
diff --git a/src/Skeleton_blocker/doc/ds_representation.png b/src/Skeleton_blocker/doc/ds_representation.png
index bb224038..8136621a 100644
--- a/src/Skeleton_blocker/doc/ds_representation.png
+++ b/src/Skeleton_blocker/doc/ds_representation.png
Binary files differ
diff --git a/src/Skeleton_blocker/doc/ds_representation.svg b/src/Skeleton_blocker/doc/ds_representation.svg
new file mode 100644
index 00000000..981b2874
--- /dev/null
+++ b/src/Skeleton_blocker/doc/ds_representation.svg
@@ -0,0 +1,470 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="434.50912"
+ height="113.23431"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="ds_representation.svg"
+ inkscape:export-filename="/home/dsalinas/Documents/CodeSVN/gudhi_depot/trunk/src/Skeleton_blocker/doc/ds_representation.png"
+ inkscape:export-xdpi="164.24294"
+ inkscape:export-ydpi="164.24294">
+ <defs
+ id="defs4">
+ <inkscape:path-effect
+ is_visible="true"
+ id="path-effect4610"
+ effect="spiro" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.959798"
+ inkscape:cx="393.78845"
+ inkscape:cy="51.962328"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="2560"
+ inkscape:window-height="1523"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(775.10425,-319.57102)">
+ <path
+ id="path4432"
+ d="m -564.66566,372.78112 -22.51977,46.5698 62.69739,-31.00174 z"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;display:inline"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ d="m -553.17597,345.78586 c 0.75762,1.51523 32.57742,14.89975 32.57742,14.89975"
+ id="path3125"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m -519.08333,361.44322 31.81981,11.8693"
+ id="path3127"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path14-7"
+ style="fill:none;stroke:none"
+ d="m -554.02684,345.73906 29.32107,42.08799 7.736,-39.88821"
+ sodipodi:nodetypes="ccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path14-1"
+ style="fill:#575e9c;fill-opacity:0.41568604;fill-rule:nonzero;stroke:none"
+ d="m -523.3168,376.08402 34.2525,-51.7575"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m -564.28765,372.5549 47.47717,-24.4962 -7.82868,39.90103 37.1231,-14.89975 -29.29442,-25.25382 -37.37564,-2.27284 29.54696,42.42641"
+ id="path3121"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-691.68016,428.25063)"
+ d="m 97.389654,113.9189 c 0,1.88726 -1.529924,3.41718 -3.417181,3.41718 -1.887257,0 -3.417181,-1.52992 -3.417181,-3.41718 0,-1.88726 1.529924,-3.41718 3.417181,-3.41718 1.887257,0 3.417181,1.52992 3.417181,3.41718 z"
+ sodipodi:ry="3.4171808"
+ sodipodi:rx="3.4171808"
+ sodipodi:cy="113.9189"
+ sodipodi:cx="93.972473"
+ id="path4584"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-669.37366,382.75481)"
+ d="m 97.389654,113.9189 c 0,1.88726 -1.529924,3.41718 -3.417181,3.41718 -1.887257,0 -3.417181,-1.52992 -3.417181,-3.41718 0,-1.88726 1.529924,-3.41718 3.417181,-3.41718 1.887257,0 3.417181,1.52992 3.417181,3.41718 z"
+ sodipodi:ry="3.4171808"
+ sodipodi:rx="3.4171808"
+ sodipodi:cy="113.9189"
+ sodipodi:cx="93.972473"
+ id="path4584-4"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-630.26652,397.04052)"
+ d="m 97.389654,113.9189 c 0,1.88726 -1.529924,3.41718 -3.417181,3.41718 -1.887257,0 -3.417181,-1.52992 -3.417181,-3.41718 0,-1.88726 1.529924,-3.41718 3.417181,-3.41718 1.887257,0 3.417181,1.52992 3.417181,3.41718 z"
+ sodipodi:ry="3.4171808"
+ sodipodi:rx="3.4171808"
+ sodipodi:cy="113.9189"
+ sodipodi:cx="93.972473"
+ id="path4584-1"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-659.37366,354.89767)"
+ d="m 97.389654,113.9189 c 0,1.88726 -1.529924,3.41718 -3.417181,3.41718 -1.887257,0 -3.417181,-1.52992 -3.417181,-3.41718 0,-1.88726 1.529924,-3.41718 3.417181,-3.41718 1.887257,0 3.417181,1.52992 3.417181,3.41718 z"
+ sodipodi:ry="3.4171808"
+ sodipodi:rx="3.4171808"
+ sodipodi:cy="113.9189"
+ sodipodi:cx="93.972473"
+ id="path4584-42"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-622.23081,358.64766)"
+ d="m 97.389654,113.9189 c 0,1.88726 -1.529924,3.41718 -3.417181,3.41718 -1.887257,0 -3.417181,-1.52992 -3.417181,-3.41718 0,-1.88726 1.529924,-3.41718 3.417181,-3.41718 1.887257,0 3.417181,1.52992 3.417181,3.41718 z"
+ sodipodi:ry="3.4171808"
+ sodipodi:rx="3.4171808"
+ sodipodi:cy="113.9189"
+ sodipodi:cx="93.972473"
+ id="path4584-3"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-593.12367,383.11196)"
+ d="m 97.389654,113.9189 c 0,1.88726 -1.529924,3.41718 -3.417181,3.41718 -1.887257,0 -3.417181,-1.52992 -3.417181,-3.41718 0,-1.88726 1.529924,-3.41718 3.417181,-3.41718 1.887257,0 3.417181,1.52992 3.417181,3.41718 z"
+ sodipodi:ry="3.4171808"
+ sodipodi:rx="3.4171808"
+ sodipodi:cy="113.9189"
+ sodipodi:cx="93.972473"
+ id="path4584-7"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ sodipodi:type="arc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path14-1-1"
+ style="fill:#575e9c;fill-opacity:0.41568604;fill-rule:nonzero;stroke:none"
+ d="m -378.67395,371.32852 34.2525,-51.7575"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m -413.6327,367.61658 37.56127,-20.2544 c 0,0 -4.64286,29.64285 -5.35714,31.42857 -0.71429,1.78571 -32.20413,-11.17417 -32.20413,-11.17417 z"
+ id="path4091"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccsc" />
+ <g
+ id="g3909">
+ <path
+ sodipodi:nodetypes="ccc"
+ d="m -409.13145,340.85729 28.31093,41.70918 8.87241,-39.38313"
+ style="fill:none;fill-opacity:0.41568603999999998;fill-rule:nonzero;stroke:none;opacity:0.13580247"
+ id="path14-3-5"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0"
+ style="opacity:0.13580244;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;display:inline"
+ d="m -420.02281,368.02562 -22.51977,46.5698 62.69739,-31.00174 z"
+ id="path4432-5" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3125-0"
+ d="m -408.53312,341.03036 c 0.75762,1.51523 32.57742,14.89975 32.57742,14.89975"
+ style="opacity:0.13580244;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 3;stroke-dashoffset:0" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3127-1"
+ d="m -374.44048,356.68772 31.81981,11.8693"
+ style="opacity:0.13580244;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ inkscape:connector-curvature="0"
+ id="path3121-0"
+ d="m -419.6448,367.7994 47.47717,-24.4962 -7.82868,39.90103 37.1231,-14.89975 -29.29442,-25.25382 -37.37564,-2.27284 29.54696,42.42641"
+ style="opacity:0.13580244;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.13580244;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ id="path4584-36"
+ sodipodi:cx="93.972473"
+ sodipodi:cy="113.9189"
+ sodipodi:rx="3.4171808"
+ sodipodi:ry="3.4171808"
+ d="m 97.389654,113.9189 a 3.4171808,3.4171808 0 1 1 -6.834362,0 3.4171808,3.4171808 0 1 1 6.834362,0 z"
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-547.03731,423.49513)" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.13580244;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ id="path4584-4-5"
+ sodipodi:cx="93.972473"
+ sodipodi:cy="113.9189"
+ sodipodi:rx="3.4171808"
+ sodipodi:ry="3.4171808"
+ d="m 97.389654,113.9189 a 3.4171808,3.4171808 0 1 1 -6.834362,0 3.4171808,3.4171808 0 1 1 6.834362,0 z"
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-524.73081,377.99931)" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.13580244;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ id="path4584-1-6"
+ sodipodi:cx="93.972473"
+ sodipodi:cy="113.9189"
+ sodipodi:rx="3.4171808"
+ sodipodi:ry="3.4171808"
+ d="m 97.389654,113.9189 a 3.4171808,3.4171808 0 1 1 -6.834362,0 3.4171808,3.4171808 0 1 1 6.834362,0 z"
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-485.62367,392.28502)" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.13580244;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ id="path4584-42-0"
+ sodipodi:cx="93.972473"
+ sodipodi:cy="113.9189"
+ sodipodi:rx="3.4171808"
+ sodipodi:ry="3.4171808"
+ d="m 97.389654,113.9189 a 3.4171808,3.4171808 0 1 1 -6.834362,0 3.4171808,3.4171808 0 1 1 6.834362,0 z"
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-514.73081,350.14217)" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.13580244;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ id="path4584-3-9"
+ sodipodi:cx="93.972473"
+ sodipodi:cy="113.9189"
+ sodipodi:rx="3.4171808"
+ sodipodi:ry="3.4171808"
+ d="m 97.389654,113.9189 a 3.4171808,3.4171808 0 1 1 -6.834362,0 3.4171808,3.4171808 0 1 1 6.834362,0 z"
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-477.58796,353.89216)" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.13580244;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ id="path4584-7-0"
+ sodipodi:cx="93.972473"
+ sodipodi:cy="113.9189"
+ sodipodi:rx="3.4171808"
+ sodipodi:ry="3.4171808"
+ d="m 97.389654,113.9189 a 3.4171808,3.4171808 0 1 1 -6.834362,0 3.4171808,3.4171808 0 1 1 6.834362,0 z"
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-448.48082,378.35646)" />
+ </g>
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m -370.55894,347.61837 23.42349,19.75458 c 0,0 -28.39286,9.99999 -29.10714,11.78571 -0.71429,1.78571 5.68365,-31.54029 5.68365,-31.54029 z"
+ id="path4091-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccsc" />
+ <path
+ id="path4432-6"
+ d="m -750.37996,370.16849 -22.51977,46.5698 62.69739,-31.00174 z"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;display:inline"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 3;stroke-dashoffset:0"
+ d="m -738.89027,343.17323 c 0.75762,1.51523 32.57742,14.89975 32.57742,14.89975"
+ id="path3125-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m -704.79763,358.83059 31.81981,11.8693"
+ id="path3127-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path14-12"
+ style="fill:#575e9c;fill-opacity:0.41568604;fill-rule:nonzero;stroke:none"
+ d="m -750.60027,369.89548 -21.18655,45.87606 60.51647,-29.53414"
+ sodipodi:nodetypes="ccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path14-7-8"
+ style="fill:#575e9c;fill-opacity:0.41568604;fill-rule:nonzero;stroke:none"
+ d="m -739.74114,343.12643 29.32107,42.08799 7.736,-39.88821"
+ sodipodi:nodetypes="ccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path14-8-0"
+ style="fill:#575e9c;fill-opacity:0.41568604;fill-rule:nonzero;stroke:none"
+ d="m -702.3655,345.90435 -2.625,13.17237 29.83309,9.73554"
+ sodipodi:nodetypes="ccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path14-2-70"
+ style="fill:#575e9c;fill-opacity:0.41568604;fill-rule:nonzero;stroke:none"
+ d="m -704.89087,358.7838 -5.27665,26.68316 35.26265,-15.39201"
+ sodipodi:nodetypes="ccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path14-3-2"
+ style="fill:#575e9c;fill-opacity:0.41568604;fill-rule:nonzero;stroke:none"
+ d="m -739.4886,343.00016 28.31093,41.70918 8.87241,-39.38313"
+ sodipodi:nodetypes="ccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path14-1-2"
+ style="fill:#575e9c;fill-opacity:0.41568604;fill-rule:nonzero;stroke:none"
+ d="m -709.0311,373.47139 34.2525,-51.7575"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m -750.00195,369.94227 47.47717,-24.4962 -7.82868,39.90103 37.1231,-14.89975 -29.29442,-25.25382 -37.37564,-2.27284 29.54696,42.42641"
+ id="path3121-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-877.39446,425.638)"
+ d="m 97.389654,113.9189 c 0,1.88726 -1.529924,3.41718 -3.417181,3.41718 -1.887257,0 -3.417181,-1.52992 -3.417181,-3.41718 0,-1.88726 1.529924,-3.41718 3.417181,-3.41718 1.887257,0 3.417181,1.52992 3.417181,3.41718 z"
+ sodipodi:ry="3.4171808"
+ sodipodi:rx="3.4171808"
+ sodipodi:cy="113.9189"
+ sodipodi:cx="93.972473"
+ id="path4584-79"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-855.08796,380.14218)"
+ d="m 97.389654,113.9189 c 0,1.88726 -1.529924,3.41718 -3.417181,3.41718 -1.887257,0 -3.417181,-1.52992 -3.417181,-3.41718 0,-1.88726 1.529924,-3.41718 3.417181,-3.41718 1.887257,0 3.417181,1.52992 3.417181,3.41718 z"
+ sodipodi:ry="3.4171808"
+ sodipodi:rx="3.4171808"
+ sodipodi:cy="113.9189"
+ sodipodi:cx="93.972473"
+ id="path4584-4-9"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-815.98082,394.42789)"
+ d="m 97.389654,113.9189 c 0,1.88726 -1.529924,3.41718 -3.417181,3.41718 -1.887257,0 -3.417181,-1.52992 -3.417181,-3.41718 0,-1.88726 1.529924,-3.41718 3.417181,-3.41718 1.887257,0 3.417181,1.52992 3.417181,3.41718 z"
+ sodipodi:ry="3.4171808"
+ sodipodi:rx="3.4171808"
+ sodipodi:cy="113.9189"
+ sodipodi:cx="93.972473"
+ id="path4584-1-61"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-845.08796,352.28504)"
+ d="m 97.389654,113.9189 c 0,1.88726 -1.529924,3.41718 -3.417181,3.41718 -1.887257,0 -3.417181,-1.52992 -3.417181,-3.41718 0,-1.88726 1.529924,-3.41718 3.417181,-3.41718 1.887257,0 3.417181,1.52992 3.417181,3.41718 z"
+ sodipodi:ry="3.4171808"
+ sodipodi:rx="3.4171808"
+ sodipodi:cy="113.9189"
+ sodipodi:cx="93.972473"
+ id="path4584-42-8"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-807.94511,356.03503)"
+ d="m 97.389654,113.9189 c 0,1.88726 -1.529924,3.41718 -3.417181,3.41718 -1.887257,0 -3.417181,-1.52992 -3.417181,-3.41718 0,-1.88726 1.529924,-3.41718 3.417181,-3.41718 1.887257,0 3.417181,1.52992 3.417181,3.41718 z"
+ sodipodi:ry="3.4171808"
+ sodipodi:rx="3.4171808"
+ sodipodi:cy="113.9189"
+ sodipodi:cx="93.972473"
+ id="path4584-3-5"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.39947101,-0.59295401,0.59295401,0.39947101,-778.83797,380.49933)"
+ d="m 97.389654,113.9189 c 0,1.88726 -1.529924,3.41718 -3.417181,3.41718 -1.887257,0 -3.417181,-1.52992 -3.417181,-3.41718 0,-1.88726 1.529924,-3.41718 3.417181,-3.41718 1.887257,0 3.417181,1.52992 3.417181,3.41718 z"
+ sodipodi:ry="3.4171808"
+ sodipodi:rx="3.4171808"
+ sodipodi:cy="113.9189"
+ sodipodi:cx="93.972473"
+ id="path4584-7-1"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99118668;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ sodipodi:type="arc" />
+ <text
+ xml:space="preserve"
+ style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Times New Roman;-inkscape-font-specification:'Times New Roman,'"
+ x="-718.37708"
+ y="430.86295"
+ id="text6164-6-56-2"
+ sodipodi:linespacing="125%"
+ inkscape:export-xdpi="164.24294"
+ inkscape:export-ydpi="164.24294"
+ inkscape:export-filename="/home/dsalinas/Documents/CodeSVN/gudhi_depot/trunk/src/Skeleton_blocker/doc/ds_representation.png"><tspan
+ sodipodi:role="line"
+ id="tspan6166-1-0-6"
+ x="-718.37708"
+ y="430.86295">Simplicial complex</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Times New Roman;-inkscape-font-specification:'Times New Roman,'"
+ x="-462.22809"
+ y="430.86295"
+ id="text6164-6-56-2-3"
+ sodipodi:linespacing="125%"
+ inkscape:export-xdpi="164.24294"
+ inkscape:export-ydpi="164.24294"
+ inkscape:export-filename="/home/dsalinas/Documents/CodeSVN/gudhi_depot/trunk/src/Skeleton_blocker/doc/ds_representation.png"><tspan
+ sodipodi:role="line"
+ id="tspan6166-1-0-6-9"
+ x="-462.22809"
+ y="430.86295">Encoding</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Times New Roman;-inkscape-font-specification:'Times New Roman,'"
+ x="-535.67126"
+ y="334.7963"
+ id="text6164-6-56-2-3-0"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan6166-1-0-6-9-9"
+ x="-535.67126"
+ y="334.7963">Graph</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Times New Roman;-inkscape-font-specification:'Times New Roman,'"
+ x="-389.50018"
+ y="335.10443"
+ id="text6164-6-56-2-3-0-3"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan6166-1-0-6-9-9-1"
+ x="-389.50018"
+ y="335.10443">Blockers</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Times New Roman;-inkscape-font-specification:'Times New Roman,'"
+ x="-470.03345"
+ y="335.56711"
+ id="text6164-6-56-2-3-0-36"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan6166-1-0-6-9-9-3"
+ x="-470.03345"
+ y="335.56711">+</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Times New Roman;-inkscape-font-specification:'Times New Roman,'"
+ x="-618.52417"
+ y="382.18915"
+ id="text6164-6-56-2-1"
+ sodipodi:linespacing="125%"
+ inkscape:export-xdpi="164.24294"
+ inkscape:export-ydpi="164.24294"
+ inkscape:export-filename="/home/dsalinas/Documents/CodeSVN/gudhi_depot/trunk/src/Skeleton_blocker/doc/ds_representation.png"><tspan
+ sodipodi:role="line"
+ id="tspan6166-1-0-6-4"
+ x="-618.52417"
+ y="382.18915">=</tspan></text>
+ </g>
+</svg>
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h
index 3d3910bf..00e1935b 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h
@@ -35,18 +35,18 @@
-/** \defgroup skbl Skeleton-blocker Package
+/** \defgroup skbl Skeleton-Blocker Package
\author David Salinas
\section Introduction
-The Skeleton-blocker data-structure had been introduced in the two papers
+The Skeleton-Blocker data-structure had been introduced in the two papers
[\cite skbl_socg2011,\cite skbl_ijcga2012].
It proposes a light encoding for simplicial complexes by storing only an *implicit* representation of its
simplices.
Intuitively, it just stores the 1-skeleton of a simplicial complex with a graph and the set of its "missing faces" that
is very small in practice (see next section for a formal definition).
-This data-structure handles every classical operations used for simplicial complexes such as
+This data-structure handles all simplicial complexes operations such as
as simplex enumeration or simplex removal but operations that are particularly efficient
are operations that do not require simplex enumeration such as edge iteration, link computation or simplex contraction.
@@ -58,7 +58,7 @@ An abstract simplex is a finite non-empty set and its dimension is its number of
Whenever \f$\tau \subset \sigma\f$ and \f$\tau \neq \emptyset \f$, \f$ \tau \f$ is called a face of
\f$ \sigma\f$ and \f$ \sigma\f$ is called a coface of \f$ \tau \f$ . Furthermore,
when \f$ \tau \neq \sigma\f$ we say that \f$ \tau\f$ is a proper-face of \f$ \sigma\f$.
-An abstract simplicial complex is a set of simplices that contains all the faces of its simplices.
+An abstract simplicial complex is a set of simplices that contains all the faces of their simplices.
The 1-skeleton of a simplicial complex (or its graph) consists of its elements of dimension lower than 2.
*\image html "ds_representation.png" "Skeleton-blocker representation" width=20cm
@@ -78,7 +78,7 @@ in topological data-analysis.
In practice, the set of blockers of a simplicial complex
remains also small when simplifying a Rips complex with edge contractions
but also for most of the simplicial complexes used in topological data-analysis such as Delaunay, Cech or Witness complexes.
-For instance, the numbers of blockers is depicted for a random 3 dimensional sphere embedded into \f$R^4\f$
+For instance, the numbers of blockers is depicted for random 3 dimensional spheres embedded into \f$R^4\f$
in figure X.
@@ -93,11 +93,11 @@ in figure X.
Four classes define a simplicial complex namely :
-\li <Code>Skeleton_blocker_complex</Code> : a simplicial complex with basic operations such as vertex/edge/simplex enumeration and construction
-\li <Code>Skeleton_blocker_link_complex</Code> : the link of a simplex in a parent complex. It is represented as a sub complex
+\li Skeleton_blocker_complex : a simplicial complex with basic operations such as vertex/edge/simplex enumeration and construction
+\li Skeleton_blocker_link_complex : the link of a simplex in a parent complex. It is represented as a sub complex
of the parent complex
-\li <Code>Skeleton_blocker_simplifiable_complex</Code> : a simplicial complex with simplification operations such as edge contraction or simplex collapse
-\li <Code>Skeleton_blocker_geometric_complex</Code> : a simplicial complex who has access to geometric points in \f$R^d\f$
+\li Skeleton_blocker_simplifiable_complex : a simplicial complex with simplification operations such as edge contraction or simplex collapse
+\li Skeleton_blocker_geometric_complex : a simplicial complex who has access to geometric points in \f$R^d\f$
The two last classes are derived classes from the <Code>Skeleton_blocker_complex</Code> class. The class <Code>Skeleton_blocker_link_complex</Code> inheritates from a template passed parameter
that may be either <Code>Skeleton_blocker_complex</Code> or <Code>Skeleton_blocker_geometric_complex</Code> (a link may store points coordinates or not).
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h
index 88c777ee..61ee8684 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h
@@ -57,6 +57,7 @@ namespace skbl {
/**
*@class Skeleton_blocker_complex
*@brief Abstract Simplicial Complex represented with a skeleton/blockers pair.
+ *@ingroup skbl
*/
template<class SkeletonBlockerDS>
class Skeleton_blocker_complex
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_geometric_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_geometric_complex.h
index 03be7990..4dbabd60 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_geometric_complex.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_geometric_complex.h
@@ -36,7 +36,7 @@ namespace skbl {
/**
* @brief Class that represents a geometric complex that can be simplified.
* The class allows access to points of vertices.
- *
+ * @ingroup skbl
*/
template<typename SkeletonBlockerGeometricDS>
class Skeleton_blocker_geometric_complex : public Skeleton_blocker_simplifiable_complex<SkeletonBlockerGeometricDS>
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h
index 62f827b7..f3ebfa60 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h
@@ -36,6 +36,7 @@ template<class ComplexType> class Skeleton_blocker_sub_complex;
* \brief Class representing the link of a simplicial complex encoded by a skeleton/blockers pair.
* It inherits from Skeleton_blocker_sub_complex because such complex is a sub complex of a
* root complex.
+ * \ingroup skbl
*/
template<typename ComplexType>
class Skeleton_blocker_link_complex : public Skeleton_blocker_sub_complex<ComplexType>
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h
index 4fbad532..968e8be4 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h
@@ -31,6 +31,7 @@ namespace skbl {
/**
* \brief Class that allows simplification operation on a simplicial complex represented
* by a skeleton/blockers pair.
+ * \ingroup skbl
*/
template<typename SkeletonBlockerDS>
class Skeleton_blocker_simplifiable_complex : public Skeleton_blocker_complex<SkeletonBlockerDS>