Skip to content

Commit

Permalink
Added plots (#309)
Browse files Browse the repository at this point in the history
  • Loading branch information
benedikt-schesch authored Jun 8, 2024
1 parent a738374 commit 376408b
Show file tree
Hide file tree
Showing 47 changed files with 1,417 additions and 2,691 deletions.
Binary file modified results/combined/plots/all/cost_with_manual.pdf
Binary file not shown.
Binary file modified results/combined/plots/all/cost_without_manual.pdf
Binary file not shown.
Binary file modified results/combined/plots/all/heatmap.pdf
Binary file not shown.
Binary file modified results/combined/plots/git/cost_with_manual.pdf
Binary file not shown.
124 changes: 45 additions & 79 deletions results/combined/plots/git/cost_with_manual.pgf
Original file line number Diff line number Diff line change
Expand Up @@ -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}%
Expand Down Expand Up @@ -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}}%
Expand All @@ -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}}%
Expand Down Expand Up @@ -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}%
Expand All @@ -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%
Expand All @@ -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%
Expand All @@ -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%
Expand All @@ -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%
Expand All @@ -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%
Expand All @@ -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%
Expand All @@ -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%
Expand All @@ -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%
Expand Down
Binary file modified results/combined/plots/git/cost_without_manual.pdf
Binary file not shown.
Loading

0 comments on commit 376408b

Please sign in to comment.