opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes for compare, Group and filter tools.

Browse Source
This commit is contained in:
Guruprasad Anada
2008-12-02 11:41:25 -05:00
parent ffa719a9ab
commit b88df9bdc3
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/filters/compare.xml
+6 -2
View File
@@ -3,9 +3,13 @@
<command interpreter="python">joinWrapper.py $input1 $input2 $field1 $field2 $mode $out_file1</command>
<inputs>
<param format="tabular" name="input1" type="data" label="Compare"/>
<param name="field1" label="Using column" type="data_column" data_ref="input1" />
<param name="field1" label="Using column" type="data_column" data_ref="input1">
<validator type="no_options" message="Invalid column choice. Please try again after editing metadata of your input dataset by clicking on the pencil icon next to it."/>
</param>
<param format="tabular" name="input2" type="data" label="against" />
<param name="field2" label="and column" type="data_column" data_ref="input2" />
<param name="field2" label="and column" type="data_column" data_ref="input2">
<validator type="no_options" message="Invalid column choice. Please try again after editing metadata of your input dataset by clicking on the pencil icon next to it."/>
</param>
<param name="mode" type="select" label="To find" help="See examples below for explanation of these options">
<option value="N">Matching rows of 1st query</option>
<option value="V">Non Matching rows of 1st query</option>
tools/stats/filtering.py
+1
View File
@@ -25,6 +25,7 @@ out_fname = sys.argv[2]
cond_text = sys.argv[3]
try:
in_columns = int( sys.argv[4] )
assert sys.argv[5] #check to see that the column types varaible isn't null
in_column_types = sys.argv[5].split( ',' )
except:
stop_err( "Data does not appear to be tabular. This tool can only be used with tab-delimited data." )
tools/stats/grouping.py
+2 -2
View File
@@ -128,7 +128,7 @@ def main():
if op not in ['c','length','unique','random']:
for j, elem in enumerate( prev_vals[i] ):
prev_vals[i][j] = float( elem )
rout = "%f" %( eval( rfunc )( prev_vals[i] ))
rout = "%g" %( eval( rfunc )( prev_vals[i] ))
if rounds[i] == 'yes':
rout = int(round(float(rout)))
else:
@@ -179,7 +179,7 @@ def main():
if op not in ['c','length','unique','random']:
for j, elem in enumerate( prev_vals[i] ):
prev_vals[i][j] = float( elem )
rout = '%f' %( eval( rfunc )( prev_vals[i] ))
rout = '%g' %( eval( rfunc )( prev_vals[i] ))
if rounds[i] == 'yes':
rout = int(round(float(rout)))
else: