Sort local repos

Sort local repos Hashes update Reverted some changes Stars as int Revmoed cache files Reverted some changes
benedikt-schesch · Aug 8, 2023 · 22b40d4 · 22b40d4
1 parent 2d34a89
commit 22b40d4
Show file tree

Hide file tree

Showing 547 changed files with 7,515 additions and 703 deletions.
diff --git a/Makefile b/Makefile
@@ -49,7 +49,7 @@ clean-everything: clean clean-cache clean-test-cache clean-stored-hashes
 # Compresses the cache.
 compress-cache:
 	rm -r cache.tar
-	tar --exclude="*explanation.txt" --exclude="*.lock" -czf cache.tar cache
+	tar --exclude="*.lock" -czf cache.tar cache
 
 # Decompresses the cache.
 decompress-cache:

diff --git a/input_data/repos.csv b/input_data/repos.csv
@@ -1,4 +1,4 @@
-,repository,language,architecture,community,continuous_integration,documentation,history,issues,license,size,unit_test,stars,scorebased_org,randomforest_org,scorebased_utl,randomforest_utl
+idx,repository,language,architecture,community,continuous_integration,documentation,history,issues,license,size,unit_test,stars,scorebased_org,randomforest_org,scorebased_utl,randomforest_utl
 329,Complexible/stardog-spring,Java,1.0,1,0,0.36999,0.0,0.0,1,2153,0.403618,12,0,0,1,1
 1502,sdeo/protobuf-socket-rpc,Java,1.0,1,0,0.233562,0.0,0.0,1,7472,0.323622,18,0,0,1,1
 2865,twitter/netty-http2,Java,1.0,2,1,0.22231,0.368421,0.0,1,5886,0.341296,41,1,0,1,1

diff --git a/input_data/repos_small.csv b/input_data/repos_small.csv
@@ -1,4 +1,4 @@
-,repository,language,architecture,community,continuous_integration,documentation,history,issues,license,size,unit_test,stars,scorebased_org,randomforest_org,scorebased_utl,randomforest_utl
+idx,repository,language,architecture,community,continuous_integration,documentation,history,issues,license,size,unit_test,stars,scorebased_org,randomforest_org,scorebased_utl,randomforest_utl
 16594,mangstadt/ez-vcard,Java,1.0,1,0,0.433617,10.5,0.0,1,34146,0.448443,54,1,0,1,1
 296895,pedrovgs/Algorithms,Java,0.932927,1,1,0.390942,89.0,0.75,1,6616,0.556371,1377,1,1,1,1
 1624004,tntim96/JSCover,Java,0.985816,1,0,0.490264,25.0,6.448276,1,54612,0.627527,298,1,1,1,1
diff --git a/results/filtered_result.csv b/results/filtered_result.csv
diff --git a/results/plots/all/cost_with_manual.pdf b/results/plots/all/cost_with_manual.pdf
diff --git a/results/plots/all/cost_without_manual.pdf b/results/plots/all/cost_without_manual.pdf
diff --git a/results/plots/all/heatmap.pdf b/results/plots/all/heatmap.pdf
diff --git a/results/plots/all/heatmap.pgf b/results/plots/all/heatmap.pgf
@@ -2541,19 +2541,6 @@
 \pgfusepath{fill}%
 \end{pgfscope}%
 \begin{pgfscope}%
-\pgfpathrectangle{\pgfqpoint{5.618710in}{1.603194in}}{\pgfqpoint{0.152340in}{3.046806in}}%
-\pgfusepath{clip}%
-\pgfsetbuttcap%
-\pgfsetmiterjoin%
-\definecolor{currentfill}{rgb}{1.000000,1.000000,1.000000}%
-\pgfsetfillcolor{currentfill}%
-\pgfsetlinewidth{0.010037pt}%
-\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}%
-\pgfsetstrokecolor{currentstroke}%
-\pgfsetdash{}{0pt}%
-\pgfusepath{stroke,fill}%
-\end{pgfscope}%
-\begin{pgfscope}%
 \pgfsys@transformshift{5.620000in}{1.600000in}%
 \pgftext[left,bottom]{\includegraphics[interpolate=true,width=0.150000in,height=3.050000in]{plots/all/heatmap-img0.png}}%
 \end{pgfscope}%

