small fixes
This commit is contained in:
zapashcanon
parent
6e49b04e9b
commit
9c7b559021
GPG Key ID:
8981C3C62D1D28F1
@ -1,69 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
|
||||
<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
|
||||
<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
|
||||
<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
|
||||
<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
|
||||
<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
|
||||
<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
|
||||
<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
|
||||
<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
|
||||
]>
|
||||
<svg version="1.1" id="Calque_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
|
||||
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 258.6 87.5"
|
||||
style="enable-background:new 0 0 258.6 87.5;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#62003C;}
|
||||
</style>
|
||||
<switch>
|
||||
<g i:extraneous="self">
|
||||
<g>
|
||||
<circle class="st0" cx="251.3" cy="7.3" r="7.3"/>
|
||||
<circle class="st0" cx="235.5" cy="21.1" r="4.5"/>
|
||||
<path class="st0" d="M53.6,75.4L53.6,75.4c0-3.7-2.5-5.9-6.7-5.9h-8.1v17.7h3.9v-5.6h3.1l3.8,5.6h4.5l-4.3-6.3
|
||||
C52.1,80,53.6,78.3,53.6,75.4z M49.7,75.6c0,1.5-1.1,2.5-3,2.5h-3.9V73h3.9C48.5,73,49.7,73.9,49.7,75.6L49.7,75.6z"/>
|
||||
<path class="st0" d="M76.5,76.6c-3.1-0.8-3.8-1.2-3.8-2.3v0c0-0.9,0.8-1.5,2.3-1.5c1.5,0,3,0.7,4.6,1.7l2-2.9
|
||||
c-1.8-1.4-4-2.2-6.6-2.2c-3.6,0-6.2,2.1-6.2,5.3v0.1c0,3.5,2.3,4.5,5.9,5.4c3,0.8,3.6,1.3,3.6,2.2v0.1c0,1-1,1.7-2.5,1.7
|
||||
c-2,0-3.7-0.8-5.3-2.1l-2.3,2.8c2.1,1.9,4.8,2.8,7.5,2.8c3.8,0,6.5-2,6.5-5.5v-0.1C82.1,78.8,80.1,77.5,76.5,76.6z"/>
|
||||
<rect x="86.5" y="77.5" class="st0" width="7.8" height="3.7"/>
|
||||
<path class="st0" d="M23.1,69.4l-7.6,17.8h4l1.6-4h7.5l1.6,4h4.1l-7.6-17.8H23.1z M22.5,79.8l2.3-5.7l2.3,5.7H22.5z"/>
|
||||
<path class="st0" d="M7.3,69.5H0.1v17.7H4v-5.3h3c4,0,7.1-2.1,7.1-6.2v0C14.1,72,11.5,69.5,7.3,69.5z M10.1,75.8
|
||||
c0,1.5-1.1,2.7-3.1,2.7H4V73h3C8.9,73,10.1,74,10.1,75.8L10.1,75.8z"/>
|
||||
<rect x="59.2" y="69.5" class="st0" width="3.9" height="17.7"/>
|
||||
<path class="st0" d="M123.3,69.4l-7.6,17.8h4l1.6-4h7.5l1.6,4h4.1l-7.6-17.8H123.3z M122.7,79.8l2.3-5.7l2.3,5.7H122.7z"/>
|
||||
<polygon class="st0" points="162.3,69.5 158.4,69.5 158.4,87.2 171.1,87.2 171.1,83.6 162.3,83.6 "/>
|
||||
<path class="st0" d="M146.3,83.9c-3,0-5.1-2.5-5.1-5.5v-0.1c0-3,2.1-5.5,5.1-5.5c1.8,0,3.2,0.8,4.5,2l2.5-2.8
|
||||
c-1.6-1.6-3.6-2.7-7-2.7c-5.4,0-9.2,4.1-9.2,9.1v0c0,5.1,3.9,9.1,9.1,9.1c3.4,0,5.4-1.2,7.2-3.2l-2.5-2.5
|
||||
C149.6,83.1,148.3,83.9,146.3,83.9z"/>
|
||||
<polygon class="st0" points="201.9,76.6 197.7,69.5 193.1,69.5 199.9,80.2 199.9,87.2 203.8,87.2 203.8,80.1 210.6,69.5
|
||||
206.2,69.5 "/>
|
||||
<path class="st0" d="M106.7,76.6c-3.1-0.8-3.8-1.2-3.8-2.3v0c0-0.9,0.8-1.5,2.3-1.5c1.5,0,3,0.7,4.6,1.7l2-2.9
|
||||
c-1.8-1.4-4-2.2-6.6-2.2c-3.6,0-6.2,2.1-6.2,5.3v0.1c0,3.5,2.3,4.5,5.9,5.4c3,0.8,3.6,1.3,3.6,2.2v0.1c0,1-1,1.7-2.5,1.7
|
||||
c-2,0-3.7-0.8-5.3-2.1l-2.3,2.8c2.1,1.9,4.8,2.8,7.5,2.8c3.8,0,6.5-2,6.5-5.5v-0.1C112.3,78.8,110.3,77.5,106.7,76.6z"/>
|
||||
<path class="st0" d="M182,69.4l-7.6,17.8h4l1.6-4h7.5l1.6,4h4.1l-7.6-17.8H182z M181.4,79.8l2.3-5.7l2.3,5.7H181.4z"/>
|
||||
<rect x="65.8" y="33.2" class="st0" width="4.9" height="27.4"/>
|
||||
<path class="st0" d="M121.4,61.2c4.6,0,8.1-1.6,11.2-5.1l0.3-0.3l-3.1-2.8l-0.3,0.3c-2.3,2.5-4.9,3.6-8,3.6c-4.6,0-8.1-3.2-8.8-8
|
||||
h20.9l0-0.4c0.1-0.5,0.1-0.9,0.1-1.3c0-8.7-5.1-14.5-12.8-14.5c-7.5,0-13.1,6.1-13.1,14.3C107.8,55.1,113.7,61.2,121.4,61.2z
|
||||
M120.8,36.9c5.1,0,7.4,4.1,7.9,8.1h-16C113.4,40.2,116.7,36.9,120.8,36.9z"/>
|
||||
<path class="st0" d="M10.6,61.2c3.6,0,6.4-1.4,8.6-4.2v3.6H24V33.2h-4.8v15.6c0,4.6-3.1,7.8-7.5,7.8c-4.3,0-6.9-2.8-6.9-7.5V33.2
|
||||
H0v16.9C0,56.8,4.2,61.2,10.6,61.2z"/>
|
||||
<path class="st0" d="M46.4,32.7c-3.6,0-6.5,1.4-8.6,4.1v-3.6h-4.9v27.4h4.9V45c0-4.6,3.1-7.8,7.5-7.8c4.3,0,6.9,2.8,6.9,7.5v15.9
|
||||
H57V43.7C57,37,52.8,32.7,46.4,32.7z"/>
|
||||
<polygon class="st0" points="93,60.8 104.9,33.2 99.7,33.2 91,54.4 82.4,33.2 77.1,33.2 88.9,60.8 "/>
|
||||
<path class="st0" d="M145.6,38.7v-5.5h-4.9v27.4h4.9v-11c0-7.1,3.9-11.7,10-11.7h0.8v-5.1l-0.4,0
|
||||
C151.7,32.6,147.9,34.8,145.6,38.7z"/>
|
||||
<path class="st0" d="M210,24.2l-4.9,2.7v6.3H200v4.4h5.1v15.5c0,5.1,2.8,7.9,7.9,7.9c1.8,0,3.4-0.4,5-1.2l0.2-0.1v-4.4l-0.7,0.3
|
||||
c-1.3,0.6-2.3,0.9-3.6,0.9c-2.7,0-4-1.3-4-3.9v-15h8.4v-4.4H210V24.2z"/>
|
||||
<path class="st0" d="M235.8,32.7c-7.5,0-13.1,6.1-13.1,14.3c0,8.1,5.9,14.3,13.7,14.3c4.6,0,8.1-1.6,11.2-5.1l0.3-0.3l-3.1-2.8
|
||||
l-0.3,0.3c-2.3,2.5-4.9,3.6-8,3.6c-4.6,0-8.1-3.2-8.8-8h20.9l0-0.4c0.1-0.5,0.1-0.9,0.1-1.3C248.6,38.5,243.5,32.7,235.8,32.7z
|
||||
M227.7,45c0.7-4.8,3.9-8.1,8.1-8.1c5.1,0,7.4,4.1,7.9,8.1H227.7z"/>
|
||||
<path class="st0" d="M181.5,52.7v-0.1c0-5.4-5.3-7-8.8-8l-0.1,0c-3.3-1-6.4-1.9-6.4-4.2c0-2,1.9-3.4,4.7-3.4
|
||||
c2.4,0,5.1,0.9,7.6,2.5l0.4,0.3l2.3-3.8l-0.4-0.2c-2.8-1.9-6.5-3-9.8-3c-5.6,0-9.5,3.3-9.5,8v0.1c0,5.3,5.2,6.8,9.1,7.9
|
||||
c3.5,1,6.3,1.9,6.3,4.3c0,2.2-2,3.7-5,3.7c-2.9,0-6-1.1-8.9-3.3l-0.4-0.3l-2.5,3.6l0.3,0.3c3,2.5,7.3,4,11.2,4
|
||||
C177.6,61.1,181.5,57.7,181.5,52.7z"/>
|
||||
<rect x="189.3" y="33.2" class="st0" width="4.9" height="27.4"/>
|
||||
</g>
|
||||
</g>
|
||||
</switch>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 5.2 KiB |
270
img/upsud.svg
Normal file
270
img/upsud.svg
Normal file
@ -0,0 +1,270 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<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"
|
||||
viewBox="0 0 292.25333 406.72"
|
||||
height="406.72"
|
||||
width="292.25333"
|
||||
xml:space="preserve"
|
||||
id="svg2"
|
||||
version="1.1"><metadata
|
||||
id="metadata8"><rdf:RDF><cc:Work
|
||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
|
||||
id="defs6" /><g
|
||||
transform="matrix(1.3333333,0,0,-1.3333333,0,406.72)"
|
||||
id="g10"><g
|
||||
transform="scale(0.1)"
|
||||
id="g12"><path
|
||||
id="path14"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 60.4258,1368.51 c -17.0039,0 -31.711,6.19 -42.9727,17.46 -16.08591,16.08 -15.85544,34.24 -15.85544,65.72 0,31.49 -0.23047,49.63 15.85544,65.73 11.2617,11.25 25.9688,17.46 42.9727,17.46 30.1015,0 52.6212,-17.7 58.3672,-50.33 H 93.5156 c -3.9062,16.55 -14.9375,28.04 -33.0898,28.04 -9.6485,0 -18.3867,-3.68 -24.1289,-9.88 -8.043,-8.73 -9.8828,-18.16 -9.8828,-51.02 0,-32.87 1.8398,-42.28 9.8828,-51.01 5.7422,-6.21 14.4804,-9.88 24.1289,-9.88 18.1523,0 29.414,11.48 33.3203,28.02 h 25.0469 c -5.512,-32.62 -28.7227,-50.31 -58.3672,-50.31" /><path
|
||||
id="path16"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 202.465,1460.19 c -4.363,4.37 -10.336,6.66 -17.231,6.66 -6.894,0 -12.64,-2.29 -17.007,-6.66 -7.122,-7.12 -8.039,-19.3 -8.039,-31.93 0,-12.65 0.917,-24.83 8.039,-31.96 4.367,-4.35 10.113,-6.89 17.007,-6.89 6.895,0 12.868,2.54 17.231,6.89 7.125,7.13 8.047,19.31 8.047,31.96 0,12.63 -0.922,24.81 -8.047,31.93 z m 17.695,-77.9 c -7.582,-7.81 -19.07,-13.78 -34.926,-13.78 -15.859,0 -27.121,5.97 -34.703,13.78 -11.027,11.49 -13.785,26.2 -13.785,45.97 0,19.53 2.758,34.23 13.785,45.72 7.582,7.81 18.844,13.79 34.703,13.79 15.856,0 27.344,-5.98 34.926,-13.79 11.031,-11.49 13.789,-26.19 13.789,-45.72 0,-19.77 -2.758,-34.48 -13.789,-45.97" /><path
|
||||
id="path18"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 400.805,1369.88 v 71.01 c 0,18.15 -10.34,25.96 -23.442,25.96 -12.636,0 -24.125,-8.04 -24.125,-24.8 v -72.17 h -23.441 v 71.01 c 0,18.15 -10.34,25.96 -23.442,25.96 -13.097,0 -24.128,-8.04 -24.128,-25.96 v -71.01 h -23.438 v 116.51 h 22.981 v -11.73 c 7.808,8.52 19.304,13.11 31.023,13.11 14.477,0 25.738,-5.74 33.09,-17.01 9.422,11.5 21.137,17.01 36.539,17.01 11.949,0 22.519,-3.91 29.414,-10.57 8.961,-8.73 12.406,-19.76 12.406,-32.87 v -74.45 h -23.437" /><path
|
||||
id="path20"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 501.27,1466.85 c -21.141,0 -24.36,-17.91 -24.36,-38.59 0,-20.69 3.219,-38.85 24.36,-38.85 21.14,0 24.128,18.16 24.128,38.85 0,20.68 -2.988,38.59 -24.128,38.59 z m 34.468,-88.01 c -6.429,-6.42 -16.543,-10.33 -28.261,-10.33 -12.414,0 -22.063,3.2 -30.567,13.32 v -59.06 h -23.437 v 163.62 h 22.976 v -12.41 c 8.739,10.57 18.156,13.79 30.797,13.79 11.719,0 22.063,-3.91 28.492,-10.34 11.723,-11.72 13.102,-31.48 13.102,-49.17 0,-17.7 -1.379,-37.7 -13.102,-49.42" /><path
|
||||
id="path22"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 637.793,1459.04 c -5.289,5.29 -9.426,7.81 -17.465,7.81 -12.64,0 -23.215,-10.1 -23.215,-26.19 v -70.78 h -23.437 v 116.51 h 22.98 v -12.65 c 5.977,8.29 17.922,14.03 31.024,14.03 11.261,0 19.761,-2.99 27.804,-11.04 l -17.691,-17.69" /><path
|
||||
id="path24"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 726.969,1453.53 c -3.676,8.73 -11.949,14.71 -22.981,14.71 -11.027,0 -19.531,-5.98 -23.207,-14.71 -2.301,-5.29 -2.758,-8.73 -2.988,-15.86 h 52.395 c -0.231,7.13 -0.918,10.57 -3.219,15.86 z m -49.176,-32.17 c 0,-20 10.57,-32.64 29.645,-32.64 13.093,0 19.988,3.68 28.265,11.96 l 14.938,-14.03 c -11.953,-11.95 -23.215,-18.14 -43.664,-18.14 -29.184,0 -52.399,15.39 -52.399,59.75 0,37.67 19.539,59.51 49.41,59.51 31.25,0 49.407,-22.98 49.407,-56.08 v -10.33 h -75.602" /><path
|
||||
id="path26"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 848.551,1369.88 v 71.01 c 0,18.15 -10.336,25.96 -23.438,25.96 -13.101,0 -24.133,-8.04 -24.133,-25.96 v -71.01 h -23.437 v 116.51 h 22.98 v -11.73 c 8.04,8.74 19.305,13.11 31.024,13.11 11.949,0 21.832,-3.91 28.726,-10.57 8.961,-8.73 11.719,-19.76 11.719,-32.87 v -74.45 h -23.441" /><path
|
||||
id="path28"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 943.484,1466.85 c -21.14,0 -24.359,-17.91 -24.359,-38.59 0,-20.69 3.219,-38.85 24.359,-38.85 21.141,0 24.129,18.16 24.129,38.85 0,20.68 -2.988,38.59 -24.129,38.59 z m 24.586,-96.97 v 12.41 c -8.73,-10.58 -18.152,-13.78 -30.789,-13.78 -11.718,0 -22.062,3.91 -28.496,10.33 -11.719,11.72 -13.097,31.72 -13.097,49.42 0,17.69 1.378,37.45 13.097,49.17 6.434,6.43 16.547,10.34 28.266,10.34 12.406,0 22.058,-2.99 30.562,-13.11 v 58.83 h 23.442 V 1369.88 H 968.07" /><path
|
||||
id="path30"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1085.53,1459.04 c -5.29,5.29 -9.43,7.81 -17.47,7.81 -12.64,0 -23.21,-10.1 -23.21,-26.19 v -70.78 h -23.44 v 116.51 h 22.98 v -12.65 c 5.98,8.29 17.92,14.03 31.03,14.03 11.25,0 19.76,-2.99 27.8,-11.04 l -17.69,-17.69" /><path
|
||||
id="path32"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1174.71,1453.53 c -3.68,8.73 -11.96,14.71 -22.99,14.71 -11.03,0 -19.53,-5.98 -23.2,-14.71 -2.31,-5.29 -2.76,-8.73 -2.99,-15.86 h 52.39 c -0.22,7.13 -0.92,10.57 -3.21,15.86 z m -49.18,-32.17 c 0,-20 10.56,-32.64 29.65,-32.64 13.08,0 19.98,3.68 28.26,11.96 l 14.94,-14.03 c -11.95,-11.95 -23.22,-18.14 -43.67,-18.14 -29.18,0 -52.4,15.39 -52.4,59.75 0,37.67 19.55,59.51 49.41,59.51 31.25,0 49.41,-22.98 49.41,-56.08 v -10.33 h -75.6" /><path
|
||||
id="path34"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1304.8,1369.88 c -22.28,0 -31.95,14.94 -31.95,32.17 v 131.44 h 23.46 v -130.06 c 0,-8.96 3.2,-13.55 12.64,-13.55 h 10.33 v -20 h -14.48" /><path
|
||||
id="path36"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1398.83,1453.53 c -3.69,8.73 -11.95,14.71 -22.99,14.71 -11.04,0 -19.53,-5.98 -23.2,-14.71 -2.31,-5.29 -2.78,-8.73 -2.99,-15.86 h 52.38 c -0.23,7.13 -0.92,10.57 -3.2,15.86 z m -49.18,-32.17 c 0,-20 10.56,-32.64 29.63,-32.64 13.1,0 20,3.68 28.28,11.96 l 14.92,-14.03 c -11.93,-11.95 -23.2,-18.14 -43.65,-18.14 -29.18,0 -52.4,15.39 -52.4,59.75 0,37.67 19.53,59.51 49.41,59.51 31.25,0 49.41,-22.98 49.41,-56.08 v -10.33 h -75.6" /><path
|
||||
id="path38"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1639.67,1369.88 v 71.01 c 0,18.15 -10.33,25.96 -23.44,25.96 -12.64,0 -24.12,-8.04 -24.12,-24.8 v -72.17 h -23.44 v 71.01 c 0,18.15 -10.35,25.96 -23.44,25.96 -13.1,0 -24.14,-8.04 -24.14,-25.96 v -71.01 h -23.43 v 116.51 h 22.98 v -11.73 c 7.82,8.52 19.3,13.11 31.02,13.11 14.47,0 25.74,-5.74 33.09,-17.01 9.43,11.5 21.15,17.01 36.54,17.01 11.95,0 22.52,-3.91 29.41,-10.57 8.97,-8.73 12.43,-19.76 12.43,-32.87 v -74.45 h -23.46" /><path
|
||||
id="path40"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1752.54,1460.19 c -4.36,4.37 -10.33,6.66 -17.23,6.66 -6.89,0 -12.63,-2.29 -17.01,-6.66 -7.11,-7.12 -8.05,-19.3 -8.05,-31.93 0,-12.65 0.94,-24.83 8.05,-31.96 4.38,-4.35 10.12,-6.89 17.01,-6.89 6.9,0 12.87,2.54 17.23,6.89 7.13,7.13 8.05,19.31 8.05,31.96 0,12.63 -0.92,24.81 -8.05,31.93 z m 17.69,-77.9 c -7.57,-7.81 -19.06,-13.78 -34.92,-13.78 -15.86,0 -27.11,5.97 -34.7,13.78 -11.02,11.49 -13.79,26.2 -13.79,45.97 0,19.53 2.77,34.23 13.79,45.72 7.59,7.81 18.84,13.79 34.7,13.79 15.86,0 27.35,-5.98 34.92,-13.79 11.04,-11.49 13.79,-26.19 13.79,-45.72 0,-19.77 -2.75,-34.48 -13.79,-45.97" /><path
|
||||
id="path42"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1879.88,1369.88 v 71.01 c 0,18.15 -10.35,25.96 -23.43,25.96 -13.11,0 -24.15,-8.04 -24.15,-25.96 v -71.01 h -23.43 v 116.51 h 22.99 v -11.73 c 8.04,8.74 19.29,13.11 31.01,13.11 11.95,0 21.84,-3.91 28.73,-10.57 8.97,-8.73 11.72,-19.76 11.72,-32.87 v -74.45 h -23.44" /><path
|
||||
id="path44"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1974.8,1466.85 c -21.13,0 -24.35,-17.91 -24.35,-38.59 0,-20.69 3.22,-38.85 24.35,-38.85 21.16,0 24.15,18.16 24.15,38.85 0,20.68 -2.99,38.59 -24.15,38.59 z m 24.59,-96.97 v 12.41 c -8.73,-10.58 -18.14,-13.78 -30.8,-13.78 -11.71,0 -22.05,3.91 -28.47,10.33 -11.74,11.72 -13.11,31.72 -13.11,49.42 0,17.69 1.37,37.45 13.11,49.17 6.42,6.43 16.54,10.34 28.26,10.34 12.4,0 22.05,-2.99 30.57,-13.11 v 58.83 h 23.43 v -163.61 h -22.99" /><path
|
||||
id="path46"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 2119.16,1453.53 c -3.69,8.73 -11.95,14.71 -22.99,14.71 -11.03,0 -19.53,-5.98 -23.2,-14.71 -2.31,-5.29 -2.77,-8.73 -2.99,-15.86 h 52.38 c -0.23,7.13 -0.91,10.57 -3.2,15.86 z m -49.18,-32.17 c 0,-20 10.57,-32.64 29.63,-32.64 13.1,0 20,3.68 28.28,11.96 l 14.92,-14.03 c -11.93,-11.95 -23.2,-18.14 -43.65,-18.14 -29.18,0 -52.4,15.39 -52.4,59.75 0,37.67 19.53,59.51 49.41,59.51 31.25,0 49.42,-22.98 49.42,-56.08 v -10.33 h -75.61" /><path
|
||||
id="path48"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 2171.33,1336.79 v 53.32 h 20.23 v -35.16 l -20.23,-18.16" /><path
|
||||
id="path50"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="M 54.6719,1110.29 C 27.0938,1110.29 0,1127.2 0,1173.17 c 0,45.95 27.0938,62.64 54.6719,62.64 16.9297,0 28.7812,-4.82 40.3906,-17.16 l -16.9258,-16.46 c -7.7422,8.47 -13.7929,11.61 -23.4648,11.61 -9.4375,0 -17.4141,-3.86 -22.7422,-10.88 -5.3242,-6.77 -7.2578,-15.48 -7.2578,-29.75 0,-14.28 1.9336,-23.23 7.2578,-29.99 5.3281,-7.01 13.3047,-10.9 22.7422,-10.9 9.6719,0 15.7226,3.14 23.4648,11.62 l 16.9258,-16.2 c -11.6094,-12.34 -23.4609,-17.41 -40.3906,-17.41" /><path
|
||||
id="path52"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 195.215,1206.79 c -4.594,4.6 -10.879,7.01 -18.141,7.01 -7.254,0 -13.304,-2.41 -17.898,-7.01 -7.5,-7.5 -8.469,-20.31 -8.469,-33.62 0,-13.31 0.969,-26.12 8.469,-33.63 4.594,-4.58 10.644,-7.26 17.898,-7.26 7.262,0 13.547,2.68 18.141,7.26 7.496,7.51 8.473,20.32 8.473,33.63 0,13.31 -0.977,26.12 -8.473,33.62 z m 18.629,-82 c -7.985,-8.22 -20.078,-14.5 -36.77,-14.5 -16.691,0 -28.543,6.28 -36.527,14.5 -11.606,12.1 -14.508,27.58 -14.508,48.38 0,20.56 2.902,36.04 14.508,48.13 7.984,8.23 19.836,14.51 36.527,14.51 16.692,0 28.785,-6.28 36.77,-14.51 11.605,-12.09 14.511,-27.57 14.511,-48.13 0,-20.8 -2.906,-36.28 -14.511,-48.38" /><path
|
||||
id="path54"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 349.086,1111.71 v 74.77 c 0,19.1 -10.883,27.32 -24.672,27.32 -13.789,0 -25.398,-8.45 -25.398,-27.32 v -74.77 H 274.34 v 122.66 h 24.191 v -12.35 c 8.473,9.2 20.317,13.79 32.66,13.79 12.575,0 22.981,-4.11 30.235,-11.12 9.433,-9.19 12.336,-20.8 12.336,-34.6 v -78.38 h -24.676" /><path
|
||||
id="path56"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 464.016,1110.29 c -20.075,0 -37.008,3.37 -51.52,17.64 l 16.203,16.21 c 9.918,-10.15 23.219,-12.83 35.317,-12.83 15,0 26.847,5.33 26.847,16.95 0,8.22 -4.593,13.54 -16.449,14.51 l -19.59,1.69 c -22.976,1.93 -36.277,12.33 -36.277,33.85 0,23.95 20.555,37.5 46.195,37.5 18.379,0 34.106,-3.86 45.473,-13.79 l -15.481,-15.72 c -7.738,6.54 -18.625,8.96 -30.23,8.96 -14.758,0 -22.254,-6.55 -22.254,-15.72 0,-7.26 3.867,-12.83 16.93,-14.03 l 19.351,-1.7 c 22.977,-1.94 36.528,-12.81 36.528,-34.59 0,-25.63 -21.774,-38.93 -51.043,-38.93" /><path
|
||||
id="path58"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 591.754,1111.71 c -22.977,0 -33.617,16.46 -33.617,34.11 v 67.5 h -14.032 v 18.86 h 14.032 v 37.26 h 24.668 v -37.26 h 23.703 v -18.86 h -23.703 v -66.27 c 0,-8.95 4.359,-14.28 13.547,-14.28 h 10.156 v -21.06 h -14.754" /><path
|
||||
id="path60"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 718.035,1205.58 c -5.558,5.57 -9.91,8.22 -18.379,8.22 -13.304,0 -24.429,-10.63 -24.429,-27.58 v -74.51 h -24.676 v 122.66 h 24.191 v -13.31 c 6.289,8.72 18.867,14.75 32.656,14.75 11.856,0 20.801,-3.14 29.266,-11.61 l -18.629,-18.62" /><path
|
||||
id="path62"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 843.367,1111.71 v 12.35 c -8.465,-9.19 -20.32,-13.77 -32.652,-13.77 -12.574,0 -22.981,4.1 -30.242,11.11 -9.434,9.2 -12.332,20.81 -12.332,34.58 v 78.39 h 24.672 v -74.75 c 0,-19.11 10.886,-27.34 24.671,-27.34 13.789,0 25.403,8.48 25.403,27.34 v 74.75 h 24.668 v -122.66 h -24.188" /><path
|
||||
id="path64"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 919.352,1111.71 v 122.66 h 24.668 v -122.66 z m -0.731,146.85 v 26.12 h 26.129 v -26.12 h -26.129" /><path
|
||||
id="path66"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1063.29,1205.58 c -5.56,5.57 -9.92,8.22 -18.38,8.22 -13.31,0 -24.44,-10.63 -24.44,-27.58 v -74.51 h -24.669 v 122.66 h 24.189 v -13.31 c 6.29,8.72 18.87,14.75 32.66,14.75 11.85,0 20.8,-3.14 29.26,-11.61 l -18.62,-18.62" /><path
|
||||
id="path68"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1177,1199.78 c -3.87,9.19 -12.57,15.48 -24.19,15.48 -11.61,0 -20.55,-6.29 -24.43,-15.48 -2.42,-5.58 -2.9,-9.2 -3.15,-16.7 h 55.16 c -0.24,7.5 -0.98,11.12 -3.39,16.7 z m -51.77,-33.87 c 0,-21.04 11.14,-34.35 31.22,-34.35 13.78,0 21.03,3.86 29.74,12.58 l 15.72,-14.75 c -12.57,-12.59 -24.43,-19.1 -45.95,-19.1 -30.73,0 -55.16,16.2 -55.16,62.88 0,39.67 20.57,62.64 52.01,62.64 32.89,0 52.01,-24.18 52.01,-59.02 v -10.88 h -79.59" /><path
|
||||
id="path70"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1353.61,1111.71 c -23.45,0 -33.61,15.74 -33.61,33.88 v 138.35 h 24.67 v -136.89 c 0,-9.44 3.4,-14.28 13.3,-14.28 h 10.9 v -21.06 h -15.26" /><path
|
||||
id="path72"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1393.28,1236.54 v 47.4 h 27.11 v -25.38 l -27.11,-22.02" /><path
|
||||
id="path74"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1536.99,1165.91 h -28.79 c -14.51,0 -22.01,-6.53 -22.01,-17.65 0,-11.13 7.01,-17.42 22.5,-17.42 9.44,0 16.45,0.72 22.99,7.02 3.61,3.62 5.31,9.43 5.31,18.12 z m 0.49,-54.2 v 11.15 c -8.94,-8.96 -17.42,-12.57 -32.66,-12.57 -15.23,0 -25.39,3.61 -32.89,11.11 -6.29,6.53 -9.68,15.97 -9.68,26.37 0,20.56 14.25,35.31 42.32,35.31 h 32.42 v 8.72 c 0,15.48 -7.75,22.97 -26.83,22.97 -13.56,0 -20.1,-3.14 -26.86,-11.85 l -16.23,15.24 c 11.62,13.54 23.73,17.65 44.04,17.65 33.62,0 50.57,-14.26 50.57,-42.08 v -82.02 h -24.2" /><path
|
||||
id="path76"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1659.65,1111.71 h -20.06 l -45,122.66 h 26.13 l 29.03,-86.36 28.79,86.36 h 26.11 l -45,-122.66" /><path
|
||||
id="path78"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1806.25,1199.78 c -3.87,9.19 -12.58,15.48 -24.2,15.48 -11.58,0 -20.55,-6.29 -24.41,-15.48 -2.43,-5.58 -2.89,-9.2 -3.15,-16.7 h 55.16 c -0.26,7.5 -0.96,11.12 -3.4,16.7 z m -51.76,-33.87 c 0,-21.04 11.14,-34.35 31.21,-34.35 13.79,0 21.06,3.86 29.75,12.58 l 15.74,-14.75 c -12.6,-12.59 -24.43,-19.1 -45.99,-19.1 -30.71,0 -55.14,16.2 -55.14,62.88 0,39.67 20.57,62.64 51.99,62.64 32.93,0 52.03,-24.18 52.03,-59.02 v -10.88 h -79.59" /><path
|
||||
id="path80"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1954.08,1111.71 v 74.77 c 0,19.1 -10.88,27.32 -24.67,27.32 -13.78,0 -25.39,-8.45 -25.39,-27.32 v -74.77 h -24.66 v 122.66 h 24.18 v -12.35 c 8.45,9.2 20.31,13.79 32.65,13.79 12.6,0 22.97,-4.11 30.24,-11.12 9.43,-9.19 12.32,-20.8 12.32,-34.6 v -78.38 h -24.67" /><path
|
||||
id="path82"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 2029.36,1111.71 v 122.66 h 24.66 v -122.66 z m -0.75,146.85 v 26.12 h 26.12 v -26.12 h -26.12" /><path
|
||||
id="path84"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 2173.28,1205.58 c -5.55,5.57 -9.9,8.22 -18.38,8.22 -13.3,0 -24.43,-10.63 -24.43,-27.58 v -74.51 h -24.67 v 122.66 h 24.18 v -13.31 c 6.29,8.72 18.89,14.75 32.68,14.75 11.83,0 20.8,-3.14 29.25,-11.61 l -18.63,-18.62" /><path
|
||||
id="path86"
|
||||
style="fill:#6ec72e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 615.445,3002.53 c 0,0 -175.468,0 -266.968,0 -154.278,0 -264.2856,-52.31 -252.7036,-186.55 C 116.477,2576 546.715,2639.72 618.961,2336.3 c 52.977,267.28 -203.023,291.4 -326.582,386.38 -48.348,37.18 -57.809,141.87 41.476,141.87 34.469,0 208.543,0 208.543,0 l 73.047,137.98" /><path
|
||||
id="path88"
|
||||
style="fill:#094268;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 4.96094,2815.49 c 0,-264.89 210.28106,-320.16 335.25806,-394.22 52.469,-31.13 57.777,-141.87 -41.528,-141.87 -34.476,0 -291.05819,0 -291.05819,0 v -406.01 l 144.86319,62.33 v 205.68 c 47.145,0 96.328,0 131.613,0 154.309,0 252.692,51.85 252.692,186.6 0,278 -472.4065,208.2 -531.84006,487.49" /><path
|
||||
id="path90"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1064.21,2855.66 -68.335,120.77 c -10.996,19.12 -17.121,28.3 -34.777,28.3 -17.227,0 -27.149,-1.68 -27.149,-1.68 v -190.3 h 32.356 v 150.73 l 75.845,-133.39 c 8.62,-14.73 15.41,-18.91 30.42,-18.91 14.77,0 24.01,1.12 24.01,1.12 v 190.86 h -32.37 v -147.5" /><path
|
||||
id="path92"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1268.81,2850.1 -60.63,152.07 -0.34,0.99 h -33.87 l 67.48,-170.7 c 6.66,-16.51 14.35,-23.22 27.63,-22.94 12.62,0.27 18.24,0.27 18.24,0.27 l 73.77,193.37 h -33.51 l -58.77,-153.06" /><path
|
||||
id="path94"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 2185.49,3050.38 h -33.79 l -28.18,-38.01 h 21.28 l 40.69,38.01" /><path
|
||||
id="path96"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 869.488,2878.37 c 0,-25.53 -14.105,-39.52 -40.582,-39.52 -26.566,0 -40.343,13.99 -40.343,39.52 v 123.8 h -31.918 v -126.54 c 0,-36.57 26.847,-65.06 73.203,-65.06 45.429,0 73.261,28.49 73.261,65.06 v 126.54 h -33.621 v -123.8" /><path
|
||||
id="path98"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1128.14,2813.74 h 35.24 v 187.93 h -35.24 v -187.93" /><path
|
||||
id="path100"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1900.37,2974.46 h 51.25 v -160.72 h 35.24 v 160.72 h 51.21 v 27.21 h -137.7 v -27.21" /><path
|
||||
id="path102"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1847.36,2813.74 h 35.24 v 187.93 h -35.24 v -187.93" /><path
|
||||
id="path104"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1765.92,2925.15 c -19.1,8.96 -35.61,16.74 -35.61,29.4 0,11.86 6.76,18.36 18.95,18.36 h 65.02 v 29.69 h -61.64 c -32.48,0 -53.52,-19.36 -53.52,-49.39 0,-31.82 28.93,-45.51 54.38,-57.54 20.17,-9.55 37.71,-17.81 37.71,-32.69 0,-10.64 -3.32,-20.47 -27.32,-20.47 h -66.06 v -29.68 h 70.51 c 33.32,0 54.08,20.04 54.08,52.25 0,33.46 -31.35,48.19 -56.5,60.07" /><path
|
||||
id="path106"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1676.95,2942.98 c 0,69.07 -67.38,60.07 -134.8,59.75 h -13.11 V 2813.5 h 31.45 v 160.54 0 c 66.05,4.25 85.19,-5.32 85.19,-31.06 0,-23.77 -20.27,-32.5 -56.34,-32.5 h -6.14 l -9.33,-27.64 67.01,-70.13 h 40.02 l -68.6,71.36 c 52.5,5.88 64.65,27.51 64.65,58.91" /><path
|
||||
id="path108"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1380.7,2813.74 117.56,0.5 v 27.21 h -82.3 v 54.51 h 69.63 l 10.41,27.18 h -80.04 v 51.32 h 82.3 v 27.21 H 1380.7 v -187.93" /><path
|
||||
id="path110"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 2059.86,2813.74 117.54,0.5 v 27.21 h -82.28 v 54.51 h 69.63 l 10.41,27.18 h -80.04 v 51.32 h 82.28 v 27.21 h -117.54 v -187.93" /><path
|
||||
id="path112"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1728.18,2585.29 c 0,137.92 -134.63,119.99 -269.31,119.28 h -26.17 v -377.9 h 62.87 v 320.66 0 c 131.87,8.51 170.15,-10.62 170.15,-62.04 0,-47.48 -40.51,-64.92 -112.54,-64.92 h -12.24 l -18.71,-55.21 133.92,-140.05 h 79.9 l -137.03,142.57 c 104.89,11.7 129.16,54.87 129.16,117.61" /><path
|
||||
id="path114"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 866.715,2465.16 c 140.525,-11.5 186.245,52.96 186.245,120.13 0,137.92 -134.62,119.99 -269.323,119.28 h -26.176 v -377.9 h 62.906 v 320.66 0 c 131.867,8.51 170.129,-10.62 170.129,-62.04 0,-47.48 -39.164,-69 -112.531,-64.92 H 865.73 l -17.554,-52.61 18.539,-2.6" /><path
|
||||
id="path116"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1794.92,2708.16 h 70.47 v -383.05 h -70.47 v 383.05" /><path
|
||||
id="path118"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1154.24,2506.94 55.21,139.54 61.96,-139.54 z m 197.93,-181.83 h 69.41 l -176.19,382.7 h -75.66 l -156.09,-383.33 68.62,0.63 50.75,128.23 h 162.26 l 56.9,-128.23" /><path
|
||||
id="path120"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 2078.09,2326.67 h -141.02 v 59.21 h 132.17 c 47.89,0 54.53,19.71 54.53,40.98 0,29.71 -34.92,46.25 -75.37,65.37 -51,24.09 -108.73,51.43 -108.73,115.07 0,60 41.99,98.68 107.07,98.68 h 130.23 v -59.29 h -137.05 c -24.39,0 -37.89,-13.05 -37.89,-36.78 0,-25.26 33.03,-40.8 71.17,-58.81 50.32,-23.63 112.99,-53.16 112.99,-120.05 0,-64.4 -41.42,-104.38 -108.1,-104.38 v 0" /><path
|
||||
id="path122"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="M 901.039,1864.49 H 759.977 v 59.29 h 132.125 c 47.972,0 54.582,19.73 54.582,41.02 0,29.68 -34.954,46.17 -75.395,65.35 -50.961,24.07 -108.707,51.4 -108.707,115.05 0,59.93 41.992,98.68 107.047,98.68 h 130.289 v -59.29 H 862.777 c -24.379,0 -37.843,-13.05 -37.843,-36.79 0,-25.32 33.027,-40.82 71.183,-58.76 50.309,-23.73 112.963,-53.28 112.963,-120.1 0,-64.41 -41.365,-104.45 -108.041,-104.45 v 0" /><path
|
||||
id="path124"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1345.43,2244.02 h -73.89 v -246.29 c 0,-51.08 -28.24,-79 -81.23,-79 -52.95,0 -80.62,27.92 -80.62,79 v 246.29 h -63.8 v -251.64 c 0,-73.19 53.64,-130.21 146.4,-130.21 90.76,0 146.44,57.02 146.44,130.21 v 194.4" /><path
|
||||
id="path126"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1344.14,1877.51 c 0,0 14.28,-10.7 79.36,-10.41 135.58,0.63 193.53,79.96 193.53,192.09 0,109.72 -80.25,184.83 -167.11,184.83 h -178.38 l 32.85,-59.08 h 120.22 c 95.64,0 125.47,-76.62 125.47,-128.01 0,-56.06 -27.01,-133.91 -120.98,-133.91 -23.12,0 -58.87,6.27 -58.87,6.27 l -26.09,-51.78" /><path
|
||||
id="path128"
|
||||
style="fill:#615e5e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="M 2177.99,1667.3 H 1.01953 v 15 H 2177.99 v -15" /><path
|
||||
id="path130"
|
||||
style="fill:#094268;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="M 1.83203,0 H 2177.75 V 962.441 H 1.83203 V 0" /><path
|
||||
id="path132"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1960.59,789.469 c -28.79,0 -52.15,-23.34 -52.15,-52.137 0,-28.801 23.36,-52.141 52.15,-52.141 28.8,0 52.12,23.34 52.12,52.141 0,28.797 -23.32,52.137 -52.12,52.137" /><path
|
||||
id="path134"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1848.2,606.941 c 17.82,0 32.25,14.418 32.25,32.258 0,17.821 -14.43,32.223 -32.25,32.223 -17.81,0 -32.24,-14.402 -32.24,-32.223 0,-17.84 14.43,-32.258 32.24,-32.258" /><path
|
||||
id="path136"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 589.348,167.211 h 27.718 v 126 h -27.718 v -126" /><path
|
||||
id="path138"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 521.48,249.832 c 0,-10.621 -7.73,-17.812 -21.242,-17.812 h -28.082 v 36.16 h 27.547 c 13.512,0 21.777,-6.11 21.777,-17.989 z m 28.086,1.43 v 0.367 c 0,25.922 -17.82,41.582 -47.511,41.582 h -57.617 v -126 h 27.718 V 207.5 h 21.789 l 27,-40.289 h 32.399 l -30.77,44.988 c 16.012,5.949 26.992,18.731 26.992,39.063" /><path
|
||||
id="path140"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 327.617,219.961 16.742,40.84 16.739,-40.84 z m 4.317,74.148 -54,-126.898 h 28.273 l 11.512,28.25 h 53.289 l 11.515,-28.25 H 411.5 l -54,126.898 h -25.566" /><path
|
||||
id="path142"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 239.254,248.75 c 0,-10.809 -8.102,-19.102 -21.965,-19.102 H 195.32 v 38.532 h 21.422 c 13.863,0 22.512,-6.641 22.512,-19.09 z m -20.168,44.461 h -51.465 v -126 h 27.699 v 37.769 h 21.071 c 28.254,0 50.945,15.141 50.945,44.321 v 0.34 c 0,25.75 -18.188,43.57 -48.25,43.57" /><path
|
||||
id="path144"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1461.5,219.961 16.74,40.84 16.74,-40.84 z m 4.32,74.148 -54,-126.898 h 28.24 l 11.54,28.25 h 53.28 l 11.51,-28.25 h 29 l -54,126.898 h -25.57" /><path
|
||||
id="path146"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 713.188,242.629 c -21.778,5.582 -27.18,8.269 -27.18,16.562 v 0.348 c 0,6.133 5.578,10.992 16.203,10.992 10.625,0 21.59,-4.679 32.762,-12.429 l 14.398,20.886 c -12.777,10.25 -28.437,16 -46.808,16 -25.731,0 -44.11,-15.109 -44.11,-37.968 v -0.348 c 0,-25.024 16.391,-32.043 41.781,-38.524 21.043,-5.41 25.371,-9 25.371,-16.027 v -0.351 c 0,-7.391 -6.835,-11.879 -18.179,-11.879 -14.414,0 -26.278,5.918 -37.606,15.308 l -16.398,-19.64 c 15.125,-13.489 34.383,-20.161 53.457,-20.161 27.184,0 46.273,14.051 46.273,39.071 v 0.371 c 0,21.949 -14.402,31.121 -39.964,37.789" /><path
|
||||
id="path148"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1607.97,242.629 -30.02,50.582 h -32.4 l 48.41,-76.32 v -49.68 h 27.7 v 50.219 l 48.42,75.781 h -31.47 l -30.64,-50.582" /><path
|
||||
id="path150"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1325.4,293.211 h -27.7 v -126 h 90.52 v 25.199 h -62.82 v 100.801" /><path
|
||||
id="path152"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1042.61,219.961 16.75,40.84 16.73,-40.84 z m 4.32,74.148 -54,-126.898 h 28.26 l 11.52,28.25 H 1086 l 11.53,-28.25 h 28.97 l -54,126.898 h -25.57" /><path
|
||||
id="path154"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1211.29,190.609 c -21.59,0 -36.52,18 -36.52,39.59 v 0.36 c 0,21.601 15.27,39.25 36.52,39.25 12.59,0 22.49,-5.411 32.22,-14.219 l 17.64,20.34 c -11.7,11.519 -25.91,19.449 -49.69,19.449 -38.69,0 -65.7,-29.348 -65.7,-65.18 v -0.347 c 0,-36.18 27.55,-64.813 64.63,-64.813 24.31,0 38.69,8.641 51.68,22.5 l -17.66,17.832 c -9.92,-9.019 -18.73,-14.762 -33.12,-14.762" /><path
|
||||
id="path156"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 784.645,209.871 h 55.437 v 26.277 h -55.437 v -26.277" /><path
|
||||
id="path158"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 928.824,242.629 c -21.769,5.582 -27.176,8.269 -27.176,16.562 v 0.348 c 0,6.133 5.579,10.992 16.204,10.992 10.609,0 21.605,-4.679 32.761,-12.429 l 14.391,20.886 c -12.77,10.25 -28.422,16 -46.797,16 -25.73,0 -44.086,-15.109 -44.086,-37.968 v -0.348 c 0,-25.024 16.387,-32.043 41.742,-38.524 21.067,-5.41 25.383,-9 25.383,-16.027 v -0.351 c 0,-7.391 -6.832,-11.879 -18.176,-11.879 -14.398,0 -26.289,5.918 -37.621,15.308 l -16.379,-19.64 c 15.125,-13.489 34.375,-20.161 53.465,-20.161 27.172,0 46.258,14.051 46.258,39.071 v 0.371 c 0,21.949 -14.406,31.121 -39.969,37.789" /><path
|
||||
id="path160"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="M 671.316,552.18 H 636.645 V 356.879 h 34.671 V 552.18" /><path
|
||||
id="path162"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1029.37,525.879 c 36.62,0 53.1,-29.149 56.59,-57.66 H 971.746 c 4.762,34.133 28.055,57.66 57.624,57.66 z m 4.38,-173.391 c 32.82,0 57.55,11.282 80.18,36.532 l 2.19,2.429 -22.33,20.012 -2.19,-2.301 c -16.69,-17.5 -34.85,-25.609 -57.12,-25.609 -33.06,0 -57.886,22.847 -62.734,57.281 h 148.894 l 0.33,2.918 c 0.38,3.48 0.38,6.48 0.38,9.129 0,61.801 -36.68,103.301 -91.25,103.301 -53.479,0 -93.815,-43.758 -93.815,-101.828 0,-58.071 41.903,-101.864 97.465,-101.864" /><path
|
||||
id="path164"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 242.438,352.871 c 25.683,0 45.851,9.731 61.316,29.68 v -25.672 h 34.312 v 195.293 h -34.312 v -111.34 c 0,-32.891 -21.899,-55.844 -53.289,-55.844 -30.629,0 -48.91,20.071 -48.91,53.653 v 113.531 h -34.68 V 431.711 c 0,-47.902 29.672,-78.84 75.563,-78.84" /><path
|
||||
id="path166"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 497.945,556.18 c -25.617,0 -46.199,-9.918 -61.328,-29.539 V 552.18 H 401.949 V 356.879 h 34.668 v 111.34 c 0,32.871 21.918,55.84 53.289,55.84 30.629,0 48.91,-20.047 48.91,-53.661 V 356.879 H 573.5 v 120.453 c 0,47.906 -29.656,78.848 -75.555,78.848" /><path
|
||||
id="path168"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 830.797,355.41 84.949,196.762 H 878.254 L 816.594,401.02 755.289,552.172 h -38.234 l 84.59,-196.762 h 29.152" /><path
|
||||
id="path170"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1206.03,513.09 v 39.082 h -34.68 V 356.879 h 34.68 v 78.48 c 0,50.559 28.07,83.223 71.55,83.223 h 5.49 v 36.746 l -3.17,0.102 c -30.31,1.281 -57.17,-14.481 -73.87,-42.34" /><path
|
||||
id="path172"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1665.51,616.578 -34.67,-19.148 v -45.258 h -36.64 v -31.383 h 36.64 V 410.172 c 0,-36.461 20.08,-56.57 56.58,-56.57 13.15,0 24.4,2.679 35.43,8.41 l 1.8,0.898 v 31.328 l -4.73,-2.269 c -9.2,-4.43 -16.72,-6.239 -25.97,-6.239 -19.42,0 -28.44,8.918 -28.44,28.098 v 106.961 h 59.88 v 31.383 h -59.88 v 64.406" /><path
|
||||
id="path174"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1791.93,468.219 c 4.77,34.133 28.05,57.66 57.62,57.66 36.62,0 53.11,-29.149 56.62,-57.66 z m 58.36,87.961 c -53.45,0 -93.81,-43.758 -93.81,-101.828 0,-58.071 41.9,-101.864 97.45,-101.864 32.83,0 57.57,11.282 80.19,36.532 l 2.21,2.429 -22.35,20.012 -2.18,-2.301 c -16.7,-17.5 -34.85,-25.609 -57.11,-25.609 -33.07,0 -57.89,22.847 -62.76,57.281 h 148.89 l 0.35,2.918 c 0.37,3.469 0.37,6.48 0.37,9.129 0,61.801 -36.66,103.301 -91.25,103.301" /><path
|
||||
id="path176"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1462.62,413.102 v 0.738 c 0,38.262 -37.85,49.648 -62.91,57.148 l -0.69,0.231 c -23.39,7.101 -45.54,13.832 -45.54,29.832 0,14.418 13.36,24.097 33.24,24.097 17.17,0 36.39,-6.296 54.06,-17.718 l 2.85,-1.828 16.14,26.757 -2.62,1.743 c -20.26,13.378 -46.31,21.347 -69.71,21.347 -39.76,0 -67.52,-23.558 -67.52,-57.308 v -0.719 c 0,-38.051 37.46,-48.684 64.81,-56.473 25.33,-7.058 44.7,-13.758 44.7,-30.758 0,-15.953 -14.39,-26.64 -35.78,-26.64 -21.01,0 -42.93,8.078 -63.38,23.429 l -2.67,2.008 -17.99,-25.328 2.4,-1.949 c 21.68,-17.57 52.38,-28.481 80.16,-28.481 42.17,0 70.45,24.071 70.45,59.872" /><path
|
||||
id="path178"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 1552.77,552.18 h -34.68 V 356.879 h 34.68 V 552.18" /></g></g></svg>
|
||||
|
After Width: | Height: | Size: 32 KiB |
@ -30,8 +30,8 @@ Il existe plusieurs méthodes permettant de vérifier une propriété d'un progr
|
||||
|
||||
L'énoncé permet alors de générer des \bsc{vc}\footnote{Verification Conditions, ou conditions de vérification en français.}, qu'il faut prouver. Pour cela, deux méthodes sont possibles :
|
||||
\begin{itemize}
|
||||
\item une preuve interactive, au moyen d'assistants de preuve tels que Coq, HOL ou Isabelle\ldots
|
||||
\item une preuve automatique, où l'on délègue à des prouveur automatiques de théorèmes tels qu'Alt-Ergo, Z3 ou CVC4\ldots
|
||||
\item une preuve interactive, au moyen d'assistants de preuve tels que Coq, HOL ou Isabelle ;
|
||||
\item une preuve automatique, où l'on délègue à des prouveur automatiques de théorèmes tels qu'Alt-Ergo, Z3 ou CVC4.
|
||||
\end{itemize}
|
||||
|
||||
La vérification déductive peut mener à la génération d'un important nombre de \bsc{vc}. On préfère éviter d'avoir à toutes les traiter interactivement et donc, on essaie autant que faire se peut de passer par une preuve automatique. Cela présente plusieurs avantages: l'effort à fournir est réduit et l'on peut plus facilement modifier le programme ou bien l'énoncé que l'on cherche à vérifier.
|
||||
|
||||
@ -2,12 +2,14 @@
|
||||
\subsection{Généralités}
|
||||
Parcoursup est une plateforme gouvernementale française utilisée par les étudiants pour candidater à des formations de l'enseignement supérieur. Le principe général est le suivant:
|
||||
\begin{itemize}
|
||||
\item les étudiants candidatent à plusieurs formations
|
||||
\item chaque formation classe l'ensemble des étudiants selon les critères de son choix\footnote{On parlera de \emph{classement pédagogique}.}
|
||||
\item la plateforme Parcoursup apporte des modifications aux classements pédagogiques\footnote{Le nouveau classement est appelé l'\emph{ordre d'appel}.}, selon des critères et des algorithmes publics et notifie les candidats acceptés, qui doivent alors faire un choix parmi les formations où ils sont acceptés\footnote{Tout en gardant la possibilité de choisir une autre formation où ils sont sur liste d'attente pour le moment.}
|
||||
\item lorsqu'un candidat choisi une formation parmi celles où il a été accepté, cela libère des places dans les autres, et les candidats suivants sur l'ordre d'appel sont alors acceptés
|
||||
\item les étudiants candidatent à plusieurs formations ;
|
||||
\item chaque formation classe l'ensemble des étudiants selon les critères de son choix\footnote{On parlera de \emph{classement pédagogique}.} ;
|
||||
\item la plateforme Parcoursup apporte des modifications aux classements pédagogiques\footnote{Le nouveau classement est appelé l'\emph{ordre d'appel}.}, selon des critères et des algorithmes publics et notifie les candidats acceptés, qui doivent alors faire un choix parmi les formations où ils sont acceptés\footnote{Tout en gardant la possibilité de choisir une autre formation où ils sont sur liste d'attente pour le moment.} ;
|
||||
\item lorsqu'un candidat choisi une formation parmi celles où il a été accepté, cela libère des places dans les autres, et les candidats suivants sur l'ordre d'appel sont alors acceptés.
|
||||
\end{itemize}
|
||||
|
||||
Plus de détails sont donnés dans \cite{AlgoPS}.
|
||||
|
||||
\subsection{Algorithme avec taux de boursiers}
|
||||
|
||||
Pour passer du classement pédagogique à l'ordre d'appel, il existe plusieurs cas, selon les formations. Chaque cas correspond à un algorithme particulier. Le cas le plus simple est celui avec un taux de boursiers.
|
||||
|
||||
@ -6,4 +6,4 @@
|
||||
|
||||
\subsection{Implémentation originale}
|
||||
|
||||
On souhaite pouvoir vérifier l'implémentation originale en Java. Pour cela, un outils appelé \texttt{jml2why3} est développé par Benedikt \bsc{Becker}. Il devrait permettre de produire du code WhyML à partir du code Java original. On espère alors pouvoir transposer les preuves de notre implémentation WhyML au code WhyML produit.
|
||||
On souhaite pouvoir vérifier l'implémentation originale en Java. Pour cela, un outils appelé \texttt{jml2why3} est développé par Benedikt \bsc{Becker}. Il devrait permettre de produire du code WhyML à partir du code Java original. On espère alors pouvoir transposer les preuves de notre implémentation WhyML au code WhyML généré.
|
||||
|
||||
@ -16,13 +16,13 @@ pour prouver la terminaison de la boucle.
|
||||
On a montré la sûreté de l'ensemble du programme.
|
||||
\subsection{Preuves des propriétés}
|
||||
|
||||
Les propriétés $P_0$, $P_1$, $P_2$ et $P_5$ on été prouvées. Pour $P_3$, seule la partie indiquant qu'un candidat de rang $r$ dans le classement pédagogique aura au mieux le rang $r$ dans l'ordre d'appel a été prouvé. La seconde partie de $P_3$ et $P_4$ ont été énoncées mais ne sont pas prouvées.
|
||||
Les propriétés $P_0$, $P_1$, $P_2$ et $P_5$ on été prouvées. Pour $P_3$, seule la partie indiquant qu'un candidat de rang $r$ dans le classement pédagogique aura au mieux le rang $r$ dans l'ordre d'appel a été prouvé. $P_4$ et la seconde partie de $P_3$ ont été énoncées mais ne sont pas prouvées.
|
||||
|
||||
Les diverses preuves menées ont impliqué des techniques variées et intéressantes: preuves par l'absurde, par des \emph{lemma functions} pour simuler des preuves par induction etc. On ne les détaillera pas ici par manque de place, mais quelques points sont intéressants à souligner.
|
||||
|
||||
Tout d'abord, on avait au départ décider de maintenir divers invariants à l'intérieur même des fonctions de l'algorithme, cependant, en procédant ainsi, on créait de la redondance: un même invariant pouvait demander d'être ajouté en précondition et en postcondition de nombreuses fonctions, ce qui était fastidieux au vu du nombre d'invariants. On a alors décidé de créer un type contenant la majorité des variables utilisées par l'algorithme et de donner des invariants à ce type directement. Ainsi, on doit toujours prouver leur préservation, mais sans avoir à les spécifier plusieurs fois.
|
||||
|
||||
D'autre part, pour faciliter les preuves, plusieurs modifications ont été apportées à la bibliothèque standard de Why3. On peut notamment mentionner la réécriture du module de file et de permutation, ainsi que l'ajout de divers lemmes, sur les séquences notamment.
|
||||
D'autre part, pour faciliter les preuves, plusieurs modifications ont été apportées à la bibliothèque standard de Why3. On peut notamment mentionner la réécriture des modules de file et de permutation, ainsi que l'ajout de divers lemmes, sur les séquences notamment.
|
||||
|
||||
\subsection{Production de code exécutable}
|
||||
Il est possible de générer du code dans un autre langage à partir de l'implémentation WhyML, on appelle cela l'\emph{extraction}. On a extrait notre code vers OCaml. En compilant le code OCaml extrait, on obtient ainsi une imlémentation de référence, que l'on peut exécuter avec des données anonymisées et comparer les résultats obtenus.
|
||||
|
||||
@ -16,9 +16,9 @@
|
||||
|
||||
\vspa{0.1}
|
||||
|
||||
\notimportant Master 1 Informatique\\
|
||||
\vspa{0.02}
|
||||
\includesvg{universite-paris-saclay.svg}\\
|
||||
\notimportant Magistère 2 Informatique\\
|
||||
\vspa{0.05}
|
||||
\includesvg[width=100pt]{upsud.svg}\\
|
||||
|
||||
\vspa{0.1}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user