forked from clawpack/riemann
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request clawpack#39 from rjleveque/rjl
Mostly improve regression tests. And close some data files after writing
- Loading branch information
Showing
7 changed files
with
171 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| """ | ||
| Compare the results of run_regression_tests.py with archived results, if they | ||
| can be found using clawpack.clawutil.fetch_regression_data. | ||
| """ | ||
|
|
||
| from clawpack.clawutil.fetch_regression_data import fetch_regression_data | ||
| from clawpack.clawutil.chardiff import chardiff_dir | ||
| from clawpack.clawutil.imagediff import imagediff_dir | ||
| import os,sys,glob | ||
| from numpy import alltrue | ||
|
|
||
|
|
||
| def compare_regression_tests(regression_dir="_regression_tests", \ | ||
| regression_output_files = 'all', \ | ||
| regression_plot_files = 'all', \ | ||
| verbose=False): | ||
|
|
||
| try: | ||
| archived_dir, tar_file = fetch_regression_data(regression_dir) | ||
| archived_dir = os.path.abspath(archived_dir) | ||
| os.system("rm %s" % tar_file) | ||
| except: | ||
| print "*** Error retrieving regression results" | ||
| sys.exit() | ||
|
|
||
|
|
||
| try: | ||
| os.chdir(regression_dir) | ||
| except: | ||
| print "*** Cannot cd to ",regression_dir | ||
| sys.exit() | ||
|
|
||
| index_file = 'index.html' | ||
| hfile = open(index_file,'w') | ||
| index_file = os.path.abspath(index_file) | ||
|
|
||
| hfile.write("""<html> | ||
| <h1>Regression test results</h1> | ||
| <h2>Comparison of output files:</h2> | ||
| Pass or Fail based only on files %s | ||
| <ul> | ||
| """ % regression_output_files) | ||
|
|
||
| outdirs = glob.glob('_output*') | ||
|
|
||
| if outdirs == []: | ||
| print "*** No output directories found" | ||
| else: | ||
| if glob.glob('_chardiffs*') != []: | ||
| ans = raw_input("Ok to clobber all _chardiffs directories? ") | ||
| if ans=='y': | ||
| os.system("rm -rf _chardiffs*") | ||
|
|
||
| output_ok_dirs = [] | ||
|
|
||
| for outdir in outdirs: | ||
| outdir_archived = archived_dir + "/" + outdir | ||
| if not os.path.exists(outdir_archived): | ||
| print "*** Cannot find directory ",outdir_archived | ||
| print "*** will not compare to ",outdir | ||
| else: | ||
| diffdir = "_chardiffs" + outdir | ||
| regression_ok = chardiff_dir(outdir_archived, outdir, dir3=diffdir, \ | ||
| regression_test_files=regression_output_files, \ | ||
| verbose=verbose) | ||
| output_ok_dirs.append(regression_ok) | ||
| hfile.write('<li> <a href="%s/_DiffIndex.html">%s</a>' % (diffdir,outdir)) | ||
| if regression_ok: | ||
| hfile.write(' <font color="green">Pass</font>\n') | ||
| else: | ||
| hfile.write(' <font color="red">Fail</font>\n') | ||
|
|
||
| hfile.write("""</ul> | ||
| <h2>Comparison of plot files: </h2> | ||
| Pass or Fail based only on files %s | ||
| <ul> | ||
| """ % regression_plot_files) | ||
|
|
||
| plot_ok_dirs = [] | ||
|
|
||
| plotdirs = glob.glob('_plots*') | ||
| if plotdirs == []: | ||
| print "*** No plots directories found" | ||
| else: | ||
| if glob.glob('_imagediffs*') != []: | ||
| ans = raw_input("Ok to clobber all _imagediffs directories? ") | ||
| if ans=='y': | ||
| os.system("rm -rf _imagediffs*") | ||
|
|
||
| for plotdir in plotdirs: | ||
| plotdir_archived = archived_dir + "/" + plotdir | ||
| if not os.path.exists(plotdir_archived): | ||
| print "*** Cannot find directory ",plotdir_archived | ||
| print "*** will not compare to ",plotdir | ||
| else: | ||
| diffdir = "_imagediffs" + plotdir | ||
| regression_ok = imagediff_dir(plotdir_archived, plotdir, dir3=diffdir, \ | ||
| regression_test_files=regression_plot_files, \ | ||
| verbose=verbose) | ||
| plot_ok_dirs.append(regression_ok) | ||
| hfile.write('<li> <a href="%s/_ImageDiffIndex.html">%s</a>' % (diffdir,plotdir)) | ||
| if regression_ok: | ||
| hfile.write(' <font color="green">Pass</font>\n') | ||
| else: | ||
| hfile.write(' <font color="red">Fail</font>\n') | ||
|
|
||
| hfile.write("""</ul> | ||
| </html> | ||
| """) | ||
| hfile.close() | ||
|
|
||
| print "\nTo see resulting diffs, open \n %s\n" % index_file | ||
|
|
||
| fail_dirs = \ | ||
| [outdirs[i] for i in range(len(outdirs)) if not output_ok_dirs[i]] + \ | ||
| [plotdirs[i] for i in range(len(plotdirs)) if not plot_ok_dirs[i]] | ||
|
|
||
| regression_ok = (fail_dirs == []) | ||
| if not regression_ok: | ||
| print "*** Regression files do not match in directories: ", fail_dirs | ||
|
|
||
| return regression_ok | ||
|
|
||
| if __name__=="__main__": | ||
|
|
||
| compare_regression_tests(*sys.argv[1:]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters