Mercurial > hg > Papers > 2014 > nobuyasu-master

comparison slides/graffle/merge_impl2.graffle @ 79:2e53de70f64e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed slide
author Nobuyasu Oshiro <dimolto@cr.ie.u-ryukyu.ac.jp>
date Mon, 03 Feb 2014 10:38:28 +0900
parents bd73f0e1cdd4
children
comparison
equal deleted inserted replaced
78:04f63b011fee 79:2e53de70f64e
44 <key>CreationDate</key> 44 <key>CreationDate</key>
45 <string>2014-02-02 18:12:50 +0000</string> 45 <string>2014-02-02 18:12:50 +0000</string>
46 <key>Creator</key> 46 <key>Creator</key>
47 <string>Oshiro Nobuyasu</string> 47 <string>Oshiro Nobuyasu</string>
48 <key>DisplayScale</key> 48 <key>DisplayScale</key>
49 <string>1 0/72 in = 1 0/72 in</string> 49 <string>1 0/72 in = 1.0000 in</string>
50 <key>GraphDocumentVersion</key> 50 <key>GraphDocumentVersion</key>
51 <integer>8</integer> 51 <integer>8</integer>
52 <key>GraphicsList</key> 52 <key>GraphicsList</key>
53 <array> 53 <array>
54 <dict> 54 <dict>
55 <key>Bounds</key> 55 <key>Class</key>
56 <string>{{183.10385588268571, 275}, {172, 38.070119395706797}}</string> 56 <string>LineGraphic</string>
57 <key>Head</key>
58 <dict>
59 <key>ID</key>
60 <integer>125</integer>
61 </dict>
62 <key>ID</key>
63 <integer>135</integer>
64 <key>Points</key>
65 <array>
66 <string>{262.72256034511082, 354.76202392578125}</string>
67 <string>{261.5, 359.05178833007812}</string>
68 <string>{244.62945929128361, 366.64383849972063}</string>
69 </array>
70 <key>Style</key>
71 <dict>
72 <key>stroke</key>
73 <dict>
74 <key>HeadArrow</key>
75 <string>FilledArrow</string>
76 <key>Legacy</key>
77 <true/>
78 <key>LineType</key>
79 <integer>1</integer>
80 <key>TailArrow</key>
81 <string>0</string>
82 </dict>
83 </dict>
84 <key>Tail</key>
85 <dict>
86 <key>ID</key>
87 <integer>134</integer>
88 </dict>
89 </dict>
90 <dict>
91 <key>Bounds</key>
92 <string>{{231.5, 331.76202392578125}, {69, 23}}</string>
93 <key>Class</key>
94 <string>ShapedGraphic</string>
95 <key>ID</key>
96 <integer>134</integer>
97 <key>Shape</key>
98 <string>Rectangle</string>
99 <key>Style</key>
100 <dict>
101 <key>fill</key>
102 <dict>
103 <key>Draws</key>
104 <string>NO</string>
105 </dict>
106 <key>shadow</key>
107 <dict>
108 <key>Draws</key>
109 <string>NO</string>
110 </dict>
111 <key>stroke</key>
112 <dict>
113 <key>Draws</key>
114 <string>NO</string>
115 </dict>
116 </dict>
117 <key>Text</key>
118 <dict>
119 <key>Text</key>
120 <string>{\rtf1\ansi\ansicpg1252\cocoartf1265
121 \cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;}
122 {\colortbl;\red255\green255\blue255;}
123 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
124
125 \f0\fs24 \cf0 2B\'82\'f0\'92\'c7\'89\'c1}</string>
126 </dict>
127 </dict>
128 <dict>
129 <key>Class</key>
130 <string>LineGraphic</string>
131 <key>Head</key>
132 <dict>
133 <key>ID</key>
134 <integer>126</integer>
135 </dict>
136 <key>ID</key>
137 <integer>131</integer>
138 <key>Points</key>
139 <array>
140 <string>{500.59607486494139, 354.76202392578125}</string>
141 <string>{501, 359}</string>
142 <string>{488.94359478040002, 365.41500959028326}</string>
143 </array>
144 <key>Style</key>
145 <dict>
146 <key>stroke</key>
147 <dict>
148 <key>HeadArrow</key>
149 <string>FilledArrow</string>
150 <key>Legacy</key>
151 <true/>
152 <key>LineType</key>
153 <integer>1</integer>
154 <key>TailArrow</key>
155 <string>0</string>
156 </dict>
157 </dict>
158 <key>Tail</key>
159 <dict>
160 <key>ID</key>
161 <integer>130</integer>
162 </dict>
163 </dict>
164 <dict>
165 <key>Bounds</key>
166 <string>{{465, 331.76202392578125}, {69, 23}}</string>
167 <key>Class</key>
168 <string>ShapedGraphic</string>
169 <key>ID</key>
170 <integer>130</integer>
171 <key>Shape</key>
172 <string>Rectangle</string>
173 <key>Style</key>
174 <dict>
175 <key>fill</key>
176 <dict>
177 <key>Draws</key>
178 <string>NO</string>
179 </dict>
180 <key>shadow</key>
181 <dict>
182 <key>Draws</key>
183 <string>NO</string>
184 </dict>
185 <key>stroke</key>
186 <dict>
187 <key>Draws</key>
188 <string>NO</string>
189 </dict>
190 </dict>
191 <key>Text</key>
192 <dict>
193 <key>Text</key>
194 <string>{\rtf1\ansi\ansicpg1252\cocoartf1265
195 \cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;}
196 {\colortbl;\red255\green255\blue255;}
197 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
198
199 \f0\fs24 \cf0 2A\'82\'f0\'92\'c7\'89\'c1}</string>
200 </dict>
201 </dict>
202 <dict>
203 <key>Bounds</key>
204 <string>{{183.1038639889174, 269}, {172, 38.070119395706797}}</string>
57 <key>Class</key> 205 <key>Class</key>
58 <string>ShapedGraphic</string> 206 <string>ShapedGraphic</string>
59 <key>ID</key> 207 <key>ID</key>
60 <integer>129</integer> 208 <integer>129</integer>
61 <key>Shape</key> 209 <key>Shape</key>
136 </dict> 284 </dict>
137 <key>ID</key> 285 <key>ID</key>
138 <integer>127</integer> 286 <integer>127</integer>
139 <key>Points</key> 287 <key>Points</key>
140 <array> 288 <array>
141 <string>{169.41315739350551, 322.98349027875952}</string> 289 <string>{169.41315739350554, 322.98349027875952}</string>
142 <string>{211.23798738352451, 361.05360967446632}</string> 290 <string>{211.23798738352451, 361.05360967446626}</string>
143 </array> 291 </array>
144 <key>Style</key> 292 <key>Style</key>
145 <dict> 293 <dict>
146 <key>stroke</key> 294 <key>stroke</key>
147 <dict> 295 <dict>
259 </dict> 407 </dict>
260 <key>ID</key> 408 <key>ID</key>
261 <integer>120</integer> 409 <integer>120</integer>
262 <key>Points</key> 410 <key>Points</key>
263 <array> 411 <array>
264 <string>{402.02946723861231, 329.15684189793234}</string> 412 <string>{402.02941558804184, 329.15686304943409}</string>
265 <string>{410.64639842655112, 354.60612798829442}</string> 413 <string>{410.64627854496194, 354.60617670803515}</string>
266 </array> 414 </array>
267 <key>Style</key> 415 <key>Style</key>
268 <dict> 416 <dict>
269 <key>stroke</key> 417 <key>stroke</key>
270 <dict> 418 <dict>
294 </dict> 442 </dict>
295 <key>ID</key> 443 <key>ID</key>
296 <integer>119</integer> 444 <integer>119</integer>
297 <key>Points</key> 445 <key>Points</key>
298 <array> 446 <array>
299 <string>{161.52946362279454, 329.1568422179347}</string> 447 <string>{161.52941197221759, 329.15686336943639}</string>
300 <string>{170.14639345951389, 354.60612762643075}</string> 448 <string>{170.14627357791323, 354.60617634617159}</string>
301 </array> 449 </array>
302 <key>Style</key> 450 <key>Style</key>
303 <dict> 451 <dict>
304 <key>stroke</key> 452 <key>stroke</key>
305 <dict> 453 <dict>
443 </dict> 591 </dict>
444 <key>ID</key> 592 <key>ID</key>
445 <integer>113</integer> 593 <integer>113</integer>
446 <key>Points</key> 594 <key>Points</key>
447 <array> 595 <array>
448 <string>{387.62236973629228, 328.54183262904701}</string> 596 <string>{387.62253883761252, 328.54191891490035}</string>
449 <string>{375.97896183908267, 356.16803336448282}</string> 597 <string>{375.97938100993071, 356.16824724912578}</string>
450 </array> 598 </array>
451 <key>Style</key> 599 <key>Style</key>
452 <dict> 600 <dict>
453 <key>stroke</key> 601 <key>stroke</key>
454 <dict> 602 <dict>
478 </dict> 626 </dict>
479 <key>ID</key> 627 <key>ID</key>
480 <integer>112</integer> 628 <integer>112</integer>
481 <key>Points</key> 629 <key>Points</key>
482 <array> 630 <array>
483 <string>{380.66432492551081, 322.41374128893654}</string> 631 <string>{380.66432871618662, 322.4137467226123}</string>
484 <string>{333.54337904264867, 362.29645895690038}</string> 632 <string>{333.54339492351937, 362.29648161406601}</string>
485 </array> 633 </array>
486 <key>Style</key> 634 <key>Style</key>
487 <dict> 635 <dict>
488 <key>stroke</key> 636 <key>stroke</key>
489 <dict> 637 <dict>
731 </dict> 879 </dict>
732 <key>ID</key> 880 <key>ID</key>
733 <integer>102</integer> 881 <integer>102</integer>
734 <key>Points</key> 882 <key>Points</key>
735 <array> 883 <array>
736 <string>{147.12236686160171, 328.54183262904706}</string> 884 <string>{147.12253596292197, 328.54191891490041}</string>
737 <string>{135.47895896439221, 356.16803336448288}</string> 885 <string>{135.47937813524018, 356.16824724912584}</string>
738 </array> 886 </array>
739 <key>Style</key> 887 <key>Style</key>
740 <dict> 888 <dict>
741 <key>stroke</key> 889 <key>stroke</key>
742 <dict> 890 <dict>
766 </dict> 914 </dict>
767 <key>ID</key> 915 <key>ID</key>
768 <integer>101</integer> 916 <integer>101</integer>
769 <key>Points</key> 917 <key>Points</key>
770 <array> 918 <array>
771 <string>{140.16432205082012, 322.41374128893665}</string> 919 <string>{140.16432584149609, 322.41374672261225}</string>
772 <string>{93.043376167957874, 362.29645895690038}</string> 920 <string>{93.043392048828608, 362.29648161406601}</string>
773 </array> 921 </array>
774 <key>Style</key> 922 <key>Style</key>
775 <dict> 923 <dict>
776 <key>stroke</key> 924 <key>stroke</key>
777 <dict> 925 <dict>
920 <key>MagnetsVisible</key> 1068 <key>MagnetsVisible</key>
921 <string>NO</string> 1069 <string>NO</string>
922 <key>MasterSheets</key> 1070 <key>MasterSheets</key>
923 <array/> 1071 <array/>
924 <key>ModificationDate</key> 1072 <key>ModificationDate</key>
925 <string>2014-02-02 18:24:21 +0000</string> 1073 <string>2014-02-03 00:46:50 +0000</string>
926 <key>Modifier</key> 1074 <key>Modifier</key>
927 <string>Oshiro Nobuyasu</string> 1075 <string>Oshiro Nobuyasu</string>
928 <key>NotesVisible</key> 1076 <key>NotesVisible</key>
929 <string>NO</string> 1077 <string>NO</string>
930 <key>Orientation</key> 1078 <key>Orientation</key>