Added latest data

results/combined/defs.tex

@@ -1,31 +1,31 @@
 \def\combinedReposInitial{42092\xspace}
 \def\combinedReposValid{4072\xspace}
-\def\combinedMergesInitial{294715\xspace}
+\def\combinedMergesInitial{294714\xspace}
 \def\combinedMergesPer{100\xspace}
 \def\combinedMergesNonTrivial{85979\xspace}
 \def\combinedReposNonTrivial{2712\xspace}
-\def\combinedMergesJavaDiff{21861\xspace}
+\def\combinedMergesJavaDiff{21860\xspace}
 \def\combinedReposJavaDiff{1653\xspace}
-\def\combinedMergesJavaDiffAndParentsPass{6046\xspace}
+\def\combinedMergesJavaDiffAndParentsPass{6045\xspace}
 \def\combinedReposJavaDiffAndParentsPass{1120\xspace}
 \def\combinedReposSampled{1120\xspace}
-\def\combinedMergesSampled{6036\xspace}
+\def\combinedMergesSampled{6035\xspace}
 \def\combinedReposYieldedFull{1\xspace}
-\def\combinedReposTotal{1117\xspace}
-\def\combinedMergesTotal{5999\xspace}
+\def\combinedReposTotal{1116\xspace}
+\def\combinedMergesTotal{5984\xspace}
 
 % Results
-\def\combinedAverageTriesUntilPass{1.0149383127709237\xspace}
-\def\combinedNumberofMergesWith1TriesUntilPass{44569\xspace}
-\def\combinedNumberofMergesWith3TriesUntilPass{99\xspace}
-\def\combinedNumberofMergesWith5TriesUntilPass{35\xspace}
-\def\combinedNumberofMergesWith2TriesUntilPass{256\xspace}
-\def\combinedNumberofMergesWith4TriesUntilPass{26\xspace}
-\def\combinedSporkOverOrtCorrect{515\xspace}
+\def\combinedAverageTriesUntilPass{1.0146972284816214\xspace}
+\def\combinedNumberofMergesWith1TriesUntilPass{69021\xspace}
+\def\combinedNumberofMergesWith3TriesUntilPass{142\xspace}
+\def\combinedNumberofMergesWith5TriesUntilPass{54\xspace}
+\def\combinedNumberofMergesWith2TriesUntilPass{422\xspace}
+\def\combinedNumberofMergesWith4TriesUntilPass{34\xspace}
+\def\combinedSporkOverOrtCorrect{512\xspace}
 \def\combinedSporkOverOrtIncorrect{487\xspace}
-\def\combinedMainBranchMerges{3532\xspace}
+\def\combinedMainBranchMerges{3524\xspace}
 \def\combinedMainBranchMergesPercent{59\xspace}
-\def\combinedOtherBranchMerges{2467\xspace}
+\def\combinedOtherBranchMerges{2460\xspace}
 \def\combinedOtherBranchMergesPercent{41\xspace}
 \def\combinedReposJava{42092\xspace}
 

results/combined/merges/apache/opennlp.csv

@@ -45,7 +45,6 @@ idx,branch_name,merge_commit,parent_1,parent_2,notes
 44,refs/remotes/origin/pull/456,f5ff67a63b22e4d7c2596176b2add5a65656ee31,46a2657b706f2a877c9777f10b7dbbba8ca9ea89,f250404afce780a12947b513f2a2ac423aa5c7b3,
 45,refs/remotes/origin/pull/479,9049807dc18b7b5d85f7e058e7725067ea58f957,65de1254f714778a63989dca0fe92bf0eef63f0f,c270b99b914baedb13045c5d5eaa9b5f11c9c999,
 46,refs/remotes/origin/pull/485,26d4013ef2a7dea7181754daed3af0c8a911a64d,5a96e223964904403d5d10afbe319713a00f5b36,395b752dcc4de0e7c1bef1300bf45ae23bda0c71,