diff --git a/results/plots/git/cost_with_manual.pdf b/results/plots/git/cost_with_manual.pdf
diff --git a/results/plots/git/cost_without_manual.pdf b/results/plots/git/cost_without_manual.pdf
diff --git a/results/plots/git/heatmap.pdf b/results/plots/git/heatmap.pdf
diff --git a/results/plots/git/heatmap.pgf b/results/plots/git/heatmap.pgf
@@ -1383,19 +1383,6 @@
 \pgfusepath{fill}%
 \end{pgfscope}%
 \begin{pgfscope}%
-\pgfpathrectangle{\pgfqpoint{5.618710in}{1.603194in}}{\pgfqpoint{0.152340in}{3.046806in}}%
-\pgfusepath{clip}%
-\pgfsetbuttcap%
-\pgfsetmiterjoin%
-\definecolor{currentfill}{rgb}{1.000000,1.000000,1.000000}%
-\pgfsetfillcolor{currentfill}%
-\pgfsetlinewidth{0.010037pt}%
-\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}%
-\pgfsetstrokecolor{currentstroke}%
-\pgfsetdash{}{0pt}%
-\pgfusepath{stroke,fill}%
-\end{pgfscope}%
-\begin{pgfscope}%
 \pgfsys@transformshift{5.620000in}{1.600000in}%
 \pgftext[left,bottom]{\includegraphics[interpolate=true,width=0.150000in,height=3.050000in]{plots/git/heatmap-img0.png}}%
 \end{pgfscope}%

diff --git a/results/plots/tools/cost_with_manual.pdf b/results/plots/tools/cost_with_manual.pdf
diff --git a/results/plots/tools/cost_without_manual.pdf b/results/plots/tools/cost_without_manual.pdf
diff --git a/results/plots/tools/heatmap.pdf b/results/plots/tools/heatmap.pdf
diff --git a/results/plots/tools/heatmap.pgf b/results/plots/tools/heatmap.pgf
@@ -811,19 +811,6 @@
 \pgfusepath{fill}%
 \end{pgfscope}%
 \begin{pgfscope}%
-\pgfpathrectangle{\pgfqpoint{5.579184in}{1.416869in}}{\pgfqpoint{0.161657in}{3.233131in}}%
-\pgfusepath{clip}%
-\pgfsetbuttcap%
-\pgfsetmiterjoin%
-\definecolor{currentfill}{rgb}{1.000000,1.000000,1.000000}%
-\pgfsetfillcolor{currentfill}%
-\pgfsetlinewidth{0.010037pt}%
-\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}%
-\pgfsetstrokecolor{currentstroke}%
-\pgfsetdash{}{0pt}%
-\pgfusepath{stroke,fill}%
-\end{pgfscope}%
-\begin{pgfscope}%
 \pgfsys@transformshift{5.580000in}{1.420000in}%
 \pgftext[left,bottom]{\includegraphics[interpolate=true,width=0.160000in,height=3.230000in]{plots/tools/heatmap-img0.png}}%
 \end{pgfscope}%

diff --git a/results/tables/all/table_feature_main_summary.tex b/results/tables/all/table_feature_main_summary.tex
@@ -13,14 +13,14 @@
             \multicolumn{2}{c}{Feature Branch} \\
             \hline
             & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\
