Mercurial > hg > Papers > 2016 > masa-master
changeset 92:8857808cd8e8
fix
| author | Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp> |
|---|---|
| date | Thu, 18 Feb 2016 17:13:48 +0900 |
| parents | ca50770a7fde |
| children | 3fbb30280a31 |
| files | slide/s6/images/example/wordcount.svg slide/s6/index.html |
| diffstat | 2 files changed, 169 insertions(+), 220 deletions(-) [+] |
line wrap: on
line diff
--- a/slide/s6/images/example/wordcount.svg Thu Feb 18 15:59:22 2016 +0900 +++ b/slide/s6/images/example/wordcount.svg Thu Feb 18 17:13:48 2016 +0900 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1272pt" height="720pt" viewBox="0 0 1272 720" version="1.1"> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1308pt" height="372pt" viewBox="0 0 1308 372" version="1.1"> <defs> <g> <symbol overflow="visible" id="glyph0-0"> @@ -24,15 +24,6 @@ <path style="stroke:none;" d="M 3.078125 -24.8125 L 3.078125 0 L 7.15625 0 L 7.15625 -14.015625 C 7.15625 -15.140625 7.304688 -16.171875 7.609375 -17.109375 C 7.910156 -18.054688 8.363281 -18.878906 8.96875 -19.578125 C 9.582031 -20.285156 10.34375 -20.832031 11.25 -21.21875 C 12.164062 -21.601562 13.25 -21.796875 14.5 -21.796875 C 16.0625 -21.796875 17.289062 -21.347656 18.1875 -20.453125 C 19.082031 -19.554688 19.53125 -18.335938 19.53125 -16.796875 L 19.53125 0 L 23.609375 0 L 23.609375 -16.3125 C 23.609375 -17.664062 23.472656 -18.890625 23.203125 -19.984375 C 22.929688 -21.085938 22.457031 -22.039062 21.78125 -22.84375 C 21.113281 -23.644531 20.234375 -24.269531 19.140625 -24.71875 C 18.054688 -25.164062 16.703125 -25.390625 15.078125 -25.390625 C 11.390625 -25.390625 8.703125 -23.882812 7.015625 -20.875 L 6.90625 -20.875 L 6.90625 -24.8125 Z M 3.078125 -24.8125 "/> </symbol> <symbol overflow="visible" id="glyph0-7"> -<path style="stroke:none;" d="M 7.390625 -29.28125 L 7.390625 -34.265625 L 3.3125 -34.265625 L 3.3125 -29.28125 Z M 3.3125 -24.8125 L 3.3125 0 L 7.390625 0 L 7.390625 -24.8125 Z M 3.3125 -24.8125 "/> -</symbol> -<symbol overflow="visible" id="glyph0-8"> -<path style="stroke:none;" d="M 19.921875 -16.84375 L 24.140625 -16.84375 C 23.984375 -18.320312 23.597656 -19.59375 22.984375 -20.65625 C 22.378906 -21.726562 21.601562 -22.617188 20.65625 -23.328125 C 19.71875 -24.035156 18.628906 -24.554688 17.390625 -24.890625 C 16.160156 -25.222656 14.84375 -25.390625 13.4375 -25.390625 C 11.488281 -25.390625 9.773438 -25.046875 8.296875 -24.359375 C 6.828125 -23.671875 5.601562 -22.726562 4.625 -21.53125 C 3.65625 -20.332031 2.929688 -18.921875 2.453125 -17.296875 C 1.972656 -15.679688 1.734375 -13.945312 1.734375 -12.09375 C 1.734375 -10.238281 1.976562 -8.535156 2.46875 -6.984375 C 2.96875 -5.429688 3.703125 -4.09375 4.671875 -2.96875 C 5.648438 -1.851562 6.867188 -0.988281 8.328125 -0.375 C 9.785156 0.226562 11.457031 0.53125 13.34375 0.53125 C 16.507812 0.53125 19.007812 -0.300781 20.84375 -1.96875 C 22.6875 -3.632812 23.832031 -6.003906 24.28125 -9.078125 L 20.109375 -9.078125 C 19.859375 -7.148438 19.160156 -5.660156 18.015625 -4.609375 C 16.878906 -3.554688 15.304688 -3.03125 13.296875 -3.03125 C 12.015625 -3.03125 10.910156 -3.285156 9.984375 -3.796875 C 9.054688 -4.304688 8.300781 -4.984375 7.71875 -5.828125 C 7.144531 -6.679688 6.722656 -7.648438 6.453125 -8.734375 C 6.179688 -9.828125 6.046875 -10.945312 6.046875 -12.09375 C 6.046875 -13.34375 6.171875 -14.550781 6.421875 -15.71875 C 6.679688 -16.882812 7.109375 -17.914062 7.703125 -18.8125 C 8.296875 -19.707031 9.085938 -20.425781 10.078125 -20.96875 C 11.066406 -21.519531 12.300781 -21.796875 13.78125 -21.796875 C 15.507812 -21.796875 16.882812 -21.363281 17.90625 -20.5 C 18.925781 -19.632812 19.597656 -18.414062 19.921875 -16.84375 Z M 19.921875 -16.84375 "/> -</symbol> -<symbol overflow="visible" id="glyph0-9"> -<path style="stroke:none;" d="M 20.296875 -14.78125 L 6.046875 -14.78125 C 6.109375 -15.738281 6.316406 -16.640625 6.671875 -17.484375 C 7.023438 -18.335938 7.503906 -19.082031 8.109375 -19.71875 C 8.722656 -20.363281 9.453125 -20.867188 10.296875 -21.234375 C 11.140625 -21.609375 12.09375 -21.796875 13.15625 -21.796875 C 14.175781 -21.796875 15.109375 -21.609375 15.953125 -21.234375 C 16.804688 -20.867188 17.546875 -20.375 18.171875 -19.75 C 18.796875 -19.125 19.289062 -18.378906 19.65625 -17.515625 C 20.019531 -16.648438 20.234375 -15.738281 20.296875 -14.78125 Z M 24.234375 -7.875 L 20.203125 -7.875 C 19.859375 -6.238281 19.132812 -5.019531 18.03125 -4.21875 C 16.925781 -3.425781 15.507812 -3.03125 13.78125 -3.03125 C 12.4375 -3.03125 11.265625 -3.253906 10.265625 -3.703125 C 9.273438 -4.148438 8.457031 -4.75 7.8125 -5.5 C 7.175781 -6.25 6.710938 -7.109375 6.421875 -8.078125 C 6.140625 -9.054688 6.015625 -10.09375 6.046875 -11.1875 L 24.625 -11.1875 C 24.6875 -12.6875 24.550781 -14.269531 24.21875 -15.9375 C 23.882812 -17.601562 23.273438 -19.140625 22.390625 -20.546875 C 21.515625 -21.953125 20.347656 -23.109375 18.890625 -24.015625 C 17.429688 -24.929688 15.597656 -25.390625 13.390625 -25.390625 C 11.691406 -25.390625 10.128906 -25.066406 8.703125 -24.421875 C 7.285156 -23.785156 6.054688 -22.890625 5.015625 -21.734375 C 3.972656 -20.585938 3.164062 -19.226562 2.59375 -17.65625 C 2.019531 -16.09375 1.734375 -14.367188 1.734375 -12.484375 C 1.796875 -10.585938 2.070312 -8.835938 2.5625 -7.234375 C 3.0625 -5.640625 3.804688 -4.265625 4.796875 -3.109375 C 5.785156 -1.960938 7.007812 -1.066406 8.46875 -0.421875 C 9.925781 0.210938 11.644531 0.53125 13.625 0.53125 C 16.445312 0.53125 18.785156 -0.171875 20.640625 -1.578125 C 22.492188 -2.992188 23.691406 -5.09375 24.234375 -7.875 Z M 24.234375 -7.875 "/> -</symbol> -<symbol overflow="visible" id="glyph0-10"> <path style="stroke:none;" d="M 6.34375 -16.75 C 6.34375 -17.582031 6.347656 -18.503906 6.359375 -19.515625 C 6.378906 -20.523438 6.457031 -21.53125 6.59375 -22.53125 C 6.738281 -23.539062 6.945312 -24.523438 7.21875 -25.484375 C 7.488281 -26.441406 7.890625 -27.28125 8.421875 -28 C 8.953125 -28.726562 9.613281 -29.316406 10.40625 -29.765625 C 11.207031 -30.210938 12.1875 -30.4375 13.34375 -30.4375 C 14.5 -30.4375 15.472656 -30.210938 16.265625 -29.765625 C 17.066406 -29.316406 17.734375 -28.726562 18.265625 -28 C 18.796875 -27.28125 19.195312 -26.441406 19.46875 -25.484375 C 19.738281 -24.523438 19.941406 -23.539062 20.078125 -22.53125 C 20.222656 -21.53125 20.304688 -20.523438 20.328125 -19.515625 C 20.347656 -18.503906 20.359375 -17.582031 20.359375 -16.75 C 20.359375 -15.46875 20.316406 -14.035156 20.234375 -12.453125 C 20.148438 -10.867188 19.890625 -9.378906 19.453125 -7.984375 C 19.023438 -6.597656 18.332031 -5.425781 17.375 -4.46875 C 16.414062 -3.507812 15.070312 -3.03125 13.34375 -3.03125 C 11.613281 -3.03125 10.269531 -3.507812 9.3125 -4.46875 C 8.351562 -5.425781 7.65625 -6.597656 7.21875 -7.984375 C 6.789062 -9.378906 6.535156 -10.867188 6.453125 -12.453125 C 6.378906 -14.035156 6.34375 -15.46875 6.34375 -16.75 Z M 2.015625 -16.703125 C 2.015625 -15.453125 2.046875 -14.15625 2.109375 -12.8125 C 2.171875 -11.46875 2.328125 -10.15625 2.578125 -8.875 C 2.835938 -7.59375 3.207031 -6.382812 3.6875 -5.25 C 4.175781 -4.113281 4.832031 -3.113281 5.65625 -2.25 C 6.488281 -1.382812 7.535156 -0.703125 8.796875 -0.203125 C 10.066406 0.285156 11.582031 0.53125 13.34375 0.53125 C 15.132812 0.53125 16.65625 0.285156 17.90625 -0.203125 C 19.15625 -0.703125 20.191406 -1.382812 21.015625 -2.25 C 21.847656 -3.113281 22.503906 -4.113281 22.984375 -5.25 C 23.472656 -6.382812 23.84375 -7.59375 24.09375 -8.875 C 24.351562 -10.15625 24.515625 -11.46875 24.578125 -12.8125 C 24.640625 -14.15625 24.671875 -15.453125 24.671875 -16.703125 C 24.671875 -17.953125 24.640625 -19.25 24.578125 -20.59375 C 24.515625 -21.9375 24.351562 -23.25 24.09375 -24.53125 C 23.84375 -25.8125 23.472656 -27.023438 22.984375 -28.171875 C 22.503906 -29.328125 21.847656 -30.335938 21.015625 -31.203125 C 20.191406 -32.066406 19.144531 -32.753906 17.875 -33.265625 C 16.613281 -33.773438 15.101562 -34.03125 13.34375 -34.03125 C 11.582031 -34.03125 10.066406 -33.773438 8.796875 -33.265625 C 7.535156 -32.753906 6.488281 -32.066406 5.65625 -31.203125 C 4.832031 -30.335938 4.175781 -29.328125 3.6875 -28.171875 C 3.207031 -27.023438 2.835938 -25.8125 2.578125 -24.53125 C 2.328125 -23.25 2.171875 -21.9375 2.109375 -20.59375 C 2.046875 -19.25 2.015625 -17.953125 2.015625 -16.703125 Z M 2.015625 -16.703125 "/> </symbol> <symbol overflow="visible" id="glyph1-0"> @@ -66,7 +57,7 @@ <path style="stroke:none;" d="M 8.109375 -26.15625 L 3.359375 -26.15625 L 3.359375 -21.40625 L 8.109375 -21.40625 Z M 8.109375 -0.28125 L 8.109375 -5.046875 L 3.359375 -5.046875 L 3.359375 -0.28125 Z M 8.109375 -0.28125 "/> </symbol> <symbol overflow="visible" id="glyph1-10"> -<path style="stroke:none;" d="M 22.703125 -0.28125 C 25.109375 -0.28125 26.6875 -0.1875 28.609375 0 L 28.609375 -4.03125 C 26.78125 -3.796875 25.15625 -3.703125 22.75 -3.703125 L 7.4375 -3.703125 C 8.015625 -6 8.6875 -7.296875 10.171875 -9.265625 C 11.765625 -11.28125 13.296875 -12.625 17.09375 -15.171875 C 22.5625 -18.8125 23.8125 -19.734375 25.25 -21.359375 C 27.125 -23.421875 28.078125 -25.734375 28.078125 -28.171875 C 28.078125 -33.84375 23.421875 -37.484375 16.171875 -37.484375 C 11.953125 -37.484375 8.6875 -36.234375 6.53125 -33.796875 C 4.9375 -32.015625 4.21875 -30.34375 3.5 -26.875 L 7.53125 -26.203125 C 7.875 -28.609375 8.296875 -29.765625 9.21875 -31.0625 C 10.65625 -33.125 13.015625 -34.171875 16.171875 -34.171875 C 21.078125 -34.171875 24.140625 -31.828125 24.140625 -28.171875 C 24.140625 -25.25 22.5625 -23.140625 17.8125 -19.921875 C 12.234375 -16.125 12.140625 -16.078125 10.46875 -14.640625 C 7.4375 -12.046875 5.421875 -9.40625 4.21875 -6.390625 C 3.5 -4.5625 3.359375 -3.84375 2.828125 -0.046875 C 4.375 -0.234375 5.09375 -0.28125 8.109375 -0.28125 Z M 22.703125 -0.28125 "/> +<path style="stroke:none;" d="M 2.15625 -8.15625 C 3.03125 -5.71875 3.59375 -4.65625 4.609375 -3.5 C 6.90625 -0.90625 10.515625 0.4375 15.359375 0.4375 C 23.375 0.4375 28.375 -3.59375 28.375 -10.078125 C 28.375 -13.15625 27.265625 -15.703125 25.15625 -17.328125 C 23.515625 -18.578125 22.03125 -19.109375 19.25 -19.390625 C 21.453125 -19.828125 22.515625 -20.203125 23.765625 -21.125 C 25.875 -22.609375 27.125 -25.203125 27.125 -28.125 C 27.125 -33.890625 22.703125 -37.53125 15.75 -37.53125 C 11.5625 -37.53125 8.296875 -36.34375 6.1875 -34.03125 C 4.984375 -32.78125 4.421875 -31.6875 3.59375 -29.234375 L 7.578125 -28.375 C 8.109375 -30.140625 8.453125 -30.90625 9.125 -31.78125 C 10.46875 -33.5 12.578125 -34.3125 15.5 -34.3125 C 20.359375 -34.3125 23.234375 -31.921875 23.234375 -27.796875 C 23.234375 -26.0625 22.515625 -24.28125 21.3125 -23.140625 C 19.828125 -21.640625 17.46875 -20.921875 14.296875 -20.921875 C 13.015625 -20.921875 11.859375 -21.03125 10.75 -21.21875 L 10.75 -17.421875 C 12.046875 -17.5625 13.25 -17.65625 14.59375 -17.65625 C 20.96875 -17.65625 24.390625 -15.078125 24.390625 -10.3125 C 24.390625 -5.765625 20.875 -2.875 15.3125 -2.875 C 12.859375 -2.875 10.75 -3.453125 9.125 -4.609375 C 7.625 -5.65625 6.953125 -6.671875 6.1875 -9.171875 Z M 2.15625 -8.15625 "/> </symbol> <symbol overflow="visible" id="glyph1-11"> <path style="stroke:none;" d="M 22.9375 -0.28125 C 25.625 -0.28125 26.96875 -0.1875 28.515625 0.046875 L 28.515625 -4.03125 C 26.640625 -3.796875 25.34375 -3.703125 22.9375 -3.703125 L 7.828125 -3.703125 L 7.828125 -31.109375 C 7.828125 -33.75 7.921875 -34.984375 8.203125 -36.765625 L 3.703125 -36.765625 C 3.984375 -35.09375 4.078125 -33.59375 4.078125 -31.109375 L 4.078125 -5.859375 C 4.078125 -3.5 3.984375 -1.96875 3.703125 -0.140625 C 5.375 -0.234375 6.71875 -0.28125 8.921875 -0.28125 Z M 22.9375 -0.28125 "/> @@ -81,218 +72,103 @@ <path style="stroke:none;" d="M 26.0625 -12.671875 C 25.96875 -13.96875 25.78125 -15.84375 25.734375 -16.375 C 24.765625 -22.796875 20.296875 -26.78125 14.109375 -26.78125 C 6.90625 -26.78125 2.203125 -21.40625 2.203125 -13.203125 C 2.203125 -4.890625 6.953125 0.390625 14.5 0.390625 C 18 0.390625 20.921875 -0.765625 23.1875 -2.96875 C 24.28125 -4.078125 24.90625 -4.9375 25.828125 -6.953125 L 22.46875 -8.296875 C 21.125 -4.609375 18.4375 -2.6875 14.546875 -2.6875 C 11.65625 -2.6875 9.3125 -3.84375 7.78125 -5.953125 C 6.484375 -7.6875 6 -9.453125 5.859375 -12.671875 Z M 6 -15.703125 C 6.28125 -17.515625 6.53125 -18.390625 7.203125 -19.578125 C 8.640625 -22.265625 11.09375 -23.765625 14.015625 -23.765625 C 16.3125 -23.765625 18.1875 -23.046875 19.6875 -21.59375 C 21.21875 -20.109375 21.9375 -18.390625 22.21875 -15.703125 Z M 6 -15.703125 "/> </symbol> <symbol overflow="visible" id="glyph1-15"> -<path style="stroke:none;" d="M 15.75 0.4375 C 20.15625 0.4375 23.515625 -1.25 25.921875 -4.609375 C 28.03125 -7.53125 29.28125 -12.671875 29.28125 -18.484375 C 29.28125 -22.46875 28.65625 -26.296875 27.453125 -29.609375 C 26.875 -31.203125 25.921875 -32.6875 24.578125 -34.03125 C 22.421875 -36.28125 19.34375 -37.4375 15.796875 -37.4375 C 11.046875 -37.4375 7.34375 -35.421875 5.046875 -31.53125 C 3.359375 -28.75 2.25 -23.5625 2.25 -18.484375 C 2.25 -14.546875 2.875 -10.75 4.078125 -7.390625 C 4.65625 -5.765625 5.65625 -4.265625 6.953125 -2.96875 C 9.21875 -0.71875 12.1875 0.4375 15.75 0.4375 Z M 15.75 -34.125 C 19.109375 -34.125 21.703125 -32.640625 23.28125 -29.765625 C 24.53125 -27.5 25.4375 -22.75 25.4375 -18.578125 C 25.4375 -15.03125 24.953125 -11.859375 23.953125 -8.875 C 23.515625 -7.484375 22.75 -6.234375 21.703125 -5.140625 C 20.25 -3.640625 18.1875 -2.875 15.796875 -2.875 C 12.53125 -2.875 10.03125 -4.265625 8.359375 -7.0625 C 7.0625 -9.3125 6.09375 -14.015625 6.09375 -18.484375 C 6.09375 -21.984375 6.578125 -25.25 7.578125 -28.171875 C 7.96875 -29.375 8.734375 -30.578125 9.75 -31.6875 C 11.28125 -33.3125 13.25 -34.125 15.75 -34.125 Z M 15.75 -34.125 "/> -</symbol> -<symbol overflow="visible" id="glyph1-16"> -<path style="stroke:none;" d="M 2.15625 -8.15625 C 3.03125 -5.71875 3.59375 -4.65625 4.609375 -3.5 C 6.90625 -0.90625 10.515625 0.4375 15.359375 0.4375 C 23.375 0.4375 28.375 -3.59375 28.375 -10.078125 C 28.375 -13.15625 27.265625 -15.703125 25.15625 -17.328125 C 23.515625 -18.578125 22.03125 -19.109375 19.25 -19.390625 C 21.453125 -19.828125 22.515625 -20.203125 23.765625 -21.125 C 25.875 -22.609375 27.125 -25.203125 27.125 -28.125 C 27.125 -33.890625 22.703125 -37.53125 15.75 -37.53125 C 11.5625 -37.53125 8.296875 -36.34375 6.1875 -34.03125 C 4.984375 -32.78125 4.421875 -31.6875 3.59375 -29.234375 L 7.578125 -28.375 C 8.109375 -30.140625 8.453125 -30.90625 9.125 -31.78125 C 10.46875 -33.5 12.578125 -34.3125 15.5 -34.3125 C 20.359375 -34.3125 23.234375 -31.921875 23.234375 -27.796875 C 23.234375 -26.0625 22.515625 -24.28125 21.3125 -23.140625 C 19.828125 -21.640625 17.46875 -20.921875 14.296875 -20.921875 C 13.015625 -20.921875 11.859375 -21.03125 10.75 -21.21875 L 10.75 -17.421875 C 12.046875 -17.5625 13.25 -17.65625 14.59375 -17.65625 C 20.96875 -17.65625 24.390625 -15.078125 24.390625 -10.3125 C 24.390625 -5.765625 20.875 -2.875 15.3125 -2.875 C 12.859375 -2.875 10.75 -3.453125 9.125 -4.609375 C 7.625 -5.65625 6.953125 -6.671875 6.1875 -9.171875 Z M 2.15625 -8.15625 "/> +<path style="stroke:none;" d="M 22.703125 -0.28125 C 25.109375 -0.28125 26.6875 -0.1875 28.609375 0 L 28.609375 -4.03125 C 26.78125 -3.796875 25.15625 -3.703125 22.75 -3.703125 L 7.4375 -3.703125 C 8.015625 -6 8.6875 -7.296875 10.171875 -9.265625 C 11.765625 -11.28125 13.296875 -12.625 17.09375 -15.171875 C 22.5625 -18.8125 23.8125 -19.734375 25.25 -21.359375 C 27.125 -23.421875 28.078125 -25.734375 28.078125 -28.171875 C 28.078125 -33.84375 23.421875 -37.484375 16.171875 -37.484375 C 11.953125 -37.484375 8.6875 -36.234375 6.53125 -33.796875 C 4.9375 -32.015625 4.21875 -30.34375 3.5 -26.875 L 7.53125 -26.203125 C 7.875 -28.609375 8.296875 -29.765625 9.21875 -31.0625 C 10.65625 -33.125 13.015625 -34.171875 16.171875 -34.171875 C 21.078125 -34.171875 24.140625 -31.828125 24.140625 -28.171875 C 24.140625 -25.25 22.5625 -23.140625 17.8125 -19.921875 C 12.234375 -16.125 12.140625 -16.078125 10.46875 -14.640625 C 7.4375 -12.046875 5.421875 -9.40625 4.21875 -6.390625 C 3.5 -4.5625 3.359375 -3.84375 2.828125 -0.046875 C 4.375 -0.234375 5.09375 -0.28125 8.109375 -0.28125 Z M 22.703125 -0.28125 "/> </symbol> </g> </defs> <g id="surface1"> -<rect x="0" y="0" width="1272" height="720" style="fill:rgb(100%,100%,100%);fill-opacity:1;stroke:none;"/> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 83.096354 221.102865 L 108.901042 221.102865 L 108.901042 249.449219 L 83.096354 249.449219 Z M 83.096354 221.102865 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-1" x="53.80437" y="450.154803"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 108.901042 221.102865 L 134.704427 221.102865 L 134.704427 249.449219 L 108.901042 249.449219 Z M 108.901042 221.102865 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-2" x="135.6326" y="450.154803"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 134.704427 221.102865 L 160.509115 221.102865 L 160.509115 249.449219 L 134.704427 249.449219 Z M 134.704427 221.102865 " transform="matrix(3,0,0,3,-216,-273)"/> +<rect x="0" y="0" width="1308" height="372" style="fill:rgb(100%,100%,100%);fill-opacity:1;stroke:none;"/> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 97.795573 102.046875 L 123.598958 102.046875 L 123.598958 130.393229 L 97.795573 130.393229 Z M 97.795573 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> <g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-3" x="218.8289" y="450.154803"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 160.509115 221.102865 L 186.3125 221.102865 L 186.3125 249.449219 L 160.509115 249.449219 Z M 160.509115 221.102865 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-4" x="290.0012" y="450.154803"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 186.3125 221.102865 L 212.117188 221.102865 L 212.117188 249.449219 L 186.3125 249.449219 Z M 186.3125 221.102865 " transform="matrix(3,0,0,3,-216,-273)"/> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 212.117188 221.102865 L 237.921875 221.102865 L 237.921875 249.449219 L 212.117188 249.449219 Z M 212.117188 221.102865 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-1" x="440.8657" y="450.154803"/> + <use xlink:href="#glyph0-1" x="55.89996" y="92.989403"/> </g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 237.921875 221.102865 L 263.72526 221.102865 L 263.72526 249.449219 L 237.921875 249.449219 Z M 237.921875 221.102865 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-2" x="522.6939" y="450.154803"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 263.72526 221.102865 L 289.529948 221.102865 L 289.529948 249.449219 L 263.72526 249.449219 Z M 263.72526 221.102865 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-3" x="605.8902" y="450.154803"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 304.227865 221.102865 L 330.032552 221.102865 L 330.032552 249.449219 L 304.227865 249.449219 Z M 304.227865 221.102865 " transform="matrix(3,0,0,3,-216,-273)"/> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 123.598958 102.046875 L 149.403646 102.046875 L 149.403646 130.393229 L 123.598958 130.393229 Z M 123.598958 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> <g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-4" x="721.1581" y="450.154803"/> + <use xlink:href="#glyph0-2" x="137.7282" y="92.989403"/> </g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 330.032552 221.102865 L 355.835938 221.102865 L 355.835938 249.449219 L 330.032552 249.449219 Z M 330.032552 221.102865 " transform="matrix(3,0,0,3,-216,-273)"/> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 149.403646 102.046875 L 175.207031 102.046875 L 175.207031 130.393229 L 149.403646 130.393229 Z M 149.403646 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> <g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-5" x="791.4663" y="450.154803"/> - <use xlink:href="#glyph0-6" x="807.4503" y="450.154803"/> + <use xlink:href="#glyph0-3" x="220.9245" y="92.989403"/> </g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 355.835938 221.102865 L 381.640625 221.102865 L 381.640625 249.449219 L 355.835938 249.449219 Z M 355.835938 221.102865 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-7" x="884.8866" y="450.154803"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 381.640625 221.102865 L 407.44401 221.102865 L 407.44401 249.449219 L 381.640625 249.449219 Z M 381.640625 221.102865 " transform="matrix(3,0,0,3,-216,-273)"/> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 175.207031 102.046875 L 201.011719 102.046875 L 201.011719 130.393229 L 175.207031 130.393229 Z M 175.207031 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> <g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-8" x="954.7389" y="450.154803"/> + <use xlink:href="#glyph0-4" x="292.0968" y="92.989403"/> </g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 407.44401 221.102865 L 433.248698 221.102865 L 433.248698 249.449219 L 407.44401 249.449219 Z M 407.44401 221.102865 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-9" x="1032.151" y="450.154803"/> -</g> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 201.011719 102.046875 L 226.815104 102.046875 L 226.815104 130.393229 L 201.011719 130.393229 Z M 201.011719 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 226.815104 102.046875 L 252.619792 102.046875 L 252.619792 130.393229 L 226.815104 130.393229 Z M 226.815104 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> <g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph1-1" x="166.3688" y="555.106276"/> - <use xlink:href="#glyph1-2" x="214.6568" y="555.106276"/> - <use xlink:href="#glyph1-3" x="244.6568" y="555.106276"/> - <use xlink:href="#glyph1-4" x="265.2968" y="555.106276"/> - <use xlink:href="#glyph1-5" x="296.3048" y="555.106276"/> - <use xlink:href="#glyph1-6" x="312.2888" y="555.106276"/> - <use xlink:href="#glyph1-7" x="349.4408" y="555.106276"/> - <use xlink:href="#glyph1-8" x="379.1048" y="555.106276"/> - <use xlink:href="#glyph1-5" x="423.7928" y="555.106276"/> - <use xlink:href="#glyph1-9" x="439.7768" y="555.106276"/> - <use xlink:href="#glyph1-5" x="451.2968" y="555.106276"/> - <use xlink:href="#glyph1-10" x="467.2808" y="555.106276"/> + <use xlink:href="#glyph0-1" x="442.9613" y="92.989403"/> </g> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 252.619792 102.046875 L 278.424479 102.046875 L 278.424479 130.393229 L 252.619792 130.393229 Z M 252.619792 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> <g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph1-11" x="182.2328" y="644.397626"/> - <use xlink:href="#glyph1-12" x="211.1288" y="644.397626"/> - <use xlink:href="#glyph1-13" x="222.5528" y="644.397626"/> - <use xlink:href="#glyph1-14" x="252.2168" y="644.397626"/> - <use xlink:href="#glyph1-5" x="280.4408" y="644.397626"/> - <use xlink:href="#glyph1-6" x="296.4248" y="644.397626"/> - <use xlink:href="#glyph1-7" x="333.5768" y="644.397626"/> - <use xlink:href="#glyph1-8" x="363.2408" y="644.397626"/> - <use xlink:href="#glyph1-5" x="407.9288" y="644.397626"/> - <use xlink:href="#glyph1-9" x="423.9128" y="644.397626"/> - <use xlink:href="#glyph1-5" x="435.4328" y="644.397626"/> - <use xlink:href="#glyph1-15" x="451.4168" y="644.397626"/> + <use xlink:href="#glyph0-2" x="524.7895" y="92.989403"/> +</g> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 278.424479 102.046875 L 304.227865 102.046875 L 304.227865 130.393229 L 278.424479 130.393229 Z M 278.424479 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> +<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> + <use xlink:href="#glyph0-3" x="607.9858" y="92.989403"/> </g> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 304.227865 102.046875 L 330.032552 102.046875 L 330.032552 130.393229 L 304.227865 130.393229 Z M 304.227865 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> <g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph1-1" x="807.0061" y="555.106276"/> - <use xlink:href="#glyph1-2" x="855.2941" y="555.106276"/> - <use xlink:href="#glyph1-3" x="885.2941" y="555.106276"/> - <use xlink:href="#glyph1-4" x="905.9341" y="555.106276"/> - <use xlink:href="#glyph1-5" x="936.9421" y="555.106276"/> - <use xlink:href="#glyph1-6" x="952.9261" y="555.106276"/> - <use xlink:href="#glyph1-7" x="990.0781" y="555.106276"/> - <use xlink:href="#glyph1-8" x="1019.7421" y="555.106276"/> - <use xlink:href="#glyph1-5" x="1064.4301" y="555.106276"/> - <use xlink:href="#glyph1-9" x="1080.4141" y="555.106276"/> - <use xlink:href="#glyph1-5" x="1091.9341" y="555.106276"/> - <use xlink:href="#glyph1-10" x="1107.9181" y="555.106276"/> + <use xlink:href="#glyph0-4" x="679.1581" y="92.989403"/> +</g> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 330.032552 102.046875 L 355.835938 102.046875 L 355.835938 130.393229 L 330.032552 130.393229 Z M 330.032552 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> +<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> + <use xlink:href="#glyph0-5" x="749.4663" y="92.989403"/> + <use xlink:href="#glyph0-6" x="765.4503" y="92.989403"/> </g> <g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph1-11" x="822.8701" y="644.397626"/> - <use xlink:href="#glyph1-12" x="851.7661" y="644.397626"/> - <use xlink:href="#glyph1-13" x="863.1901" y="644.397626"/> - <use xlink:href="#glyph1-14" x="892.8541" y="644.397626"/> - <use xlink:href="#glyph1-5" x="921.0781" y="644.397626"/> - <use xlink:href="#glyph1-6" x="937.0621" y="644.397626"/> - <use xlink:href="#glyph1-7" x="974.2141" y="644.397626"/> - <use xlink:href="#glyph1-8" x="1003.8781" y="644.397626"/> - <use xlink:href="#glyph1-5" x="1048.5661" y="644.397626"/> - <use xlink:href="#glyph1-9" x="1064.5501" y="644.397626"/> - <use xlink:href="#glyph1-5" x="1076.0701" y="644.397626"/> - <use xlink:href="#glyph1-10" x="1092.0541" y="644.397626"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 97.795573 102.046875 L 123.598958 102.046875 L 123.598958 130.393229 L 97.795573 130.393229 Z M 97.795573 102.046875 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-1" x="97.9" y="92.989403"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 123.598958 102.046875 L 149.403646 102.046875 L 149.403646 130.393229 L 123.598958 130.393229 Z M 123.598958 102.046875 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-2" x="179.7282" y="92.989403"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 149.403646 102.046875 L 175.207031 102.046875 L 175.207031 130.393229 L 149.403646 130.393229 Z M 149.403646 102.046875 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-3" x="262.9245" y="92.989403"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 175.207031 102.046875 L 201.011719 102.046875 L 201.011719 130.393229 L 175.207031 130.393229 Z M 175.207031 102.046875 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-4" x="334.0968" y="92.989403"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 201.011719 102.046875 L 226.815104 102.046875 L 226.815104 130.393229 L 201.011719 130.393229 Z M 201.011719 102.046875 " transform="matrix(3,0,0,3,-216,-273)"/> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 226.815104 102.046875 L 252.619792 102.046875 L 252.619792 130.393229 L 226.815104 130.393229 Z M 226.815104 102.046875 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-1" x="484.9613" y="92.989403"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 252.619792 102.046875 L 278.424479 102.046875 L 278.424479 130.393229 L 252.619792 130.393229 Z M 252.619792 102.046875 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-2" x="566.7895" y="92.989403"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 278.424479 102.046875 L 304.227865 102.046875 L 304.227865 130.393229 L 278.424479 130.393229 Z M 278.424479 102.046875 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-3" x="649.9858" y="92.989403"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 304.227865 102.046875 L 330.032552 102.046875 L 330.032552 130.393229 L 304.227865 130.393229 Z M 304.227865 102.046875 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-4" x="721.1581" y="92.989403"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 330.032552 102.046875 L 355.835938 102.046875 L 355.835938 130.393229 L 330.032552 130.393229 Z M 330.032552 102.046875 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-5" x="791.4663" y="92.989403"/> - <use xlink:href="#glyph0-6" x="807.4503" y="92.989403"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 355.835938 102.046875 L 381.640625 102.046875 L 381.640625 130.393229 L 355.835938 130.393229 Z M 355.835938 102.046875 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-7" x="884.8866" y="92.989403"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 381.640625 102.046875 L 407.44401 102.046875 L 407.44401 130.393229 L 381.640625 130.393229 Z M 381.640625 102.046875 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-8" x="954.7389" y="92.989403"/> -</g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 407.44401 102.046875 L 433.248698 102.046875 L 433.248698 130.393229 L 407.44401 130.393229 Z M 407.44401 102.046875 " transform="matrix(3,0,0,3,-216,-273)"/> -<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-9" x="1032.151" y="92.989403"/> + <use xlink:href="#glyph1-1" x="413.5673" y="206.444876"/> + <use xlink:href="#glyph1-2" x="461.8553" y="206.444876"/> + <use xlink:href="#glyph1-3" x="491.8553" y="206.444876"/> + <use xlink:href="#glyph1-4" x="512.4953" y="206.444876"/> + <use xlink:href="#glyph1-5" x="543.5033" y="206.444876"/> + <use xlink:href="#glyph1-6" x="559.4873" y="206.444876"/> + <use xlink:href="#glyph1-7" x="596.6393" y="206.444876"/> + <use xlink:href="#glyph1-8" x="626.3033" y="206.444876"/> + <use xlink:href="#glyph1-5" x="670.9913" y="206.444876"/> + <use xlink:href="#glyph1-9" x="686.9753" y="206.444876"/> + <use xlink:href="#glyph1-5" x="698.4953" y="206.444876"/> + <use xlink:href="#glyph1-10" x="714.4793" y="206.444876"/> </g> <g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph1-1" x="455.5673" y="206.444876"/> - <use xlink:href="#glyph1-2" x="503.8553" y="206.444876"/> - <use xlink:href="#glyph1-3" x="533.8553" y="206.444876"/> - <use xlink:href="#glyph1-4" x="554.4953" y="206.444876"/> - <use xlink:href="#glyph1-5" x="585.5033" y="206.444876"/> - <use xlink:href="#glyph1-6" x="601.4873" y="206.444876"/> - <use xlink:href="#glyph1-7" x="638.6393" y="206.444876"/> - <use xlink:href="#glyph1-8" x="668.3033" y="206.444876"/> - <use xlink:href="#glyph1-5" x="712.9913" y="206.444876"/> - <use xlink:href="#glyph1-9" x="728.9753" y="206.444876"/> - <use xlink:href="#glyph1-5" x="740.4953" y="206.444876"/> - <use xlink:href="#glyph1-16" x="756.4793" y="206.444876"/> + <use xlink:href="#glyph1-11" x="429.4313" y="295.736206"/> + <use xlink:href="#glyph1-12" x="458.3273" y="295.736206"/> + <use xlink:href="#glyph1-13" x="469.7513" y="295.736206"/> + <use xlink:href="#glyph1-14" x="499.4153" y="295.736206"/> + <use xlink:href="#glyph1-5" x="527.6393" y="295.736206"/> + <use xlink:href="#glyph1-6" x="543.6233" y="295.736206"/> + <use xlink:href="#glyph1-7" x="580.7753" y="295.736206"/> + <use xlink:href="#glyph1-8" x="610.4393" y="295.736206"/> + <use xlink:href="#glyph1-5" x="655.1273" y="295.736206"/> + <use xlink:href="#glyph1-9" x="671.1113" y="295.736206"/> + <use xlink:href="#glyph1-5" x="682.6313" y="295.736206"/> + <use xlink:href="#glyph1-15" x="698.6153" y="295.736206"/> </g> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 459.052083 102.046875 L 484.856771 102.046875 L 484.856771 130.393229 L 459.052083 130.393229 Z M 459.052083 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> <g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph1-11" x="471.4313" y="295.736176"/> - <use xlink:href="#glyph1-12" x="500.3273" y="295.736176"/> - <use xlink:href="#glyph1-13" x="511.7513" y="295.736176"/> - <use xlink:href="#glyph1-14" x="541.4153" y="295.736176"/> - <use xlink:href="#glyph1-5" x="569.6393" y="295.736176"/> - <use xlink:href="#glyph1-6" x="585.6233" y="295.736176"/> - <use xlink:href="#glyph1-7" x="622.7753" y="295.736176"/> - <use xlink:href="#glyph1-8" x="652.4393" y="295.736176"/> - <use xlink:href="#glyph1-5" x="697.1273" y="295.736176"/> - <use xlink:href="#glyph1-9" x="713.1113" y="295.736176"/> - <use xlink:href="#glyph1-5" x="724.6313" y="295.736176"/> - <use xlink:href="#glyph1-10" x="740.6153" y="295.736176"/> + <use xlink:href="#glyph0-5" x="1136.528" y="92.989403"/> + <use xlink:href="#glyph0-6" x="1152.512" y="92.989403"/> </g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 433.248698 221.102865 L 459.052083 221.102865 L 459.052083 249.449219 L 433.248698 249.449219 Z M 433.248698 221.102865 " transform="matrix(3,0,0,3,-216,-273)"/> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 484.856771 102.046875 L 510.660156 102.046875 L 510.660156 130.393229 L 484.856771 130.393229 Z M 484.856771 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> +<g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> + <use xlink:href="#glyph0-5" x="1213.94" y="92.989403"/> + <use xlink:href="#glyph0-7" x="1229.924" y="92.989403"/> +</g> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 355.835938 102.046875 L 381.640625 102.046875 L 381.640625 130.393229 L 355.835938 130.393229 Z M 355.835938 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> <g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-5" x="1101.115" y="450.154803"/> - <use xlink:href="#glyph0-6" x="1117.099" y="450.154803"/> + <use xlink:href="#glyph0-1" x="830.0226" y="92.989403"/> </g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 459.052083 221.102865 L 484.856771 221.102865 L 484.856771 249.449219 L 459.052083 249.449219 Z M 459.052083 221.102865 " transform="matrix(3,0,0,3,-216,-273)"/> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 381.640625 102.046875 L 407.44401 102.046875 L 407.44401 130.393229 L 381.640625 130.393229 Z M 381.640625 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> <g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-5" x="1178.528" y="450.154803"/> - <use xlink:href="#glyph0-10" x="1194.512" y="450.154803"/> + <use xlink:href="#glyph0-2" x="911.8509" y="92.989403"/> </g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 433.248698 102.046875 L 459.052083 102.046875 L 459.052083 130.393229 L 433.248698 130.393229 Z M 433.248698 102.046875 " transform="matrix(3,0,0,3,-216,-273)"/> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 407.44401 102.046875 L 433.248698 102.046875 L 433.248698 130.393229 L 407.44401 130.393229 Z M 407.44401 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> <g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-5" x="1101.115" y="92.989403"/> - <use xlink:href="#glyph0-6" x="1117.099" y="92.989403"/> + <use xlink:href="#glyph0-3" x="995.047" y="92.989403"/> </g> -<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 459.052083 102.046875 L 484.856771 102.046875 L 484.856771 130.393229 L 459.052083 130.393229 Z M 459.052083 102.046875 " transform="matrix(3,0,0,3,-216,-273)"/> +<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 433.248698 102.046875 L 459.052083 102.046875 L 459.052083 130.393229 L 433.248698 130.393229 Z M 433.248698 102.046875 " transform="matrix(3,0,0,3,-258,-273)"/> <g style="fill:rgb(0%,0%,0%);fill-opacity:1;"> - <use xlink:href="#glyph0-5" x="1178.528" y="92.989403"/> - <use xlink:href="#glyph0-10" x="1194.512" y="92.989403"/> + <use xlink:href="#glyph0-4" x="1066.219" y="92.989403"/> </g> </g> </svg>
--- a/slide/s6/index.html Thu Feb 18 15:59:22 2016 +0900 +++ b/slide/s6/index.html Thu Feb 18 17:13:48 2016 +0900 @@ -116,33 +116,54 @@ --> <div class='slide'> <h2>文字列処理の並列処理</h2> - + <p> 世界中のサーバには様々な情報や Log が保管されており、それらのテキストファイル全体のデータサイズを合計すると TB 単位ととても大きなサイズになると予想される。 +</p> + <p> それらの中から特定の文字列や正規表現によるパターンマッチングを探すなどの文字列処理には膨大な時間がかかる。 検索時間を短縮するためには、ファイルの読み込み時間を軽減し、プログラムの並列度をあげる必要がある。 - -Cerium は並列プログラミングフレームワークであり当研究室で開発している。 -文字列処理を Cerium に実装するにあたり、ファイルの読み込み方法について改良を行なった。 -ファイルの読み込みを行なったあとに文字列処理が走っていたが、ファイルの読み込みと文字列処理が同時に走るように改良した。 - -文字列の並列処理の例題として、Word Count、正規表現の実装を行なった。 -文字列処理を並列実行する際、ファイルを一定の大きさに分割して、それぞれに対して文字列処理を行う。 -それぞれの分割されたファイルに対して処理を行なったあと結果が出力される。 - -それぞれの結果を合計する際に、分割された部分に対して各例題工夫をすることによって整合性を取る必要がある。 - -本論文では文字列処理だけでなくファイルの読み込みまでを含む文字列処理を考慮した並列処理を実装し、処理全体の速度を上げるような実装を行なった。 - + </p> + <p> +Cerium は並列プログラミングフレームワークであり当研究室で開発している。本研究では、 + </p> + <p> + <ul> + <li> + ファイル読み込みの改良 + </li> + <li> + Cerium 上での文字列処理の並列処理の実装(Word Count、Boyer-Moore String Search、正規表現) + </li> + </ul> +を行なった。 + </p> +<p> +文字列処理だけでなくファイルの読み込みまでを含む文字列処理を考慮した並列処理を実装し、処理全体の速度を上げるような実装を行なった。 + </p> </div> <div class='slide'> <h2>Cerium Task Manager</h2> - <object data="images/cerium/createTask.svg" width="50%" type="image/svg+xml"></object><br> + <ul> + <li> + Cerium は、本研究室で開発している並列プログラミングフレームワークで、C/C++ で実装されている。 + </li> + <li> + Cerium は当初 Sony Computer Entertainment 社の PlayStation3 に搭載されいた Cell 向けに開発されていた。現在では Linux、MacOSX 上で動作する。 + </li> + <li> + Cerium は当初 Sony Computer Entertainment 社の PlayStation3 に搭載されいた Cell 向けに開発されていた。現在では Linux、MacOSX 上で動作する。 + </li> + <li> + 本研究では汎用計算フレームワークの TaskManager を利用して文字列処理の並列処理を実装した。 + </li> + </ul> </div> <div class='slide'> <h2>mmap の特徴</h2> + これまで Cerium での文字列処理の例題では File 読み込みを mmap にて行なっていた。 <object data="images/cerium/mmap.svg" width="50%" type="image/svg+xml"></object><br> <br> @@ -162,37 +183,77 @@ <div class='slide'> <h2>読み込みながら文字列処理を行う Blocked Read</h2> - <p>mmap を使用せずに、read を独立したスレッドで実行させる。そして、読み込んだ部分に対して Word Count を並列に起動する。 + <p>mmap を使用せずに、読み込みを独立したスレッドで実行させる。そして、読み込んだ部分に対して Task を並列に起動する。 </p> <br> - <object data="images/cerium/blockedread.svg" width="50%" type="image/svg+xml"></object><br> + <object data="images/cerium/blockedread.svg" width="70%" type="image/svg+xml"></object><br> <br> <ul> - <li> read は全て読み込み終えるまで連続で動作しファイルを読み込む </li> - <li> read の待ちは CPU を消費しない </li> - <li> 読み込み終わったブロックに対して、Word Count を起動する </li> + <li> ファイルを一度に全て読み込むのではなく、ある程度の大きさに分けて読み込みを行う。</li> + <li> 読み込みが終わったら文字列処理の Task を起動する。</li> <li> - WordCount Task を一度に全て生成すると、その Task でメモリを圧迫するので、 - ある程度の数でまとめた Block という単位で徐々に Task を起動していく。 + ファイルが読み込まれていない領域に対して文字列処理が行われないように依存関係を設定する。 </li> </ul> </div> <div class='slide'> - <h2>独立した CPU で処理</h2> - <object data="images/cerium/speblockedread.svg" width="50%" type="image/svg+xml"></object><br> - <object data="images/cerium/iothread.svg" width="50%" type="image/svg+xml"></object><br> + <h2>I/O 専用 threadの追加</h2> + <li> + Blocked Read は読み込みを含む処理なので、処理時間が大きくなる。 + </li> + <li> + Cerium では読み込みや文字列処理の Task に対してデバイスを設定することができる。SPE_ANY 設定を利用すると Cerium 側が自動的に割り振りを行う。 + </li> + <li> + 自動的にデバイスを割り振ると、Blocked Read Task 間に Task が割り込まれる可能性があり、読み込みが遅延する恐れがある。 + </li> + <object data="images/cerium/speblockedread.svg" width="80%" type="image/svg+xml"></object><br> + + <li> + デバイスの設定に I/O専用 thread の IO_0 を追加して、他の Task に割り込まれないようにした。 + </li> + <object data="images/cerium/iothread.svg" width="80%" type="image/svg+xml"></object><br> </div> <div class='slide'> <h2>文字列処理の並列処理</h2> - <object data="images/example/dividefile.svg" width="50%" type="image/svg+xml"></object><br> + <object data="images/example/dividefile.svg" width="70%" type="image/svg+xml"></object><br> + <li> + ファイルをある程度の大きさに分割する。 + </li> + <li> + 分割したファイルに対してそれぞれに文字列処理を行う。 + </li> + <li> + 結果の集計後、Print Task にて結果を表示する。 + </li> + <li> + ファイルの分割部分で結果の整合性が取れない場合がある。その場合は例題によって様々な方法をとって整合を取る。 + </li> </div> <div class='slide'> <h2>Word Count</h2> - <object data="images/example/wordcount.svg" width="50%" type="image/svg+xml"></object><br> + <object data="images/example/wordcount.svg" width="70%" type="image/svg+xml"></object><br> + <li> + Word Count は読み込んだファイルの単語数を数える。 + </li> + <li> + 改行が読み込まれたら行数のカウントを増やし、空白または改行が読み込まれたら単語数のカウントを増やす。 + </li> + + <object data="images/example/wordcountseparate.svg" width="70%" type="image/svg+xml"></object><br> + <li> + 1つ目の分割されたファイルは空白または改行が 1 つしか無いため、単語数 1 となってしまっている。 + </li> + <li> + ファイルの先頭の空白または改行の場合、単語数はカウントされない。 + </li> + <li> + このように分割された場合、分割されたファイルの一つ目の末尾が文字で終わり、二つ目のファイルの先頭が改行または空白で始まった場合はそれぞれの単語数の合計数に1加えることにより整合性を取ることができる。 + </li> </div> <div class='slide'> @@ -200,11 +261,23 @@ <object data="images/example/bmsearchinclude.svg" width="50%" type="image/svg+xml"></object><br> <object data="images/example/bmsearchsame.svg" width="50%" type="image/svg+xml"></object><br> <object data="images/example/bmsearchthink.svg" width="50%" type="image/svg+xml"></object><br> + <ul> +<li>pattern に含まれていない文字で不一致した場合は、 pattern の長さだけ後ろにずらす。</li> +<li>pattern に含まれている文字の場合は、pattern の長さから pattern に含まれている文字の位置を引いた数だけ後ろにずらす。</li> +<li>pattern に含まれている文字でその文字が pattern に複数含まれている場合は後ろにずらす量も複数現れる。その中の最小の値だけ後ろにずらす。</li> + </ul> </div> <div class='slide'> - <h2>正規表現の一例</h2> + <h2>正規表現マッチャ(Cerium Grep)の実装</h2> <object data="images/regex/regexbasic.svg" width="50%" type="image/svg+xml"></object><br> + <ul> +<li>与えられた正規表現を構文解析し、正規表現木に変換する。</li> +<li>正規表現木から非決定性オートマトン(以下、NFA)か決定性オートマトン(以下、DFA)に変換する。</li> +<li>Subset Construction による NFA から DFA への変換をおこなう。</li> +<li>DFA を元に文字列検索を行ない結果を返す。</li> + </ul> + </div>