Added latest data

benedikt-schesch · May 24, 2024 · 56fd0c2 · 56fd0c2
1 parent c476491
commit 56fd0c2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/results/combined/merges_analyzer_histograms.pdf b/results/combined/merges_analyzer_histograms.pdf
diff --git a/src/python/utils/delete_intellimerge_keys_from_cache.py b/src/python/utils/delete_intellimerge_keys_from_cache.py
@@ -47,7 +47,7 @@ def delete_import_keys(directory):
 
 def main():
     """Main function."""
-    directory = "cache-small"
+    directory = "cache"
     potential_deletions = count_import_keys(directory)
     print(f"Potential deletions: {potential_deletions}")
     confirm = input("Do you want to proceed with deleting these keys? (yes/no): ")

diff --git a/test/check_equal_csv.py b/test/check_equal_csv.py
@@ -44,7 +44,12 @@ def remove_run_time(df):
         goal_df = remove_run_time(goal_df)
         actual_df = remove_run_time(actual_df)
 
-        if not goal_df.equals(actual_df):
+        for col in goal_df.columns:
+            if "intellimerge" in col:
+                continue
+            # Check if the columns are equal
+            if actual_df[col].equals(goal_df[col]):
+                continue
             # Print the differences.
             print(os.system(f"diff {goal_folder/goal_file} {actual_file}"))
             # Now print details, after diffs so it is not obscured by the diff output.