diff --git a/results/combined/plots/all/cost_with_manual.pdf b/results/combined/plots/all/cost_with_manual.pdf index e9ca3b498d..120792fc05 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_with_manual.pgf b/results/combined/plots/all/cost_with_manual.pgf index 14d9552cc5..5bc07c0e8d 100644 --- a/results/combined/plots/all/cost_with_manual.pgf +++ b/results/combined/plots/all/cost_with_manual.pgf @@ -943,7 +943,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=2.055479in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Ignorespace}}% +\pgftext[x=4.238230in,y=2.055479in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}IVn-ignorespace}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% diff --git a/results/combined/plots/all/cost_without_manual.pdf b/results/combined/plots/all/cost_without_manual.pdf index 9e0d0c139d..4bf7923607 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/cost_without_manual.pgf b/results/combined/plots/all/cost_without_manual.pgf index 48c19d45b6..bbca2ecf7a 100644 --- a/results/combined/plots/all/cost_without_manual.pgf +++ b/results/combined/plots/all/cost_without_manual.pgf @@ -979,7 +979,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=2.055479in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Ignorespace}}% +\pgftext[x=4.238230in,y=2.055479in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}IVn-ignorespace}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% diff --git a/results/combined/plots/all/heatmap.pdf b/results/combined/plots/all/heatmap.pdf index 3373a4669e..329c0695c6 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/all/heatmap.pgf b/results/combined/plots/all/heatmap.pgf index 7894238542..26778009bf 100644 --- a/results/combined/plots/all/heatmap.pgf +++ b/results/combined/plots/all/heatmap.pgf @@ -4755,7 +4755,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.706497in,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{Ignorespace}}}% +\pgftext[x=5.706497in,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{IVn-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -5155,7 +5155,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=2.583333in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Ignorespace}}}% +\pgftext[x=2.036770in,y=2.583333in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{IVn-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% diff --git a/results/combined/plots/git/cost_with_manual.pdf b/results/combined/plots/git/cost_with_manual.pdf index 959157db1a..ade6e34423 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_without_manual.pdf b/results/combined/plots/git/cost_without_manual.pdf index 4a397c44ea..2ad0235f37 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/heatmap.pdf b/results/combined/plots/git/heatmap.pdf index 2135ad5376..94394c9636 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/tools/cost_with_manual.pdf b/results/combined/plots/tools/cost_with_manual.pdf index 10ea029b53..d900c5bb0a 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_with_manual.pgf b/results/combined/plots/tools/cost_with_manual.pgf index 3ee4631dd5..dbfc32717b 100644 --- a/results/combined/plots/tools/cost_with_manual.pgf +++ b/results/combined/plots/tools/cost_with_manual.pgf @@ -796,7 +796,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.594326in,y=2.636497in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Ignorespace}}% +\pgftext[x=4.594326in,y=2.636497in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}IVn-ignorespace}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetrectcap% diff --git a/results/combined/plots/tools/cost_without_manual.pdf b/results/combined/plots/tools/cost_without_manual.pdf index 442c16b920..c1ba6b2475 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/cost_without_manual.pgf b/results/combined/plots/tools/cost_without_manual.pgf index 665cf4aadd..3bd037ac46 100644 --- a/results/combined/plots/tools/cost_without_manual.pgf +++ b/results/combined/plots/tools/cost_without_manual.pgf @@ -832,7 +832,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.594326in,y=2.636497in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Ignorespace}}% +\pgftext[x=4.594326in,y=2.636497in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}IVn-ignorespace}}% \end{pgfscope}% \end{pgfpicture}% \makeatother% diff --git a/results/combined/plots/tools/heatmap.pdf b/results/combined/plots/tools/heatmap.pdf index c04b6b45ab..462a7c43af 100644 Binary files a/results/combined/plots/tools/heatmap.pdf and b/results/combined/plots/tools/heatmap.pdf differ diff --git a/results/combined/plots/tools/heatmap.pgf b/results/combined/plots/tools/heatmap.pgf index 45860d906b..b11ba3c1bd 100644 --- a/results/combined/plots/tools/heatmap.pgf +++ b/results/combined/plots/tools/heatmap.pgf @@ -2022,7 +2022,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=6.392695in,y=1.319647in,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{Ignorespace}}}% +\pgftext[x=6.392695in,y=1.319647in,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{IVn-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -2272,7 +2272,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=1.680674in,y=1.638526in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Ignorespace}}}% +\pgftext[x=1.680674in,y=1.638526in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{IVn-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% diff --git a/results/combined/tables/all/table_feature_main_summary.tex b/results/combined/tables/all/table_feature_main_summary.tex index fa53b71468..77981c6d42 100644 --- a/results/combined/tables/all/table_feature_main_summary.tex +++ b/results/combined/tables/all/table_feature_main_summary.tex @@ -27,7 +27,7 @@ Spork & 62\% & 44\% & 28\% & 45\% & 10\% & 10\% \\ IntelliMerge & 27\% & 19\% & 31\% & 46\% & 42\% & 35\% \\ IVn & 57\% & 41\% & 40\% & 57\% & 3\% & 3\% \\ - Ignorespace & 59\% & 42\% & 38\% & 54\% & 3\% & 4\% \\ + IVn-ignorespace & 59\% & 42\% & 38\% & 54\% & 3\% & 4\% \\ Adjacent & 58\% & 42\% & 39\% & 55\% & 3\% & 3\% \\ Imports & 56\% & 38\% & 42\% & 59\% & 3\% & 2\% \\ Version Numbers & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ diff --git a/results/combined/tables/all/table_run_time.tex b/results/combined/tables/all/table_run_time.tex index 1a788b8f8c..8a1626272d 100644 --- a/results/combined/tables/all/table_run_time.tex +++ b/results/combined/tables/all/table_run_time.tex @@ -15,7 +15,7 @@ Spork & 2.55 & 1.06 & 653 \\ IntelliMerge & 1.04 & 0.50 & 89.3 \\ IVn & 0.53 & 0.26 & 56.1 \\ - Ignorespace & 0.53 & 0.26 & 56.1 \\ + IVn-ignorespace & 0.53 & 0.26 & 56.1 \\ Adjacent & 0.16 & 0.09 & 10.1 \\ Imports & 0.50 & 0.25 & 54.5 \\ Version Numbers & 0.17 & 0.09 & 10.3 \\ diff --git a/results/combined/tables/all/table_summary.tex b/results/combined/tables/all/table_summary.tex index 8dc0b20fd5..c01124b54b 100644 --- a/results/combined/tables/all/table_summary.tex +++ b/results/combined/tables/all/table_summary.tex @@ -18,7 +18,7 @@ Spork & 3272 & 55\% & 2118 & 35\% & 609 & 10\% \\ IntelliMerge & 1441 & 24\% & 2237 & 37\% & 2321 & 39\% \\ IVn & 3021 & 50\% & 2808 & 47\% & 170 & 3\% \\ -Ignorespace & 3125 & 52\% & 2671 & 45\% & 203 & 3\% \\ +IVn-ignorespace & 3125 & 52\% & 2671 & 45\% & 203 & 3\% \\ Adjacent & 3073 & 51\% & 2731 & 46\% & 195 & 3\% \\ Imports & 2913 & 49\% & 2928 & 49\% & 158 & 3\% \\ Version Numbers & 2790 & 47\% & 3086 & 51\% & 123 & 2\% \\ diff --git a/results/combined/tables/tools/table_feature_main_summary.tex b/results/combined/tables/tools/table_feature_main_summary.tex index f0df985420..bf27e432fd 100644 --- a/results/combined/tables/tools/table_feature_main_summary.tex +++ b/results/combined/tables/tools/table_feature_main_summary.tex @@ -24,5 +24,5 @@ Imports & 56\% & 38\% & 42\% & 59\% & 3\% & 2\% \\ Version Numbers & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ IVn & 57\% & 41\% & 40\% & 57\% & 3\% & 3\% \\ - Ignorespace & 59\% & 42\% & 38\% & 54\% & 3\% & 4\% \\ + IVn-ignorespace & 59\% & 42\% & 38\% & 54\% & 3\% & 4\% \\ \end{tabular} diff --git a/results/combined/tables/tools/table_run_time.tex b/results/combined/tables/tools/table_run_time.tex index 158a243e4b..af872bc910 100644 --- a/results/combined/tables/tools/table_run_time.tex +++ b/results/combined/tables/tools/table_run_time.tex @@ -12,5 +12,5 @@ Imports & 0.50 & 0.25 & 54.5 \\ Version Numbers & 0.17 & 0.09 & 10.3 \\ IVn & 0.53 & 0.26 & 56.1 \\ - Ignorespace & 0.53 & 0.26 & 56.1 \\ + IVn-ignorespace & 0.53 & 0.26 & 56.1 \\ \end{tabular} diff --git a/results/combined/tables/tools/table_summary.tex b/results/combined/tables/tools/table_summary.tex index d55df95c28..4a240033df 100644 --- a/results/combined/tables/tools/table_summary.tex +++ b/results/combined/tables/tools/table_summary.tex @@ -15,5 +15,5 @@ Imports & 2913 & 49\% & 2928 & 49\% & 158 & 3\% \\ Version Numbers & 2790 & 47\% & 3086 & 51\% & 123 & 2\% \\ IVn & 3021 & 50\% & 2808 & 47\% & 170 & 3\% \\ -Ignorespace & 3125 & 52\% & 2671 & 45\% & 203 & 3\% \\ +IVn-ignorespace & 3125 & 52\% & 2671 & 45\% & 203 & 3\% \\ \end{tabular} diff --git a/results/greatest_hits/plots/all/cost_with_manual.pdf b/results/greatest_hits/plots/all/cost_with_manual.pdf index 0f853163db..5c79522eee 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_with_manual.pgf b/results/greatest_hits/plots/all/cost_with_manual.pgf index aefdc849b6..5230f736ff 100644 --- a/results/greatest_hits/plots/all/cost_with_manual.pgf +++ b/results/greatest_hits/plots/all/cost_with_manual.pgf @@ -1043,7 +1043,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=2.055479in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Ignorespace}}% +\pgftext[x=4.238230in,y=2.055479in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}IVn-ignorespace}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% diff --git a/results/greatest_hits/plots/all/cost_without_manual.pdf b/results/greatest_hits/plots/all/cost_without_manual.pdf index 14d1ed2298..b452c92412 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/cost_without_manual.pgf b/results/greatest_hits/plots/all/cost_without_manual.pgf index 669b7411d1..d977dd1f93 100644 --- a/results/greatest_hits/plots/all/cost_without_manual.pgf +++ b/results/greatest_hits/plots/all/cost_without_manual.pgf @@ -977,7 +977,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=2.055479in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Ignorespace}}% +\pgftext[x=4.238230in,y=2.055479in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}IVn-ignorespace}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% diff --git a/results/greatest_hits/plots/all/heatmap.pdf b/results/greatest_hits/plots/all/heatmap.pdf index b27d74ec63..a9a03ee2df 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/all/heatmap.pgf b/results/greatest_hits/plots/all/heatmap.pgf index 200bc71b4d..7e188aec6d 100644 --- a/results/greatest_hits/plots/all/heatmap.pgf +++ b/results/greatest_hits/plots/all/heatmap.pgf @@ -4755,7 +4755,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.706497in,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{Ignorespace}}}% +\pgftext[x=5.706497in,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{IVn-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -5155,7 +5155,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=2.583333in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Ignorespace}}}% +\pgftext[x=2.036770in,y=2.583333in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{IVn-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% diff --git a/results/greatest_hits/plots/git/cost_with_manual.pdf b/results/greatest_hits/plots/git/cost_with_manual.pdf index 83d6c58a02..020ebef4e8 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_without_manual.pdf b/results/greatest_hits/plots/git/cost_without_manual.pdf index 5876e01189..29eff0290b 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/heatmap.pdf b/results/greatest_hits/plots/git/heatmap.pdf index 0903afa79b..b0ba22d98d 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/tools/cost_with_manual.pdf b/results/greatest_hits/plots/tools/cost_with_manual.pdf index 13f844d6a5..305758f957 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_with_manual.pgf b/results/greatest_hits/plots/tools/cost_with_manual.pgf index 35df69df9a..32cc0314f9 100644 --- a/results/greatest_hits/plots/tools/cost_with_manual.pgf +++ b/results/greatest_hits/plots/tools/cost_with_manual.pgf @@ -896,7 +896,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.594326in,y=2.636497in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Ignorespace}}% +\pgftext[x=4.594326in,y=2.636497in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}IVn-ignorespace}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetrectcap% diff --git a/results/greatest_hits/plots/tools/cost_without_manual.pdf b/results/greatest_hits/plots/tools/cost_without_manual.pdf index bdfcdc57b3..6874985110 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/cost_without_manual.pgf b/results/greatest_hits/plots/tools/cost_without_manual.pgf index f6360fb706..49b70d28f6 100644 --- a/results/greatest_hits/plots/tools/cost_without_manual.pgf +++ b/results/greatest_hits/plots/tools/cost_without_manual.pgf @@ -830,7 +830,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.594326in,y=2.636497in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Ignorespace}}% +\pgftext[x=4.594326in,y=2.636497in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}IVn-ignorespace}}% \end{pgfscope}% \end{pgfpicture}% \makeatother% diff --git a/results/greatest_hits/plots/tools/heatmap.pdf b/results/greatest_hits/plots/tools/heatmap.pdf index d429cc6f78..0764e94fb6 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/plots/tools/heatmap.pgf b/results/greatest_hits/plots/tools/heatmap.pgf index b89159ce51..26b14c02bc 100644 --- a/results/greatest_hits/plots/tools/heatmap.pgf +++ b/results/greatest_hits/plots/tools/heatmap.pgf @@ -2022,7 +2022,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=6.392695in,y=1.319647in,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{Ignorespace}}}% +\pgftext[x=6.392695in,y=1.319647in,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{IVn-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -2272,7 +2272,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=1.680674in,y=1.638526in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Ignorespace}}}% +\pgftext[x=1.680674in,y=1.638526in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{IVn-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% diff --git a/results/greatest_hits/tables/all/table_feature_main_summary.tex b/results/greatest_hits/tables/all/table_feature_main_summary.tex index 363d4ad038..60844c9e9a 100644 --- a/results/greatest_hits/tables/all/table_feature_main_summary.tex +++ b/results/greatest_hits/tables/all/table_feature_main_summary.tex @@ -27,7 +27,7 @@ Spork & 58\% & 44\% & 27\% & 50\% & 15\% & 6\% \\ IntelliMerge & 25\% & 15\% & 29\% & 50\% & 46\% & 35\% \\ IVn & 58\% & 37\% & 38\% & 60\% & 4\% & 3\% \\ - Ignorespace & 59\% & 37\% & 38\% & 59\% & 3\% & 4\% \\ + IVn-ignorespace & 59\% & 37\% & 38\% & 59\% & 3\% & 4\% \\ Adjacent & 58\% & 40\% & 36\% & 57\% & 5\% & 3\% \\ Imports & 57\% & 35\% & 40\% & 63\% & 4\% & 3\% \\ Version Numbers & 54\% & 33\% & 42\% & 66\% & 4\% & 2\% \\ diff --git a/results/greatest_hits/tables/all/table_summary.tex b/results/greatest_hits/tables/all/table_summary.tex index 0cd86a894f..0388e50058 100644 --- a/results/greatest_hits/tables/all/table_summary.tex +++ b/results/greatest_hits/tables/all/table_summary.tex @@ -18,7 +18,7 @@ Spork & 581 & 50\% & 456 & 40\% & 114 & 10\% \\ IntelliMerge & 225 & 20\% & 468 & 41\% & 458 & 40\% \\ IVn & 531 & 46\% & 580 & 50\% & 40 & 3\% \\ -Ignorespace & 542 & 47\% & 565 & 49\% & 44 & 4\% \\ +IVn-ignorespace & 542 & 47\% & 565 & 49\% & 44 & 4\% \\ Adjacent & 556 & 48\% & 547 & 48\% & 48 & 4\% \\ Imports & 514 & 45\% & 599 & 52\% & 38 & 3\% \\ Version Numbers & 488 & 42\% & 633 & 55\% & 30 & 3\% \\ diff --git a/results/greatest_hits/tables/tools/table_feature_main_summary.tex b/results/greatest_hits/tables/tools/table_feature_main_summary.tex index 0c8e8a39bc..44f0dfdeee 100644 --- a/results/greatest_hits/tables/tools/table_feature_main_summary.tex +++ b/results/greatest_hits/tables/tools/table_feature_main_summary.tex @@ -24,5 +24,5 @@ Imports & 57\% & 35\% & 40\% & 63\% & 4\% & 3\% \\ Version Numbers & 54\% & 33\% & 42\% & 66\% & 4\% & 2\% \\ IVn & 58\% & 37\% & 38\% & 60\% & 4\% & 3\% \\ - Ignorespace & 59\% & 37\% & 38\% & 59\% & 3\% & 4\% \\ + IVn-ignorespace & 59\% & 37\% & 38\% & 59\% & 3\% & 4\% \\ \end{tabular} diff --git a/results/greatest_hits/tables/tools/table_summary.tex b/results/greatest_hits/tables/tools/table_summary.tex index dd76903748..7ef0ac142f 100644 --- a/results/greatest_hits/tables/tools/table_summary.tex +++ b/results/greatest_hits/tables/tools/table_summary.tex @@ -15,5 +15,5 @@ Imports & 514 & 45\% & 599 & 52\% & 38 & 3\% \\ Version Numbers & 488 & 42\% & 633 & 55\% & 30 & 3\% \\ IVn & 531 & 46\% & 580 & 50\% & 40 & 3\% \\ -Ignorespace & 542 & 47\% & 565 & 49\% & 44 & 4\% \\ +IVn-ignorespace & 542 & 47\% & 565 & 49\% & 44 & 4\% \\ \end{tabular} diff --git a/results/reaper/plots/all/cost_with_manual.pdf b/results/reaper/plots/all/cost_with_manual.pdf index ba16412409..66b54de771 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_with_manual.pgf b/results/reaper/plots/all/cost_with_manual.pgf index 4e9a4be98e..4721edd076 100644 --- a/results/reaper/plots/all/cost_with_manual.pgf +++ b/results/reaper/plots/all/cost_with_manual.pgf @@ -943,7 +943,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.238230in,y=2.055479in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Ignorespace}}% +\pgftext[x=4.238230in,y=2.055479in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}IVn-ignorespace}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% diff --git a/results/reaper/plots/all/cost_without_manual.pdf b/results/reaper/plots/all/cost_without_manual.pdf index 8d9afad185..ce6cffc246 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/cost_without_manual.pgf b/results/reaper/plots/all/cost_without_manual.pgf index b1fcbfe17d..7ccfddbc59 100644 --- a/results/reaper/plots/all/cost_without_manual.pgf +++ b/results/reaper/plots/all/cost_without_manual.pgf @@ -979,7 +979,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=1.187038in,y=1.282716in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Ignorespace}}% +\pgftext[x=1.187038in,y=1.282716in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}IVn-ignorespace}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% diff --git a/results/reaper/plots/all/heatmap.pdf b/results/reaper/plots/all/heatmap.pdf index 5217421b6c..8ba151f485 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/all/heatmap.pgf b/results/reaper/plots/all/heatmap.pgf index 83d414dcd7..608bb205f8 100644 --- a/results/reaper/plots/all/heatmap.pgf +++ b/results/reaper/plots/all/heatmap.pgf @@ -4755,7 +4755,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.706497in,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{Ignorespace}}}% +\pgftext[x=5.706497in,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{IVn-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -5155,7 +5155,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.036770in,y=2.583333in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Ignorespace}}}% +\pgftext[x=2.036770in,y=2.583333in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{IVn-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% diff --git a/results/reaper/plots/git/cost_with_manual.pdf b/results/reaper/plots/git/cost_with_manual.pdf index 162258fc36..fc1341fae1 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_without_manual.pdf b/results/reaper/plots/git/cost_without_manual.pdf index d57e16ff25..1c5364dec9 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/heatmap.pdf b/results/reaper/plots/git/heatmap.pdf index f1368e9775..3e68ef7d77 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/tools/cost_with_manual.pdf b/results/reaper/plots/tools/cost_with_manual.pdf index 97b9e65d1c..7d6c5e632a 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_with_manual.pgf b/results/reaper/plots/tools/cost_with_manual.pgf index 7f6f0a7048..13df653626 100644 --- a/results/reaper/plots/tools/cost_with_manual.pgf +++ b/results/reaper/plots/tools/cost_with_manual.pgf @@ -796,7 +796,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.594326in,y=2.636497in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Ignorespace}}% +\pgftext[x=4.594326in,y=2.636497in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}IVn-ignorespace}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetrectcap% diff --git a/results/reaper/plots/tools/cost_without_manual.pdf b/results/reaper/plots/tools/cost_without_manual.pdf index ec7a78055f..71fcb53e84 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/cost_without_manual.pgf b/results/reaper/plots/tools/cost_without_manual.pgf index e09993e1ef..a5474c3e00 100644 --- a/results/reaper/plots/tools/cost_without_manual.pgf +++ b/results/reaper/plots/tools/cost_without_manual.pgf @@ -832,7 +832,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.594326in,y=2.636497in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}Ignorespace}}% +\pgftext[x=4.594326in,y=2.636497in,left,base]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}IVn-ignorespace}}% \end{pgfscope}% \end{pgfpicture}% \makeatother% diff --git a/results/reaper/plots/tools/heatmap.pdf b/results/reaper/plots/tools/heatmap.pdf index 81ccdb1dee..235ae1b7f7 100644 Binary files a/results/reaper/plots/tools/heatmap.pdf and b/results/reaper/plots/tools/heatmap.pdf differ diff --git a/results/reaper/plots/tools/heatmap.pgf b/results/reaper/plots/tools/heatmap.pgf index 040dfe8eab..0368442cfb 100644 --- a/results/reaper/plots/tools/heatmap.pgf +++ b/results/reaper/plots/tools/heatmap.pgf @@ -2022,7 +2022,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=6.392695in,y=1.319647in,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{Ignorespace}}}% +\pgftext[x=6.392695in,y=1.319647in,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{IVn-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \pgfsetbuttcap% @@ -2272,7 +2272,7 @@ \definecolor{textcolor}{rgb}{0.000000,0.000000,0.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=1.680674in,y=1.638526in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{Ignorespace}}}% +\pgftext[x=1.680674in,y=1.638526in,right,]{\color{textcolor}{\rmfamily\fontsize{10.000000}{12.000000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}\mbox{IVn-ignorespace}}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% diff --git a/results/reaper/tables/all/table_feature_main_summary.tex b/results/reaper/tables/all/table_feature_main_summary.tex index ef55b6c1d7..75bc1ee9c1 100644 --- a/results/reaper/tables/all/table_feature_main_summary.tex +++ b/results/reaper/tables/all/table_feature_main_summary.tex @@ -27,7 +27,7 @@ Spork & 62\% & 44\% & 28\% & 45\% & 10\% & 11\% \\ IntelliMerge & 27\% & 19\% & 31\% & 46\% & 42\% & 35\% \\ IVn & 57\% & 41\% & 40\% & 56\% & 3\% & 3\% \\ - Ignorespace & 59\% & 43\% & 37\% & 54\% & 3\% & 4\% \\ + IVn-ignorespace & 59\% & 43\% & 37\% & 54\% & 3\% & 4\% \\ Adjacent & 58\% & 42\% & 39\% & 55\% & 3\% & 3\% \\ Imports & 56\% & 39\% & 41\% & 59\% & 3\% & 2\% \\ Version Numbers & 54\% & 37\% & 44\% & 61\% & 2\% & 2\% \\ diff --git a/results/reaper/tables/all/table_summary.tex b/results/reaper/tables/all/table_summary.tex index 72c39a6b07..433bd5e9f4 100644 --- a/results/reaper/tables/all/table_summary.tex +++ b/results/reaper/tables/all/table_summary.tex @@ -18,7 +18,7 @@ Spork & 2978 & 55\% & 1901 & 35\% & 553 & 10\% \\ IntelliMerge & 1301 & 24\% & 1992 & 37\% & 2139 & 39\% \\ IVn & 2768 & 51\% & 2512 & 46\% & 152 & 3\% \\ -Ignorespace & 2868 & 53\% & 2380 & 44\% & 184 & 3\% \\ +IVn-ignorespace & 2868 & 53\% & 2380 & 44\% & 184 & 3\% \\ Adjacent & 2794 & 51\% & 2462 & 45\% & 176 & 3\% \\ Imports & 2669 & 49\% & 2623 & 48\% & 140 & 3\% \\ Version Numbers & 2556 & 47\% & 2766 & 51\% & 110 & 2\% \\ diff --git a/results/reaper/tables/tools/table_feature_main_summary.tex b/results/reaper/tables/tools/table_feature_main_summary.tex index da4099711a..aedbfa130b 100644 --- a/results/reaper/tables/tools/table_feature_main_summary.tex +++ b/results/reaper/tables/tools/table_feature_main_summary.tex @@ -24,5 +24,5 @@ Imports & 56\% & 39\% & 41\% & 59\% & 3\% & 2\% \\ Version Numbers & 54\% & 37\% & 44\% & 61\% & 2\% & 2\% \\ IVn & 57\% & 41\% & 40\% & 56\% & 3\% & 3\% \\ - Ignorespace & 59\% & 43\% & 37\% & 54\% & 3\% & 4\% \\ + IVn-ignorespace & 59\% & 43\% & 37\% & 54\% & 3\% & 4\% \\ \end{tabular} diff --git a/results/reaper/tables/tools/table_summary.tex b/results/reaper/tables/tools/table_summary.tex index 0ef60c7445..d9af427b51 100644 --- a/results/reaper/tables/tools/table_summary.tex +++ b/results/reaper/tables/tools/table_summary.tex @@ -15,5 +15,5 @@ Imports & 2669 & 49\% & 2623 & 48\% & 140 & 3\% \\ Version Numbers & 2556 & 47\% & 2766 & 51\% & 110 & 2\% \\ IVn & 2768 & 51\% & 2512 & 46\% & 152 & 3\% \\ -Ignorespace & 2868 & 53\% & 2380 & 44\% & 184 & 3\% \\ +IVn-ignorespace & 2868 & 53\% & 2380 & 44\% & 184 & 3\% \\ \end{tabular} diff --git a/src/python/latex_output.py b/src/python/latex_output.py index 14a6faa411..5f8e84fff7 100755 --- a/src/python/latex_output.py +++ b/src/python/latex_output.py @@ -65,7 +65,7 @@ "plumelib_ort_imports": "Imports", "plumelib_ort_version_number": "Version Numbers", "plumelib_ort": "IVn", - "plumelib_ort_ignorespace": "Ignorespace", + "plumelib_ort_ignorespace": "IVn-ignorespace", }