-            Gitmerge-ort                     &  6005 &  93\% &   835 &  87\% &   431 &   7\% &   105 &  11\% &    47 &   1\% &    15 &   2\% \\
-            Gitmerge-ort-ignorespace         &  6017 &  93\% &   839 &  88\% &   417 &   6\% &   103 &  11\% &    49 &   1\% &    13 &   1\% \\
-            Gitmerge-recursive-patience      &  5990 &  92\% &   837 &  88\% &   430 &   7\% &   105 &  11\% &    63 &   1\% &    13 &   1\% \\
-            Gitmerge-recursive-minimal       &  5993 &  92\% &   839 &  88\% &   431 &   7\% &   105 &  11\% &    59 &   1\% &    11 &   1\% \\
-            Gitmerge-recursive-histogram     &  5994 &  92\% &   840 &  88\% &   432 &   7\% &   105 &  11\% &    57 &   1\% &    10 &   1\% \\
-            Gitmerge-recursive-myers         &  5998 &  93\% &   839 &  88\% &   431 &   7\% &   105 &  11\% &    54 &   1\% &    11 &   1\% \\
-            Gitmerge-resolve                 &  5990 &  92\% &   839 &  88\% &   440 &   7\% &   104 &  11\% &    53 &   1\% &    12 &   1\% \\
-            Git-hires-merge                  &  5978 &  92\% &   835 &  87\% &   451 &   7\% &   105 &  11\% &    54 &   1\% &    15 &   2\% \\
-            Spork                            &  6086 &  94\% &   851 &  89\% &   324 &   5\% &    87 &   9\% &    73 &   1\% &    17 &   2\% \\
-            IntelliMerge                     &  6004 &  93\% &   836 &  88\% &   431 &   7\% &   104 &  11\% &    48 &   1\% &    15 &   2\% \\
+            Gitmerge-ort                   &  6005 &  93\% &   835 &  87\% &   431 &   7\% &   105 &  11\% &    47 &   1\% &    15 &   2\% \\
+            Gitmerge-ort-ignorespace       &  6017 &  93\% &   839 &  88\% &   417 &   6\% &   103 &  11\% &    49 &   1\% &    13 &   1\% \\
+            Gitmerge-recursive-patience    &  5990 &  92\% &   837 &  88\% &   430 &   7\% &   105 &  11\% &    63 &   1\% &    13 &   1\% \\
+            Gitmerge-recursive-minimal     &  5993 &  92\% &   839 &  88\% &   431 &   7\% &   105 &  11\% &    59 &   1\% &    11 &   1\% \\
+            Gitmerge-recursive-histogram   &  5994 &  92\% &   840 &  88\% &   432 &   7\% &   105 &  11\% &    57 &   1\% &    10 &   1\% \\
+            Gitmerge-recursive-myers       &  5998 &  93\% &   839 &  88\% &   431 &   7\% &   105 &  11\% &    54 &   1\% &    11 &   1\% \\
+            Gitmerge-resolve               &  5990 &  92\% &   839 &  88\% &   440 &   7\% &   104 &  11\% &    53 &   1\% &    12 &   1\% \\
+            Git-hires-merge                &  5978 &  92\% &   835 &  87\% &   451 &   7\% &   105 &  11\% &    54 &   1\% &    15 &   2\% \\
+            Spork                          &  6086 &  94\% &   851 &  89\% &   324 &   5\% &    87 &   9\% &    73 &   1\% &    17 &   2\% \\
+            IntelliMerge                   &  6004 &  93\% &   836 &  88\% &   431 &   7\% &   104 &  11\% &    48 &   1\% &    15 &   2\% \\
 \end{tabular}
diff --git a/results/tables/all/table_run_time.tex b/results/tables/all/table_run_time.tex
@@ -3,14 +3,14 @@
     & \multicolumn{3}{c}{Run time (seconds)} \\
     Tool & Mean & Median & Max \\
     \hline
-    Gitmerge-ort                     & 0.09 & 0.07 & 0.22 \\
-    Gitmerge-ort-ignorespace         & 0.09 & 0.07 & 0.22 \\
-    Gitmerge-recursive-patience      & 0.09 & 0.08 & 0.22 \\
-    Gitmerge-recursive-minimal       & 0.09 & 0.08 & 0.22 \\
-    Gitmerge-recursive-histogram     & 0.09 & 0.08 & 0.22 \\
-    Gitmerge-recursive-myers         & 0.09 & 0.08 & 0.22 \\
-    Gitmerge-resolve                 & 0.11 & 0.08 & 0.45 \\
-    Git-hires-merge                  & 0.06 & 0.04 & 0.18 \\
-    Spork                            & 0.12 & 0.10 & 0.34 \\
-    Intellimerge                     & 1.53 & 1.44 & 3.11 \\
+    Gitmerge-ort                   & 0.09 & 0.07 & 0.22 \\
+    Gitmerge-ort-ignorespace       & 0.09 & 0.07 & 0.22 \\
+    Gitmerge-recursive-patience    & 0.09 & 0.08 & 0.22 \\
+    Gitmerge-recursive-minimal     & 0.09 & 0.08 & 0.22 \\
+    Gitmerge-recursive-histogram   & 0.09 & 0.08 & 0.22 \\
+    Gitmerge-recursive-myers       & 0.09 & 0.08 & 0.22 \\
+    Gitmerge-resolve               & 0.11 & 0.08 & 0.45 \\
+    Git-hires-merge                & 0.06 & 0.04 & 0.18 \\
+    Spork                          & 0.12 & 0.10 & 0.34 \\
+    Intellimerge                   & 1.53 & 1.44 & 3.11 \\
 \end{tabular}
