# HG changeset patch # User Nobuyasu Oshiro # Date 1390778727 -32400 # Node ID 41200e0b68310b086e0c87a081b958e8ac7b18af # Parent 1abd3c17cff941fc272967e373d576aee3649eb1 Added distrubited_repository diff -r 1abd3c17cff9 -r 41200e0b6831 paper/chapter2.tex --- a/paper/chapter2.tex Sun Jan 26 20:20:00 2014 +0900 +++ b/paper/chapter2.tex Mon Jan 27 08:25:27 2014 +0900 @@ -152,11 +152,23 @@ +\section{分散バージョン管理システムによるデータの分散} +Jungle は Git や Mercurial といった分散バージョン管理システムの機能を参考に作られている. +分散バージョン管理システムとは, 多人数によるソフトウェア開発において変更履歴を管理するシステムである. +分散管理システムでは開発者それぞれがローカルにリポジトリのクローンを持ち, 開発はこのリポジトリを通すことで進められる(図\ref{fig:distributed_repo}). +ローカルのリポジトリは独立に損刺し, サーバ上にあるリポジトリや他人のリポジトリで行われた変更履歴を取り込みアップデートにかけることができる. +また逆に, ローカルのリポジトリに開発者自身がかけたアップデートを他のリポジトリへと反映させることもできる. +% 分散管理システムは結果整合性をとることを述べる. +% 結果整合性の話を先にどっかでしたほうがいいかも +反対の意味の言葉として集中型バージョン管理システムがある. +\begin{figure}[htpb] + \begin{center} + \includegraphics[scale=0.7]{figures/distributed_repository.pdf} + \caption{分散バージョン管理システム} + \label{fig:distributed_repo} + \end{center} +\end{figure} -\section{分散管理システムによるデータの分散} -Jungle は Git や Mercurial といった分散管理システムの機能を参考に作られている. -分散管理システムとは, -反対の意味の言葉として集中型バージョン管理システムがある. \subsection{マージによるデータ変更衝突の解決} diff -r 1abd3c17cff9 -r 41200e0b6831 paper/figures/distributed_repository.pdf Binary file paper/figures/distributed_repository.pdf has changed diff -r 1abd3c17cff9 -r 41200e0b6831 paper/figures/distributed_repository.xbb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/paper/figures/distributed_repository.xbb Mon Jan 27 08:25:27 2014 +0900 @@ -0,0 +1,8 @@ +%%Title: ./distributed_repository.pdf +%%Creator: extractbb 20130405 +%%BoundingBox: 0 0 451 280 +%%HiResBoundingBox: 0.000000 0.000000 451.000000 280.000000 +%%PDFVersion: 1.4 +%%Pages: 1 +%%CreationDate: Mon Jan 27 08:22:45 2014 + diff -r 1abd3c17cff9 -r 41200e0b6831 paper/graffle/distributed_repository.graffle --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/paper/graffle/distributed_repository.graffle Mon Jan 27 08:25:27 2014 +0900 @@ -0,0 +1,2683 @@ + + + + + ActiveLayerIndex + 0 + ApplicationVersion + + com.omnigroup.OmniGraffle + 139.18.0.187838 + + AutoAdjust + + BackgroundGraphic + + Bounds + {{0, 0}, {559, 783}} + Class + SolidGraphic + ID + 2 + Style + + shadow + + Draws + NO + + stroke + + Draws + NO + + + + BaseZoom + 0 + CanvasOrigin + {0, 0} + ColumnAlign + 1 + ColumnSpacing + 36 + CreationDate + 2014-01-26 22:52:25 +0000 + Creator + Oshiro Nobuyasu + DisplayScale + 1 0/72 in = 1 0/72 in + ExportShapes + + + InspectorGroup + 255 + ShapeImageRect + {{2, 2}, {22, 22}} + ShapeName + D06F4BB7-91E5-4B20-BAF2-889D7A90A493-12200-0000ED56ED0A8CDE + ShouldExport + YES + StrokePath + + elements + + + element + MOVETO + point + {-0.5, 0.49798399999999998} + + + control1 + {-0.5, 0.49798399999999998} + control2 + {-0.48141499999999998, 0.44139699999999998} + element + CURVETO + point + {-0.47212300000000001, 0.41061999999999999} + + + control1 + {-0.46283099999999999, 0.37984400000000001} + control2 + {-0.37070700000000001, 0.32785999999999998} + element + CURVETO + point + {-0.32618000000000003, 0.32124000000000003} + + + control1 + {-0.308865, 0.31461899999999998} + control2 + {-0.227238, 0.26827299999999998} + element + CURVETO + point + {-0.227238, 0.26827299999999998} + + + control1 + {-0.227238, 0.26827299999999998} + control2 + {-0.20250099999999999, 0.24841099999999999} + element + CURVETO + point + {-0.192606, 0.24510100000000001} + + + control1 + {-0.18271200000000001, 0.24179200000000001} + control2 + {-0.153029, 0.24179200000000001} + element + CURVETO + point + {-0.153029, 0.24179200000000001} + + + element + LINETO + point + {-0.123346, 0.22192899999999999} + + + element + LINETO + point + {-0.12087199999999999, 0.132549} + + + element + LINETO + point + {-0.13818900000000001, 0.066342799999999993} + + + control1 + {-0.13818900000000001, 0.066342799999999993} + control2 + {-0.16045300000000001, 0.046482099999999998} + element + CURVETO + point + {-0.16292300000000001, 0.039859199999999997} + + + control1 + {-0.16539699999999999, 0.033238900000000002} + control2 + {-0.17776500000000001, -0.036279100000000002} + element + CURVETO + point + {-0.17776500000000001, -0.036279100000000002} + + + control1 + {-0.17776500000000001, -0.036279100000000002} + control2 + {-0.18765999999999999, -0.112418} + element + CURVETO + point + {-0.18271200000000001, -0.122349} + + + control1 + {-0.17776500000000001, -0.13228000000000001} + control2 + {-0.16787199999999999, -0.13228000000000001} + element + CURVETO + point + {-0.16787199999999999, -0.13228000000000001} + + + control1 + {-0.16787199999999999, -0.13228000000000001} + control2 + {-0.18271200000000001, -0.26469599999999999} + element + CURVETO + point + {-0.18024100000000001, -0.284557} + + + control1 + {-0.18024100000000001, -0.31766} + control2 + {-0.14560799999999999, -0.39379799999999998} + element + CURVETO + point + {-0.14560799999999999, -0.39379799999999998} + + + element + LINETO + point + {-0.115924, -0.44014300000000001} + + + control1 + {-0.115924, -0.44014300000000001} + control2 + {-0.14808199999999999, -0.41697099999999998} + element + CURVETO + point + {-0.14808199999999999, -0.423591} + + + control1 + {-0.13818900000000001, -0.45338400000000001} + control2 + {-0.096137500000000001, -0.47324699999999997} + element + CURVETO + point + {-0.091189999999999993, -0.47655700000000001} + + + control1 + {-0.086242299999999994, -0.47986699999999999} + control2 + {-0.071398699999999996, -0.47986699999999999} + element + CURVETO + point + {-0.061506699999999997, -0.47655700000000001} + + + control1 + {-0.051611400000000002, -0.47324699999999997} + control2 + {-0.036769900000000001, -0.496419} + element + CURVETO + point + {-0.036769900000000001, -0.496419} + + + control1 + {-0.036769900000000001, -0.496419} + control2 + {-0.031822799999999998, -0.48979800000000001} + element + CURVETO + point + {-0.0244032, -0.48648799999999998} + + + control1 + {-0.0021396900000000001, -0.50304000000000004} + control2 + {0.034965499999999997, -0.49973000000000001} + element + CURVETO + point + {0.039911599999999998, -0.49973000000000001} + + + control1 + {0.062174199999999999, -0.49973000000000001} + control2 + {0.15617, -0.46331499999999998} + element + CURVETO + point + {0.14380200000000001, -0.45669500000000002} + + + control1 + {0.111646, -0.450075} + control2 + {0.12648699999999999, -0.44345299999999999} + element + CURVETO + point + {0.12648699999999999, -0.44345299999999999} + + + element + LINETO + point + {0.20316799999999999, -0.41697099999999998} + + + control1 + {0.20316799999999999, -0.41697099999999998} + control2 + {0.24027299999999999, -0.390486} + element + CURVETO + point + {0.227905, -0.38717699999999999} + + + control1 + {0.20564299999999999, -0.390488} + control2 + {0.213064, -0.38055699999999998} + element + CURVETO + point + {0.213064, -0.38055699999999998} + + + control1 + {0.213064, -0.38055699999999998} + control2 + {0.230378, -0.37393599999999999} + element + CURVETO + point + {0.232853, -0.35738399999999998} + + + control1 + {0.21553600000000001, -0.354074} + control2 + {0.21801000000000001, -0.35076299999999999} + element + CURVETO + point + {0.21801000000000001, -0.35076299999999999} + + + control1 + {0.21801000000000001, -0.35076299999999999} + control2 + {0.24521999999999999, -0.284557} + element + CURVETO + point + {0.24274699999999999, -0.26800400000000002} + + + control1 + {0.23532400000000001, -0.271314} + control2 + {0.22543099999999999, -0.26800400000000002} + element + CURVETO + point + {0.22543099999999999, -0.26800400000000002} + + + control1 + {0.22543099999999999, -0.26800400000000002} + control2 + {0.230378, -0.24152100000000001} + element + CURVETO + point + {0.230377, -0.22497} + + + control1 + {0.230378, -0.20841799999999999} + control2 + {0.225434, -0.18193599999999999} + element + CURVETO + point + {0.22543099999999999, -0.16869400000000001} + + + control1 + {0.22543199999999999, -0.15545200000000001} + control2 + {0.22543099999999999, -0.12897} + element + CURVETO + point + {0.22543099999999999, -0.12897} + + + control1 + {0.22543099999999999, -0.12897} + control2 + {0.230381, -0.13227700000000001} + element + CURVETO + point + {0.23780000000000001, -0.12565899999999999} + + + control1 + {0.24521999999999999, -0.119038} + control2 + {0.24027200000000001, -0.059450700000000002} + element + CURVETO + point + {0.24027200000000001, -0.052830599999999998} + + + control1 + {0.23780000000000001, -0.029658400000000001} + control2 + {0.230377, -0.0097957800000000005} + element + CURVETO + point + {0.230377, -0.0097957800000000005} + + + element + LINETO + point + {0.21801000000000001, 0.039859199999999997} + + + control1 + {0.21801000000000001, 0.039859199999999997} + control2 + {0.213064, 0.066342799999999993} + element + CURVETO + point + {0.20564299999999999, 0.066342799999999993} + + + control1 + {0.19822100000000001, 0.066342799999999993} + control2 + {0.1908, 0.059721700000000003} + element + CURVETO + point + {0.1908, 0.059721700000000003} + + + control1 + {0.1908, 0.059721700000000003} + control2 + {0.17843300000000001, 0.12923899999999999} + element + CURVETO + point + {0.171012, 0.145791} + + + control1 + {0.16359000000000001, 0.16234299999999999} + control2 + {0.15864400000000001, 0.17558399999999999} + element + CURVETO + point + {0.15864400000000001, 0.17558399999999999} + + + element + LINETO + point + {0.15864400000000001, 0.238481} + + + control1 + {0.15864400000000001, 0.238481} + control2 + {0.190805, 0.25172600000000001} + element + CURVETO + point + {0.20069500000000001, 0.25834299999999999} + + + control1 + {0.21059, 0.264963} + control2 + {0.21801000000000001, 0.28151599999999999} + element + CURVETO + point + {0.21801000000000001, 0.28151599999999999} + + + control1 + {0.21801000000000001, 0.28151599999999999} + control2 + {0.33451700000000001, 0.31454399999999999} + element + CURVETO + point + {0.36704700000000001, 0.33319900000000002} + + + control1 + {0.39957199999999998, 0.35185300000000003} + control2 + {0.43583899999999998, 0.38835500000000001} + element + CURVETO + point + {0.45068000000000003, 0.40159600000000001} + + + control1 + {0.46552199999999999, 0.41483799999999998} + control2 + {0.5, 0.5} + element + CURVETO + point + {0.5, 0.5} + + + element + CLOSE + + + element + MOVETO + point + {-0.5, 0.49798399999999998} + + + + TextBounds + {{0, 0}, {1, 1}} + + + InspectorGroup + 255 + ShapeImageRect + {{2, 2}, {22, 22}} + ShapeName + 8B8844FF-D926-4D08-972B-50D9BAEB7C28-12200-0000ED5871BBCBFE + ShouldExport + YES + StrokePath + + elements + + + element + MOVETO + point + {-0.5, 0.5} + + + control1 + {-0.5, 0.5} + control2 + {-0.48802200000000001, 0.40712100000000001} + element + CURVETO + point + {-0.47006199999999998, 0.376162} + + + control1 + {-0.452096, 0.34520499999999998} + control2 + {-0.29417599999999999, 0.28667700000000002} + element + CURVETO + point + {-0.23262099999999999, 0.29577199999999998} + + + control1 + {-0.171068, 0.304865} + control2 + {-0.12709999999999999, 0.19575000000000001} + element + CURVETO + point + {-0.12709999999999999, 0.19575000000000001} + + + element + LINETO + point + {-0.14468800000000001, 0.177564} + + + control1 + {-0.14468800000000001, 0.177564} + control2 + {-0.13589699999999999, 0.18665799999999999} + element + CURVETO + point + {-0.171068, 0.19575000000000001} + + + control1 + {-0.19745099999999999, 0.19575000000000001} + control2 + {-0.223827, 0.18665799999999999} + element + CURVETO + point + {-0.223827, 0.18665799999999999} + + + control1 + {-0.223827, 0.18665799999999999} + control2 + {-0.17986199999999999, 0.15937799999999999} + element + CURVETO + point + {-0.17986199999999999, 0.113916} + + + control1 + {-0.19744700000000001, 0.12300700000000001} + control2 + {-0.17986199999999999, 0.1321} + element + CURVETO + point + {-0.25020999999999999, 0.1321} + + + control1 + {-0.26779399999999998, 0.1321} + control2 + {-0.276588, 0.12300700000000001} + element + CURVETO + point + {-0.276588, 0.12300700000000001} + + + element + LINETO + point + {-0.18865599999999999, 0.059356899999999997} + + + control1 + {-0.18865599999999999, 0.059356899999999997} + control2 + {-0.276588, 0.059355999999999999} + element + CURVETO + point + {-0.25020999999999999, 0.041170400000000003} + + + control1 + {-0.223827, 0.022983400000000001} + control2 + {-0.215032, 0.0047991300000000004} + element + CURVETO + point + {-0.215032, 0.0047991300000000004} + + + element + LINETO + point + {-0.215032, -0.013386800000000001} + + + element + LINETO + point + {-0.20624400000000001, -0.067944400000000002} + + + control1 + {-0.20624400000000001, -0.067944400000000002} + control2 + {-0.215032, -0.113409} + element + CURVETO + point + {-0.19745099999999999, -0.17705899999999999} + + + control1 + {-0.17986199999999999, -0.195245} + control2 + {-0.215032, -0.37710100000000002} + element + CURVETO + point + {-0.0743399, -0.46803099999999997} + + + control1 + {0.066359000000000001, -0.55896000000000001} + control2 + {0.21584700000000001, -0.43165999999999999} + element + CURVETO + point + {0.242232, -0.38619500000000001} + + + control1 + {0.25981399999999999, -0.34072400000000003} + control2 + {0.27739799999999998, -0.29526000000000002} + element + CURVETO + point + {0.27740399999999998, -0.25889099999999998} + + + control1 + {0.27740399999999998, -0.222523} + control2 + {0.26860699999999998, -0.149779} + element + CURVETO + point + {0.26860699999999998, -0.149779} + + + element + LINETO + point + {0.27739799999999998, -0.040666000000000001} + + + control1 + {0.27739799999999998, -0.040666000000000001} + control2 + {0.28619499999999998, -0.022481000000000001} + element + CURVETO + point + {0.29498600000000003, -0.0042953499999999999} + + + control1 + {0.30378100000000002, 0.0138911} + control2 + {0.27740399999999998, 0.013892399999999999} + element + CURVETO + point + {0.27740399999999998, 0.013892399999999999} + + + element + LINETO + point + {0.25981399999999999, 0.0047969800000000002} + + + element + LINETO + point + {0.26860699999999998, 0.0502627} + + + element + LINETO + point + {0.25102200000000002, 0.059355999999999999} + + + element + LINETO + point + {0.25102200000000002, 0.077542899999999998} + + + control1 + {0.25102200000000002, 0.077542899999999998} + control2 + {0.22464300000000001, 0.095728199999999999} + element + CURVETO + point + {0.22464300000000001, 0.1321} + + + control1 + {0.22464300000000001, 0.16847100000000001} + control2 + {0.20705599999999999, 0.23212099999999999} + element + CURVETO + point + {0.18946499999999999, 0.22302900000000001} + + + control1 + {0.171879, 0.21393400000000001} + control2 + {0.26860699999999998, 0.28667700000000002} + element + CURVETO + point + {0.26860699999999998, 0.28667700000000002} + + + control1 + {0.26860699999999998, 0.28667700000000002} + control2 + {0.30378100000000002, 0.277586} + element + CURVETO + point + {0.32136399999999998, 0.28667700000000002} + + + control1 + {0.33895199999999998, 0.29577199999999998} + control2 + {0.43413499999999999, 0.33282} + element + CURVETO + point + {0.46407500000000002, 0.35758699999999999} + + + control1 + {0.49401400000000001, 0.38235400000000003} + control2 + {0.5, 0.49898599999999999} + element + CURVETO + point + {0.5, 0.49898599999999999} + + + element + CLOSE + + + element + MOVETO + point + {-0.5, 0.5} + + + + TextBounds + {{0, 0}, {1, 1}} + + + InspectorGroup + 255 + ShapeImageRect + {{2, 2}, {22, 22}} + ShapeName + 942FA1E8-AE78-4EC5-8961-54CCE45B0B1D-12200-0000EC2DD7328E8E + ShouldExport + YES + StrokePath + + elements + + + element + MOVETO + point + {0.0091743499999999995, -0.49918099999999999} + + + element + LINETO + point + {0.0091743499999999995, -0.5} + + + control1 + {0.0061063799999999998, -0.500004} + control2 + {0.0030479399999999999, -0.49993500000000002} + element + CURVETO + point + {4.7683700000000004e-06, -0.49979800000000002} + + + control1 + {-0.00304127, -0.49993500000000002} + control2 + {-0.0061025599999999999, -0.500004} + element + CURVETO + point + {-0.0091743499999999995, -0.5} + + + element + LINETO + point + {-0.0091743499999999995, -0.49918099999999999} + + + control1 + {-0.067775699999999994, -0.49395299999999998} + control2 + {-0.118363, -0.46512700000000001} + element + CURVETO + point + {-0.118363, -0.45407799999999998} + + + control1 + {-0.13653100000000001, -0.43477199999999999} + control2 + {-0.15471799999999999, -0.42954700000000001} + element + CURVETO + point + {-0.163799, -0.39275599999999999} + + + control1 + {-0.20923700000000001, -0.36822100000000002} + control2 + {-0.191057, -0.22103999999999999} + element + CURVETO + point + {-0.191057, -0.22103999999999999} + + + control1 + {-0.191057, -0.22103999999999999} + control2 + {-0.18196999999999999, -0.147449} + element + CURVETO + point + {-0.191057, -0.147449} + + + control1 + {-0.20014999999999999, -0.147449} + control2 + {-0.20361099999999999, -0.14329} + element + CURVETO + point + {-0.20642099999999999, -0.11810900000000001} + + + control1 + {-0.20642099999999999, -0.099533300000000005} + control2 + {-0.19724800000000001, -0.0623825} + element + CURVETO + point + {-0.19724800000000001, -0.0623825} + + + control1 + {-0.19724800000000001, -0.0623825} + control2 + {-0.18807199999999999, -0.0189216} + element + CURVETO + point + {-0.18807199999999999, -0.0066552199999999999} + + + control1 + {-0.18807199999999999, 0.01192} + control2 + {-0.18339, 0.0181119} + element + CURVETO + point + {-0.17431099999999999, 0.0181119} + + + control1 + {-0.16972400000000001, 0.0181119} + control2 + {-0.15596199999999999, 0.01192} + element + CURVETO + point + {-0.15471699999999999, 0.0119951} + + + control1 + {-0.160549, 0.030495600000000001} + control2 + {-0.12745999999999999, 0.12238} + element + CURVETO + point + {-0.136546, 0.14691100000000001} + + + control1 + {-0.14562800000000001, 0.17144200000000001} + control2 + {-0.17289199999999999, 0.208236} + element + CURVETO + point + {-0.209231, 0.208236} + + + control1 + {-0.24557499999999999, 0.208236} + control2 + {-0.44547399999999998, 0.316023} + element + CURVETO + point + {-0.46365099999999998, 0.34315200000000001} + + + control1 + {-0.48182000000000003, 0.37027199999999999} + control2 + {-0.5, 0.5} + element + CURVETO + point + {-0.5, 0.5} + + + element + LINETO + point + {1.52588e-05, 0.49343300000000001} + + + element + LINETO + point + {0.5, 0.5} + + + element + LINETO + point + {0.5, 0.49999900000000003} + + + control1 + {0.49995699999999998, 0.49968699999999999} + control2 + {0.481798, 0.37023899999999998} + element + CURVETO + point + {0.46365200000000001, 0.34315200000000001} + + + control1 + {0.44547599999999998, 0.316023} + control2 + {0.24557599999999999, 0.208236} + element + CURVETO + point + {0.209232, 0.208236} + + + control1 + {0.17289299999999999, 0.208236} + control2 + {0.14562900000000001, 0.17144200000000001} + element + CURVETO + point + {0.136547, 0.14691100000000001} + + + control1 + {0.12745999999999999, 0.12238} + control2 + {0.16055, 0.030495399999999999} + element + CURVETO + point + {0.15471799999999999, 0.0119948} + + + control1 + {0.15596299999999999, 0.01192} + control2 + {0.16972400000000001, 0.018111700000000001} + element + CURVETO + point + {0.17431199999999999, 0.018111700000000001} + + + control1 + {0.183391, 0.018111700000000001} + control2 + {0.18807299999999999, 0.01192} + element + CURVETO + point + {0.18807299999999999, -0.0066554500000000003} + + + control1 + {0.18807299999999999, -0.0189216} + control2 + {0.19724800000000001, -0.0623825} + element + CURVETO + point + {0.19724800000000001, -0.0623825} + + + control1 + {0.19724800000000001, -0.0623825} + control2 + {0.20642199999999999, -0.0995336} + element + CURVETO + point + {0.20642199999999999, -0.11810900000000001} + + + control1 + {0.20361199999999999, -0.14329} + control2 + {0.20014999999999999, -0.147449} + element + CURVETO + point + {0.19105800000000001, -0.147449} + + + control1 + {0.18197099999999999, -0.147449} + control2 + {0.19105800000000001, -0.22104099999999999} + element + CURVETO + point + {0.19105800000000001, -0.22104099999999999} + + + control1 + {0.19105800000000001, -0.22104099999999999} + control2 + {0.20923800000000001, -0.36822100000000002} + element + CURVETO + point + {0.163799, -0.39275599999999999} + + + control1 + {0.154719, -0.42954700000000001} + control2 + {0.13653199999999999, -0.43477199999999999} + element + CURVETO + point + {0.118364, -0.45407900000000001} + + + control1 + {0.118364, -0.46512700000000001} + control2 + {0.067776699999999995, -0.49395299999999998} + element + CURVETO + point + {0.0091743499999999995, -0.49918099999999999} + + + element + CLOSE + + + element + MOVETO + point + {0.0091743499999999995, -0.49918099999999999} + + + + TextBounds + {{0, 0}, {1, 1}} + + + InspectorGroup + 255 + ShapeImageRect + {{2, 2}, {22, 22}} + ShapeName + 62A7745F-F9C3-416F-BB1D-7311BA3DB942-12200-0000EC56A49792F4 + ShouldExport + YES + StrokePath + + elements + + + element + MOVETO + point + {-0.0027027100000000001, -0.5} + + + control1 + {-0.034985500000000003, -0.50003600000000004} + control2 + {-0.068730399999999997, -0.49098999999999998} + element + CURVETO + point + {-0.101951, -0.46803099999999997} + + + control1 + {-0.233517, -0.37710100000000002} + control2 + {-0.200629, -0.195245} + element + CURVETO + point + {-0.21707499999999999, -0.17705899999999999} + + + control1 + {-0.233517, -0.113409} + control2 + {-0.2253, -0.0679448} + element + CURVETO + point + {-0.2253, -0.0679448} + + + element + LINETO + point + {-0.233517, -0.0133867} + + + element + LINETO + point + {-0.233517, 0.0047988900000000001} + + + control1 + {-0.233517, 0.0047988900000000001} + control2 + {-0.24174200000000001, 0.0229836} + element + CURVETO + point + {-0.26641399999999998, 0.041170600000000002} + + + control1 + {-0.29108000000000001, 0.059355499999999999} + control2 + {-0.20885400000000001, 0.0593565} + element + CURVETO + point + {-0.20885400000000001, 0.0593565} + + + element + LINETO + point + {-0.29108000000000001, 0.12300700000000001} + + + control1 + {-0.29108000000000001, 0.12300700000000001} + control2 + {-0.28285700000000003, 0.1321} + element + CURVETO + point + {-0.26641399999999998, 0.1321} + + + control1 + {-0.200629, 0.1321} + control2 + {-0.21707299999999999, 0.12300700000000001} + element + CURVETO + point + {-0.200629, 0.113915} + + + control1 + {-0.200629, 0.15937799999999999} + control2 + {-0.24174200000000001, 0.18665699999999999} + element + CURVETO + point + {-0.24174200000000001, 0.18665699999999999} + + + control1 + {-0.24174200000000001, 0.18665699999999999} + control2 + {-0.21707499999999999, 0.19574900000000001} + element + CURVETO + point + {-0.19240699999999999, 0.19574900000000001} + + + control1 + {-0.15951599999999999, 0.18665699999999999} + control2 + {-0.167736, 0.177564} + element + CURVETO + point + {-0.167736, 0.177564} + + + element + LINETO + point + {-0.15128800000000001, 0.19574900000000001} + + + control1 + {-0.15128800000000001, 0.19574900000000001} + control2 + {-0.19240699999999999, 0.304865} + element + CURVETO + point + {-0.24996699999999999, 0.29577100000000001} + + + control1 + {-0.30752800000000002, 0.28667599999999999} + control2 + {-0.45520500000000003, 0.34520400000000001} + element + CURVETO + point + {-0.47200300000000001, 0.376162} + + + control1 + {-0.48880000000000001, 0.40712100000000001} + control2 + {-0.50000100000000003, 0.5} + element + CURVETO + point + {-0.5, 0.5} + + + element + LINETO + point + {0, 0.49668899999999999} + + + element + LINETO + point + {0.5, 0.5} + + + control1 + {0.50000199999999995, 0.5} + control2 + {0.48880000000000001, 0.40712100000000001} + element + CURVETO + point + {0.47200300000000001, 0.376162} + + + control1 + {0.45520500000000003, 0.34520400000000001} + control2 + {0.30752800000000002, 0.28667599999999999} + element + CURVETO + point + {0.249968, 0.29577100000000001} + + + control1 + {0.19240699999999999, 0.304865} + control2 + {0.15128800000000001, 0.19574900000000001} + element + CURVETO + point + {0.15128800000000001, 0.19574900000000001} + + + element + LINETO + point + {0.167736, 0.177564} + + + control1 + {0.167736, 0.177564} + control2 + {0.15951599999999999, 0.18665699999999999} + element + CURVETO + point + {0.19240699999999999, 0.19574900000000001} + + + control1 + {0.21707599999999999, 0.19574900000000001} + control2 + {0.24174200000000001, 0.18665699999999999} + element + CURVETO + point + {0.24174200000000001, 0.18665699999999999} + + + control1 + {0.24174200000000001, 0.18665699999999999} + control2 + {0.20063, 0.15937799999999999} + element + CURVETO + point + {0.20063, 0.113915} + + + control1 + {0.21707299999999999, 0.12300700000000001} + control2 + {0.20063, 0.1321} + element + CURVETO + point + {0.26641500000000001, 0.1321} + + + control1 + {0.28285700000000003, 0.1321} + control2 + {0.29108099999999998, 0.12300700000000001} + element + CURVETO + point + {0.29108099999999998, 0.12300700000000001} + + + element + LINETO + point + {0.20885400000000001, 0.0593565} + + + control1 + {0.20885400000000001, 0.0593565} + control2 + {0.29108099999999998, 0.059355499999999999} + element + CURVETO + point + {0.26641500000000001, 0.041170600000000002} + + + control1 + {0.24174200000000001, 0.0229836} + control2 + {0.233518, 0.0047988900000000001} + element + CURVETO + point + {0.233518, 0.0047988900000000001} + + + element + LINETO + point + {0.233518, -0.0133867} + + + element + LINETO + point + {0.225301, -0.0679448} + + + control1 + {0.225301, -0.0679448} + control2 + {0.233518, -0.113409} + element + CURVETO + point + {0.21707599999999999, -0.17705899999999999} + + + control1 + {0.20063, -0.195245} + control2 + {0.233518, -0.37710100000000002} + element + CURVETO + point + {0.101952, -0.46803099999999997} + + + control1 + {0.068731299999999995, -0.49098999999999998} + control2 + {0.034986499999999997, -0.50003600000000004} + element + CURVETO + point + {0.0027027100000000001, -0.5} + + + control1 + {0.0020895000000000002, -0.49992900000000001} + control2 + {0.00147438, -0.499946} + element + CURVETO + point + {0.00085926100000000005, -0.49995899999999999} + + + control1 + {0.000287056, -0.49997200000000003} + control2 + {-0.00028610199999999999, -0.49998100000000001} + element + CURVETO + point + {-0.00085926100000000005, -0.49998799999999999} + + + control1 + {-0.00147343, -0.49999500000000002} + control2 + {-0.0020875899999999998, -0.49999900000000003} + element + CURVETO + point + {-0.0027027100000000001, -0.5} + + + element + CLOSE + + + element + MOVETO + point + {-0.0027027100000000001, -0.5} + + + + TextBounds + {{0, 0}, {1, 1}} + + + InspectorGroup + 255 + ShapeImageRect + {{2, 2}, {22, 22}} + ShapeName + 7B2DAC72-B741-4CB4-A074-F89FBACDB271-12200-0000ED5F513B10D4 + ShouldExport + YES + StrokePath + + elements + + + element + MOVETO + point + {-0.46272600000000003, 0.5} + + + control1 + {-0.46272600000000003, 0.5} + control2 + {-0.45961800000000003, 0.36988399999999999} + element + CURVETO + point + {-0.42235400000000001, 0.35172700000000001} + + + control1 + {-0.39130199999999998, 0.34265000000000001} + control2 + {-0.33851700000000001, 0.31541999999999998} + element + CURVETO + point + {-0.32919799999999999, 0.309367} + + + control1 + {-0.31987500000000002, 0.303313} + control2 + {-0.31988499999999997, 0.27305299999999999} + element + CURVETO + point + {-0.31988499999999997, 0.27607900000000002} + + + control1 + {-0.31988499999999997, 0.27910299999999999} + control2 + {-0.38820500000000002, 0.34567599999999998} + element + CURVETO + point + {-0.43477700000000002, 0.34567599999999998} + + + control1 + {-0.33539999999999998, 0.26095000000000002} + control2 + {-0.35093400000000002, 0.23371600000000001} + element + CURVETO + point + {-0.35093400000000002, 0.23371600000000001} + + + control1 + {-0.35093400000000002, 0.23371600000000001} + control2 + {-0.43167699999999998, 0.297261} + element + CURVETO + point + {-0.45031500000000002, 0.291209} + + + control1 + {-0.36646899999999999, 0.215559} + control2 + {-0.35403800000000002, 0.17924799999999999} + element + CURVETO + point + {-0.35403800000000002, 0.17924799999999999} + + + control1 + {-0.35403800000000002, 0.17924799999999999} + control2 + {-0.45961800000000003, 0.23371600000000001} + element + CURVETO + point + {-0.5, 0.212533} + + + control1 + {-0.40371800000000002, 0.18530099999999999} + control2 + {-0.37887900000000002, -0.0325685} + element + CURVETO + point + {-0.37887900000000002, -0.0325685} + + + control1 + {-0.37887900000000002, -0.0325685} + control2 + {-0.35714899999999999, -0.23228299999999999} + element + CURVETO + point + {-0.341615, -0.26859499999999997} + + + control1 + {-0.33539999999999998, -0.30187900000000001} + control2 + {-0.27328999999999998, -0.53487899999999999} + element + CURVETO + point + {0.0031004000000000001, -0.49554199999999998} + + + control1 + {0.27949499999999999, -0.456204} + control2 + {0.23912900000000001, -0.10519199999999999} + element + CURVETO + point + {0.23912900000000001, -0.096113400000000002} + + + control1 + {0.23912900000000001, -0.087035699999999994} + control2 + {0.24533199999999999, -0.099139900000000003} + element + CURVETO + point + {0.24533199999999999, -0.071906300000000006} + + + control1 + {0.24533199999999999, -0.044672999999999997} + control2 + {0.23291100000000001, -0.0325685} + element + CURVETO + point + {0.23291100000000001, -0.0325685} + + + control1 + {0.23291100000000001, -0.0325685} + control2 + {0.245337, -0.0023083700000000001} + element + CURVETO + point + {0.245337, 0.049132099999999998} + + + control1 + {0.23601800000000001, 0.040054600000000003} + control2 + {0.23291100000000001, 0.0249243} + element + CURVETO + point + {0.22670199999999999, 0.0340021} + + + control1 + {0.22360099999999999, 0.070313200000000006} + control2 + {0.21428900000000001, 0.061235699999999997} + element + CURVETO + point + {0.19564999999999999, 0.130832} + + + control1 + {0.19253799999999999, 0.16714499999999999} + control2 + {0.23601800000000001, 0.194378} + element + CURVETO + point + {0.25153999999999999, 0.194378} + + + control1 + {0.22048999999999999, 0.206482} + control2 + {0.27017200000000002, 0.215559} + element + CURVETO + point + {0.27017200000000002, 0.215559} + + + control1 + {0.27017200000000002, 0.215559} + control2 + {0.37575199999999997, 0.23068900000000001} + element + CURVETO + point + {0.41302699999999998, 0.25489800000000001} + + + control1 + {0.45029400000000003, 0.27910600000000002} + control2 + {0.49689, 0.418298} + element + CURVETO + point + {0.49999199999999999, 0.493948} + + + control1 + {0.50309899999999996, 0.49999900000000003} + control2 + {-0.46272600000000003, 0.5} + element + CURVETO + point + {-0.46272600000000003, 0.5} + + + element + CLOSE + + + element + MOVETO + point + {-0.46272600000000003, 0.5} + + + + TextBounds + {{0, 0}, {1, 1}} + + + GraphDocumentVersion + 8 + GraphicsList + + + Bounds + {{315.93538239694277, 295.34510716479372}, {61.064617603057229, 49.26424451330611}} + Class + ShapedGraphic + ID + 3027 + Shape + 942FA1E8-AE78-4EC5-8961-54CCE45B0B1D-12200-0000EC2DD7328E8E + Style + + fill + + Color + + b + 0.4 + g + 0.4 + r + 0.4 + + FillType + 2 + GradientAngle + 70 + GradientColor + + b + 0 + g + 0 + r + 0 + + MiddleColor + + b + 0.32549 + g + 0.32549 + r + 0.32549 + + MiddleFraction + 0.18253970146179199 + TrippleBlend + YES + + shadow + + Color + + b + 0.425743 + g + 0.425743 + r + 0.425743 + + Draws + NO + ShadowVector + {0, -5} + + stroke + + Draws + NO + + + + + Bounds + {{177, 261}, {51.820980223187753, 49.26424451330611}} + Class + ShapedGraphic + ID + 3037 + Shape + 62A7745F-F9C3-416F-BB1D-7311BA3DB942-12200-0000EC56A49792F4 + Style + + fill + + Color + + b + 0.4 + g + 0.4 + r + 0.4 + + FillType + 2 + GradientAngle + 70 + GradientColor + + b + 0 + g + 0 + r + 0 + + MiddleColor + + b + 0.32549 + g + 0.32549 + r + 0.32549 + + MiddleFraction + 0.18253970146179199 + TrippleBlend + YES + + shadow + + Color + + b + 0.425743 + g + 0.425743 + r + 0.425743 + + Draws + NO + ShadowVector + {0, -5} + + stroke + + Draws + NO + + + + + Bounds + {{350.84538137513277, 107.6661736658466}, {60.28865465621665, 49.057974698032019}} + Class + ShapedGraphic + ID + 3059 + Shape + D06F4BB7-91E5-4B20-BAF2-889D7A90A493-12200-0000ED56ED0A8CDE + Style + + fill + + Color + + b + 0.4 + g + 0.4 + r + 0.4 + + FillType + 2 + GradientAngle + 70 + GradientColor + + b + 0 + g + 0 + r + 0 + + MiddleColor + + b + 0.32549 + g + 0.32549 + r + 0.32549 + + MiddleFraction + 0.18253970146179199 + TrippleBlend + YES + + shadow + + Beneath + YES + Color + + b + 0.425743 + g + 0.425743 + r + 0.425743 + + Draws + NO + ShadowVector + {0, -5} + + stroke + + Draws + NO + + + + + Bounds + {{170.66340291793503, 83}, {45.658429529233693, 51.474522829365434}} + Class + ShapedGraphic + ID + 3012 + Shape + 7B2DAC72-B741-4CB4-A074-F89FBACDB271-12200-0000ED5F513B10D4 + Style + + fill + + Color + + b + 0.4 + g + 0.4 + r + 0.4 + + FillType + 2 + GradientAngle + 70 + GradientColor + + b + 0 + g + 0 + r + 0 + + MiddleColor + + b + 0.32549 + g + 0.32549 + r + 0.32549 + + MiddleFraction + 0.18253970146179199 + TrippleBlend + YES + + shadow + + Color + + b + 0.425743 + g + 0.425743 + r + 0.425743 + + Draws + NO + ShadowVector + {0, -5} + + stroke + + Draws + NO + + + + + Bounds + {{23.080662052794651, 154}, {48.459668973602668, 49.26424451330611}} + Class + ShapedGraphic + ID + 3061 + Shape + 8B8844FF-D926-4D08-972B-50D9BAEB7C28-12200-0000ED5871BBCBFE + Style + + fill + + Color + + b + 0.4 + g + 0.4 + r + 0.4 + + FillType + 2 + GradientAngle + 70 + GradientColor + + b + 0 + g + 0 + r + 0 + + MiddleColor + + b + 0.32549 + g + 0.32549 + r + 0.32549 + + MiddleFraction + 0.18253970146179199 + TrippleBlend + YES + + shadow + + Beneath + YES + Color + + b + 0.425743 + g + 0.425743 + r + 0.425743 + + Draws + NO + ShadowVector + {0, -5} + + stroke + + Draws + NO + + + + + Class + LineGraphic + Head + + ID + 12 + + ID + 21 + Points + + {289.5678715821121, 255.90961206096162} + {377, 296.69822485207101} + + Style + + stroke + + HeadArrow + 0 + Legacy + + LineType + 1 + TailArrow + FilledArrow + + + Tail + + ID + 16 + + + + Class + LineGraphic + Head + + ID + 10 + + ID + 20 + Points + + {289.50802779669596, 255.38945988354027} + {377, 186.69822485207101} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 16 + + + + Class + LineGraphic + Head + + ID + 13 + + ID + 19 + Points + + {222, 255.69822485207101} + {144.11475409836066, 212.69822485207101} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 16 + + + + Class + LineGraphic + Head + + ID + 10 + + ID + 18 + Points + + {289.55774263543913, 140.93008939880525} + {377, 186.69822485207101} + + Style + + stroke + + HeadArrow + 0 + Legacy + + LineType + 1 + TailArrow + FilledArrow + + + Tail + + ID + 15 + + + + Class + LineGraphic + Head + + ID + 13 + + ID + 17 + Points + + {222, 140.69822485207101} + {144.11475409836066, 212.69822485207101} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 15 + + + + Bounds + {{222, 233}, {67.114754098360663, 45.396449704142015}} + Class + ShapedGraphic + ID + 16 + Magnets + + {0, 1} + {0, -1} + {1, 0} + {-1, 0} + + Shape + Cylinder + Style + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\fs20 \cf0 repository} + VerticalPad + 0 + + + + Bounds + {{222, 118}, {67.114754098360663, 45.396449704142015}} + Class + ShapedGraphic + ID + 15 + Magnets + + {0, 1} + {0, -1} + {1, 0} + {-1, 0} + + Shape + Cylinder + Style + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\fs20 \cf0 repository} + VerticalPad + 0 + + + + Bounds + {{77, 190}, {67.114754098360663, 45.396449704142015}} + Class + ShapedGraphic + ID + 13 + Magnets + + {0, 1} + {0, -1} + {1, 0} + {-1, 0} + + Shape + Cylinder + Style + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\fs20 \cf0 repository} + VerticalPad + 0 + + + + Bounds + {{377, 274}, {67.114754098360663, 45.396449704142015}} + Class + ShapedGraphic + ID + 12 + Magnets + + {0, 1} + {0, -1} + {1, 0} + {-1, 0} + + Shape + Cylinder + Style + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\fs20 \cf0 repository} + VerticalPad + 0 + + + + Bounds + {{377, 164}, {67.114754098360663, 45.396449704142015}} + Class + ShapedGraphic + ID + 10 + Magnets + + {0, 1} + {0, -1} + {1, 0} + {-1, 0} + + Shape + Cylinder + Style + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\fs20 \cf0 repository} + VerticalPad + 0 + + + + GridInfo + + GuidesLocked + NO + GuidesVisible + YES + HPages + 1 + ImageCounter + 1 + KeepToScale + + Layers + + + Lock + NO + Name + Layer 1 + Print + YES + View + YES + + + LayoutInfo + + Animate + NO + circoMinDist + 18 + circoSeparation + 0.0 + layoutEngine + dot + neatoSeparation + 0.0 + twopiSeparation + 0.0 + + LinksVisible + NO + MagnetsVisible + NO + MasterSheets + + ModificationDate + 2014-01-26 23:22:04 +0000 + Modifier + Oshiro Nobuyasu + NotesVisible + NO + Orientation + 2 + OriginVisible + NO + PageBreaks + YES + PrintInfo + + NSBottomMargin + + float + 41 + + NSHorizonalPagination + + coded + BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG + + NSLeftMargin + + float + 18 + + NSPaperSize + + size + {595, 842} + + NSPrintReverseOrientation + + int + 0 + + NSRightMargin + + float + 18 + + NSTopMargin + + float + 18 + + + PrintOnePage + + ReadOnly + NO + RowAlign + 1 + RowSpacing + 36 + SheetTitle + Canvas 1 + SmartAlignmentGuidesActive + YES + SmartDistanceGuidesActive + YES + UniqueID + 1 + UseEntirePage + + VPages + 1 + WindowInfo + + CurrentSheet + 0 + ExpandedCanvases + + + name + Canvas 1 + + + Frame + {{377, 96}, {693, 922}} + ListView + + OutlineWidth + 142 + RightSidebar + + ShowRuler + + Sidebar + + SidebarWidth + 120 + VisibleRegion + {{0, 0}, {558, 783}} + Zoom + 1 + ZoomValues + + + Canvas 1 + 1 + 1 + + + + + diff -r 1abd3c17cff9 -r 41200e0b6831 paper/master_paper.pdf Binary file paper/master_paper.pdf has changed