details: http://www.bx.psu.edu/hg/galaxy/rev/144abb3b14bc changeset: 2983:144abb3b14bc user: Greg Von Kuster <greg@bx.psu.edu> date: Sat Nov 07 10:30:20 2009 -0500 description: Change fuctional test output test files for aggregate scores tool due to upgrade of numpy - upped the tool version. diffstat: test-data/aggregate_binned_scores_in_intervals.out | 16 ++++++++-------- test-data/aggregate_binned_scores_in_intervals3.out | 2 +- tools/stats/aggregate_binned_scores_in_intervals.xml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diffs (40 lines): diff -r 678e8507a90d -r 144abb3b14bc test-data/aggregate_binned_scores_in_intervals.out --- a/test-data/aggregate_binned_scores_in_intervals.out Fri Nov 06 19:11:30 2009 -0500 +++ b/test-data/aggregate_binned_scores_in_intervals.out Sat Nov 07 10:30:20 2009 -0500 @@ -1,10 +1,10 @@ -chr7 115444712 115444739 CCDS5763.1_cds_0_0_chr7_115444713_f 0 + 0.842925922462 0.0590000003576 1.0 -chr7 115468538 115468624 CCDS5763.1_cds_1_0_chr7_115468539_f 0 + 0.999697674152 0.981999993324 1.0 -chr7 115483024 115483277 CCDS5763.1_cds_2_0_chr7_115483025_f 0 + 0.99544268823 0.837000012398 1.0 +chr7 115444712 115444739 CCDS5763.1_cds_0_0_chr7_115444713_f 0 + 0.842925922462 0.059 1.0 +chr7 115468538 115468624 CCDS5763.1_cds_1_0_chr7_115468539_f 0 + 0.999697674152 0.982 1.0 +chr7 115483024 115483277 CCDS5763.1_cds_2_0_chr7_115483025_f 0 + 0.99544268823 0.837 1.0 chr7 115484165 115484501 CCDS5763.1_cds_3_0_chr7_115484166_f 0 + 0.750726190992 0.0 1.0 -chr7 115485764 115485980 CCDS5763.1_cds_4_0_chr7_115485765_f 0 + 0.984907407314 0.354000002146 1.0 -chr7 115486322 115486481 CCDS5763.1_cds_5_0_chr7_115486323_f 0 + 0.994924527669 0.739000022411 1.0 -chr7 115491298 115491487 CCDS5763.1_cds_6_0_chr7_115491299_f 0 + 0.946195768256 0.00700000021607 1.0 -chr7 115468538 115468624 CCDS5764.1_cds_0_0_chr7_115468539_f 0 + 0.999697674152 0.981999993324 1.0 -chr7 115483024 115483277 CCDS5764.1_cds_1_0_chr7_115483025_f 0 + 0.99544268823 0.837000012398 1.0 +chr7 115485764 115485980 CCDS5763.1_cds_4_0_chr7_115485765_f 0 + 0.984907407314 0.354 1.0 +chr7 115486322 115486481 CCDS5763.1_cds_5_0_chr7_115486323_f 0 + 0.994924527669 0.739 1.0 +chr7 115491298 115491487 CCDS5763.1_cds_6_0_chr7_115491299_f 0 + 0.946195768256 0.007 1.0 +chr7 115468538 115468624 CCDS5764.1_cds_0_0_chr7_115468539_f 0 + 0.999697674152 0.982 1.0 +chr7 115483024 115483277 CCDS5764.1_cds_1_0_chr7_115483025_f 0 + 0.99544268823 0.837 1.0 chr7 115484165 115484501 CCDS5764.1_cds_2_0_chr7_115484166_f 0 + 0.750726190992 0.0 1.0 diff -r 678e8507a90d -r 144abb3b14bc test-data/aggregate_binned_scores_in_intervals3.out --- a/test-data/aggregate_binned_scores_in_intervals3.out Fri Nov 06 19:11:30 2009 -0500 +++ b/test-data/aggregate_binned_scores_in_intervals3.out Sat Nov 07 10:30:20 2009 -0500 @@ -1,4 +1,4 @@ -chr7 115444712 115444739 CCDS5763.1_cds_0_0_chr7_115444713_f 0 + 0.904053741031 0.559054970741 1.0 +chr7 115444712 115444739 CCDS5763.1_cds_0_0_chr7_115444713_f 0 + 0.904053741031 0.559055 1.0 chr7 115468538 115468624 CCDS5763.1_cds_1_0_chr7_115468539_f 0 + nan nan nan chr7 115483024 115483277 CCDS5763.1_cds_2_0_chr7_115483025_f 0 + nan nan nan chr7 115484165 115484501 CCDS5763.1_cds_3_0_chr7_115484166_f 0 + nan nan nan diff -r 678e8507a90d -r 144abb3b14bc tools/stats/aggregate_binned_scores_in_intervals.xml --- a/tools/stats/aggregate_binned_scores_in_intervals.xml Fri Nov 06 19:11:30 2009 -0500 +++ b/tools/stats/aggregate_binned_scores_in_intervals.xml Sat Nov 07 10:30:20 2009 -0500 @@ -1,4 +1,4 @@ -<tool id="aggregate_scores_in_intervals2" description="such as phastCons, GERP, binCons, and others for a set of genomic intervals" name="Aggregate datapoints" version="1.1.1"> +<tool id="aggregate_scores_in_intervals2" description="such as phastCons, GERP, binCons, and others for a set of genomic intervals" name="Aggregate datapoints" version="1.1.2"> <description>Appends the average, min, max of datapoints per interval</description> <command interpreter="python"> #if $score_source_type.score_source == "user":#aggregate_scores_in_intervals.py $score_source_type.input2 $input1 ${input1.metadata.chromCol} ${input1.metadata.startCol} ${input1.metadata.endCol} $out_file1 --chrom_buffer=3