diff --git a/results/tables/all/table_summary.tex b/results/tables/all/table_summary.tex
@@ -6,14 +6,14 @@
             \multicolumn{2}{c}{Incorrect Merges} \\
             & \# & \% & \# & \% & \# & \% \\
             \hline
-Gitmerge-ort                     &  6840 &  92\% &   536 &   7\% &    62 &   1\% \\
-Gitmerge-ort-ignorespace         &  6856 &  92\% &   520 &   7\% &    62 &   1\% \\
-Gitmerge-recursive-patience      &  6827 &  92\% &   535 &   7\% &    76 &   1\% \\
-Gitmerge-recursive-minimal       &  6832 &  92\% &   536 &   7\% &    70 &   1\% \\
-Gitmerge-recursive-histogram     &  6834 &  92\% &   537 &   7\% &    67 &   1\% \\
-Gitmerge-recursive-myers         &  6837 &  92\% &   536 &   7\% &    65 &   1\% \\
-Gitmerge-resolve                 &  6829 &  92\% &   544 &   7\% &    65 &   1\% \\
-Git-hires-merge                  &  6813 &  92\% &   556 &   7\% &    69 &   1\% \\
-Spork                            &  6937 &  93\% &   411 &   6\% &    90 &   1\% \\
-IntelliMerge                     &  6840 &  92\% &   535 &   7\% &    63 &   1\% \\
+Gitmerge-ort                   &  6840 &  92\% &   536 &   7\% &    62 &   1\% \\
+Gitmerge-ort-ignorespace       &  6856 &  92\% &   520 &   7\% &    62 &   1\% \\
+Gitmerge-recursive-patience    &  6827 &  92\% &   535 &   7\% &    76 &   1\% \\
+Gitmerge-recursive-minimal     &  6832 &  92\% &   536 &   7\% &    70 &   1\% \\
+Gitmerge-recursive-histogram   &  6834 &  92\% &   537 &   7\% &    67 &   1\% \\
+Gitmerge-recursive-myers       &  6837 &  92\% &   536 &   7\% &    65 &   1\% \\
+Gitmerge-resolve               &  6829 &  92\% &   544 &   7\% &    65 &   1\% \\
+Git-hires-merge                &  6813 &  92\% &   556 &   7\% &    69 &   1\% \\
+Spork                          &  6937 &  93\% &   411 &   6\% &    90 &   1\% \\
+IntelliMerge                   &  6840 &  92\% &   535 &   7\% &    63 &   1\% \\
 \end{tabular}
diff --git a/results/tables/git/table_feature_main_summary.tex b/results/tables/git/table_feature_main_summary.tex
@@ -13,11 +13,11 @@
             \multicolumn{2}{c}{Feature Branch} \\
             \hline
             & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\
-            Gitmerge-ort                     &  6005 &  93\% &   835 &  87\% &   431 &   7\% &   105 &  11\% &    47 &   1\% &    15 &   2\% \\
-            Gitmerge-ort-ignorespace         &  6017 &  93\% &   839 &  88\% &   417 &   6\% &   103 &  11\% &    49 &   1\% &    13 &   1\% \\
-            Gitmerge-recursive-patience      &  5990 &  92\% &   837 &  88\% &   430 &   7\% &   105 &  11\% &    63 &   1\% &    13 &   1\% \\
-            Gitmerge-recursive-minimal       &  5993 &  92\% &   839 &  88\% &   431 &   7\% &   105 &  11\% &    59 &   1\% &    11 &   1\% \\
-            Gitmerge-recursive-histogram     &  5994 &  92\% &   840 &  88\% &   432 &   7\% &   105 &  11\% &    57 &   1\% &    10 &   1\% \\
-            Gitmerge-recursive-myers         &  5998 &  93\% &   839 &  88\% &   431 &   7\% &   105 &  11\% &    54 &   1\% &    11 &   1\% \\
-            Gitmerge-resolve                 &  5990 &  92\% &   839 &  88\% &   440 &   7\% &   104 &  11\% &    53 &   1\% &    12 &   1\% \\
+            Gitmerge-ort                   &  6005 &  93\% &   835 &  87\% &   431 &   7\% &   105 &  11\% &    47 &   1\% &    15 &   2\% \\
+            Gitmerge-ort-ignorespace       &  6017 &  93\% &   839 &  88\% &   417 &   6\% &   103 &  11\% &    49 &   1\% &    13 &   1\% \\
+            Gitmerge-recursive-patience    &  5990 &  92\% &   837 &  88\% &   430 &   7\% &   105 &  11\% &    63 &   1\% &    13 &   1\% \\
+            Gitmerge-recursive-minimal     &  5993 &  92\% &   839 &  88\% &   431 &   7\% &   105 &  11\% &    59 &   1\% &    11 &   1\% \\
+            Gitmerge-recursive-histogram   &  5994 &  92\% &   840 &  88\% &   432 &   7\% &   105 &  11\% &    57 &   1\% &    10 &   1\% \\
+            Gitmerge-recursive-myers       &  5998 &  93\% &   839 &  88\% &   431 &   7\% &   105 &  11\% &    54 &   1\% &    11 &   1\% \\
+            Gitmerge-resolve               &  5990 &  92\% &   839 &  88\% &   440 &   7\% &   104 &  11\% &    53 &   1\% &    12 &   1\% \\
 \end{tabular}
