From 56fd0c282859a9c468bbb0c61a7fc2a5a6083f3f Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Thu, 23 May 2024 21:57:09 -0700 Subject: [PATCH] Added latest data --- .../combined/merges_analyzer_histograms.pdf | Bin 213437 -> 213437 bytes .../delete_intellimerge_keys_from_cache.py | 2 +- test/check_equal_csv.py | 7 ++++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/results/combined/merges_analyzer_histograms.pdf b/results/combined/merges_analyzer_histograms.pdf index a3ed35b8682c6bf15bd9350e157dc382bd2bc6cd..d44b2741b747decd8010e42c50e170fa9d6056a5 100644 GIT binary patch delta 29 kcmdnn%)7Ulx1oixg=q^jlMTDEk)f%niNSVG8|E#n0F8JEJ^%m! delta 29 kcmdnn%)7Ulx1oixg=q^jlMTC}fu(_|fys7G8|E#n0F7t}Jpcdz diff --git a/src/python/utils/delete_intellimerge_keys_from_cache.py b/src/python/utils/delete_intellimerge_keys_from_cache.py index dba10c3318..341f8558ba 100644 --- 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 index 6bb4a7fd69..64318e0957 100755 --- 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.