-47,refs/remotes/origin/pull/485,6e3a2f9841a9d55ba74c921fe8348b76ff86f76d,9c6642b1ce97dfbd032ce2020b81bffb89f095e3,8c789590c3cf12416549ccc3beffafedf09289c8,
 48,refs/remotes/origin/pull/519,61f8cdc1019febb6d6946e412adc3a2c982b14c9,52b8e691a62018bf5a19ce850c06d608c1035c00,f53cd707ccf54a7fd4683c6ff72b9b1534a31406,
 49,refs/remotes/origin/pull/523,9b72417d36d02cee6873385ae5cceb0080650d73,00b5141c8fdb8986d82b9473ed86ab3e6c208920,9b9ceb0dae7b974144033cb2e4b1e07e8144e0f6,
 50,refs/remotes/origin/pull/53,ad51f2c36b419409801aa31ed51879a75217491e,df32818d3dd56ab2372b7ec5b61d32e62760d2d7,818af0c8d1a99b34e5bc3bb67ef6c86bbd9b113d,

results/combined/merges_analyzed/3scale/3scale_ws_api_for_java.csv

@@ -1,9 +1,9 @@
-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing
-12,refs/remotes/origin/pull/10,c77b1297186f967622adaeaaa8996a27f77cf1fc,3c9c2af6b97384850a9acd7245d7c62ec7afd593,88d410aa7befa2c5499395a1fec6da34c9cb0b5f,,True,True,True,10,29,266,4,False,10,Tests_failed,29f6d014333b808c5b2979ba16de7e6bac963e80ad0cba35ae14faa710e7c431,False,Tests_failed,5cdfe7b9b14c055deb49591da977b31082e45249cd70e299661f2de943586fc8,False
-13,refs/remotes/origin/pull/10,d5be99e116542e2f465caba331c0ec589bf726d9,c68f61f0fa127bfeaea5e4e255e7b3730df4a0f6,f85b6777113505109cc1f1d4a9edea615fd403f5,,False,True,True,6,11,193,1,False,6,,,,,,False
-14,refs/remotes/origin/pull/10,ea282678896734ff75f85799cfd7ae3f3515790c,ea143d850887e020a5f505f0917da33cf186af75,94607fd9ce59988a15dca58958c7ae30bf51155f,,False,True,True,6,8,47,1,False,6,,,,,,False
-15,refs/remotes/origin/pull/10,c3b5f5d43f5699e2e4d698bd32a74dad9ac1d477,78eceb43ad7a9dd89e7c2f36f82b0e36061e40ff,85d75a23e94054bbb8c219f21036872149150a90,,True,True,True,275,1285,43918,4,False,275,Tests_failed,257e4c08564208c7ebf0f6e8185853cf539495c4508abc372e8e39cbae743174,False,Tests_failed,9d947990e32bc40c172cff6bdce6a3e34ff00f241abe661da55bae8a1e399000,False
-16,refs/remotes/origin/pull/10,d0c36bece9c7b6409a6d57008f327287bfdffa06,d2ddc1e3a56d5b420971b107bdcd3b99bd48d0ef,799779c8c760115a7e8db66d8c24bfccd5a55416,,False,False,False,0,Error,0,210,False,210,,,,,,False
-17,refs/remotes/origin/pull/10,332b6ed4e324199565e235cd915368f9bc1b43d2,4650578dee712b2b08f2ead2bf6a531f82b1e0e9,d623f491daa2f14f06f53338265d28a489138a6b,,True,True,True,112,200,4448,4,False,113,Tests_failed,78bd4536994ebea95ea8ebd2ea2e7c2b38f2a1fec25ecf322a0e8ccd1406b50b,False,Tests_failed,aa6ad3f4018260b629417aa44faa0ed893f6092c9f5dd08efdae1fd8223de2ba,False
-18,refs/remotes/origin/pull/11,9616295df7f50bfc3ec267047e569e83b6cdb0fa,5ac6e3f5b0c069465004538a3b95a37fcaf7b57e,88d410aa7befa2c5499395a1fec6da34c9cb0b5f,,True,True,True,9,31,119,3,False,9,Tests_failed,d91c6fc51df617b83f7695a8eee5308421e57fe98f4a0c678e994c79904f69f0,False,Tests_failed,5cdfe7b9b14c055deb49591da977b31082e45249cd70e299661f2de943586fc8,False
-20,refs/remotes/origin/pull/13,3054b1c14ba79e67394915d27d5e5d766f3b3db0,f39a51f3fa3259bd4cabd16fe9c025fe4dbbea1f,3c11b36e5054ec09cdc29ec3d0e9273406163498,,False,True,True,10,108,1126,2,False,10,,,,,,False
+idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing
+12,refs/remotes/origin/pull/10,c77b1297186f967622adaeaaa8996a27f77cf1fc,3c9c2af6b97384850a9acd7245d7c62ec7afd593,88d410aa7befa2c5499395a1fec6da34c9cb0b5f,,True,True,Tests_failed,29f6d014333b808c5b2979ba16de7e6bac963e80ad0cba35ae14faa710e7c431,True,10,29,266,4,False,Tests_failed,5cdfe7b9b14c055deb49591da977b31082e45249cd70e299661f2de943586fc8,False,10,False
+13,refs/remotes/origin/pull/10,d5be99e116542e2f465caba331c0ec589bf726d9,c68f61f0fa127bfeaea5e4e255e7b3730df4a0f6,f85b6777113505109cc1f1d4a9edea615fd403f5,,False,True,,,True,6,11,193,1,,,,False,6,False
+14,refs/remotes/origin/pull/10,ea282678896734ff75f85799cfd7ae3f3515790c,ea143d850887e020a5f505f0917da33cf186af75,94607fd9ce59988a15dca58958c7ae30bf51155f,,False,True,,,True,6,8,47,1,,,,False,6,False
+15,refs/remotes/origin/pull/10,c3b5f5d43f5699e2e4d698bd32a74dad9ac1d477,78eceb43ad7a9dd89e7c2f36f82b0e36061e40ff,85d75a23e94054bbb8c219f21036872149150a90,,True,True,Tests_failed,257e4c08564208c7ebf0f6e8185853cf539495c4508abc372e8e39cbae743174,True,275,1285,43918,4,False,Tests_failed,9d947990e32bc40c172cff6bdce6a3e34ff00f241abe661da55bae8a1e399000,False,275,False
+16,refs/remotes/origin/pull/10,d0c36bece9c7b6409a6d57008f327287bfdffa06,d2ddc1e3a56d5b420971b107bdcd3b99bd48d0ef,799779c8c760115a7e8db66d8c24bfccd5a55416,,False,False,,,False,0,Error,0,210,,,,False,210,False
+17,refs/remotes/origin/pull/10,332b6ed4e324199565e235cd915368f9bc1b43d2,4650578dee712b2b08f2ead2bf6a531f82b1e0e9,d623f491daa2f14f06f53338265d28a489138a6b,,True,True,Tests_failed,78bd4536994ebea95ea8ebd2ea2e7c2b38f2a1fec25ecf322a0e8ccd1406b50b,True,112,200,4448,4,False,Tests_failed,aa6ad3f4018260b629417aa44faa0ed893f6092c9f5dd08efdae1fd8223de2ba,False,113,False
+18,refs/remotes/origin/pull/11,9616295df7f50bfc3ec267047e569e83b6cdb0fa,5ac6e3f5b0c069465004538a3b95a37fcaf7b57e,88d410aa7befa2c5499395a1fec6da34c9cb0b5f,,True,True,Tests_failed,d91c6fc51df617b83f7695a8eee5308421e57fe98f4a0c678e994c79904f69f0,True,9,31,119,3,False,Tests_failed,5cdfe7b9b14c055deb49591da977b31082e45249cd70e299661f2de943586fc8,False,9,False
+20,refs/remotes/origin/pull/13,3054b1c14ba79e67394915d27d5e5d766f3b3db0,f39a51f3fa3259bd4cabd16fe9c025fe4dbbea1f,3c11b36e5054ec09cdc29ec3d0e9273406163498,,False,True,,,True,10,108,1126,2,,,,False,10,False