diff --git a/results/tables/git/table_run_time.tex b/results/tables/git/table_run_time.tex
@@ -3,11 +3,11 @@
     & \multicolumn{3}{c}{Run time (seconds)} \\
     Tool & Mean & Median & Max \\
     \hline
-    Gitmerge-ort                     & 0.09 & 0.07 & 0.22 \\
-    Gitmerge-ort-ignorespace         & 0.09 & 0.07 & 0.22 \\
-    Gitmerge-recursive-patience      & 0.09 & 0.08 & 0.22 \\
-    Gitmerge-recursive-minimal       & 0.09 & 0.08 & 0.22 \\
-    Gitmerge-recursive-histogram     & 0.09 & 0.08 & 0.22 \\
-    Gitmerge-recursive-myers         & 0.09 & 0.08 & 0.22 \\
-    Gitmerge-resolve                 & 0.11 & 0.08 & 0.45 \\
+    Gitmerge-ort                   & 0.09 & 0.07 & 0.22 \\
+    Gitmerge-ort-ignorespace       & 0.09 & 0.07 & 0.22 \\
+    Gitmerge-recursive-patience    & 0.09 & 0.08 & 0.22 \\
+    Gitmerge-recursive-minimal     & 0.09 & 0.08 & 0.22 \\
+    Gitmerge-recursive-histogram   & 0.09 & 0.08 & 0.22 \\
+    Gitmerge-recursive-myers       & 0.09 & 0.08 & 0.22 \\
+    Gitmerge-resolve               & 0.11 & 0.08 & 0.45 \\
 \end{tabular}
diff --git a/results/tables/git/table_summary.tex b/results/tables/git/table_summary.tex
@@ -6,11 +6,11 @@
             \multicolumn{2}{c}{Incorrect Merges} \\
             & \# & \% & \# & \% & \# & \% \\
             \hline
-Gitmerge-ort                     &  6840 &  92\% &   536 &   7\% &    62 &   1\% \\
-Gitmerge-ort-ignorespace         &  6856 &  92\% &   520 &   7\% &    62 &   1\% \\
-Gitmerge-recursive-patience      &  6827 &  92\% &   535 &   7\% &    76 &   1\% \\
-Gitmerge-recursive-minimal       &  6832 &  92\% &   536 &   7\% &    70 &   1\% \\
-Gitmerge-recursive-histogram     &  6834 &  92\% &   537 &   7\% &    67 &   1\% \\
-Gitmerge-recursive-myers         &  6837 &  92\% &   536 &   7\% &    65 &   1\% \\
-Gitmerge-resolve                 &  6829 &  92\% &   544 &   7\% &    65 &   1\% \\
+Gitmerge-ort                   &  6840 &  92\% &   536 &   7\% &    62 &   1\% \\
+Gitmerge-ort-ignorespace       &  6856 &  92\% &   520 &   7\% &    62 &   1\% \\
+Gitmerge-recursive-patience    &  6827 &  92\% &   535 &   7\% &    76 &   1\% \\
+Gitmerge-recursive-minimal     &  6832 &  92\% &   536 &   7\% &    70 &   1\% \\
+Gitmerge-recursive-histogram   &  6834 &  92\% &   537 &   7\% &    67 &   1\% \\
+Gitmerge-recursive-myers       &  6837 &  92\% &   536 &   7\% &    65 &   1\% \\
+Gitmerge-resolve               &  6829 &  92\% &   544 &   7\% &    65 &   1\% \\
 \end{tabular}
