diff --git a/results/combined/plots/all/cost_with_manual.pdf b/results/combined/plots/all/cost_with_manual.pdf index 16f5b0afa6..3d58978ffc 100644 Binary files a/results/combined/plots/all/cost_with_manual.pdf and b/results/combined/plots/all/cost_with_manual.pdf differ diff --git a/results/combined/plots/all/cost_without_manual.pdf b/results/combined/plots/all/cost_without_manual.pdf index f35b87cb68..b516f6dae2 100644 Binary files a/results/combined/plots/all/cost_without_manual.pdf and b/results/combined/plots/all/cost_without_manual.pdf differ diff --git a/results/combined/plots/all/heatmap.pdf b/results/combined/plots/all/heatmap.pdf index 573018a70c..1a5aa2a3cc 100644 Binary files a/results/combined/plots/all/heatmap.pdf and b/results/combined/plots/all/heatmap.pdf differ diff --git a/results/combined/plots/git/cost_with_manual.pdf b/results/combined/plots/git/cost_with_manual.pdf index c32c92deb9..ae37c3267e 100644 Binary files a/results/combined/plots/git/cost_with_manual.pdf and b/results/combined/plots/git/cost_with_manual.pdf differ diff --git a/results/combined/plots/git/cost_with_manual.pgf b/results/combined/plots/git/cost_with_manual.pgf index 0bcfbdd847..4813c52b40 100644 --- a/results/combined/plots/git/cost_with_manual.pgf +++ b/results/combined/plots/git/cost_with_manual.pgf @@ -431,9 +431,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{12.800000pt}{3.200000pt}{2.000000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{0.850088in}{3.871357in}}% -\pgfpathlineto{\pgfqpoint{5.748458in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{5.748458in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{0.850088in}{3.719957in}}% +\pgfpathlineto{\pgfqpoint{6.250000in}{0.655074in}}% +\pgfpathlineto{\pgfqpoint{6.250000in}{0.655074in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% @@ -461,21 +461,6 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{20.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{0.850088in}{3.719957in}}% -\pgfpathlineto{\pgfqpoint{6.250000in}{0.655074in}}% -\pgfpathlineto{\pgfqpoint{6.250000in}{0.655074in}}% -\pgfusepath{stroke}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{0.603704in}{0.549691in}}{\pgfqpoint{5.646296in}{4.052084in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.890196,0.466667,0.760784}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% \pgfpathmoveto{\pgfqpoint{0.850088in}{3.723425in}}% \pgfpathlineto{\pgfqpoint{6.250000in}{0.658541in}}% \pgfpathlineto{\pgfqpoint{6.250000in}{0.658541in}}% @@ -487,10 +472,10 @@ \pgfsetbuttcap% \pgfsetroundjoin% \pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.498039,0.498039,0.498039}% +\definecolor{currentstroke}{rgb}{0.890196,0.466667,0.760784}% \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{6.000000pt}{10.000000pt}{2.000000pt}{10.000000pt}}{0.000000pt}% +\pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% \pgfpathmoveto{\pgfqpoint{0.850088in}{3.672573in}}% \pgfpathlineto{\pgfqpoint{6.250000in}{0.633019in}}% \pgfpathlineto{\pgfqpoint{6.250000in}{0.633019in}}% @@ -565,16 +550,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.821564in}{2.747609in}}% -\pgfpathlineto{\pgfqpoint{6.152778in}{2.747609in}}% -\pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{2.747609in}}{\pgfqpoint{6.180556in}{2.775386in}}% +\pgfpathmoveto{\pgfqpoint{3.914156in}{2.941281in}}% +\pgfpathlineto{\pgfqpoint{6.152778in}{2.941281in}}% +\pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{2.941281in}}{\pgfqpoint{6.180556in}{2.969059in}}% \pgfpathlineto{\pgfqpoint{6.180556in}{4.504552in}}% \pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{4.532330in}}{\pgfqpoint{6.152778in}{4.532330in}}% -\pgfpathlineto{\pgfqpoint{3.821564in}{4.532330in}}% -\pgfpathquadraticcurveto{\pgfqpoint{3.793786in}{4.532330in}}{\pgfqpoint{3.793786in}{4.504552in}}% -\pgfpathlineto{\pgfqpoint{3.793786in}{2.775386in}}% -\pgfpathquadraticcurveto{\pgfqpoint{3.793786in}{2.747609in}}{\pgfqpoint{3.821564in}{2.747609in}}% -\pgfpathlineto{\pgfqpoint{3.821564in}{2.747609in}}% +\pgfpathlineto{\pgfqpoint{3.914156in}{4.532330in}}% +\pgfpathquadraticcurveto{\pgfqpoint{3.886378in}{4.532330in}}{\pgfqpoint{3.886378in}{4.504552in}}% +\pgfpathlineto{\pgfqpoint{3.886378in}{2.969059in}}% +\pgfpathquadraticcurveto{\pgfqpoint{3.886378in}{2.941281in}}{\pgfqpoint{3.914156in}{2.941281in}}% +\pgfpathlineto{\pgfqpoint{3.914156in}{2.941281in}}% \pgfpathclose% \pgfusepath{stroke,fill}% \end{pgfscope}% @@ -586,16 +571,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.428164in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.428164in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.428164in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.428164in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.428164in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.428164in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=4.379552in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort}}% +\pgftext[x=4.330823in,y=4.379552in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -605,16 +590,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{2.000000pt}{3.300000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.234491in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.234491in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.234491in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.234491in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.234491in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.234491in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=4.185880in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort-ignorespace}}% +\pgftext[x=4.330823in,y=4.185880in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort-ignorespace}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -624,16 +609,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{7.400000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.040818in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.040818in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.040818in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.040818in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.040818in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.040818in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.992207in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-histogram}}% +\pgftext[x=4.330823in,y=3.992207in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-histogram}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -643,16 +628,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{12.800000pt}{3.200000pt}{2.000000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.847145in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.847145in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.847145in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.847145in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.847145in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.847145in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.798534in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-ignorespace}}% +\pgftext[x=4.330823in,y=3.798534in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-minimal}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -662,16 +647,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{2.000000pt}{2.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.653472in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.653472in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.653472in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.653472in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.653472in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.653472in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.604861in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-minimal}}% +\pgftext[x=4.330823in,y=3.604861in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-myers}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -681,16 +666,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{20.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.459800in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.459800in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.459800in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.459800in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.459800in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.459800in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.411189in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-myers}}% +\pgftext[x=4.330823in,y=3.411189in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-patience}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -700,35 +685,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.266127in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.266127in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.266127in}}% -\pgfusepath{stroke}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.217516in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-patience}}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.498039,0.498039,0.498039}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{6.000000pt}{10.000000pt}{2.000000pt}{10.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.072454in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.072454in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.072454in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.266127in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.266127in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.266127in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.023843in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-resolve}}% +\pgftext[x=4.330823in,y=3.217516in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-resolve}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetrectcap% @@ -737,16 +703,16 @@ \definecolor{currentstroke}{rgb}{1.000000,0.000000,0.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{2.878781in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{2.878781in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{2.878781in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.072454in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.072454in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.072454in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=2.830170in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Manual Merging}}% +\pgftext[x=4.330823in,y=3.023843in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Manual Merging}}% \end{pgfscope}% \end{pgfpicture}% \makeatother% diff --git a/results/combined/plots/git/cost_without_manual.pdf b/results/combined/plots/git/cost_without_manual.pdf index 3cf0ce321a..3a951b2282 100644 Binary files a/results/combined/plots/git/cost_without_manual.pdf and b/results/combined/plots/git/cost_without_manual.pdf differ diff --git a/results/combined/plots/git/cost_without_manual.pgf b/results/combined/plots/git/cost_without_manual.pgf index cc2b69ee11..99a0779429 100644 --- a/results/combined/plots/git/cost_without_manual.pgf +++ b/results/combined/plots/git/cost_without_manual.pgf @@ -481,9 +481,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{12.800000pt}{3.200000pt}{2.000000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.119297in}{4.442940in}}% -\pgfpathlineto{\pgfqpoint{6.147499in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{6.147499in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.119297in}{4.130047in}}% +\pgfpathlineto{\pgfqpoint{6.260000in}{0.799977in}}% +\pgfpathlineto{\pgfqpoint{6.260000in}{0.799977in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% @@ -511,21 +511,6 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{20.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.119297in}{4.130047in}}% -\pgfpathlineto{\pgfqpoint{6.260000in}{0.799977in}}% -\pgfpathlineto{\pgfqpoint{6.260000in}{0.799977in}}% -\pgfusepath{stroke}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{0.673149in}{0.549691in}}{\pgfqpoint{5.576851in}{4.052084in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.890196,0.466667,0.760784}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% \pgfpathmoveto{\pgfqpoint{1.119297in}{4.137212in}}% \pgfpathlineto{\pgfqpoint{6.260000in}{0.807142in}}% \pgfpathlineto{\pgfqpoint{6.260000in}{0.807142in}}% @@ -537,10 +522,10 @@ \pgfsetbuttcap% \pgfsetroundjoin% \pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.498039,0.498039,0.498039}% +\definecolor{currentstroke}{rgb}{0.890196,0.466667,0.760784}% \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{6.000000pt}{10.000000pt}{2.000000pt}{10.000000pt}}{0.000000pt}% +\pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% \pgfpathmoveto{\pgfqpoint{1.119297in}{4.032118in}}% \pgfpathlineto{\pgfqpoint{6.260000in}{0.729569in}}% \pgfpathlineto{\pgfqpoint{6.260000in}{0.729569in}}% @@ -601,16 +586,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.821564in}{2.941281in}}% -\pgfpathlineto{\pgfqpoint{6.152778in}{2.941281in}}% -\pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{2.941281in}}{\pgfqpoint{6.180556in}{2.969059in}}% +\pgfpathmoveto{\pgfqpoint{3.914156in}{3.134954in}}% +\pgfpathlineto{\pgfqpoint{6.152778in}{3.134954in}}% +\pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{3.134954in}}{\pgfqpoint{6.180556in}{3.162732in}}% \pgfpathlineto{\pgfqpoint{6.180556in}{4.504552in}}% \pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{4.532330in}}{\pgfqpoint{6.152778in}{4.532330in}}% -\pgfpathlineto{\pgfqpoint{3.821564in}{4.532330in}}% -\pgfpathquadraticcurveto{\pgfqpoint{3.793786in}{4.532330in}}{\pgfqpoint{3.793786in}{4.504552in}}% -\pgfpathlineto{\pgfqpoint{3.793786in}{2.969059in}}% -\pgfpathquadraticcurveto{\pgfqpoint{3.793786in}{2.941281in}}{\pgfqpoint{3.821564in}{2.941281in}}% -\pgfpathlineto{\pgfqpoint{3.821564in}{2.941281in}}% +\pgfpathlineto{\pgfqpoint{3.914156in}{4.532330in}}% +\pgfpathquadraticcurveto{\pgfqpoint{3.886378in}{4.532330in}}{\pgfqpoint{3.886378in}{4.504552in}}% +\pgfpathlineto{\pgfqpoint{3.886378in}{3.162732in}}% +\pgfpathquadraticcurveto{\pgfqpoint{3.886378in}{3.134954in}}{\pgfqpoint{3.914156in}{3.134954in}}% +\pgfpathlineto{\pgfqpoint{3.914156in}{3.134954in}}% \pgfpathclose% \pgfusepath{stroke,fill}% \end{pgfscope}% @@ -622,16 +607,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.428164in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.428164in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.428164in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.428164in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.428164in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.428164in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=4.379552in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort}}% +\pgftext[x=4.330823in,y=4.379552in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -641,16 +626,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{2.000000pt}{3.300000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.234491in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.234491in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.234491in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.234491in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.234491in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.234491in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=4.185880in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort-ignorespace}}% +\pgftext[x=4.330823in,y=4.185880in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort-ignorespace}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -660,16 +645,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{7.400000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.040818in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.040818in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.040818in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.040818in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.040818in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.040818in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.992207in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-histogram}}% +\pgftext[x=4.330823in,y=3.992207in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-histogram}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -679,16 +664,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{12.800000pt}{3.200000pt}{2.000000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.847145in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.847145in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.847145in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.847145in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.847145in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.847145in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.798534in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-ignorespace}}% +\pgftext[x=4.330823in,y=3.798534in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-minimal}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -698,16 +683,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{2.000000pt}{2.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.653472in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.653472in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.653472in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.653472in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.653472in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.653472in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.604861in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-minimal}}% +\pgftext[x=4.330823in,y=3.604861in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-myers}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -717,16 +702,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{20.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.459800in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.459800in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.459800in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.459800in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.459800in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.459800in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.411189in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-myers}}% +\pgftext[x=4.330823in,y=3.411189in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-patience}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -736,35 +721,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.266127in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.266127in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.266127in}}% -\pgfusepath{stroke}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.217516in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-patience}}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.498039,0.498039,0.498039}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{6.000000pt}{10.000000pt}{2.000000pt}{10.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.072454in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.072454in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.072454in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.266127in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.266127in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.266127in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.023843in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-resolve}}% +\pgftext[x=4.330823in,y=3.217516in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-resolve}}% \end{pgfscope}% \end{pgfpicture}% \makeatother% diff --git a/results/combined/plots/git/heatmap-img0.png b/results/combined/plots/git/heatmap-img0.png index 3c4bb052c1..1a14e1b762 100644 Binary files a/results/combined/plots/git/heatmap-img0.png and b/results/combined/plots/git/heatmap-img0.png differ diff --git a/results/combined/plots/git/heatmap.pdf b/results/combined/plots/git/heatmap.pdf index 1c4a49a6d1..c7293741f2 100644 Binary files a/results/combined/plots/git/heatmap.pdf and b/results/combined/plots/git/heatmap.pdf differ diff --git a/results/combined/plots/git/heatmap.pgf b/results/combined/plots/git/heatmap.pgf index 08af440f49..0ae13e778d 100644 --- a/results/combined/plots/git/heatmap.pgf +++ b/results/combined/plots/git/heatmap.pgf @@ -56,16 +56,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.000000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{1.668667in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{1.603194in}}% \pgfpathclose% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -75,15 +75,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{5.850000in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -91,15 +91,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -107,15 +107,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -123,15 +123,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -139,15 +139,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -155,15 +155,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -171,31 +171,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.850000in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -205,15 +189,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{5.243313in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -223,15 +207,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.243313in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -239,15 +223,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.243313in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -255,15 +239,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.243313in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -271,15 +255,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.243313in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -287,15 +271,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.243313in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -303,31 +287,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.243313in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.327333in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -337,15 +305,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{4.804667in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{4.636627in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -355,15 +323,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.804667in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.636627in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -373,15 +341,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.804667in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.636627in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -389,15 +357,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.804667in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.636627in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -405,15 +373,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.804667in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.636627in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -421,15 +389,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.804667in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.636627in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -437,167 +405,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.804667in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.636627in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.804667in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.220715,0.467835}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{4.282000in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.879431,0.927228,0.971457}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.282000in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.220715,0.467835}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.282000in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.968627,0.984314,1.000000}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.282000in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.282000in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.282000in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.282000in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.282000in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -607,15 +423,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{4.029940in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -625,15 +441,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.029940in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -643,33 +459,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.029940in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.232895,0.485921}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.759333in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -679,15 +477,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.029940in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -695,15 +493,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.029940in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -711,15 +509,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.029940in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -727,15 +525,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.029940in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -745,15 +543,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{3.423254in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -763,15 +561,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{3.423254in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -781,33 +579,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.236667in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.232895,0.485921}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{3.423254in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -817,15 +597,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{3.423254in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -835,15 +615,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{3.423254in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -851,15 +631,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{3.423254in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -867,15 +647,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{3.423254in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -885,15 +665,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -903,15 +683,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -921,33 +701,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.224775,0.473864}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.714000in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -957,15 +719,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -975,15 +737,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -993,15 +755,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1009,15 +771,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.816567in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1027,15 +789,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1045,15 +807,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1063,33 +825,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.196355,0.431665}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.191333in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1099,15 +843,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1117,15 +861,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1135,15 +879,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1153,11 +897,11 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% @@ -1175,32 +919,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.419792in}{1.668667in}% -\pgfsys@useobject{currentmarker}{}% -\end{pgfscope}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort}}}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.803000pt}% -\definecolor{currentstroke}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfsys@defobject{currentmarker}{\pgfqpoint{0.000000in}{-0.048611in}}{\pgfqpoint{0.000000in}{0.000000in}}{% -\pgfpathmoveto{\pgfqpoint{0.000000in}{0.000000in}}% -\pgfpathlineto{\pgfqpoint{0.000000in}{-0.048611in}}% -\pgfusepath{stroke,fill}% -}% -\begin{pgfscope}% -\pgfsys@transformshift{2.991393in}{1.668667in}% +\pgfsys@transformshift{2.373320in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1208,7 +927,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort-ignorespace}}}% +\pgftext[x=2.373320in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1225,7 +944,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{3.562994in}{1.668667in}% +\pgfsys@transformshift{3.037160in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1233,7 +952,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-histogram}}}% +\pgftext[x=3.037160in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1250,7 +969,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{4.134595in}{1.668667in}% +\pgfsys@transformshift{3.701000in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1258,7 +977,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-ignorespace}}}% +\pgftext[x=3.701000in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-histogram}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1275,7 +994,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{4.706195in}{1.668667in}% +\pgfsys@transformshift{4.364840in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1283,7 +1002,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.706195in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-minimal}}}% +\pgftext[x=4.364840in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-minimal}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1300,7 +1019,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{5.277796in}{1.668667in}% +\pgfsys@transformshift{5.028680in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1308,7 +1027,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.277796in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-myers}}}% +\pgftext[x=5.028680in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-myers}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1325,7 +1044,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{5.849397in}{1.668667in}% +\pgfsys@transformshift{5.692520in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1333,7 +1052,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.849397in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-patience}}}% +\pgftext[x=5.692520in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-patience}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1350,32 +1069,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{6.420998in}{1.668667in}% -\pgfsys@useobject{currentmarker}{}% -\end{pgfscope}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=6.420998in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-resolve}}}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.803000pt}% -\definecolor{currentstroke}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfsys@defobject{currentmarker}{\pgfqpoint{-0.048611in}{0.000000in}}{\pgfqpoint{-0.000000in}{0.000000in}}{% -\pgfpathmoveto{\pgfqpoint{-0.000000in}{0.000000in}}% -\pgfpathlineto{\pgfqpoint{-0.048611in}{0.000000in}}% -\pgfusepath{stroke,fill}% -}% -\begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{5.588667in}% +\pgfsys@transformshift{6.356360in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1383,7 +1077,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=5.588667in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort}}}% +\pgftext[x=6.356360in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-resolve}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1400,7 +1094,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{5.066000in}% +\pgfsys@transformshift{2.041400in}{5.546657in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1408,7 +1102,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=5.066000in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort-ignorespace}}}% +\pgftext[x=1.944177in,y=5.546657in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1425,7 +1119,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{4.543333in}% +\pgfsys@transformshift{2.041400in}{4.939970in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1433,7 +1127,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=4.543333in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-histogram}}}% +\pgftext[x=1.944177in,y=4.939970in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1450,7 +1144,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{4.020667in}% +\pgfsys@transformshift{2.041400in}{4.333284in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1458,7 +1152,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=4.020667in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-ignorespace}}}% +\pgftext[x=1.944177in,y=4.333284in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-histogram}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1475,7 +1169,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{3.498000in}% +\pgfsys@transformshift{2.041400in}{3.726597in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1483,7 +1177,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=3.498000in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-minimal}}}% +\pgftext[x=1.944177in,y=3.726597in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-minimal}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1500,7 +1194,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{2.975333in}% +\pgfsys@transformshift{2.041400in}{3.119911in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1508,7 +1202,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=2.975333in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-myers}}}% +\pgftext[x=1.944177in,y=3.119911in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-myers}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1525,7 +1219,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{2.452667in}% +\pgfsys@transformshift{2.041400in}{2.513224in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1533,7 +1227,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=2.452667in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-patience}}}% +\pgftext[x=1.944177in,y=2.513224in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-patience}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1550,7 +1244,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{1.930000in}% +\pgfsys@transformshift{2.041400in}{1.906538in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1558,223 +1252,175 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=1.930000in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-resolve}}}% +\pgftext[x=1.944177in,y=1.906538in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-resolve}}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=5.588667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=2.373320in,y=5.546657in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=5.066000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.4e+02}}% +\pgftext[x=2.373320in,y=4.939970in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.4e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=5.066000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=3.037160in,y=4.939970in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=4.543333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=2.373320in,y=4.333284in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=4.543333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.4e+02}}% +\pgftext[x=3.037160in,y=4.333284in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.4e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=4.543333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=4.020667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.5e+02}}% +\pgftext[x=3.701000in,y=4.333284in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=4.020667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1e+02}}% +\pgftext[x=2.373320in,y=3.726597in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=4.020667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.5e+02}}% +\pgftext[x=3.037160in,y=3.726597in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.5e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=4.020667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=3.701000in,y=3.726597in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=3.498000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=3.498000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.5e+02}}% +\pgftext[x=4.364840in,y=3.726597in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=3.498000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% +\pgftext[x=2.373320in,y=3.119911in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=3.498000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.4e+02}}% +\pgftext[x=3.037160in,y=3.119911in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.5e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.706195in,y=3.498000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=3.701000in,y=3.119911in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.5e+02}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.4e+02}}% +\pgftext[x=4.364840in,y=3.119911in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.706195in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=5.028680in,y=3.119911in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.277796in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}12}}% +\pgftext[x=2.373320in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}12}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.6e+02}}% +\pgftext[x=3.037160in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.6e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}12}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.5e+02}}% +\pgftext[x=3.701000in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}12}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.706195in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}11}}% +\pgftext[x=4.364840in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}11}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.277796in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}11}}% +\pgftext[x=5.028680in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}11}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.849397in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=5.692520in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}52}}% +\pgftext[x=2.373320in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}52}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.8e+02}}% +\pgftext[x=3.037160in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.8e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}52}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.7e+02}}% +\pgftext[x=3.701000in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}52}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.706195in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}40}}% +\pgftext[x=4.364840in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}40}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.277796in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}40}}% +\pgftext[x=5.028680in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}40}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.849397in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}51}}% +\pgftext[x=5.692520in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}51}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=6.420998in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=6.356360in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1786,17 +1432,17 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.000000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.992599in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{7.201665in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{7.201665in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.992599in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.992599in}{1.668667in}}% +\pgfpathmoveto{\pgfqpoint{6.978710in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{7.191050in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{7.191050in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.978710in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.978710in}{1.603194in}}% \pgfpathclose% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfsys@transformshift{6.990000in}{1.670000in}% -\pgftext[left,bottom]{\includegraphics[interpolate=true,width=0.210000in,height=4.180000in]{results/combined/plots/git/heatmap-img0.png}}% +\pgfsys@transformshift{6.980000in}{1.600000in}% +\pgftext[left,bottom]{\includegraphics[interpolate=true,width=0.210000in,height=4.250000in]{results/combined/plots/git/heatmap-img0.png}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1813,7 +1459,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{1.668667in}% +\pgfsys@transformshift{7.191050in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1821,7 +1467,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=1.620442in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{0}$}}% +\pgftext[x=7.288272in, y=1.554969in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{0}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1838,7 +1484,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{2.143279in}% +\pgfsys@transformshift{7.191050in}{2.085238in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1846,7 +1492,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=2.095054in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{100}$}}% +\pgftext[x=7.288272in, y=2.037013in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{100}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1863,7 +1509,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{2.617891in}% +\pgfsys@transformshift{7.191050in}{2.567282in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1871,7 +1517,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=2.569666in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{200}$}}% +\pgftext[x=7.288272in, y=2.519057in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{200}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1888,7 +1534,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{3.092503in}% +\pgfsys@transformshift{7.191050in}{3.049326in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1896,7 +1542,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=3.044278in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{300}$}}% +\pgftext[x=7.288272in, y=3.001100in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{300}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1913,7 +1559,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{3.567115in}% +\pgfsys@transformshift{7.191050in}{3.531369in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1921,7 +1567,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=3.518890in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{400}$}}% +\pgftext[x=7.288272in, y=3.483144in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{400}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1938,7 +1584,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{4.041728in}% +\pgfsys@transformshift{7.191050in}{4.013413in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1946,7 +1592,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=3.993502in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{500}$}}% +\pgftext[x=7.288272in, y=3.965188in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{500}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1963,7 +1609,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{4.516340in}% +\pgfsys@transformshift{7.191050in}{4.495457in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1971,7 +1617,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=4.468115in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{600}$}}% +\pgftext[x=7.288272in, y=4.447232in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{600}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1988,7 +1634,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{4.990952in}% +\pgfsys@transformshift{7.191050in}{4.977501in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1996,7 +1642,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=4.942727in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{700}$}}% +\pgftext[x=7.288272in, y=4.929275in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{700}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -2013,7 +1659,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{5.465564in}% +\pgfsys@transformshift{7.191050in}{5.459545in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -2021,7 +1667,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=5.417339in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{800}$}}% +\pgftext[x=7.288272in, y=5.411319in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{800}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetrectcap% @@ -2030,13 +1676,13 @@ \definecolor{currentstroke}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.992599in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{7.097132in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{7.201665in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{7.201665in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{7.097132in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.992599in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.992599in}{1.668667in}}% +\pgfpathmoveto{\pgfqpoint{6.978710in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{7.084880in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{7.191050in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{7.191050in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{7.084880in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.978710in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.978710in}{1.603194in}}% \pgfpathclose% \pgfusepath{}% \end{pgfscope}% diff --git a/results/combined/plots/tools/cost_with_manual.pdf b/results/combined/plots/tools/cost_with_manual.pdf index 476a901dcb..a2cb3d6e17 100644 Binary files a/results/combined/plots/tools/cost_with_manual.pdf and b/results/combined/plots/tools/cost_with_manual.pdf differ diff --git a/results/combined/plots/tools/cost_without_manual.pdf b/results/combined/plots/tools/cost_without_manual.pdf index 0ca1bc1ee7..af876fe385 100644 Binary files a/results/combined/plots/tools/cost_without_manual.pdf and b/results/combined/plots/tools/cost_without_manual.pdf differ diff --git a/results/combined/plots/tools/heatmap.pdf b/results/combined/plots/tools/heatmap.pdf index 9be96abf42..85d3554ab8 100644 Binary files a/results/combined/plots/tools/heatmap.pdf and b/results/combined/plots/tools/heatmap.pdf differ diff --git a/results/combined/tables/git/table_feature_main_summary.tex b/results/combined/tables/git/table_feature_main_summary.tex index 5bdc0bb87d..a6aa9f624a 100644 --- a/results/combined/tables/git/table_feature_main_summary.tex +++ b/results/combined/tables/git/table_feature_main_summary.tex @@ -18,7 +18,6 @@ Gitmerge-ort & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ Gitmerge-ort-ignorespace & 56\% & 38\% & 41\% & 60\% & 3\% & 2\% \\ Gitmerge-recursive-histogram & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ - Gitmerge-recursive-ignorespace & 56\% & 38\% & 41\% & 60\% & 3\% & 2\% \\ Gitmerge-recursive-minimal & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ Gitmerge-recursive-myers & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ Gitmerge-recursive-patience & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ diff --git a/results/combined/tables/git/table_run_time.tex b/results/combined/tables/git/table_run_time.tex index a203a3f93c..b8ed186228 100644 --- a/results/combined/tables/git/table_run_time.tex +++ b/results/combined/tables/git/table_run_time.tex @@ -6,7 +6,6 @@ Gitmerge-ort & 0.04 & 0.04 & 1.19 \\ Gitmerge-ort-ignorespace & 0.04 & 0.04 & 1.22 \\ Gitmerge-recursive-histogram & 0.05 & 0.04 & 2.97 \\ - Gitmerge-recursive-ignorespace & 0.05 & 0.04 & 2.14 \\ Gitmerge-recursive-minimal & 0.05 & 0.04 & 2.13 \\ Gitmerge-recursive-myers & 0.05 & 0.04 & 2.11 \\ Gitmerge-recursive-patience & 0.05 & 0.04 & 3.05 \\ diff --git a/results/combined/tables/git/table_summary.tex b/results/combined/tables/git/table_summary.tex index 1019f4e37c..01be3d557c 100644 --- a/results/combined/tables/git/table_summary.tex +++ b/results/combined/tables/git/table_summary.tex @@ -9,7 +9,6 @@ Gitmerge-ort & 2630 & 47\% & 2905 & 51\% & 120 & 2\% \\ Gitmerge-ort-ignorespace & 2760 & 49\% & 2752 & 49\% & 143 & 3\% \\ Gitmerge-recursive-histogram & 2630 & 47\% & 2905 & 51\% & 120 & 2\% \\ -Gitmerge-recursive-ignorespace & 2761 & 49\% & 2749 & 49\% & 145 & 3\% \\ Gitmerge-recursive-minimal & 2630 & 47\% & 2904 & 51\% & 121 & 2\% \\ Gitmerge-recursive-myers & 2630 & 47\% & 2904 & 51\% & 121 & 2\% \\ Gitmerge-recursive-patience & 2633 & 47\% & 2901 & 51\% & 121 & 2\% \\ diff --git a/results/greatest_hits/plots/all/cost_with_manual.pdf b/results/greatest_hits/plots/all/cost_with_manual.pdf index 36fd3631da..df0d93f5f4 100644 Binary files a/results/greatest_hits/plots/all/cost_with_manual.pdf and b/results/greatest_hits/plots/all/cost_with_manual.pdf differ diff --git a/results/greatest_hits/plots/all/cost_without_manual.pdf b/results/greatest_hits/plots/all/cost_without_manual.pdf index f32d8a291d..f44b6e6a9d 100644 Binary files a/results/greatest_hits/plots/all/cost_without_manual.pdf and b/results/greatest_hits/plots/all/cost_without_manual.pdf differ diff --git a/results/greatest_hits/plots/all/heatmap.pdf b/results/greatest_hits/plots/all/heatmap.pdf index ef16634bee..9c0d8e352d 100644 Binary files a/results/greatest_hits/plots/all/heatmap.pdf and b/results/greatest_hits/plots/all/heatmap.pdf differ diff --git a/results/greatest_hits/plots/git/cost_with_manual.pdf b/results/greatest_hits/plots/git/cost_with_manual.pdf index bd5de9e283..e150ff0f96 100644 Binary files a/results/greatest_hits/plots/git/cost_with_manual.pdf and b/results/greatest_hits/plots/git/cost_with_manual.pdf differ diff --git a/results/greatest_hits/plots/git/cost_with_manual.pgf b/results/greatest_hits/plots/git/cost_with_manual.pgf index 55978bd3ee..6fbf9ce2bd 100644 --- a/results/greatest_hits/plots/git/cost_with_manual.pgf +++ b/results/greatest_hits/plots/git/cost_with_manual.pgf @@ -531,9 +531,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{12.800000pt}{3.200000pt}{2.000000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{0.945547in}{3.523306in}}% -\pgfpathlineto{\pgfqpoint{6.000835in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{6.000835in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{0.945547in}{3.431599in}}% +\pgfpathlineto{\pgfqpoint{6.250000in}{0.585535in}}% +\pgfpathlineto{\pgfqpoint{6.250000in}{0.585535in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% @@ -561,21 +561,6 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{20.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{0.945547in}{3.431599in}}% -\pgfpathlineto{\pgfqpoint{6.250000in}{0.585535in}}% -\pgfpathlineto{\pgfqpoint{6.250000in}{0.585535in}}% -\pgfusepath{stroke}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{0.603704in}{0.549691in}}{\pgfqpoint{5.646296in}{4.052084in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.890196,0.466667,0.760784}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% \pgfpathmoveto{\pgfqpoint{0.945547in}{3.437713in}}% \pgfpathlineto{\pgfqpoint{6.250000in}{0.591648in}}% \pgfpathlineto{\pgfqpoint{6.250000in}{0.591648in}}% @@ -587,10 +572,10 @@ \pgfsetbuttcap% \pgfsetroundjoin% \pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.498039,0.498039,0.498039}% +\definecolor{currentstroke}{rgb}{0.890196,0.466667,0.760784}% \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{6.000000pt}{10.000000pt}{2.000000pt}{10.000000pt}}{0.000000pt}% +\pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% \pgfpathmoveto{\pgfqpoint{0.945547in}{3.382689in}}% \pgfpathlineto{\pgfqpoint{6.250000in}{0.631493in}}% \pgfpathlineto{\pgfqpoint{6.250000in}{0.631493in}}% @@ -665,16 +650,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.821564in}{2.747609in}}% -\pgfpathlineto{\pgfqpoint{6.152778in}{2.747609in}}% -\pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{2.747609in}}{\pgfqpoint{6.180556in}{2.775386in}}% +\pgfpathmoveto{\pgfqpoint{3.914156in}{2.941281in}}% +\pgfpathlineto{\pgfqpoint{6.152778in}{2.941281in}}% +\pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{2.941281in}}{\pgfqpoint{6.180556in}{2.969059in}}% \pgfpathlineto{\pgfqpoint{6.180556in}{4.504552in}}% \pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{4.532330in}}{\pgfqpoint{6.152778in}{4.532330in}}% -\pgfpathlineto{\pgfqpoint{3.821564in}{4.532330in}}% -\pgfpathquadraticcurveto{\pgfqpoint{3.793786in}{4.532330in}}{\pgfqpoint{3.793786in}{4.504552in}}% -\pgfpathlineto{\pgfqpoint{3.793786in}{2.775386in}}% -\pgfpathquadraticcurveto{\pgfqpoint{3.793786in}{2.747609in}}{\pgfqpoint{3.821564in}{2.747609in}}% -\pgfpathlineto{\pgfqpoint{3.821564in}{2.747609in}}% +\pgfpathlineto{\pgfqpoint{3.914156in}{4.532330in}}% +\pgfpathquadraticcurveto{\pgfqpoint{3.886378in}{4.532330in}}{\pgfqpoint{3.886378in}{4.504552in}}% +\pgfpathlineto{\pgfqpoint{3.886378in}{2.969059in}}% +\pgfpathquadraticcurveto{\pgfqpoint{3.886378in}{2.941281in}}{\pgfqpoint{3.914156in}{2.941281in}}% +\pgfpathlineto{\pgfqpoint{3.914156in}{2.941281in}}% \pgfpathclose% \pgfusepath{stroke,fill}% \end{pgfscope}% @@ -686,16 +671,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.428164in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.428164in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.428164in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.428164in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.428164in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.428164in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=4.379552in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort}}% +\pgftext[x=4.330823in,y=4.379552in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -705,16 +690,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{2.000000pt}{3.300000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.234491in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.234491in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.234491in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.234491in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.234491in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.234491in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=4.185880in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort-ignorespace}}% +\pgftext[x=4.330823in,y=4.185880in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort-ignorespace}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -724,16 +709,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{7.400000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.040818in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.040818in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.040818in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.040818in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.040818in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.040818in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.992207in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-histogram}}% +\pgftext[x=4.330823in,y=3.992207in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-histogram}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -743,16 +728,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{12.800000pt}{3.200000pt}{2.000000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.847145in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.847145in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.847145in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.847145in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.847145in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.847145in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.798534in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-ignorespace}}% +\pgftext[x=4.330823in,y=3.798534in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-minimal}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -762,16 +747,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{2.000000pt}{2.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.653472in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.653472in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.653472in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.653472in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.653472in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.653472in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.604861in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-minimal}}% +\pgftext[x=4.330823in,y=3.604861in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-myers}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -781,16 +766,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{20.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.459800in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.459800in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.459800in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.459800in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.459800in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.459800in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.411189in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-myers}}% +\pgftext[x=4.330823in,y=3.411189in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-patience}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -800,35 +785,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.266127in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.266127in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.266127in}}% -\pgfusepath{stroke}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.217516in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-patience}}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.498039,0.498039,0.498039}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{6.000000pt}{10.000000pt}{2.000000pt}{10.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.072454in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.072454in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.072454in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.266127in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.266127in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.266127in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.023843in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-resolve}}% +\pgftext[x=4.330823in,y=3.217516in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-resolve}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetrectcap% @@ -837,16 +803,16 @@ \definecolor{currentstroke}{rgb}{1.000000,0.000000,0.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{2.878781in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{2.878781in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{2.878781in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.072454in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.072454in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.072454in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=2.830170in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Manual Merging}}% +\pgftext[x=4.330823in,y=3.023843in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Manual Merging}}% \end{pgfscope}% \end{pgfpicture}% \makeatother% diff --git a/results/greatest_hits/plots/git/cost_without_manual.pdf b/results/greatest_hits/plots/git/cost_without_manual.pdf index 4f8fc09b42..68500cb861 100644 Binary files a/results/greatest_hits/plots/git/cost_without_manual.pdf and b/results/greatest_hits/plots/git/cost_without_manual.pdf differ diff --git a/results/greatest_hits/plots/git/cost_without_manual.pgf b/results/greatest_hits/plots/git/cost_without_manual.pgf index 036c30bda8..fe3249e605 100644 --- a/results/greatest_hits/plots/git/cost_without_manual.pgf +++ b/results/greatest_hits/plots/git/cost_without_manual.pgf @@ -481,9 +481,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{12.800000pt}{3.200000pt}{2.000000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.119297in}{3.723634in}}% -\pgfpathlineto{\pgfqpoint{4.526130in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{4.526130in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.119297in}{3.534107in}}% +\pgfpathlineto{\pgfqpoint{4.643740in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{4.643740in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% @@ -511,21 +511,6 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{20.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.119297in}{3.534107in}}% -\pgfpathlineto{\pgfqpoint{4.643740in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{4.643740in}{0.539691in}}% -\pgfusepath{stroke}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{0.673149in}{0.549691in}}{\pgfqpoint{5.576851in}{4.052084in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.890196,0.466667,0.760784}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% \pgfpathmoveto{\pgfqpoint{1.119297in}{3.546742in}}% \pgfpathlineto{\pgfqpoint{4.658611in}{0.539691in}}% \pgfpathlineto{\pgfqpoint{4.658611in}{0.539691in}}% @@ -537,10 +522,10 @@ \pgfsetbuttcap% \pgfsetroundjoin% \pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.498039,0.498039,0.498039}% +\definecolor{currentstroke}{rgb}{0.890196,0.466667,0.760784}% \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{6.000000pt}{10.000000pt}{2.000000pt}{10.000000pt}}{0.000000pt}% +\pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% \pgfpathmoveto{\pgfqpoint{1.119297in}{3.433026in}}% \pgfpathlineto{\pgfqpoint{4.642197in}{0.539691in}}% \pgfpathlineto{\pgfqpoint{4.642197in}{0.539691in}}% @@ -601,16 +586,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.821564in}{2.941281in}}% -\pgfpathlineto{\pgfqpoint{6.152778in}{2.941281in}}% -\pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{2.941281in}}{\pgfqpoint{6.180556in}{2.969059in}}% +\pgfpathmoveto{\pgfqpoint{3.914156in}{3.134954in}}% +\pgfpathlineto{\pgfqpoint{6.152778in}{3.134954in}}% +\pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{3.134954in}}{\pgfqpoint{6.180556in}{3.162732in}}% \pgfpathlineto{\pgfqpoint{6.180556in}{4.504552in}}% \pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{4.532330in}}{\pgfqpoint{6.152778in}{4.532330in}}% -\pgfpathlineto{\pgfqpoint{3.821564in}{4.532330in}}% -\pgfpathquadraticcurveto{\pgfqpoint{3.793786in}{4.532330in}}{\pgfqpoint{3.793786in}{4.504552in}}% -\pgfpathlineto{\pgfqpoint{3.793786in}{2.969059in}}% -\pgfpathquadraticcurveto{\pgfqpoint{3.793786in}{2.941281in}}{\pgfqpoint{3.821564in}{2.941281in}}% -\pgfpathlineto{\pgfqpoint{3.821564in}{2.941281in}}% +\pgfpathlineto{\pgfqpoint{3.914156in}{4.532330in}}% +\pgfpathquadraticcurveto{\pgfqpoint{3.886378in}{4.532330in}}{\pgfqpoint{3.886378in}{4.504552in}}% +\pgfpathlineto{\pgfqpoint{3.886378in}{3.162732in}}% +\pgfpathquadraticcurveto{\pgfqpoint{3.886378in}{3.134954in}}{\pgfqpoint{3.914156in}{3.134954in}}% +\pgfpathlineto{\pgfqpoint{3.914156in}{3.134954in}}% \pgfpathclose% \pgfusepath{stroke,fill}% \end{pgfscope}% @@ -622,16 +607,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.428164in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.428164in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.428164in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.428164in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.428164in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.428164in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=4.379552in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort}}% +\pgftext[x=4.330823in,y=4.379552in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -641,16 +626,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{2.000000pt}{3.300000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.234491in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.234491in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.234491in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.234491in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.234491in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.234491in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=4.185880in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort-ignorespace}}% +\pgftext[x=4.330823in,y=4.185880in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort-ignorespace}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -660,16 +645,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{7.400000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.040818in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.040818in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.040818in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.040818in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.040818in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.040818in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.992207in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-histogram}}% +\pgftext[x=4.330823in,y=3.992207in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-histogram}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -679,16 +664,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{12.800000pt}{3.200000pt}{2.000000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.847145in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.847145in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.847145in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.847145in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.847145in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.847145in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.798534in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-ignorespace}}% +\pgftext[x=4.330823in,y=3.798534in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-minimal}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -698,16 +683,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{2.000000pt}{2.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.653472in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.653472in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.653472in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.653472in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.653472in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.653472in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.604861in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-minimal}}% +\pgftext[x=4.330823in,y=3.604861in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-myers}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -717,16 +702,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{20.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.459800in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.459800in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.459800in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.459800in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.459800in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.459800in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.411189in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-myers}}% +\pgftext[x=4.330823in,y=3.411189in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-patience}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -736,35 +721,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.266127in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.266127in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.266127in}}% -\pgfusepath{stroke}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.217516in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-patience}}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.498039,0.498039,0.498039}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{6.000000pt}{10.000000pt}{2.000000pt}{10.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.072454in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.072454in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.072454in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.266127in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.266127in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.266127in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.023843in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-resolve}}% +\pgftext[x=4.330823in,y=3.217516in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-resolve}}% \end{pgfscope}% \end{pgfpicture}% \makeatother% diff --git a/results/greatest_hits/plots/git/heatmap-img0.png b/results/greatest_hits/plots/git/heatmap-img0.png index 3c4bb052c1..1a14e1b762 100644 Binary files a/results/greatest_hits/plots/git/heatmap-img0.png and b/results/greatest_hits/plots/git/heatmap-img0.png differ diff --git a/results/greatest_hits/plots/git/heatmap.pdf b/results/greatest_hits/plots/git/heatmap.pdf index d86066f3be..e09d9d3938 100644 Binary files a/results/greatest_hits/plots/git/heatmap.pdf and b/results/greatest_hits/plots/git/heatmap.pdf differ diff --git a/results/greatest_hits/plots/git/heatmap.pgf b/results/greatest_hits/plots/git/heatmap.pgf index b5a743f86a..c015986244 100644 --- a/results/greatest_hits/plots/git/heatmap.pgf +++ b/results/greatest_hits/plots/git/heatmap.pgf @@ -56,16 +56,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.000000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{1.668667in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{1.603194in}}% \pgfpathclose% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -75,15 +75,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{5.850000in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -91,15 +91,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -107,15 +107,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -123,15 +123,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -139,15 +139,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -155,15 +155,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -171,31 +171,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.850000in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -205,15 +189,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{5.243313in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -223,31 +207,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.243313in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.327333in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -255,15 +223,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.243313in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -271,15 +239,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.243313in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -287,15 +255,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.243313in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -303,15 +271,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.243313in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -319,15 +287,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.243313in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -337,15 +305,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{4.804667in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{4.636627in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -355,167 +323,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.804667in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.968627,0.984314,1.000000}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.804667in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.804667in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.804667in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.804667in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.804667in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.804667in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.220715,0.467835}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{4.282000in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.636627in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.882507,0.929196,0.972441}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.282000in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.220715,0.467835}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.282000in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -525,15 +341,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.282000in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.636627in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -541,15 +357,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.282000in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.636627in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -557,15 +373,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.282000in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.636627in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -573,15 +389,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.282000in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.636627in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -589,15 +405,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.282000in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.636627in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -607,15 +423,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{4.029940in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -625,15 +441,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.029940in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -643,33 +459,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.029940in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.228835,0.479892}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.759333in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -679,15 +477,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.029940in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -695,15 +493,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.029940in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -711,15 +509,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.029940in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -727,15 +525,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.029940in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -745,15 +543,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{3.423254in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -763,15 +561,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{3.423254in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -781,33 +579,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.236667in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.228835,0.479892}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{3.423254in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -817,15 +597,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{3.423254in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -835,15 +615,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{3.423254in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -851,15 +631,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{3.423254in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -867,15 +647,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{3.423254in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -885,15 +665,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -903,15 +683,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -921,33 +701,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.714000in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.220715,0.467835}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -957,15 +719,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -975,15 +737,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -993,15 +755,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1009,15 +771,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.816567in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1027,15 +789,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1045,15 +807,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1063,33 +825,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.188235,0.419608}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.191333in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1099,15 +843,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1117,15 +861,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1135,15 +879,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1153,11 +897,11 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% @@ -1175,7 +919,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.419792in}{1.668667in}% +\pgfsys@transformshift{2.373320in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1183,7 +927,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort}}}% +\pgftext[x=2.373320in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1200,7 +944,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.991393in}{1.668667in}% +\pgfsys@transformshift{3.037160in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1208,7 +952,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort-ignorespace}}}% +\pgftext[x=3.037160in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1225,7 +969,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{3.562994in}{1.668667in}% +\pgfsys@transformshift{3.701000in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1233,7 +977,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-histogram}}}% +\pgftext[x=3.701000in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-histogram}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1250,7 +994,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{4.134595in}{1.668667in}% +\pgfsys@transformshift{4.364840in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1258,7 +1002,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-ignorespace}}}% +\pgftext[x=4.364840in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-minimal}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1275,7 +1019,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{4.706195in}{1.668667in}% +\pgfsys@transformshift{5.028680in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1283,7 +1027,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.706195in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-minimal}}}% +\pgftext[x=5.028680in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-myers}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1300,7 +1044,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{5.277796in}{1.668667in}% +\pgfsys@transformshift{5.692520in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1308,7 +1052,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.277796in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-myers}}}% +\pgftext[x=5.692520in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-patience}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1325,7 +1069,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{5.849397in}{1.668667in}% +\pgfsys@transformshift{6.356360in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1333,32 +1077,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.849397in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-patience}}}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.803000pt}% -\definecolor{currentstroke}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfsys@defobject{currentmarker}{\pgfqpoint{0.000000in}{-0.048611in}}{\pgfqpoint{0.000000in}{0.000000in}}{% -\pgfpathmoveto{\pgfqpoint{0.000000in}{0.000000in}}% -\pgfpathlineto{\pgfqpoint{0.000000in}{-0.048611in}}% -\pgfusepath{stroke,fill}% -}% -\begin{pgfscope}% -\pgfsys@transformshift{6.420998in}{1.668667in}% -\pgfsys@useobject{currentmarker}{}% -\end{pgfscope}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=6.420998in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-resolve}}}% +\pgftext[x=6.356360in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-resolve}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1375,7 +1094,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{5.588667in}% +\pgfsys@transformshift{2.041400in}{5.546657in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1383,7 +1102,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=5.588667in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort}}}% +\pgftext[x=1.944177in,y=5.546657in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1400,7 +1119,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{5.066000in}% +\pgfsys@transformshift{2.041400in}{4.939970in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1408,7 +1127,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=5.066000in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort-ignorespace}}}% +\pgftext[x=1.944177in,y=4.939970in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1425,7 +1144,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{4.543333in}% +\pgfsys@transformshift{2.041400in}{4.333284in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1433,7 +1152,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=4.543333in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-histogram}}}% +\pgftext[x=1.944177in,y=4.333284in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-histogram}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1450,7 +1169,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{4.020667in}% +\pgfsys@transformshift{2.041400in}{3.726597in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1458,7 +1177,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=4.020667in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-ignorespace}}}% +\pgftext[x=1.944177in,y=3.726597in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-minimal}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1475,7 +1194,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{3.498000in}% +\pgfsys@transformshift{2.041400in}{3.119911in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1483,7 +1202,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=3.498000in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-minimal}}}% +\pgftext[x=1.944177in,y=3.119911in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-myers}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1500,7 +1219,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{2.975333in}% +\pgfsys@transformshift{2.041400in}{2.513224in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1508,7 +1227,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=2.975333in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-myers}}}% +\pgftext[x=1.944177in,y=2.513224in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-patience}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1525,7 +1244,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{2.452667in}% +\pgfsys@transformshift{2.041400in}{1.906538in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1533,248 +1252,175 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=2.452667in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-patience}}}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.803000pt}% -\definecolor{currentstroke}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfsys@defobject{currentmarker}{\pgfqpoint{-0.048611in}{0.000000in}}{\pgfqpoint{-0.000000in}{0.000000in}}{% -\pgfpathmoveto{\pgfqpoint{-0.000000in}{0.000000in}}% -\pgfpathlineto{\pgfqpoint{-0.048611in}{0.000000in}}% -\pgfusepath{stroke,fill}% -}% -\begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{1.930000in}% -\pgfsys@useobject{currentmarker}{}% -\end{pgfscope}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=1.930000in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-resolve}}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=5.588667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=5.066000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=5.066000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=1.944177in,y=1.906538in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-resolve}}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=4.543333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=2.373320in,y=5.546657in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=4.543333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% +\pgftext[x=2.373320in,y=4.939970in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=4.543333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=4.020667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% +\pgftext[x=3.037160in,y=4.939970in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=4.020667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}16}}% +\pgftext[x=2.373320in,y=4.333284in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=4.020667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% +\pgftext[x=3.037160in,y=4.333284in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=4.020667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=3.701000in,y=4.333284in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=3.498000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1}}% +\pgftext[x=2.373320in,y=3.726597in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=3.498000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% +\pgftext[x=3.037160in,y=3.726597in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=3.498000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=3.498000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% +\pgftext[x=3.701000in,y=3.726597in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.706195in,y=3.498000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=4.364840in,y=3.726597in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1}}% +\pgftext[x=2.373320in,y=3.119911in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% +\pgftext[x=3.037160in,y=3.119911in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% +\pgftext[x=3.701000in,y=3.119911in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.706195in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=4.364840in,y=3.119911in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.277796in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=5.028680in,y=3.119911in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}2}}% +\pgftext[x=2.373320in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}2}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% +\pgftext[x=3.037160in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}2}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% +\pgftext[x=3.701000in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}2}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.706195in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1}}% +\pgftext[x=4.364840in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.277796in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1}}% +\pgftext[x=5.028680in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.849397in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=5.692520in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}11}}% +\pgftext[x=2.373320in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}11}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% +\pgftext[x=3.037160in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}11}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1.4e+02}}% +\pgftext[x=3.701000in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}11}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.706195in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}10}}% +\pgftext[x=4.364840in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}10}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.277796in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}10}}% +\pgftext[x=5.028680in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}10}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.849397in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}11}}% +\pgftext[x=5.692520in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}11}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=6.420998in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=6.356360in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1786,17 +1432,17 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.000000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.992599in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{7.201665in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{7.201665in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.992599in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.992599in}{1.668667in}}% +\pgfpathmoveto{\pgfqpoint{6.978710in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{7.191050in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{7.191050in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.978710in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.978710in}{1.603194in}}% \pgfpathclose% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfsys@transformshift{6.990000in}{1.670000in}% -\pgftext[left,bottom]{\includegraphics[interpolate=true,width=0.210000in,height=4.180000in]{results/greatest_hits/plots/git/heatmap-img0.png}}% +\pgfsys@transformshift{6.980000in}{1.600000in}% +\pgftext[left,bottom]{\includegraphics[interpolate=true,width=0.210000in,height=4.250000in]{results/greatest_hits/plots/git/heatmap-img0.png}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1813,7 +1459,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{1.668667in}% +\pgfsys@transformshift{7.191050in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1821,7 +1467,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=1.620442in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{0}$}}% +\pgftext[x=7.288272in, y=1.554969in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{0}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1838,7 +1484,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{2.253469in}% +\pgfsys@transformshift{7.191050in}{2.197153in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1846,7 +1492,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=2.205243in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{20}$}}% +\pgftext[x=7.288272in, y=2.148928in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{20}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1863,7 +1509,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{2.838271in}% +\pgfsys@transformshift{7.191050in}{2.791112in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1871,7 +1517,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=2.790045in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{40}$}}% +\pgftext[x=7.288272in, y=2.742887in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{40}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1888,7 +1534,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{3.423072in}% +\pgfsys@transformshift{7.191050in}{3.385071in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1896,7 +1542,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=3.374847in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{60}$}}% +\pgftext[x=7.288272in, y=3.336846in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{60}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1913,7 +1559,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{4.007874in}% +\pgfsys@transformshift{7.191050in}{3.979030in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1921,7 +1567,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=3.959649in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{80}$}}% +\pgftext[x=7.288272in, y=3.930804in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{80}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1938,7 +1584,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{4.592676in}% +\pgfsys@transformshift{7.191050in}{4.572988in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1946,7 +1592,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=4.544451in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{100}$}}% +\pgftext[x=7.288272in, y=4.524763in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{100}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1963,7 +1609,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{5.177478in}% +\pgfsys@transformshift{7.191050in}{5.166947in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1971,7 +1617,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=5.129253in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{120}$}}% +\pgftext[x=7.288272in, y=5.118722in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{120}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1988,7 +1634,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{5.762280in}% +\pgfsys@transformshift{7.191050in}{5.760906in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1996,7 +1642,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=5.714054in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{140}$}}% +\pgftext[x=7.288272in, y=5.712681in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{140}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetrectcap% @@ -2005,13 +1651,13 @@ \definecolor{currentstroke}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.992599in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{7.097132in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{7.201665in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{7.201665in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{7.097132in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.992599in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.992599in}{1.668667in}}% +\pgfpathmoveto{\pgfqpoint{6.978710in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{7.084880in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{7.191050in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{7.191050in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{7.084880in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.978710in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.978710in}{1.603194in}}% \pgfpathclose% \pgfusepath{}% \end{pgfscope}% diff --git a/results/greatest_hits/plots/tools/cost_with_manual.pdf b/results/greatest_hits/plots/tools/cost_with_manual.pdf index 8d55395663..e83d11461d 100644 Binary files a/results/greatest_hits/plots/tools/cost_with_manual.pdf and b/results/greatest_hits/plots/tools/cost_with_manual.pdf differ diff --git a/results/greatest_hits/plots/tools/cost_without_manual.pdf b/results/greatest_hits/plots/tools/cost_without_manual.pdf index 5651685e6e..addc6c7634 100644 Binary files a/results/greatest_hits/plots/tools/cost_without_manual.pdf and b/results/greatest_hits/plots/tools/cost_without_manual.pdf differ diff --git a/results/greatest_hits/plots/tools/heatmap.pdf b/results/greatest_hits/plots/tools/heatmap.pdf index 62712df573..100f25824b 100644 Binary files a/results/greatest_hits/plots/tools/heatmap.pdf and b/results/greatest_hits/plots/tools/heatmap.pdf differ diff --git a/results/greatest_hits/tables/git/table_feature_main_summary.tex b/results/greatest_hits/tables/git/table_feature_main_summary.tex index cabade8882..6739be9351 100644 --- a/results/greatest_hits/tables/git/table_feature_main_summary.tex +++ b/results/greatest_hits/tables/git/table_feature_main_summary.tex @@ -18,7 +18,6 @@ Gitmerge-ort & 53\% & 32\% & 43\% & 66\% & 4\% & 2\% \\ Gitmerge-ort-ignorespace & 54\% & 34\% & 42\% & 64\% & 3\% & 3\% \\ Gitmerge-recursive-histogram & 53\% & 32\% & 43\% & 66\% & 4\% & 2\% \\ - Gitmerge-recursive-ignorespace & 54\% & 34\% & 42\% & 64\% & 4\% & 3\% \\ Gitmerge-recursive-minimal & 53\% & 32\% & 43\% & 66\% & 4\% & 2\% \\ Gitmerge-recursive-myers & 53\% & 32\% & 43\% & 66\% & 4\% & 2\% \\ Gitmerge-recursive-patience & 53\% & 32\% & 43\% & 66\% & 4\% & 2\% \\ diff --git a/results/greatest_hits/tables/git/table_summary.tex b/results/greatest_hits/tables/git/table_summary.tex index 3d4b0c512d..ce6a9a2627 100644 --- a/results/greatest_hits/tables/git/table_summary.tex +++ b/results/greatest_hits/tables/git/table_summary.tex @@ -9,7 +9,6 @@ Gitmerge-ort & 450 & 42\% & 590 & 55\% & 29 & 3\% \\ Gitmerge-ort-ignorespace & 465 & 43\% & 572 & 54\% & 32 & 3\% \\ Gitmerge-recursive-histogram & 450 & 42\% & 590 & 55\% & 29 & 3\% \\ -Gitmerge-recursive-ignorespace & 465 & 43\% & 571 & 53\% & 33 & 3\% \\ Gitmerge-recursive-minimal & 450 & 42\% & 589 & 55\% & 30 & 3\% \\ Gitmerge-recursive-myers & 450 & 42\% & 589 & 55\% & 30 & 3\% \\ Gitmerge-recursive-patience & 451 & 42\% & 588 & 55\% & 30 & 3\% \\ diff --git a/results/reaper/plots/all/cost_with_manual.pdf b/results/reaper/plots/all/cost_with_manual.pdf index 947513e9da..e0bb9ae52b 100644 Binary files a/results/reaper/plots/all/cost_with_manual.pdf and b/results/reaper/plots/all/cost_with_manual.pdf differ diff --git a/results/reaper/plots/all/cost_without_manual.pdf b/results/reaper/plots/all/cost_without_manual.pdf index 6ab8b72a29..834de2fbe4 100644 Binary files a/results/reaper/plots/all/cost_without_manual.pdf and b/results/reaper/plots/all/cost_without_manual.pdf differ diff --git a/results/reaper/plots/all/heatmap.pdf b/results/reaper/plots/all/heatmap.pdf index c2d05c1ba0..de5ab4326c 100644 Binary files a/results/reaper/plots/all/heatmap.pdf and b/results/reaper/plots/all/heatmap.pdf differ diff --git a/results/reaper/plots/git/cost_with_manual.pdf b/results/reaper/plots/git/cost_with_manual.pdf index 92fc6a135f..739dec1aca 100644 Binary files a/results/reaper/plots/git/cost_with_manual.pdf and b/results/reaper/plots/git/cost_with_manual.pdf differ diff --git a/results/reaper/plots/git/cost_with_manual.pgf b/results/reaper/plots/git/cost_with_manual.pgf index 3fb13e3de7..a6de827b11 100644 --- a/results/reaper/plots/git/cost_with_manual.pgf +++ b/results/reaper/plots/git/cost_with_manual.pgf @@ -431,9 +431,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{12.800000pt}{3.200000pt}{2.000000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{0.845977in}{3.918174in}}% -\pgfpathlineto{\pgfqpoint{5.697086in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{5.697086in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{0.845977in}{3.759673in}}% +\pgfpathlineto{\pgfqpoint{6.250000in}{0.651892in}}% +\pgfpathlineto{\pgfqpoint{6.250000in}{0.651892in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% @@ -461,21 +461,6 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{20.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{0.845977in}{3.759673in}}% -\pgfpathlineto{\pgfqpoint{6.250000in}{0.651892in}}% -\pgfpathlineto{\pgfqpoint{6.250000in}{0.651892in}}% -\pgfusepath{stroke}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{0.603704in}{0.549691in}}{\pgfqpoint{5.646296in}{4.052084in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.890196,0.466667,0.760784}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% \pgfpathmoveto{\pgfqpoint{0.845977in}{3.762230in}}% \pgfpathlineto{\pgfqpoint{6.250000in}{0.654448in}}% \pgfpathlineto{\pgfqpoint{6.250000in}{0.654448in}}% @@ -487,10 +472,10 @@ \pgfsetbuttcap% \pgfsetroundjoin% \pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.498039,0.498039,0.498039}% +\definecolor{currentstroke}{rgb}{0.890196,0.466667,0.760784}% \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{6.000000pt}{10.000000pt}{2.000000pt}{10.000000pt}}{0.000000pt}% +\pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% \pgfpathmoveto{\pgfqpoint{0.845977in}{3.714935in}}% \pgfpathlineto{\pgfqpoint{6.250000in}{0.607153in}}% \pgfpathlineto{\pgfqpoint{6.250000in}{0.607153in}}% @@ -565,16 +550,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.821564in}{2.747609in}}% -\pgfpathlineto{\pgfqpoint{6.152778in}{2.747609in}}% -\pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{2.747609in}}{\pgfqpoint{6.180556in}{2.775386in}}% +\pgfpathmoveto{\pgfqpoint{3.914156in}{2.941281in}}% +\pgfpathlineto{\pgfqpoint{6.152778in}{2.941281in}}% +\pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{2.941281in}}{\pgfqpoint{6.180556in}{2.969059in}}% \pgfpathlineto{\pgfqpoint{6.180556in}{4.504552in}}% \pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{4.532330in}}{\pgfqpoint{6.152778in}{4.532330in}}% -\pgfpathlineto{\pgfqpoint{3.821564in}{4.532330in}}% -\pgfpathquadraticcurveto{\pgfqpoint{3.793786in}{4.532330in}}{\pgfqpoint{3.793786in}{4.504552in}}% -\pgfpathlineto{\pgfqpoint{3.793786in}{2.775386in}}% -\pgfpathquadraticcurveto{\pgfqpoint{3.793786in}{2.747609in}}{\pgfqpoint{3.821564in}{2.747609in}}% -\pgfpathlineto{\pgfqpoint{3.821564in}{2.747609in}}% +\pgfpathlineto{\pgfqpoint{3.914156in}{4.532330in}}% +\pgfpathquadraticcurveto{\pgfqpoint{3.886378in}{4.532330in}}{\pgfqpoint{3.886378in}{4.504552in}}% +\pgfpathlineto{\pgfqpoint{3.886378in}{2.969059in}}% +\pgfpathquadraticcurveto{\pgfqpoint{3.886378in}{2.941281in}}{\pgfqpoint{3.914156in}{2.941281in}}% +\pgfpathlineto{\pgfqpoint{3.914156in}{2.941281in}}% \pgfpathclose% \pgfusepath{stroke,fill}% \end{pgfscope}% @@ -586,16 +571,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.428164in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.428164in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.428164in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.428164in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.428164in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.428164in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=4.379552in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort}}% +\pgftext[x=4.330823in,y=4.379552in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -605,16 +590,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{2.000000pt}{3.300000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.234491in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.234491in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.234491in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.234491in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.234491in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.234491in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=4.185880in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort-ignorespace}}% +\pgftext[x=4.330823in,y=4.185880in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort-ignorespace}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -624,16 +609,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{7.400000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.040818in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.040818in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.040818in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.040818in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.040818in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.040818in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.992207in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-histogram}}% +\pgftext[x=4.330823in,y=3.992207in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-histogram}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -643,16 +628,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{12.800000pt}{3.200000pt}{2.000000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.847145in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.847145in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.847145in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.847145in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.847145in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.847145in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.798534in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-ignorespace}}% +\pgftext[x=4.330823in,y=3.798534in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-minimal}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -662,16 +647,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{2.000000pt}{2.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.653472in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.653472in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.653472in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.653472in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.653472in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.653472in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.604861in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-minimal}}% +\pgftext[x=4.330823in,y=3.604861in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-myers}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -681,16 +666,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{20.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.459800in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.459800in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.459800in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.459800in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.459800in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.459800in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.411189in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-myers}}% +\pgftext[x=4.330823in,y=3.411189in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-patience}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -700,35 +685,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.266127in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.266127in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.266127in}}% -\pgfusepath{stroke}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.217516in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-patience}}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.498039,0.498039,0.498039}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{6.000000pt}{10.000000pt}{2.000000pt}{10.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.072454in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.072454in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.072454in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.266127in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.266127in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.266127in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.023843in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-resolve}}% +\pgftext[x=4.330823in,y=3.217516in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-resolve}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetrectcap% @@ -737,16 +703,16 @@ \definecolor{currentstroke}{rgb}{1.000000,0.000000,0.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{2.878781in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{2.878781in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{2.878781in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.072454in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.072454in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.072454in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=2.830170in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Manual Merging}}% +\pgftext[x=4.330823in,y=3.023843in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Manual Merging}}% \end{pgfscope}% \end{pgfpicture}% \makeatother% diff --git a/results/reaper/plots/git/cost_without_manual.pdf b/results/reaper/plots/git/cost_without_manual.pdf index c60cc0add6..e3fb4f7567 100644 Binary files a/results/reaper/plots/git/cost_without_manual.pdf and b/results/reaper/plots/git/cost_without_manual.pdf differ diff --git a/results/reaper/plots/git/cost_without_manual.pgf b/results/reaper/plots/git/cost_without_manual.pgf index 0bbff04c94..9ea498509c 100644 --- a/results/reaper/plots/git/cost_without_manual.pgf +++ b/results/reaper/plots/git/cost_without_manual.pgf @@ -481,9 +481,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{12.800000pt}{3.200000pt}{2.000000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.119297in}{4.539695in}}% -\pgfpathlineto{\pgfqpoint{6.237107in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{6.237107in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.119297in}{4.212126in}}% +\pgfpathlineto{\pgfqpoint{6.260000in}{0.894317in}}% +\pgfpathlineto{\pgfqpoint{6.260000in}{0.894317in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% @@ -511,21 +511,6 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{20.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.119297in}{4.212126in}}% -\pgfpathlineto{\pgfqpoint{6.260000in}{0.894317in}}% -\pgfpathlineto{\pgfqpoint{6.260000in}{0.894317in}}% -\pgfusepath{stroke}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{0.673149in}{0.549691in}}{\pgfqpoint{5.576851in}{4.052084in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.890196,0.466667,0.760784}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% \pgfpathmoveto{\pgfqpoint{1.119297in}{4.217409in}}% \pgfpathlineto{\pgfqpoint{6.260000in}{0.899601in}}% \pgfpathlineto{\pgfqpoint{6.260000in}{0.899601in}}% @@ -537,10 +522,10 @@ \pgfsetbuttcap% \pgfsetroundjoin% \pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.498039,0.498039,0.498039}% +\definecolor{currentstroke}{rgb}{0.890196,0.466667,0.760784}% \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{6.000000pt}{10.000000pt}{2.000000pt}{10.000000pt}}{0.000000pt}% +\pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% \pgfpathmoveto{\pgfqpoint{1.119297in}{4.119667in}}% \pgfpathlineto{\pgfqpoint{6.260000in}{0.801858in}}% \pgfpathlineto{\pgfqpoint{6.260000in}{0.801858in}}% @@ -601,16 +586,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.821564in}{2.941281in}}% -\pgfpathlineto{\pgfqpoint{6.152778in}{2.941281in}}% -\pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{2.941281in}}{\pgfqpoint{6.180556in}{2.969059in}}% +\pgfpathmoveto{\pgfqpoint{3.914156in}{3.134954in}}% +\pgfpathlineto{\pgfqpoint{6.152778in}{3.134954in}}% +\pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{3.134954in}}{\pgfqpoint{6.180556in}{3.162732in}}% \pgfpathlineto{\pgfqpoint{6.180556in}{4.504552in}}% \pgfpathquadraticcurveto{\pgfqpoint{6.180556in}{4.532330in}}{\pgfqpoint{6.152778in}{4.532330in}}% -\pgfpathlineto{\pgfqpoint{3.821564in}{4.532330in}}% -\pgfpathquadraticcurveto{\pgfqpoint{3.793786in}{4.532330in}}{\pgfqpoint{3.793786in}{4.504552in}}% -\pgfpathlineto{\pgfqpoint{3.793786in}{2.969059in}}% -\pgfpathquadraticcurveto{\pgfqpoint{3.793786in}{2.941281in}}{\pgfqpoint{3.821564in}{2.941281in}}% -\pgfpathlineto{\pgfqpoint{3.821564in}{2.941281in}}% +\pgfpathlineto{\pgfqpoint{3.914156in}{4.532330in}}% +\pgfpathquadraticcurveto{\pgfqpoint{3.886378in}{4.532330in}}{\pgfqpoint{3.886378in}{4.504552in}}% +\pgfpathlineto{\pgfqpoint{3.886378in}{3.162732in}}% +\pgfpathquadraticcurveto{\pgfqpoint{3.886378in}{3.134954in}}{\pgfqpoint{3.914156in}{3.134954in}}% +\pgfpathlineto{\pgfqpoint{3.914156in}{3.134954in}}% \pgfpathclose% \pgfusepath{stroke,fill}% \end{pgfscope}% @@ -622,16 +607,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.428164in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.428164in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.428164in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.428164in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.428164in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.428164in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=4.379552in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort}}% +\pgftext[x=4.330823in,y=4.379552in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -641,16 +626,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{2.000000pt}{3.300000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.234491in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.234491in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.234491in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.234491in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.234491in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.234491in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=4.185880in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort-ignorespace}}% +\pgftext[x=4.330823in,y=4.185880in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-ort-ignorespace}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -660,16 +645,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{7.400000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{4.040818in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{4.040818in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{4.040818in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{4.040818in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{4.040818in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{4.040818in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.992207in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-histogram}}% +\pgftext[x=4.330823in,y=3.992207in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-histogram}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -679,16 +664,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{12.800000pt}{3.200000pt}{2.000000pt}{3.200000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.847145in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.847145in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.847145in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.847145in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.847145in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.847145in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.798534in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-ignorespace}}% +\pgftext[x=4.330823in,y=3.798534in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-minimal}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -698,16 +683,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{2.000000pt}{2.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.653472in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.653472in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.653472in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.653472in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.653472in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.653472in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.604861in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-minimal}}% +\pgftext[x=4.330823in,y=3.604861in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-myers}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -717,16 +702,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{20.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.459800in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.459800in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.459800in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.459800in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.459800in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.459800in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.411189in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-myers}}% +\pgftext[x=4.330823in,y=3.411189in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-patience}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -736,35 +721,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{10.000000pt}{10.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.266127in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.266127in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.266127in}}% -\pgfusepath{stroke}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.217516in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-recursive-patience}}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{2.007500pt}% -\definecolor{currentstroke}{rgb}{0.498039,0.498039,0.498039}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetstrokeopacity{0.800000}% -\pgfsetdash{{6.000000pt}{10.000000pt}{2.000000pt}{10.000000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{3.849342in}{3.072454in}}% -\pgfpathlineto{\pgfqpoint{3.988230in}{3.072454in}}% -\pgfpathlineto{\pgfqpoint{4.127119in}{3.072454in}}% +\pgfpathmoveto{\pgfqpoint{3.941934in}{3.266127in}}% +\pgfpathlineto{\pgfqpoint{4.080823in}{3.266127in}}% +\pgfpathlineto{\pgfqpoint{4.219712in}{3.266127in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=3.023843in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-resolve}}% +\pgftext[x=4.330823in,y=3.217516in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Gitmerge-resolve}}% \end{pgfscope}% \end{pgfpicture}% \makeatother% diff --git a/results/reaper/plots/git/heatmap-img0.png b/results/reaper/plots/git/heatmap-img0.png index 3c4bb052c1..1a14e1b762 100644 Binary files a/results/reaper/plots/git/heatmap-img0.png and b/results/reaper/plots/git/heatmap-img0.png differ diff --git a/results/reaper/plots/git/heatmap.pdf b/results/reaper/plots/git/heatmap.pdf index 480e61e641..ac37637781 100644 Binary files a/results/reaper/plots/git/heatmap.pdf and b/results/reaper/plots/git/heatmap.pdf differ diff --git a/results/reaper/plots/git/heatmap.pgf b/results/reaper/plots/git/heatmap.pgf index 6922eaeaf9..becec7a04c 100644 --- a/results/reaper/plots/git/heatmap.pgf +++ b/results/reaper/plots/git/heatmap.pgf @@ -56,16 +56,16 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.000000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{1.668667in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{1.603194in}}% \pgfpathclose% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -75,15 +75,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{5.850000in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -91,15 +91,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -107,15 +107,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -123,15 +123,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -139,15 +139,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -155,15 +155,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -171,31 +171,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.850000in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.850000in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.850000in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -205,15 +189,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{5.243313in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -223,31 +207,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{5.243313in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{5.327333in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -255,15 +223,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{5.243313in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -271,15 +239,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{5.243313in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -287,15 +255,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{5.243313in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -303,15 +271,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{5.243313in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -319,15 +287,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{5.327333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{5.327333in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{5.243313in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{5.243313in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -337,15 +305,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{4.804667in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{4.636627in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -355,15 +323,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.804667in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.636627in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -373,31 +341,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.804667in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.636627in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.804667in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -405,15 +357,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.804667in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.636627in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -421,15 +373,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.804667in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.636627in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -437,15 +389,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.804667in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.636627in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -453,151 +405,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{4.804667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.804667in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{4.636627in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.636627in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.216655,0.461807}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{4.282000in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.879431,0.927228,0.971457}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{4.282000in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.216655,0.461807}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{4.282000in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.968627,0.984314,1.000000}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{4.282000in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{4.282000in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{4.282000in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{4.282000in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{4.282000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{4.282000in}}% -\pgfusepath{}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -607,15 +423,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{4.029940in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -625,15 +441,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{4.029940in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -643,33 +459,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{4.029940in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.228835,0.479892}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.759333in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -679,15 +477,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{4.029940in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -695,15 +493,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{4.029940in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -711,15 +509,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{4.029940in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -727,15 +525,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{3.759333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.759333in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{4.029940in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{4.029940in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -745,15 +543,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{3.423254in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -763,15 +561,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{3.423254in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -781,33 +579,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{3.236667in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.228835,0.479892}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{3.423254in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -817,15 +597,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{3.423254in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -835,15 +615,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{3.423254in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -851,15 +631,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{3.423254in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -867,15 +647,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{3.236667in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{3.236667in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{3.423254in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{3.423254in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -885,15 +665,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -903,15 +683,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -921,33 +701,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.220715,0.467835}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.714000in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -957,15 +719,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -975,15 +737,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -993,15 +755,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.816567in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1009,15 +771,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{2.714000in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.714000in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{2.816567in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.816567in}}% \pgfusepath{}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1027,15 +789,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.133992in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{2.133992in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{2.041400in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{2.041400in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1045,15 +807,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{2.705593in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{2.705593in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{2.705240in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{2.705240in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1063,33 +825,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.277193in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{3.277193in}{2.191333in}}% -\pgfusepath{fill}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% -\pgfusepath{clip}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.031373,0.200415,0.437693}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.000000pt}% -\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{3.848794in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{3.848794in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{3.369080in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{3.369080in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1099,15 +843,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.420395in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{4.420395in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{4.032920in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{4.032920in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1117,15 +861,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{4.991996in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{4.991996in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{4.696760in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{4.696760in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1135,15 +879,15 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{5.563597in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{5.563597in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{5.360600in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{5.360600in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfpathrectangle{\pgfqpoint{2.133992in}{1.668667in}}{\pgfqpoint{4.572807in}{4.181333in}}% +\pgfpathrectangle{\pgfqpoint{2.041400in}{1.603194in}}{\pgfqpoint{4.646880in}{4.246806in}}% \pgfusepath{clip}% \pgfsetbuttcap% \pgfsetroundjoin% @@ -1153,11 +897,11 @@ \definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.135198in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{2.191333in}}% -\pgfpathlineto{\pgfqpoint{6.706798in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{6.135198in}{2.191333in}}% +\pgfpathmoveto{\pgfqpoint{6.024440in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{2.209881in}}% +\pgfpathlineto{\pgfqpoint{6.688280in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{6.024440in}{2.209881in}}% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% @@ -1175,7 +919,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.419792in}{1.668667in}% +\pgfsys@transformshift{2.373320in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1183,7 +927,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort}}}% +\pgftext[x=2.373320in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1200,7 +944,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.991393in}{1.668667in}% +\pgfsys@transformshift{3.037160in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1208,7 +952,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort-ignorespace}}}% +\pgftext[x=3.037160in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1225,7 +969,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{3.562994in}{1.668667in}% +\pgfsys@transformshift{3.701000in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1233,7 +977,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-histogram}}}% +\pgftext[x=3.701000in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-histogram}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1250,7 +994,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{4.134595in}{1.668667in}% +\pgfsys@transformshift{4.364840in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1258,7 +1002,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-ignorespace}}}% +\pgftext[x=4.364840in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-minimal}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1275,7 +1019,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{4.706195in}{1.668667in}% +\pgfsys@transformshift{5.028680in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1283,7 +1027,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.706195in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-minimal}}}% +\pgftext[x=5.028680in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-myers}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1300,7 +1044,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{5.277796in}{1.668667in}% +\pgfsys@transformshift{5.692520in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1308,7 +1052,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.277796in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-myers}}}% +\pgftext[x=5.692520in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-patience}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1325,57 +1069,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{5.849397in}{1.668667in}% -\pgfsys@useobject{currentmarker}{}% -\end{pgfscope}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=5.849397in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-patience}}}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.803000pt}% -\definecolor{currentstroke}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfsys@defobject{currentmarker}{\pgfqpoint{0.000000in}{-0.048611in}}{\pgfqpoint{0.000000in}{0.000000in}}{% -\pgfpathmoveto{\pgfqpoint{0.000000in}{0.000000in}}% -\pgfpathlineto{\pgfqpoint{0.000000in}{-0.048611in}}% -\pgfusepath{stroke,fill}% -}% -\begin{pgfscope}% -\pgfsys@transformshift{6.420998in}{1.668667in}% -\pgfsys@useobject{currentmarker}{}% -\end{pgfscope}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=6.420998in,y=1.571445in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-resolve}}}% -\end{pgfscope}% -\begin{pgfscope}% -\pgfsetbuttcap% -\pgfsetroundjoin% -\definecolor{currentfill}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetfillcolor{currentfill}% -\pgfsetlinewidth{0.803000pt}% -\definecolor{currentstroke}{rgb}{0.000000,0.000000,0.000000}% -\pgfsetstrokecolor{currentstroke}% -\pgfsetdash{}{0pt}% -\pgfsys@defobject{currentmarker}{\pgfqpoint{-0.048611in}{0.000000in}}{\pgfqpoint{-0.000000in}{0.000000in}}{% -\pgfpathmoveto{\pgfqpoint{-0.000000in}{0.000000in}}% -\pgfpathlineto{\pgfqpoint{-0.048611in}{0.000000in}}% -\pgfusepath{stroke,fill}% -}% -\begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{5.588667in}% +\pgfsys@transformshift{6.356360in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1383,7 +1077,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=5.588667in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort}}}% +\pgftext[x=6.356360in,y=1.505972in,right,top,rotate=45.000000]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-resolve}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1400,7 +1094,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{5.066000in}% +\pgfsys@transformshift{2.041400in}{5.546657in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1408,7 +1102,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=5.066000in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort-ignorespace}}}% +\pgftext[x=1.944177in,y=5.546657in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1425,7 +1119,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{4.543333in}% +\pgfsys@transformshift{2.041400in}{4.939970in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1433,7 +1127,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=4.543333in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-histogram}}}% +\pgftext[x=1.944177in,y=4.939970in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-ort-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1450,7 +1144,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{4.020667in}% +\pgfsys@transformshift{2.041400in}{4.333284in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1458,7 +1152,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=4.020667in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-ignorespace}}}% +\pgftext[x=1.944177in,y=4.333284in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-histogram}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1475,7 +1169,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{3.498000in}% +\pgfsys@transformshift{2.041400in}{3.726597in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1483,7 +1177,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=3.498000in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-minimal}}}% +\pgftext[x=1.944177in,y=3.726597in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-minimal}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1500,7 +1194,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{2.975333in}% +\pgfsys@transformshift{2.041400in}{3.119911in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1508,7 +1202,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=2.975333in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-myers}}}% +\pgftext[x=1.944177in,y=3.119911in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-myers}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1525,7 +1219,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{2.452667in}% +\pgfsys@transformshift{2.041400in}{2.513224in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1533,7 +1227,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=2.452667in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-patience}}}% +\pgftext[x=1.944177in,y=2.513224in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-recursive-patience}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1550,7 +1244,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{2.133992in}{1.930000in}% +\pgfsys@transformshift{2.041400in}{1.906538in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1558,223 +1252,175 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=1.930000in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-resolve}}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=5.588667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=5.066000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}7.8e+02}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=5.066000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=1.944177in,y=1.906538in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Gitmerge-resolve}}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=4.543333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=2.373320in,y=5.546657in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=4.543333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}7.8e+02}}% +\pgftext[x=2.373320in,y=4.939970in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}7.8e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=4.543333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=4.020667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}7.8e+02}}% +\pgftext[x=3.037160in,y=4.939970in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=4.020667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}92}}% +\pgftext[x=2.373320in,y=4.333284in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=4.020667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}7.8e+02}}% +\pgftext[x=3.037160in,y=4.333284in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}7.8e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=4.020667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=3.701000in,y=4.333284in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=3.498000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% +\pgftext[x=2.373320in,y=3.726597in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=3.498000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}7.9e+02}}% +\pgftext[x=3.037160in,y=3.726597in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}7.9e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=3.498000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=3.498000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}7.8e+02}}% +\pgftext[x=3.701000in,y=3.726597in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.706195in,y=3.498000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=4.364840in,y=3.726597in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% +\pgftext[x=2.373320in,y=3.119911in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}7.9e+02}}% +\pgftext[x=3.037160in,y=3.119911in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}7.9e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}7.8e+02}}% +\pgftext[x=3.701000in,y=3.119911in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}13}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.706195in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=4.364840in,y=3.119911in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.277796in,y=2.975333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=5.028680in,y=3.119911in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}11}}% +\pgftext[x=2.373320in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}11}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}7.9e+02}}% +\pgftext[x=3.037160in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}7.9e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}11}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}7.8e+02}}% +\pgftext[x=3.701000in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}11}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.706195in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}10}}% +\pgftext[x=4.364840in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}10}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.277796in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}10}}% +\pgftext[x=5.028680in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}10}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.849397in,y=2.452667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=5.692520in,y=2.513224in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.419792in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}45}}% +\pgftext[x=2.373320in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}45}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.991393in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.1e+02}}% +\pgftext[x=3.037160in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8.1e+02}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.562994in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}45}}% -\end{pgfscope}% -\begin{pgfscope}% -\definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% -\pgfsetstrokecolor{textcolor}% -\pgfsetfillcolor{textcolor}% -\pgftext[x=4.134595in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}8e+02}}% +\pgftext[x=3.701000in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}45}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.706195in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}33}}% +\pgftext[x=4.364840in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}33}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.277796in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}33}}% +\pgftext[x=5.028680in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}33}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.849397in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}43}}% +\pgftext[x=5.692520in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}43}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=6.420998in,y=1.930000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% +\pgftext[x=6.356360in,y=1.906538in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}0}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1786,17 +1432,17 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.000000}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.992599in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{7.201665in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{7.201665in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.992599in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.992599in}{1.668667in}}% +\pgfpathmoveto{\pgfqpoint{6.978710in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{7.191050in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{7.191050in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.978710in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.978710in}{1.603194in}}% \pgfpathclose% \pgfusepath{fill}% \end{pgfscope}% \begin{pgfscope}% -\pgfsys@transformshift{6.990000in}{1.670000in}% -\pgftext[left,bottom]{\includegraphics[interpolate=true,width=0.210000in,height=4.180000in]{results/reaper/plots/git/heatmap-img0.png}}% +\pgfsys@transformshift{6.980000in}{1.600000in}% +\pgftext[left,bottom]{\includegraphics[interpolate=true,width=0.210000in,height=4.250000in]{results/reaper/plots/git/heatmap-img0.png}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1813,7 +1459,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{1.668667in}% +\pgfsys@transformshift{7.191050in}{1.603194in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1821,7 +1467,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=1.620442in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{0}$}}% +\pgftext[x=7.288272in, y=1.554969in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{0}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1838,7 +1484,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{2.184881in}% +\pgfsys@transformshift{7.191050in}{2.127491in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1846,7 +1492,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=2.136656in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{100}$}}% +\pgftext[x=7.288272in, y=2.079266in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{100}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1863,7 +1509,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{2.701095in}% +\pgfsys@transformshift{7.191050in}{2.651788in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1871,7 +1517,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=2.652869in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{200}$}}% +\pgftext[x=7.288272in, y=2.603563in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{200}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1888,7 +1534,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{3.217309in}% +\pgfsys@transformshift{7.191050in}{3.176085in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1896,7 +1542,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=3.169083in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{300}$}}% +\pgftext[x=7.288272in, y=3.127860in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{300}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1913,7 +1559,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{3.733523in}% +\pgfsys@transformshift{7.191050in}{3.700382in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1921,7 +1567,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=3.685297in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{400}$}}% +\pgftext[x=7.288272in, y=3.652157in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{400}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1938,7 +1584,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{4.249737in}% +\pgfsys@transformshift{7.191050in}{4.224679in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1946,7 +1592,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=4.201511in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{500}$}}% +\pgftext[x=7.288272in, y=4.176454in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{500}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1963,7 +1609,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{4.765951in}% +\pgfsys@transformshift{7.191050in}{4.748976in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1971,7 +1617,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=4.717725in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{600}$}}% +\pgftext[x=7.288272in, y=4.700751in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{600}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -1988,7 +1634,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{5.282165in}% +\pgfsys@transformshift{7.191050in}{5.273273in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -1996,7 +1642,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=5.233939in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{700}$}}% +\pgftext[x=7.288272in, y=5.225048in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{700}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -2013,7 +1659,7 @@ \pgfusepath{stroke,fill}% }% \begin{pgfscope}% -\pgfsys@transformshift{7.201665in}{5.798379in}% +\pgfsys@transformshift{7.191050in}{5.797570in}% \pgfsys@useobject{currentmarker}{}% \end{pgfscope}% \end{pgfscope}% @@ -2021,7 +1667,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=7.298888in, y=5.750153in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{800}$}}% +\pgftext[x=7.288272in, y=5.749345in, left, base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}$\mathdefault{800}$}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetrectcap% @@ -2030,13 +1676,13 @@ \definecolor{currentstroke}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{currentstroke}% \pgfsetdash{}{0pt}% -\pgfpathmoveto{\pgfqpoint{6.992599in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{7.097132in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{7.201665in}{1.668667in}}% -\pgfpathlineto{\pgfqpoint{7.201665in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{7.097132in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.992599in}{5.850000in}}% -\pgfpathlineto{\pgfqpoint{6.992599in}{1.668667in}}% +\pgfpathmoveto{\pgfqpoint{6.978710in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{7.084880in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{7.191050in}{1.603194in}}% +\pgfpathlineto{\pgfqpoint{7.191050in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{7.084880in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.978710in}{5.850000in}}% +\pgfpathlineto{\pgfqpoint{6.978710in}{1.603194in}}% \pgfpathclose% \pgfusepath{}% \end{pgfscope}% diff --git a/results/reaper/plots/tools/cost_with_manual.pdf b/results/reaper/plots/tools/cost_with_manual.pdf index ca4d8bc365..e78322a529 100644 Binary files a/results/reaper/plots/tools/cost_with_manual.pdf and b/results/reaper/plots/tools/cost_with_manual.pdf differ diff --git a/results/reaper/plots/tools/cost_without_manual.pdf b/results/reaper/plots/tools/cost_without_manual.pdf index f148ed885b..ca69ebdf3d 100644 Binary files a/results/reaper/plots/tools/cost_without_manual.pdf and b/results/reaper/plots/tools/cost_without_manual.pdf differ diff --git a/results/reaper/plots/tools/heatmap.pdf b/results/reaper/plots/tools/heatmap.pdf index e5fd6c4bc2..5855397ed1 100644 Binary files a/results/reaper/plots/tools/heatmap.pdf and b/results/reaper/plots/tools/heatmap.pdf differ diff --git a/results/reaper/tables/git/table_feature_main_summary.tex b/results/reaper/tables/git/table_feature_main_summary.tex index be146a0397..0edea1667c 100644 --- a/results/reaper/tables/git/table_feature_main_summary.tex +++ b/results/reaper/tables/git/table_feature_main_summary.tex @@ -18,7 +18,6 @@ Gitmerge-ort & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ Gitmerge-ort-ignorespace & 57\% & 38\% & 41\% & 59\% & 3\% & 3\% \\ Gitmerge-recursive-histogram & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ - Gitmerge-recursive-ignorespace & 57\% & 38\% & 41\% & 59\% & 3\% & 3\% \\ Gitmerge-recursive-minimal & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ Gitmerge-recursive-myers & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ Gitmerge-recursive-patience & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ diff --git a/results/reaper/tables/git/table_summary.tex b/results/reaper/tables/git/table_summary.tex index 592d874f5b..a236ee53bc 100644 --- a/results/reaper/tables/git/table_summary.tex +++ b/results/reaper/tables/git/table_summary.tex @@ -9,7 +9,6 @@ Gitmerge-ort & 2409 & 47\% & 2596 & 51\% & 108 & 2\% \\ Gitmerge-ort-ignorespace & 2532 & 50\% & 2451 & 48\% & 130 & 3\% \\ Gitmerge-recursive-histogram & 2409 & 47\% & 2596 & 51\% & 108 & 2\% \\ -Gitmerge-recursive-ignorespace & 2533 & 50\% & 2448 & 48\% & 132 & 3\% \\ Gitmerge-recursive-minimal & 2409 & 47\% & 2595 & 51\% & 109 & 2\% \\ Gitmerge-recursive-myers & 2409 & 47\% & 2595 & 51\% & 109 & 2\% \\ Gitmerge-recursive-patience & 2411 & 47\% & 2593 & 51\% & 109 & 2\% \\ diff --git a/src/python/latex_output.py b/src/python/latex_output.py index a7a5f602d4..f2ca5eff2c 100755 --- a/src/python/latex_output.py +++ b/src/python/latex_output.py @@ -150,7 +150,6 @@ def latex_def(name, value) -> str: "gitmerge_ort", "gitmerge_ort_ignorespace", "gitmerge_recursive_histogram", - "gitmerge_recursive_ignorespace", "gitmerge_recursive_minimal", "gitmerge_recursive_myers", "gitmerge_recursive_patience",