Skip to content

Commit

Permalink
debug statements
Browse files Browse the repository at this point in the history
  • Loading branch information
aspeake committed Nov 19, 2024
1 parent 098f07b commit 1e23617
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,16 @@ jobs:
branch_name="${{ github.ref }}"
git pull origin $branch_name
if [[ $(git diff --quiet ./tests/integration_testing/results/agg_results.json ./tests/integration_testing/results/ecm_results.json) ]]; then
echo "comparing CI results"
mkdir tests/integration_testing/base_results
git show origin/ci_outputs:tests/integration_testing/results/agg_results.json > tests/integration_testing/base_results/agg_results.json
git show origin/ci_outputs:tests/integration_testing/results/ecm_results.json > tests/integration_testing/base_results/ecm_results.json
git show origin/ci_outputs:tests/integration_testing/results/plots/tech_potential/Summary_Data-TP.xlsx > tests/integration_testing/base_results/Summary_Data-TP.xlsx
git show origin/ci_outputs:tests/integration_testing/results/plots/max_adopt_potential/Summary_Data-MAP.xlsx > tests/integration_testing/base_results/Summary_Data-MAP.xlsx
python tests/integration_testing/compare_results.py --base-dir tests/integration_testing/base_results --new-dir tests/integration_testing/results
else
echo "No chages to results files, skipping results comparison"
fi
- name: Upload artifacts
uses: actions/upload-artifact@v3
Expand Down
6 changes: 5 additions & 1 deletion tests/integration_testing/compare_results.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,15 @@ def write_dict_key_report(self, diff_report, output_path):
if diff_report.empty:
return
diff_report.to_csv(output_path, index=False)
print(f"Wrote dictionary key report to {output_path}")

def write_dict_value_report(self, diff_report, output_path):
df = pd.DataFrame(columns=["Results path", "Percent difference"],
data=list(zip(diff_report.keys(), diff_report.values())))
if df.empty:
return
df.to_csv(output_path, index=False)
print(f"Wrote dictionary value report to {output_path}")

def compare_jsons(self, json1_path, json2_path, output_dir=True):
"""Compare two jsons and report differences in keys and in values
Expand Down Expand Up @@ -145,7 +147,9 @@ def compare_summary_reports(self, report1_path, report2_path, output_dir=None):
diff = ((report2 - report1)/report1).round(2)
if output_dir is None:
output_dir = report2_path.parent
diff.to_csv(output_dir / f"{report2_path.stem}_percent_diffs.csv")
output_path = output_dir / f"{report2_path.stem}_percent_diffs.csv"
diff.to_csv(output_path)
print(f"Wrote Summary_Data percent difference report to {output_path}")


def main():
Expand Down

0 comments on commit 1e23617

Please sign in to comment.