diff --git a/results/tables/tools/table_feature_main_summary.tex b/results/tables/tools/table_feature_main_summary.tex
@@ -13,9 +13,9 @@
             \multicolumn{2}{c}{Feature Branch} \\
             \hline
             & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\
-            Gitmerge-ort                     &  6005 &  93\% &   835 &  87\% &   431 &   7\% &   105 &  11\% &    47 &   1\% &    15 &   2\% \\
-            Gitmerge-ort-ignorespace         &  6017 &  93\% &   839 &  88\% &   417 &   6\% &   103 &  11\% &    49 &   1\% &    13 &   1\% \\
-            Git-hires-merge                  &  5978 &  92\% &   835 &  87\% &   451 &   7\% &   105 &  11\% &    54 &   1\% &    15 &   2\% \\
-            Spork                            &  6086 &  94\% &   851 &  89\% &   324 &   5\% &    87 &   9\% &    73 &   1\% &    17 &   2\% \\
-            IntelliMerge                     &  6004 &  93\% &   836 &  88\% &   431 &   7\% &   104 &  11\% &    48 &   1\% &    15 &   2\% \\
+            Gitmerge-ort                   &  6005 &  93\% &   835 &  87\% &   431 &   7\% &   105 &  11\% &    47 &   1\% &    15 &   2\% \\
+            Gitmerge-ort-ignorespace       &  6017 &  93\% &   839 &  88\% &   417 &   6\% &   103 &  11\% &    49 &   1\% &    13 &   1\% \\
+            Git-hires-merge                &  5978 &  92\% &   835 &  87\% &   451 &   7\% &   105 &  11\% &    54 &   1\% &    15 &   2\% \\
+            Spork                          &  6086 &  94\% &   851 &  89\% &   324 &   5\% &    87 &   9\% &    73 &   1\% &    17 &   2\% \\
+            IntelliMerge                   &  6004 &  93\% &   836 &  88\% &   431 &   7\% &   104 &  11\% &    48 &   1\% &    15 &   2\% \\
 \end{tabular}
diff --git a/results/tables/tools/table_run_time.tex b/results/tables/tools/table_run_time.tex
@@ -3,9 +3,9 @@
     & \multicolumn{3}{c}{Run time (seconds)} \\
     Tool & Mean & Median & Max \\
     \hline
-    Gitmerge-ort                     & 0.09 & 0.07 & 0.22 \\
-    Gitmerge-ort-ignorespace         & 0.09 & 0.07 & 0.22 \\
-    Git-hires-merge                  & 0.06 & 0.04 & 0.18 \\
-    Spork                            & 0.12 & 0.10 & 0.34 \\
-    Intellimerge                     & 1.53 & 1.44 & 3.11 \\
+    Gitmerge-ort                   & 0.09 & 0.07 & 0.22 \\
+    Gitmerge-ort-ignorespace       & 0.09 & 0.07 & 0.22 \\
+    Git-hires-merge                & 0.06 & 0.04 & 0.18 \\
+    Spork                          & 0.12 & 0.10 & 0.34 \\
+    Intellimerge                   & 1.53 & 1.44 & 3.11 \\
 \end{tabular}
diff --git a/results/tables/tools/table_summary.tex b/results/tables/tools/table_summary.tex
@@ -6,9 +6,9 @@
             \multicolumn{2}{c}{Incorrect Merges} \\
             & \# & \% & \# & \% & \# & \% \\
             \hline
-Gitmerge-ort                     &  6840 &  92\% &   536 &   7\% &    62 &   1\% \\
-Gitmerge-ort-ignorespace         &  6856 &  92\% &   520 &   7\% &    62 &   1\% \\
-Git-hires-merge                  &  6813 &  92\% &   556 &   7\% &    69 &   1\% \\
-Spork                            &  6937 &  93\% &   411 &   6\% &    90 &   1\% \\
-IntelliMerge                     &  6840 &  92\% &   535 &   7\% &    63 &   1\% \\
+Gitmerge-ort                   &  6840 &  92\% &   536 &   7\% &    62 &   1\% \\
+Gitmerge-ort-ignorespace       &  6856 &  92\% &   520 &   7\% &    62 &   1\% \\
+Git-hires-merge                &  6813 &  92\% &   556 &   7\% &    69 &   1\% \\
+Spork                          &  6937 &  93\% &   411 &   6\% &    90 &   1\% \\
+IntelliMerge                   &  6840 &  92\% &   535 &   7\% &    63 &   1\% \\
 \end{tabular}
diff --git a/src/python/get_repos.py b/src/python/get_repos.py
@@ -21,14 +21,14 @@
 if __name__ == "__main__":
     urllib.request.urlretrieve(
         "https://reporeapers.github.io/static/downloads/dataset.csv.gz",
-        "data/repos.csv.gz",
+        "input_data/repos.csv.gz",
     )
-    with gzip.open("data/repos.csv.gz", "rb") as f:
+    with gzip.open("input_data/repos.csv.gz", "rb") as f:
         df = pd.read_csv(BytesIO(f.read()))
-
     df = df[df["language"] == "Java"]
     df = df.replace(to_replace="None", value=np.nan).dropna()
-    df = df[df["stars"].astype(int) > 10]
+    df["stars"] = df["stars"].astype(int)
+    df = df[df["stars"] > 10]
     df = df[df["unit_test"] > 0.25]
 
     df.to_csv(repos_csv, index_label="idx")

diff --git a/src/python/split_repos.py b/src/python/split_repos.py
@@ -19,10 +19,11 @@
     parser.add_argument("--num_machines", type=int)
     parser.add_argument("--output_file", type=str)
     args = parser.parse_args()
-    df = pd.read_csv(args.repos_csv, index_col="idx")
+    df:pd.DataFrame = pd.read_csv(args.repos_csv, index_col="idx")
     # Make sure load factor is not biased
     df = df.sample(frac=1, random_state=42)
     df = np.array_split(df, args.num_machines)[args.machine_id]
+    df.sort_values(by=["repo_name"], inplace=True)
 
     df.to_csv(args.output_file, index_label="idx")
     print("Number of local repos in", args.repos_csv, "=", len(df))
diff --git a/src/python/validate_repos.py b/src/python/validate_repos.py
@@ -31,7 +31,7 @@
 TIMEOUT_TESTING = 60 * 30  # 30 minutes
 
 
-def clone_repo(repo_name: str):
+def clone_repo(repo_name: str)->git.repo.Repo:
     """Clones a repository, or runs `git fetch` if it is already cloned.
     Args:
         repo_name (str): The name of the repository to be cloned
@@ -53,6 +53,7 @@ def clone_repo(repo_name: str):
     except Exception as e:
         print(repo_name, "Exception during cloning. Exception:\n", e)
         raise
+    return repo
 
 
 def head_passes_tests(args: Tuple[pd.Series, Path]) -> TEST_STATE:

diff --git a/...ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-ort-ignorespace_git-hires-merge.txt b/...ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-ort-ignorespace_git-hires-merge.txt
diff --git a/...61ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-ort-ignorespace_gitmerge-meld.txt b/...61ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-ort-ignorespace_gitmerge-meld.txt
diff --git a/...461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-ort-ignorespace_gitmerge-ort.txt b/...461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-ort-ignorespace_gitmerge-ort.txt
diff --git a/...b5b6e3378461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-ort_git-hires-merge.txt b/...b5b6e3378461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-ort_git-hires-merge.txt
diff --git a/...e9b5b6e3378461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-ort_gitmerge-meld.txt b/...e9b5b6e3378461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-ort_gitmerge-meld.txt
diff --git a/...e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-histogram_git-hires-merge.txt b/...e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-histogram_git-hires-merge.txt
diff --git a/...4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-histogram_gitmerge-meld.txt b/...4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-histogram_gitmerge-meld.txt
diff --git a/...6d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-histogram_gitmerge-ort-ignorespace.txt b/...6d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-histogram_gitmerge-ort-ignorespace.txt
diff --git a/...e4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-histogram_gitmerge-ort.txt b/...e4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-histogram_gitmerge-ort.txt
diff --git a/...4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-minimal_git-hires-merge.txt b/...4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-minimal_git-hires-merge.txt
diff --git a/...ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-minimal_gitmerge-meld.txt b/...ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-minimal_gitmerge-meld.txt
diff --git a/...916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-minimal_gitmerge-ort-ignorespace.txt b/...916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-minimal_gitmerge-ort-ignorespace.txt
diff --git a/...1ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-minimal_gitmerge-ort.txt b/...1ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-minimal_gitmerge-ort.txt
diff --git a/...6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-minimal_gitmerge-recursive-histogram.txt b/...6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-minimal_gitmerge-recursive-histogram.txt