- galaxy-dev - lists.galaxyproject.org

[hg] galaxy 3466: Fix SGE bug reported in issue #281
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/1d11aec88053 changeset: 3466:1d11aec88053 user: Nate Coraor <nate(a)bx.psu.edu> date: Tue Mar 02 13:20:47 2010 -0500 description: Fix SGE bug reported in issue #281 diffstat: lib/galaxy/jobs/runners/sge.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 0967cea77985 -r 1d11aec88053 lib/galaxy/jobs/runners/sge.py --- a/lib/galaxy/jobs/runners/sge.py Tue Mar 02 12:32:44 2010 -0500 +++ b/lib/galaxy/jobs/runners/sge.py Tue Mar 02 13:20:47 2010 -0500 @@ -337,6 +337,6 @@ self.queue.put( sge_job_state ) elif job.state == model.Job.states.QUEUED: log.debug( "(%s/%s) is still in SGE queued state, adding to the SGE queue" % ( job.id, job.job_runner_external_id ) ) - sge_job_state.old_state = DRMAA.Session.QUEUED + sge_job_state.old_state = DRMAA.Session.QUEUED_ACTIVE sge_job_state.running = False self.queue.put( sge_job_state )

1 0

[hg] galaxy 3465: Fix comment and indentation.
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/0967cea77985 changeset: 3465:0967cea77985 user: jeremy goecks <jeremy.goecks(a)emory.edu> date: Tue Mar 02 12:32:44 2010 -0500 description: Fix comment and indentation. diffstat: templates/workflow/display.mako | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r 69db124587e3 -r 0967cea77985 templates/workflow/display.mako --- a/templates/workflow/display.mako Tue Mar 02 12:10:43 2010 -0500 +++ b/templates/workflow/display.mako Tue Mar 02 12:32:44 2010 -0500 @@ -86,9 +86,9 @@ <%def name="render_item( workflow, steps )"> <% - # HACK: Rendering workflow steps requires that trans have a history; however, if a user's first visit to Galaxy is here, he won't have a history - # and an error will occur. To prevent this error, make sure user has a history. - trans.get_history( create=True ) + # HACK: Rendering workflow steps requires that trans have a history; however, if it's user's first visit to Galaxy is here, he won't have a history + # and an error will occur. To prevent this error, make sure user has a history. + trans.get_history( create=True ) %> <table class="annotated-item"> <tr><th>Step</th><th class="annotation">Description/Notes</th></tr>

1 0

[hg] galaxy 3464: I am having a bad day
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/69db124587e3 changeset: 3464:69db124587e3 user: Nate Coraor <nate(a)bx.psu.edu> date: Tue Mar 02 12:10:43 2010 -0500 description: I am having a bad day diffstat: scripts/scramble/scripts/pbs_python.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 5f6b53b08623 -r 69db124587e3 scripts/scramble/scripts/pbs_python.py --- a/scripts/scramble/scripts/pbs_python.py Tue Mar 02 12:08:01 2010 -0500 +++ b/scripts/scramble/scripts/pbs_python.py Tue Mar 02 12:10:43 2010 -0500 @@ -29,8 +29,8 @@ i = open( 'setup.py.orig', 'r' ) o = open( 'setup.py', 'w' ) for line in i.readlines(): - if line == " version = '2.9.0',\n": - line = " version = '2.9.4',\n" + if line == " version = '2.9.0',\n": + line = " version = '2.9.4',\n" print >>o, line, i.close() o.close()

1 0

[hg] galaxy 3463: pbs_python 2.9.8 doesn't work
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/5f6b53b08623 changeset: 3463:5f6b53b08623 user: Nate Coraor <nate(a)bx.psu.edu> date: Tue Mar 02 12:08:01 2010 -0500 description: pbs_python 2.9.8 doesn't work diffstat: eggs.ini | 2 +- scripts/scramble/scripts/pbs_python.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diffs (35 lines): diff -r db7ee1dc19c4 -r 5f6b53b08623 eggs.ini --- a/eggs.ini Tue Mar 02 11:52:16 2010 -0500 +++ b/eggs.ini Tue Mar 02 12:08:01 2010 -0500 @@ -16,7 +16,7 @@ Cheetah = 2.2.2 DRMAA_python = 0.2 MySQL_python = 1.2.3c1 -pbs_python = 2.9.8 +pbs_python = 2.9.4 psycopg2 = 2.0.6 pycrypto = 2.0.1 pysam = 0.1.1 diff -r db7ee1dc19c4 -r 5f6b53b08623 scripts/scramble/scripts/pbs_python.py --- a/scripts/scramble/scripts/pbs_python.py Tue Mar 02 11:52:16 2010 -0500 +++ b/scripts/scramble/scripts/pbs_python.py Tue Mar 02 12:08:01 2010 -0500 @@ -22,6 +22,19 @@ # run the config script run( 'sh configure --with-pbsdir=%s' % os.environ['LIBTORQUE_DIR'], os.getcwd(), 'Running pbs_python configure script' ) +# version string in 2.9.4 setup.py is wrong +print "scramble(): Patching setup.py" +if not os.path.exists( 'setup.py.orig' ): + shutil.copyfile( 'setup.py', 'setup.py.orig' ) + i = open( 'setup.py.orig', 'r' ) + o = open( 'setup.py', 'w' ) + for line in i.readlines(): + if line == " version = '2.9.0',\n": + line = " version = '2.9.4',\n" + print >>o, line, +i.close() +o.close() + # reset args for distutils me = sys.argv[0] sys.argv = [ me ]

1 0

[hg] galaxy 3462: Scratch that, just upgrade pbs_python instead
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/db7ee1dc19c4 changeset: 3462:db7ee1dc19c4 user: Nate Coraor <nate(a)bx.psu.edu> date: Tue Mar 02 11:52:16 2010 -0500 description: Scratch that, just upgrade pbs_python instead diffstat: eggs.ini | 2 +- lib/galaxy/eggs/scramble.py | 2 +- scripts/scramble/patches/pbs_python/setup.py | 64 ---------------------------- scripts/scramble/scripts/pbs_python.py | 3 - 4 files changed, 2 insertions(+), 69 deletions(-) diffs (105 lines): diff -r cb10a08016eb -r db7ee1dc19c4 eggs.ini --- a/eggs.ini Tue Mar 02 11:37:55 2010 -0500 +++ b/eggs.ini Tue Mar 02 11:52:16 2010 -0500 @@ -16,7 +16,7 @@ Cheetah = 2.2.2 DRMAA_python = 0.2 MySQL_python = 1.2.3c1 -pbs_python = 2.9.4 +pbs_python = 2.9.8 psycopg2 = 2.0.6 pycrypto = 2.0.1 pysam = 0.1.1 diff -r cb10a08016eb -r db7ee1dc19c4 lib/galaxy/eggs/scramble.py --- a/lib/galaxy/eggs/scramble.py Tue Mar 02 11:37:55 2010 -0500 +++ b/lib/galaxy/eggs/scramble.py Tue Mar 02 11:52:16 2010 -0500 @@ -56,7 +56,7 @@ self.run_scramble_script() new_egg = os.path.join( self.buildpath, 'dist', os.path.basename( self.distribution.location ) ) if not os.path.exists( new_egg ): - raise ScrambleFailure( self, "%s(): Egg build for %s did not appear to fail, but no egg found to copy from expected path:\n %s" % ( sys._getframe().f_code.co_name, self.name, egg_name ) ) + raise ScrambleFailure( self, "%s(): Egg build for %s did not appear to fail, but no egg found to copy from expected path:\n %s" % ( sys._getframe().f_code.co_name, self.name, new_egg ) ) shutil.copyfile( new_egg, self.distribution.location ) log.warning( "%s(): Copied egg to:" % sys._getframe().f_code.co_name ) log.warning( " %s" % self.distribution.location ) diff -r cb10a08016eb -r db7ee1dc19c4 scripts/scramble/patches/pbs_python/setup.py --- a/scripts/scramble/patches/pbs_python/setup.py Tue Mar 02 11:37:55 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -#!/usr/bin/env python -# -# $Id: setup.py 434 2005-11-04 15:02:07Z bas $ -# -# set ts=4 -# - -import sys -import os - -from distutils.core import setup, Extension - -# Try some usefule defaults if not set -# -PBS_LIB_DIR='/opt/local/lib' -NEW_BUILD_SYSTEM=1 - -if not PBS_LIB_DIR: - for dir in ['/usr/lib', '/usr/local/lib', '/opt/pbs/usr/lib', '/usr/lib/torque', '/opt/pbs/lib', '/opt/torque/lib' ]: - dummy_new = os.path.join(dir, 'libtorque.so') - dummy_old = os.path.join(dir, 'libpbs.a') - if os.path.exists(dummy_new): - PBS_LIB_DIR=dir - break - elif os.path.exists(dummy_old): - PBS_LIB_DIR=dir - NEW_BUILD_SYSTEM=0 - break - -if not PBS_LIB_DIR: - print 'Please specify where the PBS libraries are!!' - print 'edit setup.py and fill in the PBS_LIB_DIR variable' - sys.exit(1) - -# Test if we have all the libs: -# -if NEW_BUILD_SYSTEM: - LIBS = ['torque'] -else: - LIBS = ['log', 'net', 'pbs'] - for lib in LIBS: - library = 'lib%s.a' %(lib) - dummy = os.path.join(PBS_LIB_DIR, library) - if not os.path.exists(dummy): - print 'You need to install "%s" in %s' %(library, PBS_LIB_DIR) - sys.exit(1) - -setup ( name = 'pbs_python', - version = '2.9.4', - description = 'openpbs/torque python interface', - author = 'Bas van der Vlies', - author_email = 'basv(a)sara.nl', - url = 'http://www.sara.nl/index_eng.html', - - extra_path = 'pbs', - package_dir = { '' : 'src' }, - py_modules = [ 'pbs', 'PBSQuery' ], - - ext_modules = [ - Extension( '_pbs', ['src/pbs_wrap.c'], - library_dirs = [ PBS_LIB_DIR ], - libraries = LIBS) - ] -) diff -r cb10a08016eb -r db7ee1dc19c4 scripts/scramble/scripts/pbs_python.py --- a/scripts/scramble/scripts/pbs_python.py Tue Mar 02 11:37:55 2010 -0500 +++ b/scripts/scramble/scripts/pbs_python.py Tue Mar 02 11:52:16 2010 -0500 @@ -19,9 +19,6 @@ # the build process doesn't set an rpath for libtorque os.environ['LD_RUN_PATH'] = os.environ['LIBTORQUE_DIR'] -# patch setup.py -shutil.copy( os.path.join( patches, 'pbs_python', 'setup.py' ), 'setup.py' ) - # run the config script run( 'sh configure --with-pbsdir=%s' % os.environ['LIBTORQUE_DIR'], os.getcwd(), 'Running pbs_python configure script' )

1 0

[hg] galaxy 3461: Use the old method for fixing pbs_python's ver...
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/cb10a08016eb changeset: 3461:cb10a08016eb user: Nate Coraor <nate(a)bx.psu.edu> date: Tue Mar 02 11:37:55 2010 -0500 description: Use the old method for fixing pbs_python's version diffstat: scripts/scramble/patches/pbs_python/setup.py | 64 ++++++++++++++++++++++++++++ scripts/scramble/scripts/pbs_python.py | 7 +- 2 files changed, 68 insertions(+), 3 deletions(-) diffs (102 lines): diff -r 182a7947e63a -r cb10a08016eb scripts/scramble/patches/pbs_python/setup.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/scramble/patches/pbs_python/setup.py Tue Mar 02 11:37:55 2010 -0500 @@ -0,0 +1,64 @@ +#!/usr/bin/env python +# +# $Id: setup.py 434 2005-11-04 15:02:07Z bas $ +# +# set ts=4 +# + +import sys +import os + +from distutils.core import setup, Extension + +# Try some usefule defaults if not set +# +PBS_LIB_DIR='/opt/local/lib' +NEW_BUILD_SYSTEM=1 + +if not PBS_LIB_DIR: + for dir in ['/usr/lib', '/usr/local/lib', '/opt/pbs/usr/lib', '/usr/lib/torque', '/opt/pbs/lib', '/opt/torque/lib' ]: + dummy_new = os.path.join(dir, 'libtorque.so') + dummy_old = os.path.join(dir, 'libpbs.a') + if os.path.exists(dummy_new): + PBS_LIB_DIR=dir + break + elif os.path.exists(dummy_old): + PBS_LIB_DIR=dir + NEW_BUILD_SYSTEM=0 + break + +if not PBS_LIB_DIR: + print 'Please specify where the PBS libraries are!!' + print 'edit setup.py and fill in the PBS_LIB_DIR variable' + sys.exit(1) + +# Test if we have all the libs: +# +if NEW_BUILD_SYSTEM: + LIBS = ['torque'] +else: + LIBS = ['log', 'net', 'pbs'] + for lib in LIBS: + library = 'lib%s.a' %(lib) + dummy = os.path.join(PBS_LIB_DIR, library) + if not os.path.exists(dummy): + print 'You need to install "%s" in %s' %(library, PBS_LIB_DIR) + sys.exit(1) + +setup ( name = 'pbs_python', + version = '2.9.4', + description = 'openpbs/torque python interface', + author = 'Bas van der Vlies', + author_email = 'basv(a)sara.nl', + url = 'http://www.sara.nl/index_eng.html', + + extra_path = 'pbs', + package_dir = { '' : 'src' }, + py_modules = [ 'pbs', 'PBSQuery' ], + + ext_modules = [ + Extension( '_pbs', ['src/pbs_wrap.c'], + library_dirs = [ PBS_LIB_DIR ], + libraries = LIBS) + ] +) diff -r 182a7947e63a -r cb10a08016eb scripts/scramble/scripts/pbs_python.py --- a/scripts/scramble/scripts/pbs_python.py Tue Mar 02 11:17:05 2010 -0500 +++ b/scripts/scramble/scripts/pbs_python.py Tue Mar 02 11:37:55 2010 -0500 @@ -1,4 +1,4 @@ -import os, sys +import os, sys, shutil if "LIBTORQUE_DIR" not in os.environ: print "main(): Please set LIBTORQUE_DIR to the path of the" @@ -13,13 +13,15 @@ sys.path.append( os.path.join( '..', '..', '..', 'lib' ) ) from scramble_lib import * -ver = get_ver() # get the version tag = get_tag() # get the tag clean() # clean up any existing stuff (could happen if you run scramble.py by hand) # the build process doesn't set an rpath for libtorque os.environ['LD_RUN_PATH'] = os.environ['LIBTORQUE_DIR'] +# patch setup.py +shutil.copy( os.path.join( patches, 'pbs_python', 'setup.py' ), 'setup.py' ) + # run the config script run( 'sh configure --with-pbsdir=%s' % os.environ['LIBTORQUE_DIR'], os.getcwd(), 'Running pbs_python configure script' ) @@ -27,7 +29,6 @@ me = sys.argv[0] sys.argv = [ me ] sys.argv.append( "egg_info" ) -sys.argv.append( "--version=%s" % ver ) if tag is not None: sys.argv.append( "--tag-build=%s" %tag ) # svn revision (if any) is handled directly in tag-build

1 0

[hg] galaxy 3460: Fix bug that prevents new Galaxy visitors from...
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/182a7947e63a changeset: 3460:182a7947e63a user: jeremy goecks <jeremy.goecks(a)emory.edu> date: Tue Mar 02 11:17:05 2010 -0500 description: Fix bug that prevents new Galaxy visitors from viewing an accessible/published workflow. Viewing an accessible/published workflow requires a history because rendering parameters require a history, so a history is now created for visitors that do not already have one. diffstat: templates/workflow/display.mako | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r 8bd2ace6c92d -r 182a7947e63a templates/workflow/display.mako --- a/templates/workflow/display.mako Tue Mar 02 10:47:23 2010 -0500 +++ b/templates/workflow/display.mako Tue Mar 02 11:17:05 2010 -0500 @@ -85,6 +85,11 @@ </%def> <%def name="render_item( workflow, steps )"> + <% + # HACK: Rendering workflow steps requires that trans have a history; however, if a user's first visit to Galaxy is here, he won't have a history + # and an error will occur. To prevent this error, make sure user has a history. + trans.get_history( create=True ) + %> <table class="annotated-item"> <tr><th>Step</th><th class="annotation">Description/Notes</th></tr> %for i, step in enumerate( steps ):

1 0

[hg] galaxy 3459: Change color space FASTA file type from fastqs...
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/8bd2ace6c92d changeset: 3459:8bd2ace6c92d user: Dan Blankenberg <dan(a)bx.psu.edu> date: Tue Mar 02 10:47:23 2010 -0500 description: Change color space FASTA file type from fastqsolid to fastqcssanger. Cripple accepted tool input formats for many of the FASTQ tools to only allow only fastqsanger and fastqcssanger to be used. diffstat: datatypes_conf.xml.sample | 2 +- lib/galaxy/datatypes/sequence.py | 6 +- lib/galaxy_utils/sequence/fasta.py | 2 +- lib/galaxy_utils/sequence/fastq.py | 6 +- test-data/combine_phiX_out_1.fastqcssanger | 576 +++++++++++++ test-data/combine_phiX_out_1.fastqsolid | 576 ------------- test-data/combine_phiX_out_2.fastqcssanger | 576 +++++++++++++ test-data/combine_phiX_out_2.fastqsolid | 576 ------------- test-data/fastq_combiner_no_qual_ascii_out_1.fastqcssanger | 576 +++++++++++++ test-data/fastq_combiner_no_qual_ascii_out_1.fastqsolid | 576 ------------- test-data/illumina_full_range_as_cssanger.fastqcssanger | 8 + test-data/illumina_full_range_as_solid.fastqsolid | 8 - test-data/sanger_full_range_as_cssanger.fastqcssanger | 8 + test-data/sanger_full_range_as_solid.fastqsolid | 8 - test-data/solexa_full_range_as_cssanger.fastqcssanger | 8 + test-data/solexa_full_range_as_solid.fastqsolid | 8 - tool_conf.xml.sample | 19 +- tools/fastq/fastq_combiner.py | 2 +- tools/fastq/fastq_combiner.xml | 15 +- tools/fastq/fastq_filter.xml | 32 +- tools/fastq/fastq_groomer.xml | 50 +- tools/fastq/fastq_manipulation.xml | 19 +- tools/fastq/fastq_paired_end_joiner.xml | 4 +- tools/fastq/fastq_paired_end_splitter.xml | 2 +- tools/fastq/fastq_stats.xml | 12 +- tools/fastq/fastq_to_fasta.xml | 2 +- tools/fastq/fastq_trimmer.xml | 12 +- 27 files changed, 1848 insertions(+), 1841 deletions(-) diffs (truncated from 4157 to 3000 lines): diff -r 19d8ba4269ba -r 8bd2ace6c92d datatypes_conf.xml.sample --- a/datatypes_conf.xml.sample Tue Mar 02 09:51:05 2010 -0500 +++ b/datatypes_conf.xml.sample Tue Mar 02 10:47:23 2010 -0500 @@ -35,7 +35,7 @@ <datatype extension="fastq" type="galaxy.datatypes.sequence:Fastq" display_in_upload="true"/> <datatype extension="fastqsanger" type="galaxy.datatypes.sequence:FastqSanger" display_in_upload="true"/> <datatype extension="fastqsolexa" type="galaxy.datatypes.sequence:FastqSolexa" display_in_upload="true"/> - <datatype extension="fastqsolid" type="galaxy.datatypes.sequence:FastqSolid" display_in_upload="true"/> + <datatype extension="fastqcssanger" type="galaxy.datatypes.sequence:FastqCSSanger" display_in_upload="true"/> <datatype extension="fastqillumina" type="galaxy.datatypes.sequence:FastqIllumina" display_in_upload="true"/> <datatype extension="genetrack" type="galaxy.datatypes.tracks:GeneTrack">  diff -r 19d8ba4269ba -r 8bd2ace6c92d lib/galaxy/datatypes/sequence.py --- a/lib/galaxy/datatypes/sequence.py Tue Mar 02 09:51:05 2010 -0500 +++ b/lib/galaxy/datatypes/sequence.py Tue Mar 02 10:47:23 2010 -0500 @@ -224,9 +224,9 @@ """Class representing a FASTQ sequence ( the Illumina 1.3+ variant )""" file_ext = "fastqillumina" -class FastqSolid( Fastq ): - """Class representing a FASTQ sequence ( the SOLiD (color space) variant )""" - file_ext = "fastqsolid" +class FastqCSSanger( Fastq ): + """Class representing a Color Space FASTQ sequence ( e.g a SOLiD variant )""" + file_ext = "fastqcssanger" try: from galaxy import eggs diff -r 19d8ba4269ba -r 8bd2ace6c92d lib/galaxy_utils/sequence/fasta.py --- a/lib/galaxy_utils/sequence/fasta.py Tue Mar 02 09:51:05 2010 -0500 +++ b/lib/galaxy_utils/sequence/fasta.py Tue Mar 02 10:47:23 2010 -0500 @@ -104,7 +104,7 @@ def __init__( self, fh ): self.file = fh def write( self, fastq_read ): - #this will include SOLiD adapter base if applicable + #this will include color space adapter base if applicable self.file.write( ">%s\n%s\n" % ( fastq_read.identifier[1:], fastq_read.sequence ) ) def close( self ): return self.file.close() diff -r 19d8ba4269ba -r 8bd2ace6c92d lib/galaxy_utils/sequence/fastq.py --- a/lib/galaxy_utils/sequence/fastq.py Tue Mar 02 09:51:05 2010 -0500 +++ b/lib/galaxy_utils/sequence/fastq.py Tue Mar 02 10:47:23 2010 -0500 @@ -176,8 +176,8 @@ score_system = 'solexa' sequence_space = 'base' -class fastqSolidRead( fastqSequencingRead ): - format = 'solid' #color space +class fastqCSSangerRead( fastqSequencingRead ): + format = 'cssanger' #color space ascii_min = 33 ascii_max = 126 quality_min = 0 @@ -260,7 +260,7 @@ FASTQ_FORMATS = {} -for format in [ fastqIlluminaRead, fastqSolexaRead, fastqSangerRead, fastqSolidRead ]: +for format in [ fastqIlluminaRead, fastqSolexaRead, fastqSangerRead, fastqCSSangerRead ]: FASTQ_FORMATS[ format.format ] = format diff -r 19d8ba4269ba -r 8bd2ace6c92d test-data/combine_phiX_out_1.fastqcssanger --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/combine_phiX_out_1.fastqcssanger Tue Mar 02 10:47:23 2010 -0500 @@ -0,0 +1,576 @@ +@1831_573_1004_F3 +T00030133312212111300011021310132222 ++ +4 29 27 34 5 5 24 24 20 17 10 34 29 20 27 13 30 27 22 24 11 28 19 17 27 17 24 17 25 27 7 24 14 12 22 +@1831_573_1050_F3 +T03330322230322112131010221102122113 ++ +8 26 31 31 16 22 30 31 28 29 22 30 30 31 32 23 30 28 28 31 19 32 30 32 19 8 5 10 13 6 5 10 6 16 11 +@1831_573_1067_F3 +T00023032023103330112220321200200002 ++ +13 10 10 2 4 7 6 11 4 14 3 11 10 5 16 2 5 8 11 8 5 10 6 9 6 9 4 2 3 5 2 4 7 6 3 +@1831_573_1219_F3 +T11211130300300301021212330201121310 ++ +31 31 31 28 19 14 10 8 20 8 19 15 23 30 6 21 21 20 29 9 14 20 30 27 21 16 6 26 27 18 11 25 11 20 12 +@1831_573_1242_F3 +T02132003121011302100130302112221121 ++ +29 29 29 25 25 29 16 22 28 32 20 30 31 31 28 26 22 32 28 26 17 13 21 15 29 23 17 27 23 28 22 19 10 26 26 +@1831_573_1333_F3 +T00200312330110101013212313222303112 ++ +8 28 6 31 2 4 18 28 13 29 8 14 18 19 9 16 16 22 11 11 14 21 12 19 10 13 24 22 19 17 19 20 21 27 8 +@1831_573_1362_F3 +T21203131001102231121211101111321131 ++ +34 33 31 31 30 31 31 30 31 34 31 33 32 30 31 29 31 27 31 23 32 31 30 31 6 13 23 6 30 16 22 25 11 10 30 +@1831_573_1448_F3 +T23101211223113320132212331313312022 ++ +22 22 28 32 8 30 11 13 31 32 31 31 25 31 31 27 28 14 22 8 31 27 12 2 23 21 21 17 4 24 21 16 18 5 10 +@1831_573_1490_F3 +T31312310323301210002210123101021011 ++ +31 31 31 31 30 11 31 30 30 31 3 29 27 28 29 10 4 14 9 29 9 16 11 8 30 17 21 5 16 17 6 24 4 22 13 +@1831_573_1523_F3 +T10322001220012223202202222001230222 ++ +7 11 14 14 9 11 2 23 6 6 13 21 6 6 21 6 17 5 17 22 14 23 15 8 4 5 2 15 6 4 2 9 11 17 6 +@1831_573_1578_F3 +T21202302100010020121100311022120111 ++ +31 30 28 31 27 31 34 31 30 31 31 30 30 28 29 31 26 22 27 27 23 27 21 24 19 8 18 20 16 16 7 10 16 27 13 +@1831_573_1647_F3 +T10222233301013033120132223202022123 ++ +28 30 31 31 27 31 31 30 30 30 26 32 28 28 31 31 26 24 30 31 30 18 28 26 21 13 19 14 26 21 25 28 14 26 19 +@1831_573_1684_F3 +T13310013212312012302121010221231123 ++ +22 29 16 25 23 27 31 18 24 31 31 30 30 24 28 26 31 31 27 29 30 31 31 27 26 27 30 22 29 22 21 30 24 29 30 +@1831_573_1769_F3 +T33220123030232212032021032302233131 ++ +22 20 19 22 19 24 5 5 22 21 22 4 14 22 26 18 3 12 22 26 18 2 11 18 14 14 2 11 19 20 14 2 5 15 21 +@1831_573_1853_F3 +T11000012111222211310103212122102331 ++ +21 19 13 14 33 31 31 22 17 33 10 14 19 30 31 30 22 30 10 31 24 14 10 24 24 13 6 8 17 27 17 5 8 17 5 +@1831_573_1943_F3 +T20300123032210232001222122001132111 ++ +7 29 14 9 16 11 8 11 31 12 8 6 15 9 29 20 6 3 14 30 21 31 14 13 5 30 23 14 7 6 8 32 19 18 11 +@1831_573_1977_F3 +T22212302221310332321002303112011311 ++ +31 31 30 21 31 23 31 31 24 32 31 28 19 21 18 18 32 22 30 24 30 27 18 25 10 22 29 6 31 4 31 30 4 18 17 +@1831_574_109_F3 +T13122332123301331032220222133301033 ++ +15 22 21 20 16 2 19 23 16 22 29 31 21 20 27 17 25 23 19 22 16 21 28 22 23 23 27 16 24 24 20 13 22 30 21 +@1831_574_148_F3 +T01200113123030012202302312200010231 ++ +27 26 12 29 18 26 26 18 29 14 14 29 15 26 26 22 28 11 28 19 12 19 14 10 29 15 17 24 27 24 27 21 17 19 26 +@1831_574_185_F3 +T21123333211302300321312212102123121 ++ +31 27 19 26 4 4 31 22 29 2 9 29 24 22 4 21 26 10 23 3 2 27 15 22 4 16 18 22 17 3 4 27 20 19 2 +@1831_574_243_F3 +T30221011230013102201033131203302330 ++ +2 31 31 31 24 20 31 28 24 30 9 29 27 19 20 3 27 31 27 19 4 31 24 30 22 2 28 30 29 22 5 29 30 24 22 +@1831_574_257_F3 +T00301133110002100302003000000102301 ++ +4 29 29 33 29 8 31 30 29 33 31 33 30 31 16 4 9 4 11 2 10 15 15 13 6 7 10 5 20 5 4 2 3 18 5 +@1831_574_293_F3 +T23213210003000103010211331300320130 ++ +5 6 8 22 6 13 9 4 2 5 3 6 14 13 3 2 2 3 13 3 5 9 8 10 9 3 2 23 4 5 4 2 5 5 4 +@1831_574_389_F3 +T21032213032101122333230212301312020 ++ +8 8 3 29 14 29 23 8 25 17 31 25 17 16 18 26 26 13 16 8 31 18 4 21 19 4 10 8 27 22 8 10 3 24 17 +@1831_574_575_F3 +T33313322100212102033032123311211302 ++ +22 30 31 29 28 30 31 29 23 31 31 31 28 31 21 9 4 5 27 28 6 20 31 27 27 6 11 15 27 28 19 9 20 14 27 +@1831_574_592_F3 +T33103330110123102223122023103310330 ++ +22 18 12 20 8 16 24 11 11 27 31 29 19 15 21 22 27 17 13 12 23 21 19 18 19 21 26 24 27 16 14 26 17 16 17 +@1831_574_617_F3 +T20021031221222021210021322200223211 ++ +31 29 31 30 26 29 30 28 31 28 28 31 29 31 28 20 30 31 10 31 25 31 19 15 31 29 27 25 15 8 6 8 21 19 12 +@1831_574_725_F3 +T32010020322130330333010031120313210 ++ +24 6 29 30 20 17 10 20 28 26 19 3 21 26 27 23 13 16 27 19 22 9 24 10 30 22 7 10 20 26 12 8 13 8 19 +@1831_574_734_F3 +T31132301200020012302210322213222222 ++ +13 12 5 13 3 17 5 27 9 7 12 4 8 25 14 8 4 20 25 8 14 4 22 10 11 24 15 18 19 9 32 13 30 22 15 +@1831_574_824_F3 +T30212100033032123311211302122020013 ++ +26 31 31 31 26 26 8 11 10 31 27 12 27 22 26 27 5 23 24 30 30 5 17 24 30 27 3 17 25 32 27 8 26 23 30 +@1831_574_959_F3 +T11212130220131221111002020123311211 ++ +22 32 28 26 10 30 31 24 26 14 27 31 26 27 23 2 5 5 14 9 4 7 4 13 15 3 15 3 17 8 10 16 3 12 16 +@1831_574_1062_F3 +T30112230030300221001032033012211012 ++ +19 31 23 17 16 27 14 14 25 16 18 21 14 23 27 16 14 20 13 19 17 22 13 26 29 17 23 23 14 15 27 16 3 8 14 +@1831_574_1092_F3 +T02013221200031031212200000111130310 ++ +27 23 30 13 11 24 23 8 15 18 4 2 11 11 11 7 11 10 10 3 6 21 24 6 2 24 6 22 2 6 26 21 13 4 17 +@1831_574_1103_F3 +T20313113203302010303131123021310121 ++ +31 30 30 29 30 31 28 29 31 31 32 27 29 30 28 31 28 28 27 25 30 27 26 20 23 6 5 5 8 25 10 18 20 6 16 +@1831_574_1116_F3 +T21011310123202303021021112021231011 ++ +8 31 10 10 11 8 14 8 30 13 14 8 4 27 8 17 29 13 28 28 25 23 30 5 26 19 19 5 14 5 11 8 14 9 19 +@1831_574_1194_F3 +T23303101033322220312200222013013312 ++ +25 20 29 26 11 30 30 24 31 24 31 30 31 16 31 31 28 31 18 28 31 29 31 19 30 31 31 24 19 30 22 20 14 11 21 +@1831_574_1204_F3 +T21330132231321322010303023221203200 ++ +32 32 20 32 20 33 31 20 25 26 31 31 11 13 24 30 32 16 30 2 13 30 26 18 8 11 29 23 17 4 8 28 6 22 9 +@1831_574_1306_F3 +T10332133020311023221213100301001220 ++ +15 17 13 22 5 4 6 6 13 3 5 2 6 4 2 2 3 2 6 2 4 6 8 6 8 3 6 3 4 3 11 8 6 13 16 +@1831_574_1387_F3 +T12301331310032132101301303230121111 ++ +12 30 32 30 30 25 31 30 31 31 24 30 31 31 30 24 34 26 25 29 5 8 13 11 11 8 26 5 6 27 5 22 7 14 6 +@1831_574_1431_F3 +T12011023331022213001123111301312011 ++ +29 22 30 29 24 33 32 23 24 22 26 10 23 9 28 21 2 21 13 10 20 5 12 2 17 21 3 15 13 11 20 5 6 3 16 +@1831_574_1560_F3 +T32212313302203320020222113111011111 ++ +28 8 8 5 21 20 27 19 28 29 24 24 31 25 20 24 22 7 16 5 26 10 5 7 4 5 19 2 11 2 5 5 5 9 3 +@1831_574_1591_F3 +T23202101330322130221230222201123202 ++ +28 28 27 32 29 27 30 31 22 23 31 27 28 26 31 5 31 21 29 23 25 30 11 29 27 5 5 27 22 29 23 7 23 10 24 +@1831_574_1624_F3 +T20122200222132200313011102302210332 ++ +2 27 21 13 5 7 11 22 12 10 8 8 22 13 13 6 14 26 19 18 13 8 24 17 22 13 7 27 23 20 5 16 18 12 8 +@1831_574_1826_F3 +T13012312120112021233030302313201111 ++ +10 31 27 27 11 8 8 19 20 24 27 30 13 10 20 22 6 12 6 5 21 30 16 8 7 26 16 26 15 5 4 19 11 2 3 +@1831_574_1903_F3 +T30232100103132133321330310210101221 ++ +27 24 20 21 30 31 29 26 22 31 31 31 23 25 31 29 23 29 27 28 24 29 24 29 31 17 28 22 16 30 16 25 21 26 14 +@1831_574_1961_F3 +T02333101331223303300200011100032200 ++ +21 29 12 15 22 12 31 29 7 17 6 31 27 2 15 21 19 31 4 20 4 31 31 21 13 5 27 27 7 24 8 28 25 19 22 +@1831_575_54_F3 +T13331330322230200102132110132013200 ++ +29 28 31 31 21 23 27 17 26 27 23 26 30 31 27 29 10 24 29 22 11 11 21 24 22 17 5 20 22 25 19 5 24 27 23 +@1831_575_80_F3 +T33133322233322221003332230323312313 ++ +9 30 20 29 27 31 30 14 28 20 4 7 5 13 20 8 10 2 14 15 6 14 6 29 2 3 14 6 18 22 2 7 8 21 5 +@1831_575_192_F3 +T30013012111133003301010212123302011 ++ +15 25 23 27 11 24 7 13 28 14 8 2 4 23 3 11 19 6 27 11 25 8 18 14 13 6 13 20 27 11 29 12 26 22 6 +@1831_575_197_F3 +T33312113010133020301131330001310032 ++ +11 12 25 30 19 21 18 31 32 25 23 23 30 21 30 19 18 22 27 28 13 17 5 16 13 26 31 21 22 13 19 31 4 17 11 +@1831_575_223_F3 +T10121010002202131221210302100121020 ++ +31 30 29 30 23 30 31 25 30 26 29 10 3 6 4 5 11 10 2 3 13 12 12 2 4 3 16 6 5 2 12 22 3 5 6 +@1831_575_420_F3 +T31110103220000101310112112001020212 ++ +23 17 30 13 29 30 7 12 6 6 17 10 13 13 31 8 11 3 4 16 31 26 6 8 16 8 30 10 8 22 13 6 8 13 13 +@1831_575_434_F3 +T30312132120223101113223301211113311 ++ +27 31 31 29 27 31 33 31 29 28 31 31 30 29 29 27 31 30 26 8 31 30 26 21 13 30 28 19 11 6 6 26 14 18 8 +@1831_575_444_F3 +T33022120112320220100202132332113320 ++ +27 17 31 31 26 27 13 28 30 31 27 10 28 25 32 27 27 31 30 27 27 14 29 31 29 27 7 27 23 29 19 5 20 26 29 +@1831_575_459_F3 +T31330310210101223330110231120131100 ++ +30 31 31 34 31 30 32 31 31 32 31 30 30 32 31 31 6 21 31 31 33 6 28 26 34 31 6 19 27 28 24 11 31 16 13 +@1831_575_506_F3 +T31210200111210121332321310110132301 ++ +23 30 8 17 9 20 31 18 10 13 22 28 30 32 25 23 31 11 14 5 8 25 31 18 22 14 27 23 24 6 10 19 9 8 9 +@1831_575_569_F3 +T10210201321323001012232322323002203 ++ +14 6 24 12 11 31 17 24 10 19 22 24 4 5 29 24 2 5 15 23 28 29 22 2 24 29 11 21 24 14 10 6 9 18 8 +@1831_575_622_F3 +T01100031122111023002323113231210111 ++ +31 32 23 33 28 31 31 30 27 31 30 27 29 29 28 30 24 21 27 19 24 22 8 27 19 14 27 6 25 19 10 26 22 19 10 +@1831_575_644_F3 +T11332003221203131231202200030110130 ++ +27 27 23 29 13 29 5 11 10 8 23 13 16 15 6 25 20 7 14 12 21 17 5 9 13 28 14 4 7 13 27 5 5 16 23 +@1831_575_663_F3 +T32210013303112103322311101322021210 ++ +31 31 31 31 31 32 27 14 26 32 29 31 21 29 15 22 24 17 27 20 24 21 21 25 30 26 17 20 10 25 29 27 16 11 10 +@1831_575_681_F3 +T23131132033020103031013233200101021 ++ +13 22 17 30 13 8 17 20 26 24 21 12 16 19 6 9 13 15 18 6 2 19 2 10 10 3 8 14 23 10 4 14 7 7 5 +@1831_575_711_F3 +T03032331231101231020121210002332121 ++ +19 4 10 25 17 7 2 6 16 10 13 8 5 9 19 20 12 2 11 27 32 12 4 19 26 29 10 8 8 27 26 2 2 9 5 +@1831_575_730_F3 +T31010102200110302123032330331011111 ++ +11 4 23 27 4 12 6 8 20 11 9 16 5 28 2 8 7 16 9 16 8 12 29 22 3 13 11 19 6 19 6 5 6 9 5 +@1831_575_904_F3 +T20111213300020123200333321131121211 ++ +30 27 29 27 13 21 23 24 31 31 22 31 27 20 19 25 19 28 31 29 21 24 28 25 10 21 12 28 19 17 26 23 27 25 2 +@1831_575_938_F3 +T13103102220022130222233301013033120 ++ +26 25 31 31 25 30 31 26 28 23 26 29 28 26 26 25 28 27 24 18 27 19 13 26 27 21 25 17 27 24 26 19 8 23 22 +@1831_575_970_F3 +T23201311301023133303023011202220221 ++ +28 31 28 31 28 26 31 31 29 27 31 31 25 24 27 25 28 30 26 29 31 28 30 24 29 29 30 31 25 17 28 28 28 27 20 +@1831_575_991_F3 +T33312212031111111012212120321121210 ++ +31 29 29 26 22 30 30 30 14 19 27 25 25 25 11 2 5 9 4 6 3 12 12 20 12 2 7 22 8 5 5 11 12 8 4 +@1831_575_1138_F3 +T23320002011320012120333103233301321 ++ +27 28 15 26 4 16 24 18 21 10 30 24 21 30 11 30 20 27 25 17 29 31 21 31 27 25 26 19 29 13 22 26 9 25 16 +@1831_575_1157_F3 +T13121323330203331222022230133102321 ++ +31 33 31 33 29 30 32 30 32 31 30 24 6 30 26 30 5 23 30 31 31 21 26 27 31 28 10 27 25 24 24 10 24 21 20 +@1831_575_1180_F3 +T32003310122102323303101123331133110 ++ +14 27 33 29 20 30 6 25 14 22 23 30 26 16 26 20 20 25 24 24 22 31 31 29 24 19 28 22 27 16 23 21 12 29 22 +@1831_575_1283_F3 +T02232200301300220130032321323131333 ++ +4 34 31 32 20 19 29 27 30 32 22 23 31 27 30 17 29 25 2 29 28 30 31 17 29 23 15 25 6 30 21 24 13 6 22 +@1831_575_1302_F3 +T01201303312333123130200123201013021 ++ +5 16 17 29 14 2 17 6 5 12 17 5 4 6 22 10 3 4 9 2 3 14 16 7 5 5 16 17 14 3 11 17 11 11 9 +@1831_575_1310_F3 +T31332131312021303211310220101211133 ++ +21 27 27 29 21 21 18 30 24 24 31 7 31 22 28 16 16 31 25 31 31 14 22 30 30 27 31 27 26 29 6 18 12 22 26 +@1831_575_1321_F3 +T11001010233200122122022023000203212 ++ +15 26 33 31 30 31 29 28 32 31 27 32 30 29 31 29 30 21 29 31 20 29 6 19 31 24 30 8 22 31 22 30 14 23 24 +@1831_575_1373_F3 +T21213011223311001221321132013121220 ++ +32 31 31 31 29 31 26 28 24 27 31 30 30 22 31 29 31 25 31 26 31 26 16 22 30 21 18 15 14 22 28 19 11 17 27 +@1831_575_1419_F3 +T33222200303001021230212332001013020 ++ +29 14 14 18 12 29 5 12 13 12 29 4 16 16 14 31 5 14 5 22 25 27 11 12 16 28 11 10 17 27 21 6 4 5 27 +@1831_575_1436_F3 +T13210313021212303321202113301220331 ++ +9 17 31 28 26 18 24 9 18 27 9 19 27 25 29 20 17 29 29 24 6 22 25 27 28 6 15 28 29 16 6 16 18 21 27 +@1831_575_1442_F3 +T33132010022331132101132123132020222 ++ +23 29 20 23 27 30 22 29 10 16 33 21 12 14 24 27 27 25 20 30 29 32 25 16 31 30 20 18 24 13 31 19 14 16 29 +@1831_575_1454_F3 +T11131130011012021120222231313211113 ++ +17 19 28 30 23 28 21 20 23 24 28 15 25 32 28 25 30 29 21 27 26 31 14 11 19 10 12 21 10 14 6 13 11 7 11 +@1831_575_1500_F3 +T11010000223111301132313011130103021 ++ +17 30 31 31 30 32 31 30 23 27 21 27 25 24 23 20 28 24 24 24 24 24 28 28 33 18 27 20 27 27 11 22 30 29 24 +@1831_575_1535_F3 +T21312012030320112110211013300131121 ++ +31 33 28 31 27 31 31 33 30 25 32 31 31 28 29 31 30 21 23 31 28 30 31 20 30 22 26 25 21 27 27 26 29 20 27 +@1831_575_1724_F3 +T33123002323300220213232301000010010 ++ +24 27 33 13 10 31 8 11 17 9 13 4 8 8 8 19 4 17 31 26 22 2 4 7 4 10 3 23 8 8 23 20 4 5 20 +@1831_575_1829_F3 +T21033321320111321230233302313101021 ++ +17 17 7 9 6 4 13 18 3 10 22 8 31 5 4 3 6 18 9 10 9 2 14 2 14 9 10 15 13 28 5 2 8 10 15 +@1831_575_1898_F3 +T31330110303103131001110300102101330 ++ +31 33 29 31 31 5 16 14 8 8 6 19 15 8 4 2 23 14 13 4 2 23 3 7 7 2 26 19 6 3 6 21 18 11 11 +@1831_575_1964_F3 +T22010201103202213200201301300232123 ++ +16 29 18 24 8 31 17 27 17 14 31 10 24 30 17 28 5 8 29 29 31 9 21 17 28 20 5 17 27 19 17 13 6 30 10 +@1831_576_32_F3 +T13012100120333032211330300332022110 ++ +10 27 29 30 29 30 28 22 27 17 8 20 17 17 26 29 27 27 31 19 15 31 29 22 15 19 27 29 20 28 17 18 31 10 5 +@1831_576_74_F3 +T30103313210232220102021223012112100 ++ +23 28 31 31 30 31 29 7 30 30 27 33 20 30 31 31 31 24 27 31 29 27 10 29 27 26 31 6 26 29 21 24 21 16 30 +@1831_576_86_F3 +T10320000121033022010011030032211310 ++ +22 23 16 16 8 17 25 9 13 10 10 20 27 14 25 18 10 19 18 24 17 19 9 8 8 14 25 11 21 5 17 24 8 17 14 +@1831_576_89_F3 +T02132333203332020020220033002121120 ++ +17 8 21 24 10 11 6 13 19 28 12 11 29 14 29 7 9 3 2 8 18 15 18 15 9 6 7 11 4 8 17 2 2 3 11 +@1831_576_266_F3 +T30322223101312011300311121221333223 ++ +27 31 31 30 28 26 27 30 22 28 31 29 24 11 29 31 16 3 5 5 23 24 3 14 25 29 22 6 18 16 22 23 4 5 21 +@1831_576_327_F3 +T22112331301313021321001332120332130 ++ +27 31 30 31 21 31 31 26 27 31 30 29 27 31 29 28 28 18 31 25 28 28 27 18 31 31 29 20 18 27 24 29 27 21 28 +@1831_576_331_F3 +T32012133301311223023011232112333030 ++ +26 12 17 8 10 7 9 13 9 16 14 26 20 4 13 12 24 5 2 14 16 6 10 7 3 9 3 2 2 7 8 4 14 3 13 +@1831_576_387_F3 +T00101211032031120300200222001230022 ++ +14 23 8 13 3 20 2 16 2 9 4 13 3 2 2 13 9 2 3 4 2 2 12 4 11 10 11 16 2 5 4 13 4 8 8 +@1831_576_406_F3 +T00223133010210122221320212103132011 ++ +27 19 27 29 4 4 16 19 25 9 19 21 20 21 8 5 27 17 20 16 5 17 10 18 2 5 16 24 11 21 5 19 29 20 7 +@1831_576_449_F3 +T31312001121222231100020132132100220 ++ +7 10 6 5 6 13 11 11 3 14 10 13 8 3 3 23 5 4 2 10 30 5 11 2 8 12 5 2 2 2 22 11 10 2 9 +@1831_576_519_F3 +T03011321130130133213131202130321131 ++ +28 28 19 21 27 24 22 31 29 17 14 21 30 26 17 27 19 32 23 23 16 29 24 16 17 16 10 27 16 14 19 13 24 10 22 +@1831_576_603_F3 +T21003032313302312320131221001330311 ++ +31 31 19 21 28 31 34 13 30 30 27 32 22 24 31 31 26 12 27 31 31 29 17 24 33 30 29 20 20 27 33 22 20 24 23 +@1831_576_655_F3 +T02001023130302322122200313123123102 ++ +28 31 32 32 24 31 31 27 21 9 29 31 31 20 14 27 31 29 24 6 28 26 29 22 10 31 30 24 29 14 24 26 10 11 4 +@1831_576_677_F3 +T13330131023320301031013230210103022 ++ +21 17 24 15 5 14 9 15 2 5 6 5 11 13 17 6 2 5 9 3 5 7 6 2 12 4 7 3 9 2 4 3 8 2 4 +@1831_576_718_F3 +T31232113331022231333313223132231213 ++ +3 19 2 2 2 3 15 2 2 2 4 7 2 2 2 2 2 2 2 2 2 11 2 2 2 2 4 2 2 2 2 3 2 2 2 +@1831_576_722_F3 +T31230320322120231333030031100313200 ++ +7 9 11 12 11 2 2 13 8 9 5 7 9 16 4 9 7 4 7 12 17 2 10 8 12 2 13 5 12 2 4 4 3 6 8 +@1831_576_754_F3 +T30221231132103120112331303112133020 ++ +13 19 14 14 2 7 13 3 8 6 6 11 29 7 5 2 16 3 27 11 2 2 4 7 7 11 2 20 30 2 15 9 4 16 9 +@1831_576_815_F3 +T23022113203032010120310102321001031 ++ +27 18 29 31 30 24 29 31 30 33 28 29 28 26 29 32 30 30 30 28 29 25 17 20 28 19 13 17 20 30 21 27 20 22 13 +@1831_576_882_F3 +T13230020122320223230022031020110122 ++ +30 17 21 30 23 30 31 25 19 29 31 29 24 21 30 30 27 27 28 20 6 16 27 29 24 23 19 21 28 27 24 27 16 29 23 +@1831_576_898_F3 +T10230132312121033222231132231233213 ++ +28 31 31 34 17 30 34 29 30 27 29 31 23 23 21 33 30 26 30 13 30 30 23 22 28 33 27 23 27 16 20 30 30 28 13 +@1831_576_923_F3 +T21322010320202013210121223010123122 ++ +22 21 13 20 16 28 26 13 21 24 24 27 24 21 29 26 26 19 24 27 26 26 16 16 26 27 31 20 24 25 24 28 21 19 22 +@1831_576_930_F3 +T21322103230123110323102012021020013 ++ +17 2 9 15 13 17 5 13 25 7 7 2 6 16 19 6 2 2 12 8 2 4 3 3 17 4 2 3 14 16 5 2 4 14 2 +@1831_576_1019_F3 +T22032121213231032210312001103122312 ++ +17 27 3 29 3 11 16 11 5 10 10 5 31 11 13 8 6 10 14 10 2 24 6 21 24 14 21 6 17 7 10 12 6 24 12 +@1831_576_1068_F3 +T00020232013101330112220321203220211 ++ +25 29 29 27 28 19 30 26 31 22 28 30 30 24 30 26 24 29 20 31 24 30 25 23 31 25 28 20 6 26 22 26 6 2 19 +@1831_576_1131_F3 +T10233122200222132200313011102302210 ++ +16 15 19 31 2 31 14 31 11 19 29 24 30 17 10 30 16 20 22 16 31 6 11 29 28 26 7 22 20 24 26 9 24 17 27 +@1831_576_1168_F3 +T31013300131121323122002113301002010 ++ +29 31 34 34 21 31 31 17 30 24 28 29 22 30 26 22 21 27 26 19 21 22 31 26 24 11 15 4 17 21 6 6 11 19 3 +@1831_576_1207_F3 +T21001132013000122220301213221213010 ++ +4 3 29 17 11 7 5 30 19 30 7 11 31 25 27 5 11 31 29 30 3 5 25 23 32 4 4 28 15 13 4 11 20 24 22 +@1831_576_1289_F3 +T03021210023110200323310302013121203 ++ +31 24 27 29 16 33 31 31 26 22 31 31 21 21 18 28 28 17 23 11 20 6 25 23 27 27 11 13 28 17 29 29 13 20 15 +@1831_576_1329_F3 +T01100302102020113003022000120002100 ++ +27 29 5 15 11 23 22 15 14 32 31 31 14 20 13 26 28 26 25 6 5 31 18 6 5 3 3 4 11 10 2 7 3 5 17 +@1831_576_1367_F3 +T12231310311233110031222013332011023 ++ +30 30 31 31 27 29 31 31 28 31 27 31 27 28 31 29 31 30 30 24 25 30 27 28 29 28 27 23 26 20 24 31 22 23 22 +@1831_576_1416_F3 +T33021233100123120313103133211203221 ++ +10 6 26 30 13 13 16 13 27 31 6 13 28 10 21 13 20 30 22 27 15 12 30 22 26 7 4 28 29 20 21 13 24 23 31 +@1831_576_1461_F3 +T32022221221112233100210223002100100 ++ +2 16 5 22 19 2 7 2 7 5 2 2 3 2 11 6 2 2 2 4 2 4 4 2 9 2 5 4 4 2 2 4 4 4 6 +@1831_576_1605_F3 +T30232100103132133321330310210101221 ++ +21 27 31 34 31 31 29 16 26 31 25 26 27 27 31 31 24 31 30 30 30 24 27 18 30 20 12 17 16 28 19 23 22 22 11 +@1831_576_1664_F3 +T31212101001312110320301201002011120 ++ +31 31 30 29 30 31 28 32 25 31 31 29 31 28 6 28 27 29 28 8 13 29 28 24 9 23 8 7 22 2 14 10 10 26 8 +@1831_576_1671_F3 +T22313332300211322113223102231322313 ++ +31 31 30 31 20 29 31 31 23 5 23 30 17 20 2 5 8 5 20 5 5 8 16 20 5 5 11 5 19 4 5 11 5 21 4 +@1831_576_1729_F3 +T11233312313010012320101302101023030 ++ +31 30 31 30 27 30 27 31 29 32 30 14 28 28 30 29 30 22 29 30 31 23 27 30 31 29 24 24 26 29 27 10 15 28 29 +@1831_576_1880_F3 +T13032121323320213301001310130212003 ++ +15 20 16 20 14 22 24 17 11 25 11 22 14 4 14 15 20 11 4 3 8 25 10 2 23 4 17 7 16 22 20 19 8 8 18 +@1831_576_1982_F3 +T00032312310201201333221212000011030 ++ +11 31 31 30 31 11 32 29 27 31 24 31 28 30 31 24 33 28 23 27 21 31 31 21 31 17 27 32 30 29 13 22 27 10 31 +@1831_576_1987_F3 +T30022313313231221213220132001011320 ++ +8 2 2 7 8 7 2 5 2 2 8 4 8 14 12 2 4 3 16 16 2 4 18 29 6 2 2 5 3 11 2 3 3 6 10 +@1831_576_2014_F3 +T31123201010100321122111102113021003 ++ +31 31 31 24 11 33 17 24 12 20 29 6 30 11 10 30 22 24 10 14 32 6 26 6 17 31 6 20 5 14 24 11 21 5 16 +@1831_576_2028_F3 +T20131211210311112023201213120201100 ++ +20 27 29 24 29 20 6 17 7 5 22 15 22 13 23 2 5 5 18 24 11 15 4 22 14 2 7 2 11 9 4 5 20 9 10 +@1831_577_40_F3 +T11111212330120012020200031313303003 ++ +24 17 14 19 7 6 13 6 8 7 27 9 30 2 3 8 4 5 27 11 14 18 24 27 7 13 17 11 10 27 28 31 21 16 16 +@1831_577_119_F3 +T33111010021103320103213121313000102 ++ +24 29 30 34 16 16 8 12 16 14 8 2 26 2 14 11 23 20 15 9 10 13 10 3 3 20 20 20 15 10 4 12 13 19 15 +@1831_577_133_F3 +T33213323012231300122223032223331322 ++ +14 19 31 29 29 30 28 16 30 25 10 29 31 15 22 31 31 29 27 29 31 9 27 10 16 31 16 20 8 24 21 6 17 3 8 +@1831_577_255_F3 +T00332022110020300332022020202002232 ++ +22 27 28 23 22 31 29 21 24 4 9 9 2 5 2 12 10 3 13 2 5 5 2 10 3 12 10 4 5 4 13 11 4 20 2 +@1831_577_281_F3 +T03032301231212301013112222111210000 ++ +22 12 25 33 26 23 31 28 26 29 22 31 29 19 30 28 30 10 21 20 24 30 26 20 27 22 30 26 24 31 23 7 29 25 30 +@1831_577_288_F3 +T01031120221303100221230021013201130 ++ +20 26 14 22 24 30 30 5 28 33 25 25 17 24 23 9 21 13 22 14 10 19 5 17 16 11 22 11 21 30 13 22 2 6 21 +@1831_577_322_F3 +T12003213220230103303201000130312202 ++ +24 28 26 29 19 20 15 21 26 17 20 20 19 21 19 12 27 2 22 10 16 24 19 5 17 27 30 21 20 24 21 23 8 22 14 +@1831_577_362_F3 +T31203302330110131230331210121110220 ++ +21 17 33 30 25 31 30 31 27 30 24 20 23 28 11 18 25 11 24 15 25 5 6 12 24 24 11 21 27 20 13 7 3 10 21 +@1831_577_382_F3 +T32312123033111120321303230201332100 ++ +16 17 24 20 22 14 25 16 8 8 28 22 21 7 9 17 19 26 11 18 10 25 27 13 5 13 5 12 28 16 28 17 14 20 9 +@1831_577_464_F3 +T13020221011130013102221333131203302 ++ +18 28 27 22 14 27 23 17 21 8 29 2 13 6 5 19 17 15 19 10 20 2 14 15 19 16 13 22 9 24 16 5 22 20 21 +@1831_577_488_F3 +T13200302330322110200323132101120301 ++ +25 19 23 13 11 9 29 21 20 21 21 27 30 23 28 27 28 27 17 29 21 26 24 19 29 26 28 24 29 31 23 24 17 19 31 +@1831_577_511_F3 +T32232133031023313331312220133230333 ++ +2 22 14 10 5 3 25 27 22 4 21 11 3 3 4 6 4 14 10 8 2 3 22 7 7 5 9 18 29 16 21 6 15 14 10 +@1831_577_545_F3 +T00112131333222303222210031322103233 ++ +29 29 27 27 24 30 27 29 30 32 27 19 23 16 31 27 31 23 28 28 31 22 21 14 21 16 27 24 20 13 20 24 23 23 12 +@1831_577_559_F3 +T32321101303233120102011130022122002 ++ +13 27 31 26 30 30 31 29 31 30 14 17 27 13 31 16 28 29 16 17 28 21 16 14 26 28 30 13 5 17 10 24 17 8 6 +@1831_577_562_F3 +T32331101301233110121000220031120031 ++ +2 7 7 5 9 5 15 4 8 16 4 8 2 7 3 17 12 11 9 9 9 4 14 12 11 11 8 8 5 11 12 13 16 6 9 +@1831_577_637_F3 +T22113312122202103031023120301031110 ++ +23 12 11 19 2 29 25 12 21 10 25 23 11 5 7 20 26 18 28 15 29 22 28 21 23 5 16 14 24 5 6 30 26 19 11 +@1831_577_641_F3 +T13031301101121223221212020032131113 ++ +5 19 22 26 14 6 25 32 26 26 20 30 25 22 17 11 7 28 8 11 2 9 30 10 13 2 5 22 3 23 2 4 22 14 6 +@1831_577_692_F3 +T01122320200330103121202301211100220 ++ +31 33 11 31 30 31 33 7 31 32 30 31 10 31 31 29 31 10 30 28 29 31 6 28 27 31 27 28 27 24 28 30 22 20 27 diff -r 19d8ba4269ba -r 8bd2ace6c92d test-data/combine_phiX_out_1.fastqsolid --- a/test-data/combine_phiX_out_1.fastqsolid Tue Mar 02 09:51:05 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,576 +0,0 @@ -@1831_573_1004_F3 -T00030133312212111300011021310132222 -+ -4 29 27 34 5 5 24 24 20 17 10 34 29 20 27 13 30 27 22 24 11 28 19 17 27 17 24 17 25 27 7 24 14 12 22 -@1831_573_1050_F3 -T03330322230322112131010221102122113 -+ -8 26 31 31 16 22 30 31 28 29 22 30 30 31 32 23 30 28 28 31 19 32 30 32 19 8 5 10 13 6 5 10 6 16 11 -@1831_573_1067_F3 -T00023032023103330112220321200200002 -+ -13 10 10 2 4 7 6 11 4 14 3 11 10 5 16 2 5 8 11 8 5 10 6 9 6 9 4 2 3 5 2 4 7 6 3 -@1831_573_1219_F3 -T11211130300300301021212330201121310 -+ -31 31 31 28 19 14 10 8 20 8 19 15 23 30 6 21 21 20 29 9 14 20 30 27 21 16 6 26 27 18 11 25 11 20 12 -@1831_573_1242_F3 -T02132003121011302100130302112221121 -+ -29 29 29 25 25 29 16 22 28 32 20 30 31 31 28 26 22 32 28 26 17 13 21 15 29 23 17 27 23 28 22 19 10 26 26 -@1831_573_1333_F3 -T00200312330110101013212313222303112 -+ -8 28 6 31 2 4 18 28 13 29 8 14 18 19 9 16 16 22 11 11 14 21 12 19 10 13 24 22 19 17 19 20 21 27 8 -@1831_573_1362_F3 -T21203131001102231121211101111321131 -+ -34 33 31 31 30 31 31 30 31 34 31 33 32 30 31 29 31 27 31 23 32 31 30 31 6 13 23 6 30 16 22 25 11 10 30 -@1831_573_1448_F3 -T23101211223113320132212331313312022 -+ -22 22 28 32 8 30 11 13 31 32 31 31 25 31 31 27 28 14 22 8 31 27 12 2 23 21 21 17 4 24 21 16 18 5 10 -@1831_573_1490_F3 -T31312310323301210002210123101021011 -+ -31 31 31 31 30 11 31 30 30 31 3 29 27 28 29 10 4 14 9 29 9 16 11 8 30 17 21 5 16 17 6 24 4 22 13 -@1831_573_1523_F3 -T10322001220012223202202222001230222 -+ -7 11 14 14 9 11 2 23 6 6 13 21 6 6 21 6 17 5 17 22 14 23 15 8 4 5 2 15 6 4 2 9 11 17 6 -@1831_573_1578_F3 -T21202302100010020121100311022120111 -+ -31 30 28 31 27 31 34 31 30 31 31 30 30 28 29 31 26 22 27 27 23 27 21 24 19 8 18 20 16 16 7 10 16 27 13 -@1831_573_1647_F3 -T10222233301013033120132223202022123 -+ -28 30 31 31 27 31 31 30 30 30 26 32 28 28 31 31 26 24 30 31 30 18 28 26 21 13 19 14 26 21 25 28 14 26 19 -@1831_573_1684_F3 -T13310013212312012302121010221231123 -+ -22 29 16 25 23 27 31 18 24 31 31 30 30 24 28 26 31 31 27 29 30 31 31 27 26 27 30 22 29 22 21 30 24 29 30 -@1831_573_1769_F3 -T33220123030232212032021032302233131 -+ -22 20 19 22 19 24 5 5 22 21 22 4 14 22 26 18 3 12 22 26 18 2 11 18 14 14 2 11 19 20 14 2 5 15 21 -@1831_573_1853_F3 -T11000012111222211310103212122102331 -+ -21 19 13 14 33 31 31 22 17 33 10 14 19 30 31 30 22 30 10 31 24 14 10 24 24 13 6 8 17 27 17 5 8 17 5 -@1831_573_1943_F3 -T20300123032210232001222122001132111 -+ -7 29 14 9 16 11 8 11 31 12 8 6 15 9 29 20 6 3 14 30 21 31 14 13 5 30 23 14 7 6 8 32 19 18 11 -@1831_573_1977_F3 -T22212302221310332321002303112011311 -+ -31 31 30 21 31 23 31 31 24 32 31 28 19 21 18 18 32 22 30 24 30 27 18 25 10 22 29 6 31 4 31 30 4 18 17 -@1831_574_109_F3 -T13122332123301331032220222133301033 -+ -15 22 21 20 16 2 19 23 16 22 29 31 21 20 27 17 25 23 19 22 16 21 28 22 23 23 27 16 24 24 20 13 22 30 21 -@1831_574_148_F3 -T01200113123030012202302312200010231 -+ -27 26 12 29 18 26 26 18 29 14 14 29 15 26 26 22 28 11 28 19 12 19 14 10 29 15 17 24 27 24 27 21 17 19 26 -@1831_574_185_F3 -T21123333211302300321312212102123121 -+ -31 27 19 26 4 4 31 22 29 2 9 29 24 22 4 21 26 10 23 3 2 27 15 22 4 16 18 22 17 3 4 27 20 19 2 -@1831_574_243_F3 -T30221011230013102201033131203302330 -+ -2 31 31 31 24 20 31 28 24 30 9 29 27 19 20 3 27 31 27 19 4 31 24 30 22 2 28 30 29 22 5 29 30 24 22 -@1831_574_257_F3 -T00301133110002100302003000000102301 -+ -4 29 29 33 29 8 31 30 29 33 31 33 30 31 16 4 9 4 11 2 10 15 15 13 6 7 10 5 20 5 4 2 3 18 5 -@1831_574_293_F3 -T23213210003000103010211331300320130 -+ -5 6 8 22 6 13 9 4 2 5 3 6 14 13 3 2 2 3 13 3 5 9 8 10 9 3 2 23 4 5 4 2 5 5 4 -@1831_574_389_F3 -T21032213032101122333230212301312020 -+ -8 8 3 29 14 29 23 8 25 17 31 25 17 16 18 26 26 13 16 8 31 18 4 21 19 4 10 8 27 22 8 10 3 24 17 -@1831_574_575_F3 -T33313322100212102033032123311211302 -+ -22 30 31 29 28 30 31 29 23 31 31 31 28 31 21 9 4 5 27 28 6 20 31 27 27 6 11 15 27 28 19 9 20 14 27 -@1831_574_592_F3 -T33103330110123102223122023103310330 -+ -22 18 12 20 8 16 24 11 11 27 31 29 19 15 21 22 27 17 13 12 23 21 19 18 19 21 26 24 27 16 14 26 17 16 17 -@1831_574_617_F3 -T20021031221222021210021322200223211 -+ -31 29 31 30 26 29 30 28 31 28 28 31 29 31 28 20 30 31 10 31 25 31 19 15 31 29 27 25 15 8 6 8 21 19 12 -@1831_574_725_F3 -T32010020322130330333010031120313210 -+ -24 6 29 30 20 17 10 20 28 26 19 3 21 26 27 23 13 16 27 19 22 9 24 10 30 22 7 10 20 26 12 8 13 8 19 -@1831_574_734_F3 -T31132301200020012302210322213222222 -+ -13 12 5 13 3 17 5 27 9 7 12 4 8 25 14 8 4 20 25 8 14 4 22 10 11 24 15 18 19 9 32 13 30 22 15 -@1831_574_824_F3 -T30212100033032123311211302122020013 -+ -26 31 31 31 26 26 8 11 10 31 27 12 27 22 26 27 5 23 24 30 30 5 17 24 30 27 3 17 25 32 27 8 26 23 30 -@1831_574_959_F3 -T11212130220131221111002020123311211 -+ -22 32 28 26 10 30 31 24 26 14 27 31 26 27 23 2 5 5 14 9 4 7 4 13 15 3 15 3 17 8 10 16 3 12 16 -@1831_574_1062_F3 -T30112230030300221001032033012211012 -+ -19 31 23 17 16 27 14 14 25 16 18 21 14 23 27 16 14 20 13 19 17 22 13 26 29 17 23 23 14 15 27 16 3 8 14 -@1831_574_1092_F3 -T02013221200031031212200000111130310 -+ -27 23 30 13 11 24 23 8 15 18 4 2 11 11 11 7 11 10 10 3 6 21 24 6 2 24 6 22 2 6 26 21 13 4 17 -@1831_574_1103_F3 -T20313113203302010303131123021310121 -+ -31 30 30 29 30 31 28 29 31 31 32 27 29 30 28 31 28 28 27 25 30 27 26 20 23 6 5 5 8 25 10 18 20 6 16 -@1831_574_1116_F3 -T21011310123202303021021112021231011 -+ -8 31 10 10 11 8 14 8 30 13 14 8 4 27 8 17 29 13 28 28 25 23 30 5 26 19 19 5 14 5 11 8 14 9 19 -@1831_574_1194_F3 -T23303101033322220312200222013013312 -+ -25 20 29 26 11 30 30 24 31 24 31 30 31 16 31 31 28 31 18 28 31 29 31 19 30 31 31 24 19 30 22 20 14 11 21 -@1831_574_1204_F3 -T21330132231321322010303023221203200 -+ -32 32 20 32 20 33 31 20 25 26 31 31 11 13 24 30 32 16 30 2 13 30 26 18 8 11 29 23 17 4 8 28 6 22 9 -@1831_574_1306_F3 -T10332133020311023221213100301001220 -+ -15 17 13 22 5 4 6 6 13 3 5 2 6 4 2 2 3 2 6 2 4 6 8 6 8 3 6 3 4 3 11 8 6 13 16 -@1831_574_1387_F3 -T12301331310032132101301303230121111 -+ -12 30 32 30 30 25 31 30 31 31 24 30 31 31 30 24 34 26 25 29 5 8 13 11 11 8 26 5 6 27 5 22 7 14 6 -@1831_574_1431_F3 -T12011023331022213001123111301312011 -+ -29 22 30 29 24 33 32 23 24 22 26 10 23 9 28 21 2 21 13 10 20 5 12 2 17 21 3 15 13 11 20 5 6 3 16 -@1831_574_1560_F3 -T32212313302203320020222113111011111 -+ -28 8 8 5 21 20 27 19 28 29 24 24 31 25 20 24 22 7 16 5 26 10 5 7 4 5 19 2 11 2 5 5 5 9 3 -@1831_574_1591_F3 -T23202101330322130221230222201123202 -+ -28 28 27 32 29 27 30 31 22 23 31 27 28 26 31 5 31 21 29 23 25 30 11 29 27 5 5 27 22 29 23 7 23 10 24 -@1831_574_1624_F3 -T20122200222132200313011102302210332 -+ -2 27 21 13 5 7 11 22 12 10 8 8 22 13 13 6 14 26 19 18 13 8 24 17 22 13 7 27 23 20 5 16 18 12 8 -@1831_574_1826_F3 -T13012312120112021233030302313201111 -+ -10 31 27 27 11 8 8 19 20 24 27 30 13 10 20 22 6 12 6 5 21 30 16 8 7 26 16 26 15 5 4 19 11 2 3 -@1831_574_1903_F3 -T30232100103132133321330310210101221 -+ -27 24 20 21 30 31 29 26 22 31 31 31 23 25 31 29 23 29 27 28 24 29 24 29 31 17 28 22 16 30 16 25 21 26 14 -@1831_574_1961_F3 -T02333101331223303300200011100032200 -+ -21 29 12 15 22 12 31 29 7 17 6 31 27 2 15 21 19 31 4 20 4 31 31 21 13 5 27 27 7 24 8 28 25 19 22 -@1831_575_54_F3 -T13331330322230200102132110132013200 -+ -29 28 31 31 21 23 27 17 26 27 23 26 30 31 27 29 10 24 29 22 11 11 21 24 22 17 5 20 22 25 19 5 24 27 23 -@1831_575_80_F3 -T33133322233322221003332230323312313 -+ -9 30 20 29 27 31 30 14 28 20 4 7 5 13 20 8 10 2 14 15 6 14 6 29 2 3 14 6 18 22 2 7 8 21 5 -@1831_575_192_F3 -T30013012111133003301010212123302011 -+ -15 25 23 27 11 24 7 13 28 14 8 2 4 23 3 11 19 6 27 11 25 8 18 14 13 6 13 20 27 11 29 12 26 22 6 -@1831_575_197_F3 -T33312113010133020301131330001310032 -+ -11 12 25 30 19 21 18 31 32 25 23 23 30 21 30 19 18 22 27 28 13 17 5 16 13 26 31 21 22 13 19 31 4 17 11 -@1831_575_223_F3 -T10121010002202131221210302100121020 -+ -31 30 29 30 23 30 31 25 30 26 29 10 3 6 4 5 11 10 2 3 13 12 12 2 4 3 16 6 5 2 12 22 3 5 6 -@1831_575_420_F3 -T31110103220000101310112112001020212 -+ -23 17 30 13 29 30 7 12 6 6 17 10 13 13 31 8 11 3 4 16 31 26 6 8 16 8 30 10 8 22 13 6 8 13 13 -@1831_575_434_F3 -T30312132120223101113223301211113311 -+ -27 31 31 29 27 31 33 31 29 28 31 31 30 29 29 27 31 30 26 8 31 30 26 21 13 30 28 19 11 6 6 26 14 18 8 -@1831_575_444_F3 -T33022120112320220100202132332113320 -+ -27 17 31 31 26 27 13 28 30 31 27 10 28 25 32 27 27 31 30 27 27 14 29 31 29 27 7 27 23 29 19 5 20 26 29 -@1831_575_459_F3 -T31330310210101223330110231120131100 -+ -30 31 31 34 31 30 32 31 31 32 31 30 30 32 31 31 6 21 31 31 33 6 28 26 34 31 6 19 27 28 24 11 31 16 13 -@1831_575_506_F3 -T31210200111210121332321310110132301 -+ -23 30 8 17 9 20 31 18 10 13 22 28 30 32 25 23 31 11 14 5 8 25 31 18 22 14 27 23 24 6 10 19 9 8 9 -@1831_575_569_F3 -T10210201321323001012232322323002203 -+ -14 6 24 12 11 31 17 24 10 19 22 24 4 5 29 24 2 5 15 23 28 29 22 2 24 29 11 21 24 14 10 6 9 18 8 -@1831_575_622_F3 -T01100031122111023002323113231210111 -+ -31 32 23 33 28 31 31 30 27 31 30 27 29 29 28 30 24 21 27 19 24 22 8 27 19 14 27 6 25 19 10 26 22 19 10 -@1831_575_644_F3 -T11332003221203131231202200030110130 -+ -27 27 23 29 13 29 5 11 10 8 23 13 16 15 6 25 20 7 14 12 21 17 5 9 13 28 14 4 7 13 27 5 5 16 23 -@1831_575_663_F3 -T32210013303112103322311101322021210 -+ -31 31 31 31 31 32 27 14 26 32 29 31 21 29 15 22 24 17 27 20 24 21 21 25 30 26 17 20 10 25 29 27 16 11 10 -@1831_575_681_F3 -T23131132033020103031013233200101021 -+ -13 22 17 30 13 8 17 20 26 24 21 12 16 19 6 9 13 15 18 6 2 19 2 10 10 3 8 14 23 10 4 14 7 7 5 -@1831_575_711_F3 -T03032331231101231020121210002332121 -+ -19 4 10 25 17 7 2 6 16 10 13 8 5 9 19 20 12 2 11 27 32 12 4 19 26 29 10 8 8 27 26 2 2 9 5 -@1831_575_730_F3 -T31010102200110302123032330331011111 -+ -11 4 23 27 4 12 6 8 20 11 9 16 5 28 2 8 7 16 9 16 8 12 29 22 3 13 11 19 6 19 6 5 6 9 5 -@1831_575_904_F3 -T20111213300020123200333321131121211 -+ -30 27 29 27 13 21 23 24 31 31 22 31 27 20 19 25 19 28 31 29 21 24 28 25 10 21 12 28 19 17 26 23 27 25 2 -@1831_575_938_F3 -T13103102220022130222233301013033120 -+ -26 25 31 31 25 30 31 26 28 23 26 29 28 26 26 25 28 27 24 18 27 19 13 26 27 21 25 17 27 24 26 19 8 23 22 -@1831_575_970_F3 -T23201311301023133303023011202220221 -+ -28 31 28 31 28 26 31 31 29 27 31 31 25 24 27 25 28 30 26 29 31 28 30 24 29 29 30 31 25 17 28 28 28 27 20 -@1831_575_991_F3 -T33312212031111111012212120321121210 -+ -31 29 29 26 22 30 30 30 14 19 27 25 25 25 11 2 5 9 4 6 3 12 12 20 12 2 7 22 8 5 5 11 12 8 4 -@1831_575_1138_F3 -T23320002011320012120333103233301321 -+ -27 28 15 26 4 16 24 18 21 10 30 24 21 30 11 30 20 27 25 17 29 31 21 31 27 25 26 19 29 13 22 26 9 25 16 -@1831_575_1157_F3 -T13121323330203331222022230133102321 -+ -31 33 31 33 29 30 32 30 32 31 30 24 6 30 26 30 5 23 30 31 31 21 26 27 31 28 10 27 25 24 24 10 24 21 20 -@1831_575_1180_F3 -T32003310122102323303101123331133110 -+ -14 27 33 29 20 30 6 25 14 22 23 30 26 16 26 20 20 25 24 24 22 31 31 29 24 19 28 22 27 16 23 21 12 29 22 -@1831_575_1283_F3 -T02232200301300220130032321323131333 -+ -4 34 31 32 20 19 29 27 30 32 22 23 31 27 30 17 29 25 2 29 28 30 31 17 29 23 15 25 6 30 21 24 13 6 22 -@1831_575_1302_F3 -T01201303312333123130200123201013021 -+ -5 16 17 29 14 2 17 6 5 12 17 5 4 6 22 10 3 4 9 2 3 14 16 7 5 5 16 17 14 3 11 17 11 11 9 -@1831_575_1310_F3 -T31332131312021303211310220101211133 -+ -21 27 27 29 21 21 18 30 24 24 31 7 31 22 28 16 16 31 25 31 31 14 22 30 30 27 31 27 26 29 6 18 12 22 26 -@1831_575_1321_F3 -T11001010233200122122022023000203212 -+ -15 26 33 31 30 31 29 28 32 31 27 32 30 29 31 29 30 21 29 31 20 29 6 19 31 24 30 8 22 31 22 30 14 23 24 -@1831_575_1373_F3 -T21213011223311001221321132013121220 -+ -32 31 31 31 29 31 26 28 24 27 31 30 30 22 31 29 31 25 31 26 31 26 16 22 30 21 18 15 14 22 28 19 11 17 27 -@1831_575_1419_F3 -T33222200303001021230212332001013020 -+ -29 14 14 18 12 29 5 12 13 12 29 4 16 16 14 31 5 14 5 22 25 27 11 12 16 28 11 10 17 27 21 6 4 5 27 -@1831_575_1436_F3 -T13210313021212303321202113301220331 -+ -9 17 31 28 26 18 24 9 18 27 9 19 27 25 29 20 17 29 29 24 6 22 25 27 28 6 15 28 29 16 6 16 18 21 27 -@1831_575_1442_F3 -T33132010022331132101132123132020222 -+ -23 29 20 23 27 30 22 29 10 16 33 21 12 14 24 27 27 25 20 30 29 32 25 16 31 30 20 18 24 13 31 19 14 16 29 -@1831_575_1454_F3 -T11131130011012021120222231313211113 -+ -17 19 28 30 23 28 21 20 23 24 28 15 25 32 28 25 30 29 21 27 26 31 14 11 19 10 12 21 10 14 6 13 11 7 11 -@1831_575_1500_F3 -T11010000223111301132313011130103021 -+ -17 30 31 31 30 32 31 30 23 27 21 27 25 24 23 20 28 24 24 24 24 24 28 28 33 18 27 20 27 27 11 22 30 29 24 -@1831_575_1535_F3 -T21312012030320112110211013300131121 -+ -31 33 28 31 27 31 31 33 30 25 32 31 31 28 29 31 30 21 23 31 28 30 31 20 30 22 26 25 21 27 27 26 29 20 27 -@1831_575_1724_F3 -T33123002323300220213232301000010010 -+ -24 27 33 13 10 31 8 11 17 9 13 4 8 8 8 19 4 17 31 26 22 2 4 7 4 10 3 23 8 8 23 20 4 5 20 -@1831_575_1829_F3 -T21033321320111321230233302313101021 -+ -17 17 7 9 6 4 13 18 3 10 22 8 31 5 4 3 6 18 9 10 9 2 14 2 14 9 10 15 13 28 5 2 8 10 15 -@1831_575_1898_F3 -T31330110303103131001110300102101330 -+ -31 33 29 31 31 5 16 14 8 8 6 19 15 8 4 2 23 14 13 4 2 23 3 7 7 2 26 19 6 3 6 21 18 11 11 -@1831_575_1964_F3 -T22010201103202213200201301300232123 -+ -16 29 18 24 8 31 17 27 17 14 31 10 24 30 17 28 5 8 29 29 31 9 21 17 28 20 5 17 27 19 17 13 6 30 10 -@1831_576_32_F3 -T13012100120333032211330300332022110 -+ -10 27 29 30 29 30 28 22 27 17 8 20 17 17 26 29 27 27 31 19 15 31 29 22 15 19 27 29 20 28 17 18 31 10 5 -@1831_576_74_F3 -T30103313210232220102021223012112100 -+ -23 28 31 31 30 31 29 7 30 30 27 33 20 30 31 31 31 24 27 31 29 27 10 29 27 26 31 6 26 29 21 24 21 16 30 -@1831_576_86_F3 -T10320000121033022010011030032211310 -+ -22 23 16 16 8 17 25 9 13 10 10 20 27 14 25 18 10 19 18 24 17 19 9 8 8 14 25 11 21 5 17 24 8 17 14 -@1831_576_89_F3 -T02132333203332020020220033002121120 -+ -17 8 21 24 10 11 6 13 19 28 12 11 29 14 29 7 9 3 2 8 18 15 18 15 9 6 7 11 4 8 17 2 2 3 11 -@1831_576_266_F3 -T30322223101312011300311121221333223 -+ -27 31 31 30 28 26 27 30 22 28 31 29 24 11 29 31 16 3 5 5 23 24 3 14 25 29 22 6 18 16 22 23 4 5 21 -@1831_576_327_F3 -T22112331301313021321001332120332130 -+ -27 31 30 31 21 31 31 26 27 31 30 29 27 31 29 28 28 18 31 25 28 28 27 18 31 31 29 20 18 27 24 29 27 21 28 -@1831_576_331_F3 -T32012133301311223023011232112333030 -+ -26 12 17 8 10 7 9 13 9 16 14 26 20 4 13 12 24 5 2 14 16 6 10 7 3 9 3 2 2 7 8 4 14 3 13 -@1831_576_387_F3 -T00101211032031120300200222001230022 -+ -14 23 8 13 3 20 2 16 2 9 4 13 3 2 2 13 9 2 3 4 2 2 12 4 11 10 11 16 2 5 4 13 4 8 8 -@1831_576_406_F3 -T00223133010210122221320212103132011 -+ -27 19 27 29 4 4 16 19 25 9 19 21 20 21 8 5 27 17 20 16 5 17 10 18 2 5 16 24 11 21 5 19 29 20 7 -@1831_576_449_F3 -T31312001121222231100020132132100220 -+ -7 10 6 5 6 13 11 11 3 14 10 13 8 3 3 23 5 4 2 10 30 5 11 2 8 12 5 2 2 2 22 11 10 2 9 -@1831_576_519_F3 -T03011321130130133213131202130321131 -+ -28 28 19 21 27 24 22 31 29 17 14 21 30 26 17 27 19 32 23 23 16 29 24 16 17 16 10 27 16 14 19 13 24 10 22 -@1831_576_603_F3 -T21003032313302312320131221001330311 -+ -31 31 19 21 28 31 34 13 30 30 27 32 22 24 31 31 26 12 27 31 31 29 17 24 33 30 29 20 20 27 33 22 20 24 23 -@1831_576_655_F3 -T02001023130302322122200313123123102 -+ -28 31 32 32 24 31 31 27 21 9 29 31 31 20 14 27 31 29 24 6 28 26 29 22 10 31 30 24 29 14 24 26 10 11 4 -@1831_576_677_F3 -T13330131023320301031013230210103022 -+ -21 17 24 15 5 14 9 15 2 5 6 5 11 13 17 6 2 5 9 3 5 7 6 2 12 4 7 3 9 2 4 3 8 2 4 -@1831_576_718_F3 -T31232113331022231333313223132231213 -+ -3 19 2 2 2 3 15 2 2 2 4 7 2 2 2 2 2 2 2 2 2 11 2 2 2 2 4 2 2 2 2 3 2 2 2 -@1831_576_722_F3 -T31230320322120231333030031100313200 -+ -7 9 11 12 11 2 2 13 8 9 5 7 9 16 4 9 7 4 7 12 17 2 10 8 12 2 13 5 12 2 4 4 3 6 8 -@1831_576_754_F3 -T30221231132103120112331303112133020 -+ -13 19 14 14 2 7 13 3 8 6 6 11 29 7 5 2 16 3 27 11 2 2 4 7 7 11 2 20 30 2 15 9 4 16 9 -@1831_576_815_F3 -T23022113203032010120310102321001031 -+ -27 18 29 31 30 24 29 31 30 33 28 29 28 26 29 32 30 30 30 28 29 25 17 20 28 19 13 17 20 30 21 27 20 22 13 -@1831_576_882_F3 -T13230020122320223230022031020110122 -+ -30 17 21 30 23 30 31 25 19 29 31 29 24 21 30 30 27 27 28 20 6 16 27 29 24 23 19 21 28 27 24 27 16 29 23 -@1831_576_898_F3 -T10230132312121033222231132231233213 -+ -28 31 31 34 17 30 34 29 30 27 29 31 23 23 21 33 30 26 30 13 30 30 23 22 28 33 27 23 27 16 20 30 30 28 13 -@1831_576_923_F3 -T21322010320202013210121223010123122 -+ -22 21 13 20 16 28 26 13 21 24 24 27 24 21 29 26 26 19 24 27 26 26 16 16 26 27 31 20 24 25 24 28 21 19 22 -@1831_576_930_F3 -T21322103230123110323102012021020013 -+ -17 2 9 15 13 17 5 13 25 7 7 2 6 16 19 6 2 2 12 8 2 4 3 3 17 4 2 3 14 16 5 2 4 14 2 -@1831_576_1019_F3 -T22032121213231032210312001103122312 -+ -17 27 3 29 3 11 16 11 5 10 10 5 31 11 13 8 6 10 14 10 2 24 6 21 24 14 21 6 17 7 10 12 6 24 12 -@1831_576_1068_F3 -T00020232013101330112220321203220211 -+ -25 29 29 27 28 19 30 26 31 22 28 30 30 24 30 26 24 29 20 31 24 30 25 23 31 25 28 20 6 26 22 26 6 2 19 -@1831_576_1131_F3 -T10233122200222132200313011102302210 -+ -16 15 19 31 2 31 14 31 11 19 29 24 30 17 10 30 16 20 22 16 31 6 11 29 28 26 7 22 20 24 26 9 24 17 27 -@1831_576_1168_F3 -T31013300131121323122002113301002010 -+ -29 31 34 34 21 31 31 17 30 24 28 29 22 30 26 22 21 27 26 19 21 22 31 26 24 11 15 4 17 21 6 6 11 19 3 -@1831_576_1207_F3 -T21001132013000122220301213221213010 -+ -4 3 29 17 11 7 5 30 19 30 7 11 31 25 27 5 11 31 29 30 3 5 25 23 32 4 4 28 15 13 4 11 20 24 22 -@1831_576_1289_F3 -T03021210023110200323310302013121203 -+ -31 24 27 29 16 33 31 31 26 22 31 31 21 21 18 28 28 17 23 11 20 6 25 23 27 27 11 13 28 17 29 29 13 20 15 -@1831_576_1329_F3 -T01100302102020113003022000120002100 -+ -27 29 5 15 11 23 22 15 14 32 31 31 14 20 13 26 28 26 25 6 5 31 18 6 5 3 3 4 11 10 2 7 3 5 17 -@1831_576_1367_F3 -T12231310311233110031222013332011023 -+ -30 30 31 31 27 29 31 31 28 31 27 31 27 28 31 29 31 30 30 24 25 30 27 28 29 28 27 23 26 20 24 31 22 23 22 -@1831_576_1416_F3 -T33021233100123120313103133211203221 -+ -10 6 26 30 13 13 16 13 27 31 6 13 28 10 21 13 20 30 22 27 15 12 30 22 26 7 4 28 29 20 21 13 24 23 31 -@1831_576_1461_F3 -T32022221221112233100210223002100100 -+ -2 16 5 22 19 2 7 2 7 5 2 2 3 2 11 6 2 2 2 4 2 4 4 2 9 2 5 4 4 2 2 4 4 4 6 -@1831_576_1605_F3 -T30232100103132133321330310210101221 -+ -21 27 31 34 31 31 29 16 26 31 25 26 27 27 31 31 24 31 30 30 30 24 27 18 30 20 12 17 16 28 19 23 22 22 11 -@1831_576_1664_F3 -T31212101001312110320301201002011120 -+ -31 31 30 29 30 31 28 32 25 31 31 29 31 28 6 28 27 29 28 8 13 29 28 24 9 23 8 7 22 2 14 10 10 26 8 -@1831_576_1671_F3 -T22313332300211322113223102231322313 -+ -31 31 30 31 20 29 31 31 23 5 23 30 17 20 2 5 8 5 20 5 5 8 16 20 5 5 11 5 19 4 5 11 5 21 4 -@1831_576_1729_F3 -T11233312313010012320101302101023030 -+ -31 30 31 30 27 30 27 31 29 32 30 14 28 28 30 29 30 22 29 30 31 23 27 30 31 29 24 24 26 29 27 10 15 28 29 -@1831_576_1880_F3 -T13032121323320213301001310130212003 -+ -15 20 16 20 14 22 24 17 11 25 11 22 14 4 14 15 20 11 4 3 8 25 10 2 23 4 17 7 16 22 20 19 8 8 18 -@1831_576_1982_F3 -T00032312310201201333221212000011030 -+ -11 31 31 30 31 11 32 29 27 31 24 31 28 30 31 24 33 28 23 27 21 31 31 21 31 17 27 32 30 29 13 22 27 10 31 -@1831_576_1987_F3 -T30022313313231221213220132001011320 -+ -8 2 2 7 8 7 2 5 2 2 8 4 8 14 12 2 4 3 16 16 2 4 18 29 6 2 2 5 3 11 2 3 3 6 10 -@1831_576_2014_F3 -T31123201010100321122111102113021003 -+ -31 31 31 24 11 33 17 24 12 20 29 6 30 11 10 30 22 24 10 14 32 6 26 6 17 31 6 20 5 14 24 11 21 5 16 -@1831_576_2028_F3 -T20131211210311112023201213120201100 -+ -20 27 29 24 29 20 6 17 7 5 22 15 22 13 23 2 5 5 18 24 11 15 4 22 14 2 7 2 11 9 4 5 20 9 10 -@1831_577_40_F3 -T11111212330120012020200031313303003 -+ -24 17 14 19 7 6 13 6 8 7 27 9 30 2 3 8 4 5 27 11 14 18 24 27 7 13 17 11 10 27 28 31 21 16 16 -@1831_577_119_F3 -T33111010021103320103213121313000102 -+ -24 29 30 34 16 16 8 12 16 14 8 2 26 2 14 11 23 20 15 9 10 13 10 3 3 20 20 20 15 10 4 12 13 19 15 -@1831_577_133_F3 -T33213323012231300122223032223331322 -+ -14 19 31 29 29 30 28 16 30 25 10 29 31 15 22 31 31 29 27 29 31 9 27 10 16 31 16 20 8 24 21 6 17 3 8 -@1831_577_255_F3 -T00332022110020300332022020202002232 -+ -22 27 28 23 22 31 29 21 24 4 9 9 2 5 2 12 10 3 13 2 5 5 2 10 3 12 10 4 5 4 13 11 4 20 2 -@1831_577_281_F3 -T03032301231212301013112222111210000 -+ -22 12 25 33 26 23 31 28 26 29 22 31 29 19 30 28 30 10 21 20 24 30 26 20 27 22 30 26 24 31 23 7 29 25 30 -@1831_577_288_F3 -T01031120221303100221230021013201130 -+ -20 26 14 22 24 30 30 5 28 33 25 25 17 24 23 9 21 13 22 14 10 19 5 17 16 11 22 11 21 30 13 22 2 6 21 -@1831_577_322_F3 -T12003213220230103303201000130312202 -+ -24 28 26 29 19 20 15 21 26 17 20 20 19 21 19 12 27 2 22 10 16 24 19 5 17 27 30 21 20 24 21 23 8 22 14 -@1831_577_362_F3 -T31203302330110131230331210121110220 -+ -21 17 33 30 25 31 30 31 27 30 24 20 23 28 11 18 25 11 24 15 25 5 6 12 24 24 11 21 27 20 13 7 3 10 21 -@1831_577_382_F3 -T32312123033111120321303230201332100 -+ -16 17 24 20 22 14 25 16 8 8 28 22 21 7 9 17 19 26 11 18 10 25 27 13 5 13 5 12 28 16 28 17 14 20 9 -@1831_577_464_F3 -T13020221011130013102221333131203302 -+ -18 28 27 22 14 27 23 17 21 8 29 2 13 6 5 19 17 15 19 10 20 2 14 15 19 16 13 22 9 24 16 5 22 20 21 -@1831_577_488_F3 -T13200302330322110200323132101120301 -+ -25 19 23 13 11 9 29 21 20 21 21 27 30 23 28 27 28 27 17 29 21 26 24 19 29 26 28 24 29 31 23 24 17 19 31 -@1831_577_511_F3 -T32232133031023313331312220133230333 -+ -2 22 14 10 5 3 25 27 22 4 21 11 3 3 4 6 4 14 10 8 2 3 22 7 7 5 9 18 29 16 21 6 15 14 10 -@1831_577_545_F3 -T00112131333222303222210031322103233 -+ -29 29 27 27 24 30 27 29 30 32 27 19 23 16 31 27 31 23 28 28 31 22 21 14 21 16 27 24 20 13 20 24 23 23 12 -@1831_577_559_F3 -T32321101303233120102011130022122002 -+ -13 27 31 26 30 30 31 29 31 30 14 17 27 13 31 16 28 29 16 17 28 21 16 14 26 28 30 13 5 17 10 24 17 8 6 -@1831_577_562_F3 -T32331101301233110121000220031120031 -+ -2 7 7 5 9 5 15 4 8 16 4 8 2 7 3 17 12 11 9 9 9 4 14 12 11 11 8 8 5 11 12 13 16 6 9 -@1831_577_637_F3 -T22113312122202103031023120301031110 -+ -23 12 11 19 2 29 25 12 21 10 25 23 11 5 7 20 26 18 28 15 29 22 28 21 23 5 16 14 24 5 6 30 26 19 11 -@1831_577_641_F3 -T13031301101121223221212020032131113 -+ -5 19 22 26 14 6 25 32 26 26 20 30 25 22 17 11 7 28 8 11 2 9 30 10 13 2 5 22 3 23 2 4 22 14 6 -@1831_577_692_F3 -T01122320200330103121202301211100220 -+ -31 33 11 31 30 31 33 7 31 32 30 31 10 31 31 29 31 10 30 28 29 31 6 28 27 31 27 28 27 24 28 30 22 20 27 diff -r 19d8ba4269ba -r 8bd2ace6c92d test-data/combine_phiX_out_2.fastqcssanger --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/combine_phiX_out_2.fastqcssanger Tue Mar 02 10:47:23 2010 -0500 @@ -0,0 +1,576 @@ +@1831_573_1004_F3 +T00030133312212111300011021310132222 ++ +%><C&&9952+C>5<.?<79,=42<292:<(9/-7 +@1831_573_1050_F3 +T03330322230322112131010221102122113 ++ +);@@17?@=>7??@A8?==@4A?A4)&+.'&+'1, +@1831_573_1067_F3 +T00023032023103330112220321200200002 ++ +.++#%(',%/$,+&1#&),)&+'*'*%#$&#%('$ +@1831_573_1219_F3 +T11211130300300301021212330201121310 ++ +@@@=4/+)5)408?'665>*/5?<61';<3,:,5- +@1831_573_1242_F3 +T02132003121011302100130302112221121 ++ +>>>::>17=A5?@@=;7A=;2.60>82<8=74+;; +@1831_573_1333_F3 +T00200312330110101013212313222303112 ++ +)='@#%3=.>)/34*117,,/6-4+.9742456<) +@1831_573_1362_F3 +T21203131001102231121211101111321131 ++ +CB@@?@@?@C@BA?@>@<@8A@?@'.8'?17:,+? +@1831_573_1448_F3 +T23101211223113320132212331313312022 ++ +77=A)?,.@A@@:@@<=/7)@<-#8662%9613&+ +@1831_573_1490_F3 +T31312310323301210002210123101021011 ++ +@@@@?,@??@$><=>+%/*>*1,)?26&12'9%7. +@1831_573_1523_F3 +T10322001220012223202202222001230222 ++ +(,//*,#8''.6''6'2&27/80)%&#0'%#*,2' +@1831_573_1578_F3 +T21202302100010020121100311022120111 ++ +@?=@<@C@?@@??=>@;7<<8<694)3511(+1<. +@1831_573_1647_F3 +T10222233301013033120132223202022123 ++ +=?@@<@@???;A==@@;9?@?3=;6.4/;6:=/;4 +@1831_573_1684_F3 +T13310013212312012302121010221231123 ++ +7>1:8<@39@@??9=;@@<>?@@<;<?7>76?9>? +@1831_573_1769_F3 +T33220123030232212032021032302233131 ++ +754749&&767%/7;3$-7;3#,3//#,45/#&06 +@1831_573_1853_F3 +T11000012111222211310103212122102331 ++ +64./B@@72B+/4?@?7?+@9/+99.')2<2&)2& +@1831_573_1943_F3 +T20300123032210232001222122001132111 ++ +(>/*1,),@-)'0*>5'$/?6(a)/.&?8/(')A43, +@1831_573_1977_F3 +T22212302221310332321002303112011311 ++ +@@?6@8@@9A@=4633A7?9?<3:+7>'@%@?%32 +@1831_574_109_F3 +T13122332123301331032220222133301033 ++ +07651#4817>@65<2:84716=788<1995.7?6 +@1831_574_148_F3 +T01200113123030012202302312200010231 ++ +<;->3;;3>//>0;;7=,=4-4/+>029<9<624; +@1831_574_185_F3 +T21123333211302300321312212102123121 ++ +@<4;%%@7>#*>97%6;+8$#<07%1372$%<54# +@1831_574_243_F3 +T30221011230013102201033131203302330 ++ +#@@@95@=9?*><45$<@<4%@9?7#=?>7&>?97 +@1831_574_257_F3 +T00301133110002100302003000000102301 ++ +%>>B>)@?>B@B?@1%*%,#+00.'(+&5&%#$3& +@1831_574_293_F3 +T23213210003000103010211331300320130 ++ +&')7'.*%#&$'/.$##$.$&*)+*$#8%&%#&&% +@1831_574_389_F3 +T21032213032101122333230212301312020 ++ +))$>/>8):2@:213;;.1)@3%64%+)<7)+$92 +@1831_574_575_F3 +T33313322100212102033032123311211302 ++ +7?@>=?@>8@@@=@6*%&<='5@<<',0<=4*5/< +@1831_574_592_F3 +T33103330110123102223122023103310330 ++ +73-5)19,,<@>4067<2.-864346;9<1/;212 +@1831_574_617_F3 +T20021031221222021210021322200223211 ++ +@>@?;>?=@==@>@=5?@+@:@40@><:0)')64- +@1831_574_725_F3 +T32010020322130330333010031120313210 ++ +9'>?52+5=;4$6;<8.1<47*9+?7(+5;-).)4 +@1831_574_734_F3 +T31132301200020012302210322213222222 ++ +.-&.$2&<*(-%):/)%5:)/%7+,9034*A.?70 +@1831_574_824_F3 +T30212100033032123311211302122020013 ++ +;@@@;;),+@<-<7;<&89??&29?<$2:A<);8? +@1831_574_959_F3 +T11212130220131221111002020123311211 ++ +7A=;+?@9;/<@;<8#&&/*%(%.0$0$2)+1$-1 +@1831_574_1062_F3 +T30112230030300221001032033012211012 ++ +4@821<//:136/8<1/5.427.;>288/0<1$)/ +@1831_574_1092_F3 +T02013221200031031212200000111130310 ++ +<8?.,98)03%#,,,(,++$'69'#9'7#';6.%2 +@1831_574_1103_F3 +T20313113203302010303131123021310121 ++ +@??>?@=>@@A<>?=@==<:?<;58'&&):+35'1 +@1831_574_1116_F3 +T21011310123202303021021112021231011 ++ +)(a)++,)/)?./)%<)2>.==:8?&;44&/&,)/*4 +@1831_574_1194_F3 +T23303101033322220312200222013013312 ++ +:5>;,??9@9@?@1@@=@3=@>@4?@@94?75/,6 +@1831_574_1204_F3 +T21330132231321322010303023221203200 ++ +AA5A5B@5:;@@,.9?A1?#.?;3),>82%)='7* +@1831_574_1306_F3 +T10332133020311023221213100301001220 ++ +02.7&%''.$&#'%##$#'#%')')$'$%$,)'.1 +@1831_574_1387_F3 +T12301331310032132101301303230121111 ++ +-?A??:@?@@9?@@?9C;:>&).,,);&'<&7(/' +@1831_574_1431_F3 +T12011023331022213001123111301312011 ++ +>7?>9BA897;+8*=6#6.+5&-#26$0.,5&'$1 +@1831_574_1560_F3 +T32212313302203320020222113111011111 ++ +=))&65<4=>99@:597(1&;+&(%&4#,#&&&*$ +@1831_574_1591_F3 +T23202101330322130221230222201123202 ++ +==<A><?@78@<=;@&@6>8:?,><&&<7>8(8+9 +@1831_574_1624_F3 +T20122200222132200313011102302210332 ++ +#<6.&(,7-+))7..'/;43.)927.(<85&13-) +@1831_574_1826_F3 +T13012312120112021233030302313201111 ++ ++@<<,))459<?.+57'-'&6?1)(;1;0&%4,#$ +@1831_574_1903_F3 +T30232100103132133321330310210101221 ++ +<956?@>;7@@@8:@>8><=9>9>@2=71?1:6;/ +@1831_574_1961_F3 +T02333101331223303300200011100032200 ++ +6>-07-@>(2'@<#064@%5%@@6.&<<(9)=:47 +@1831_575_54_F3 +T13331330322230200102132110132013200 ++ +>=@@68<2;<8;?@<>+9>7,,6972&57:4&9<8 +@1831_575_80_F3 +T33133322233322221003332230323312313 ++ +*?5><@?/=5%(&.5)+#/0'/'>#$/'37#()6& +@1831_575_192_F3 +T30013012111133003301010212123302011 ++ +0:8<,9(.=/)#%8$,4'<,:)3/.'.5<,>-;7' +@1831_575_197_F3 +T33312113010133020301131330001310032 ++ +,-:?463@A:88?6?437<=.2&1.;@67.4@%2, +@1831_575_223_F3 +T10121010002202131221210302100121020 ++ +@?>?8?@:?;>+$'%&,+#$.--#%$1'&#-7$&' +@1831_575_420_F3 +T31110103220000101310112112001020212 ++ +82?.>?(-''2+..@),$%1@;')1)?+)7.').. +@1831_575_434_F3 +T30312132120223101113223301211113311 ++ +<@@><@B@>=@@?>><@?;)@?;6.?=4,'';/3) +@1831_575_444_F3 +T33022120112320220100202132332113320 ++ +<2@@;<.=?@<+=:A<<@?<</>@><(<8>4&5;> +@1831_575_459_F3 +T31330310210101223330110231120131100 ++ +?@@C@?A@@A@??A@@'6@@B'=;C@'4<=9,@1. +@1831_575_506_F3 +T31210200111210121332321310110132301 ++ +8?)2*5@3+.7=?A:8@,/&):@37/<89'+4*)* +@1831_575_569_F3 +T10210201321323001012232322323002203 ++ +/'9-,@29+479%&>9#&08=>7#9>,69/+'*3) +@1831_575_622_F3 +T01100031122111023002323113231210111 ++ +@A8B=@@?<@?<>>=?96<497)<4/<':4+;74+ +@1831_575_644_F3 +T11332003221203131231202200030110130 ++ +<<8>.>&,+)8.10':5(/-62&*.=/%(.<&&18 +@1831_575_663_F3 +T32210013303112103322311101322021210 ++ +@@@@@A</;A>@6>0792<5966:?;25+:><1,+ +@1831_575_681_F3 +T23131132033020103031013233200101021 ++ +.72?.)25;96-14'*.03'#4#++$)/8+%/((& +@1831_575_711_F3 +T03032331231101231020121210002332121 ++ +4%+:2(#'1+.)&*45-#,<A-%4;>+))<;##*& +@1831_575_730_F3 +T31010102200110302123032330331011111 ++ +,%8<%-')5,*1&=#)(1*1)->7$.,4'4'&'*& +@1831_575_904_F3 +T20111213300020123200333321131121211 ++ +?<><.689@@7@<54:4=@>69=:+6-=42;8<:# +@1831_575_938_F3 +T13103102220022130222233301013033120 ++ +;:@@:?@;=8;>=;;:=<93<4.;<6:2<9;4)87 +@1831_575_970_F3 +T23201311301023133303023011202220221 ++ +=@=@=;@@><@@:9<:=?;>@=?9>>?@:2===<5 +@1831_575_991_F3 +T33312212031111111012212120321121210 ++ +@>>;7???/4<:::,#&*%'$--5-#(7)&&,-)% +@1831_575_1138_F3 +T23320002011320012120333103233301321 ++ +<=0;%1936+?96?,?5<:2>@6@<:;4>.7;*:1 +@1831_575_1157_F3 +T13121323330203331222022230133102321 ++ +@B@B>?A?A@?9'?;?&8?@@6;<@=+<:99+965 +@1831_575_1180_F3 +T32003310122102323303101123331133110 ++ +/<B>5?':/78?;1;55:997@@>94=7<186->7 +@1831_575_1283_F3 +T02232200301300220130032321323131333 ++ +%C@A54><?A78@<?2>:#>=?@2>80:'?69.'7 +@1831_575_1302_F3 +T01201303312333123130200123201013021 ++ +&12>/#2'&-2&%'7+$%*#$/1(&&12/$,2,,* +@1831_575_1310_F3 +T31332131312021303211310220101211133 ++ +6<<>663?99@(@7=11@:@@/7??<@<;>'3-7; +@1831_575_1321_F3 +T11001010233200122122022023000203212 ++ +0;B@?@>=A@<A?>@>?6>@5>'4@9?)7@7?/89 +@1831_575_1373_F3 +T21213011223311001221321132013121220 ++ +A@@@>@;=9<@??7@>@:@;@;17?630/7=4,2< +@1831_575_1419_F3 +T33222200303001021230212332001013020 ++ +>//3->&-.->%11/@&/&7:<,-1=,+2<6'%&< +@1831_575_1436_F3 +T13210313021212303321202113301220331 ++ +*2@=;39*3<*4<:>52>>9'7:<='0=>1'136< +@1831_575_1442_F3 +T33132010022331132101132123132020222 ++ +8>58<?7>+1B6-/9<<:5?>A:1@?539.@4/1> +@1831_575_1454_F3 +T11131130011012021120222231313211113 ++ +24=?8=6589=0:A=:?>6<;@/,4+-6+/'.,(, +@1831_575_1500_F3 +T11010000223111301132313011130103021 ++ +2?@@?A@?8<6<:985=99999==B3<5<<,7?>9 +@1831_575_1535_F3 +T21312012030320112110211013300131121 ++ +@B=@<@@B?:A@@=>@?68@=?@5?7;:6<<;>5< +@1831_575_1724_F3 +T33123002323300220213232301000010010 ++ +9<B.+@),2*.%)))4%2@;7#%(%+$8))85%&5 +@1831_575_1829_F3 +T21033321320111321230233302313101021 ++ +22(*'%.3$+7)@&%$'3*+*#/#/*+0.=&#)+0 +@1831_575_1898_F3 +T31330110303103131001110300102101330 ++ +@B>@@&1/))'40)%#8/.%#8$((#;4'$'63,, +@1831_575_1964_F3 +T22010201103202213200201301300232123 ++ +1>39)@2<2/@+9?2=&)>>@*62=5&2<42.'?+ +@1831_576_32_F3 +T13012100120333032211330300332022110 ++ ++<>?>?=7<2)522;><<@40@>704<>5=23@+& +@1831_576_74_F3 +T30103313210232220102021223012112100 ++ +8=@@?@>(??<B5?@@@9<@><+><;@';>6961? +@1831_576_86_F3 +T10320000121033022010011030032211310 ++ +7811)2:*.++5</:3+43924*))/:,6&29)2/ +@1831_576_89_F3 +T02132333203332020020220033002121120 ++ +2)69+,'.4=-,>/>(*$#)3030*'(,%)2##$, +@1831_576_266_F3 +T30322223101312011300311121221333223 ++ +<@@?=;<?7=@>9,>@1$&&89$/:>7'3178%&6 +@1831_576_327_F3 +T22112331301313021321001332120332130 ++ +<@?@6@@;<@?><@>==3@:==<3@@>53<9><6= +@1831_576_331_F3 +T32012133301311223023011232112333030 ++ +;-2)+(*.*1/;5%.-9&#/1'+($*$##()%/$. +@1831_576_387_F3 +T00101211032031120300200222001230022 ++ +/8).$5#1#*%.$##.*#$%##-%,+,1#&%.%)) +@1831_576_406_F3 +T00223133010210122221320212103132011 ++ +<4<>%%14:*4656)&<251&2+3#&19,6&4>5( +@1831_576_449_F3 +T31312001121222231100020132132100220 ++ +(+'&'.,,$/+.)$$8&%#+?&,#)-&###7,+#* +@1831_576_519_F3 +T03011321130130133213131202130321131 ++ +==46<97@>2/6?;2<4A881>9121+<1/4.9+7 +@1831_576_603_F3 +T21003032313302312320131221001330311 ++ +@@46=@C.??<A79@@;-<@@>29B?>55<B7598 +@1831_576_655_F3 +T02001023130302322122200313123123102 ++ +=@AA9@@<6*>@@5/<@>9'=;>7+@?9>/9;+,% +@1831_576_677_F3 +T13330131023320301031013230210103022 ++ +6290&/*0#&'&,.2'#&*$&('#-%($*#%$)#% +@1831_576_718_F3 +T31232113331022231333313223132231213 ++ +$4###$0###%(#########,####%####$### +@1831_576_722_F3 +T31230320322120231333030031100313200 ++ +(*,-,##.)*&(*1%*(%(-2#+)-#.&-#%%$') +@1831_576_754_F3 +T30221231132103120112331303112133020 ++ +.4//#(.$)'',>(&#1$<,##%((,#5?#0*%1* +@1831_576_815_F3 +T23022113203032010120310102321001031 ++ +<3>@?9>@?B=>=;>A???=>:25=4.25?6<57. +@1831_576_882_F3 +T13230020122320223230022031020110122 ++ +?26?8?@:4>@>96??<<=5'1<>9846=<9<1>8 +@1831_576_898_F3 +T10230132312121033222231132231233213 ++ +=@@C2?C>?<>@886B?;?.??87=B<8<15??=. +@1831_576_923_F3 +T21322010320202013210121223010123122 ++ +76.51=;.699<96>;;49<;;11;<@59:9=647 +@1831_576_930_F3 +T21322103230123110323102012021020013 ++ +2#*0.2&.:((#'14'##-)#%$$2%#$/1&#%/# +@1831_576_1019_F3 +T22032121213231032210312001103122312 ++ +2<$>$,1,&++&@,.)'+/+#9'69/6'2(+-'9- +@1831_576_1068_F3 +T00020232013101330112220321203220211 ++ +:>><=4?;@7=??9?;9>5@9?:8@:=5';7;'#4 +@1831_576_1131_F3 +T10233122200222132200313011102302210 ++ +104@#@/@,4>9?2+?1571@',>=;(759;*92< +@1831_576_1168_F3 +T31013300131121323122002113301002010 ++ +>@CC6@@2?9=>7?;76<;467@;9,0%26'',4$ +@1831_576_1207_F3 +T21001132013000122220301213221213010 ++ +%$>2,(&?4?(,@:<&,@>?$&:8A%%=0.%,597 +@1831_576_1289_F3 +T03021210023110200323310302013121203 ++ +@9<>1B@@;7@@663==28,5':8<<,.=2>>.50 +@1831_576_1329_F3 +T01100302102020113003022000120002100 ++ +<>&0,870/A@@/5.;=;:'&@3'&$$%,+#($&2 +@1831_576_1367_F3 +T12231310311233110031222013332011023 ++ +??@@<>@@=@<@<=@>@??9:?<=>=<8;59@787 +@1831_576_1416_F3 +T33021233100123120313103133211203221 ++ ++';?..1.<@'.=+6.5?7<0-?7;(%=>56.98@ +@1831_576_1461_F3 +T32022221221112233100210223002100100 ++ +#1&74#(#(&##$#,'###%#%%#*#&%%##%%%' +@1831_576_1605_F3 +T30232100103132133321330310210101221 ++ +6<@C@@>1;@:;<<@@9@???9<3?5-21=4877, +@1831_576_1664_F3 +T31212101001312110320301201002011120 ++ +@@?>?@=A:@@>@='=<>=).>=9*8)(7#/++;) +@1831_576_1671_F3 +T22313332300211322113223102231322313 ++ +@@?@5>@@8&8?25#&)&5&&)15&&,&4%&,&6% +@1831_576_1729_F3 +T11233312313010012320101302101023030 ++ +@?@?<?<@>A?/==?>?7>?@8<?@>99;><+0=> +@1831_576_1880_F3 +T13032121323320213301001310130212003 ++ +0515/792,:,7/%/05,%$):+#8%2(1754))3 +@1831_576_1982_F3 +T00032312310201201333221212000011030 ++ +,@@?@,A><@9@=?@9B=8<6@@6@2<A?>.7<+@ +@1831_576_1987_F3 +T30022313313231221213220132001011320 ++ +)##()(#&##)%)/-#%$11#%3>'##&$,#$$'+ +@1831_576_2014_F3 +T31123201010100321122111102113021003 ++ +@@@9,B29-5>'?,+?79+/A';'2@'5&/9,6&1 +@1831_576_2028_F3 +T20131211210311112023201213120201100 ++ +5<>9>5'2(&707.8#&&39,0%7/#(#,*%&5*+ +@1831_577_40_F3 +T11111212330120012020200031313303003 ++ +92/4('.')(<*?#$)%&<,/39<(.2,+<=@611 +@1831_577_119_F3 +T33111010021103320103213121313000102 ++ +9>?C11)-1/)#;#/,850*+.+$$5550+%-.40 +@1831_577_133_F3 +T33213323012231300122223032223331322 ++ +/4@>>?=1?:+>@07@@><>@*<+1@15)96'2$) +@1831_577_255_F3 +T00332022110020300332022020202002232 ++ +7<=87@>69%**#&#-+$.#&&#+$-+%&%.,%5# +@1831_577_281_F3 +T03032301231212301013112222111210000 ++ +7-:B;8@=;>7@>4?=?+659?;5<7?;9@8(>:? +@1831_577_288_F3 +T01031120221303100221230021013201130 ++ +5;/79??&=B::298*6.7/+4&21,7,6?.7#'6 +@1831_577_322_F3 +T12003213220230103303201000130312202 ++ +9=;>4506;255464-<#7+194&2<?65968)7/ +@1831_577_362_F3 +T31203302330110131230331210121110220 ++ +62B?:@?@<?958=,3:,90:&'-99,6<5.($+6 +@1831_577_382_F3 +T32312123033111120321303230201332100 ++ +12957/:1))=76(*24;,3+:<.&.&-=1=2/5* +@1831_577_464_F3 +T13020221011130013102221333131203302 ++ +3=<7/<826)>#.'&4204+5#/041.7*91&756 +@1831_577_488_F3 +T13200302330322110200323132101120301 ++ +:48.,*>6566<?8=<=<2>6;94>;=9>@8924@ +@1831_577_511_F3 +T32232133031023313331312220133230333 ++ +#7/+&$:<7%6,$$%'%/+)#$7((&*3>16'0/+ +@1831_577_545_F3 +T00112131333222303222210031322103233 ++ +>><<9?<>?A<481@<@8==@76/61<95.5988- +@1831_577_559_F3 +T32321101303233120102011130022122002 ++ +.<@;??@>@?/2<.@1=>12=61/;=?.&2+92)' +@1831_577_562_F3 +T32331101301233110121000220031120031 ++ +#((&*&0%)1%)#($2-,***%/-,,))&,-.1'* +@1831_577_637_F3 +T22113312122202103031023120301031110 ++ +8-,4#>:-6+:8,&(5;3=0>7=68&1/9&'?;4, +@1831_577_641_F3 +T13031301101121223221212020032131113 ++ +&47;/':A;;5?:72,(=),#*?+.#&7$8#%7/' +@1831_577_692_F3 +T01122320200330103121202301211100220 ++ +@B,@?@B(@A?@+@@>@+?=>@'=<@<=<9=?75< diff -r 19d8ba4269ba -r 8bd2ace6c92d test-data/combine_phiX_out_2.fastqsolid --- a/test-data/combine_phiX_out_2.fastqsolid Tue Mar 02 09:51:05 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,576 +0,0 @@ -@1831_573_1004_F3 -T00030133312212111300011021310132222 -+ -%><C&&9952+C>5<.?<79,=42<292:<(9/-7 -@1831_573_1050_F3 -T03330322230322112131010221102122113 -+ -);@@17?@=>7??@A8?==@4A?A4)&+.'&+'1, -@1831_573_1067_F3 -T00023032023103330112220321200200002 -+ -.++#%(',%/$,+&1#&),)&+'*'*%#$&#%('$ -@1831_573_1219_F3 -T11211130300300301021212330201121310 -+ -@@@=4/+)5)408?'665>*/5?<61';<3,:,5- -@1831_573_1242_F3 -T02132003121011302100130302112221121 -+ ->>>::>17=A5?@@=;7A=;2.60>82<8=74+;; -@1831_573_1333_F3 -T00200312330110101013212313222303112 -+ -)='@#%3=.>)/34*117,,/6-4+.9742456<) -@1831_573_1362_F3 -T21203131001102231121211101111321131 -+ -CB@@?@@?@C@BA?@>@<@8A@?@'.8'?17:,+? -@1831_573_1448_F3 -T23101211223113320132212331313312022 -+ -77=A)?,.@A@@:@@<=/7)@<-#8662%9613&+ -@1831_573_1490_F3 -T31312310323301210002210123101021011 -+ -@@@@?,@??@$><=>+%/*>*1,)?26&12'9%7. -@1831_573_1523_F3 -T10322001220012223202202222001230222 -+ -(,//*,#8''.6''6'2&27/80)%&#0'%#*,2' -@1831_573_1578_F3 -T21202302100010020121100311022120111 -+ -@?=@<@C@?@@??=>@;7<<8<694)3511(+1<. -@1831_573_1647_F3 -T10222233301013033120132223202022123 -+ -=?@@<@@???;A==@@;9?@?3=;6.4/;6:=/;4 -@1831_573_1684_F3 -T13310013212312012302121010221231123 -+ -7>1:8<@39@@??9=;@@<>?@@<;<?7>76?9>? -@1831_573_1769_F3 -T33220123030232212032021032302233131 -+ -754749&&767%/7;3$-7;3#,3//#,45/#&06 -@1831_573_1853_F3 -T11000012111222211310103212122102331 -+ -64./B@@72B+/4?@?7?+@9/+99.')2<2&)2& -@1831_573_1943_F3 -T20300123032210232001222122001132111 -+ -(>/*1,),@-)'0*>5'$/?6(a)/.&?8/(')A43, -@1831_573_1977_F3 -T22212302221310332321002303112011311 -+ -@@?6@8@@9A@=4633A7?9?<3:+7>'@%@?%32 -@1831_574_109_F3 -T13122332123301331032220222133301033 -+ -07651#4817>@65<2:84716=788<1995.7?6 -@1831_574_148_F3 -T01200113123030012202302312200010231 -+ -<;->3;;3>//>0;;7=,=4-4/+>029<9<624; -@1831_574_185_F3 -T21123333211302300321312212102123121 -+ -@<4;%%@7>#*>97%6;+8$#<07%1372$%<54# -@1831_574_243_F3 -T30221011230013102201033131203302330 -+ -#@@@95@=9?*><45$<@<4%@9?7#=?>7&>?97 -@1831_574_257_F3 -T00301133110002100302003000000102301 -+ -%>>B>)@?>B@B?@1%*%,#+00.'(+&5&%#$3& -@1831_574_293_F3 -T23213210003000103010211331300320130 -+ -&')7'.*%#&$'/.$##$.$&*)+*$#8%&%#&&% -@1831_574_389_F3 -T21032213032101122333230212301312020 -+ -))$>/>8):2@:213;;.1)@3%64%+)<7)+$92 -@1831_574_575_F3 -T33313322100212102033032123311211302 -+ -7?@>=?@>8@@@=@6*%&<='5@<<',0<=4*5/< -@1831_574_592_F3 -T33103330110123102223122023103310330 -+ -73-5)19,,<@>4067<2.-864346;9<1/;212 -@1831_574_617_F3 -T20021031221222021210021322200223211 -+ -@>@?;>?=@==@>@=5?@+@:@40@><:0)')64- -@1831_574_725_F3 -T32010020322130330333010031120313210 -+ -9'>?52+5=;4$6;<8.1<47*9+?7(+5;-).)4 -@1831_574_734_F3 -T31132301200020012302210322213222222 -+ -.-&.$2&<*(-%):/)%5:)/%7+,9034*A.?70 -@1831_574_824_F3 -T30212100033032123311211302122020013 -+ -;@@@;;),+@<-<7;<&89??&29?<$2:A<);8? -@1831_574_959_F3 -T11212130220131221111002020123311211 -+ -7A=;+?@9;/<@;<8#&&/*%(%.0$0$2)+1$-1 -@1831_574_1062_F3 -T30112230030300221001032033012211012 -+ -4@821<//:136/8<1/5.427.;>288/0<1$)/ -@1831_574_1092_F3 -T02013221200031031212200000111130310 -+ -<8?.,98)03%#,,,(,++$'69'#9'7#';6.%2 -@1831_574_1103_F3 -T20313113203302010303131123021310121 -+ -@??>?@=>@@A<>?=@==<:?<;58'&&):+35'1 -@1831_574_1116_F3 -T21011310123202303021021112021231011 -+ -)(a)++,)/)?./)%<)2>.==:8?&;44&/&,)/*4 -@1831_574_1194_F3 -T23303101033322220312200222013013312 -+ -:5>;,??9@9@?@1@@=@3=@>@4?@@94?75/,6 -@1831_574_1204_F3 -T21330132231321322010303023221203200 -+ -AA5A5B@5:;@@,.9?A1?#.?;3),>82%)='7* -@1831_574_1306_F3 -T10332133020311023221213100301001220 -+ -02.7&%''.$&#'%##$#'#%')')$'$%$,)'.1 -@1831_574_1387_F3 -T12301331310032132101301303230121111 -+ --?A??:@?@@9?@@?9C;:>&).,,);&'<&7(/' -@1831_574_1431_F3 -T12011023331022213001123111301312011 -+ ->7?>9BA897;+8*=6#6.+5&-#26$0.,5&'$1 -@1831_574_1560_F3 -T32212313302203320020222113111011111 -+ -=))&65<4=>99@:597(1&;+&(%&4#,#&&&*$ -@1831_574_1591_F3 -T23202101330322130221230222201123202 -+ -==<A><?@78@<=;@&@6>8:?,><&&<7>8(8+9 -@1831_574_1624_F3 -T20122200222132200313011102302210332 -+ -#<6.&(,7-+))7..'/;43.)927.(<85&13-) -@1831_574_1826_F3 -T13012312120112021233030302313201111 -+ -+@<<,))459<?.+57'-'&6?1)(;1;0&%4,#$ -@1831_574_1903_F3 -T30232100103132133321330310210101221 -+ -<956?@>;7@@@8:@>8><=9>9>@2=71?1:6;/ -@1831_574_1961_F3 -T02333101331223303300200011100032200 -+ -6>-07-@>(2'@<#064@%5%@@6.&<<(9)=:47 -@1831_575_54_F3 -T13331330322230200102132110132013200 -+ ->=@@68<2;<8;?@<>+9>7,,6972&57:4&9<8 -@1831_575_80_F3 -T33133322233322221003332230323312313 -+ -*?5><@?/=5%(&.5)+#/0'/'>#$/'37#()6& -@1831_575_192_F3 -T30013012111133003301010212123302011 -+ -0:8<,9(.=/)#%8$,4'<,:)3/.'.5<,>-;7' -@1831_575_197_F3 -T33312113010133020301131330001310032 -+ -,-:?463@A:88?6?437<=.2&1.;@67.4@%2, -@1831_575_223_F3 -T10121010002202131221210302100121020 -+ -@?>?8?@:?;>+$'%&,+#$.--#%$1'&#-7$&' -@1831_575_420_F3 -T31110103220000101310112112001020212 -+ -82?.>?(-''2+..@),$%1@;')1)?+)7.').. -@1831_575_434_F3 -T30312132120223101113223301211113311 -+ -<@@><@B@>=@@?>><@?;)@?;6.?=4,'';/3) -@1831_575_444_F3 -T33022120112320220100202132332113320 -+ -<2@@;<.=?@<+=:A<<@?<</>@><(<8>4&5;> -@1831_575_459_F3 -T31330310210101223330110231120131100 -+ -?@@C@?A@@A@??A@@'6@@B'=;C@'4<=9,@1. -@1831_575_506_F3 -T31210200111210121332321310110132301 -+ -8?)2*5@3+.7=?A:8@,/&):@37/<89'+4*)* -@1831_575_569_F3 -T10210201321323001012232322323002203 -+ -/'9-,@29+479%&>9#&08=>7#9>,69/+'*3) -@1831_575_622_F3 -T01100031122111023002323113231210111 -+ -@A8B=@@?<@?<>>=?96<497)<4/<':4+;74+ -@1831_575_644_F3 -T11332003221203131231202200030110130 -+ -<<8>.>&,+)8.10':5(/-62&*.=/%(.<&&18 -@1831_575_663_F3 -T32210013303112103322311101322021210 -+ -@@@@@A</;A>@6>0792<5966:?;25+:><1,+ -@1831_575_681_F3 -T23131132033020103031013233200101021 -+ -.72?.)25;96-14'*.03'#4#++$)/8+%/((& -@1831_575_711_F3 -T03032331231101231020121210002332121 -+ -4%+:2(#'1+.)&*45-#,<A-%4;>+))<;##*& -@1831_575_730_F3 -T31010102200110302123032330331011111 -+ -,%8<%-')5,*1&=#)(1*1)->7$.,4'4'&'*& -@1831_575_904_F3 -T20111213300020123200333321131121211 -+ -?<><.689@@7@<54:4=@>69=:+6-=42;8<:# -@1831_575_938_F3 -T13103102220022130222233301013033120 -+ -;:@@:?@;=8;>=;;:=<93<4.;<6:2<9;4)87 -@1831_575_970_F3 -T23201311301023133303023011202220221 -+ -=@=@=;@@><@@:9<:=?;>@=?9>>?@:2===<5 -@1831_575_991_F3 -T33312212031111111012212120321121210 -+ -@>>;7???/4<:::,#&*%'$--5-#(7)&&,-)% -@1831_575_1138_F3 -T23320002011320012120333103233301321 -+ -<=0;%1936+?96?,?5<:2>@6@<:;4>.7;*:1 -@1831_575_1157_F3 -T13121323330203331222022230133102321 -+ -@B@B>?A?A@?9'?;?&8?@@6;<@=+<:99+965 -@1831_575_1180_F3 -T32003310122102323303101123331133110 -+ -/<B>5?':/78?;1;55:997@@>94=7<186->7 -@1831_575_1283_F3 -T02232200301300220130032321323131333 -+ -%C@A54><?A78@<?2>:#>=?@2>80:'?69.'7 -@1831_575_1302_F3 -T01201303312333123130200123201013021 -+ -&12>/#2'&-2&%'7+$%*#$/1(&&12/$,2,,* -@1831_575_1310_F3 -T31332131312021303211310220101211133 -+ -6<<>663?99@(@7=11@:@@/7??<@<;>'3-7; -@1831_575_1321_F3 -T11001010233200122122022023000203212 -+ -0;B@?@>=A@<A?>@>?6>@5>'4@9?)7@7?/89 -@1831_575_1373_F3 -T21213011223311001221321132013121220 -+ -A@@@>@;=9<@??7@>@:@;@;17?630/7=4,2< -@1831_575_1419_F3 -T33222200303001021230212332001013020 -+ ->//3->&-.->%11/@&/&7:<,-1=,+2<6'%&< -@1831_575_1436_F3 -T13210313021212303321202113301220331 -+ -*2@=;39*3<*4<:>52>>9'7:<='0=>1'136< -@1831_575_1442_F3 -T33132010022331132101132123132020222 -+ -8>58<?7>+1B6-/9<<:5?>A:1@?539.@4/1> -@1831_575_1454_F3 -T11131130011012021120222231313211113 -+ -24=?8=6589=0:A=:?>6<;@/,4+-6+/'.,(, -@1831_575_1500_F3 -T11010000223111301132313011130103021 -+ -2?@@?A@?8<6<:985=99999==B3<5<<,7?>9 -@1831_575_1535_F3 -T21312012030320112110211013300131121 -+ -@B=@<@@B?:A@@=>@?68@=?@5?7;:6<<;>5< -@1831_575_1724_F3 -T33123002323300220213232301000010010 -+ -9<B.+@),2*.%)))4%2@;7#%(%+$8))85%&5 -@1831_575_1829_F3 -T21033321320111321230233302313101021 -+ -22(*'%.3$+7)@&%$'3*+*#/#/*+0.=&#)+0 -@1831_575_1898_F3 -T31330110303103131001110300102101330 -+ -@B>@@&1/))'40)%#8/.%#8$((#;4'$'63,, -@1831_575_1964_F3 -T22010201103202213200201301300232123 -+ -1>39)@2<2/@+9?2=&)>>@*62=5&2<42.'?+ -@1831_576_32_F3 -T13012100120333032211330300332022110 -+ -+<>?>?=7<2)522;><<@40@>704<>5=23@+& -@1831_576_74_F3 -T30103313210232220102021223012112100 -+ -8=@@?@>(??<B5?@@@9<@><+><;@';>6961? -@1831_576_86_F3 -T10320000121033022010011030032211310 -+ -7811)2:*.++5</:3+43924*))/:,6&29)2/ -@1831_576_89_F3 -T02132333203332020020220033002121120 -+ -2)69+,'.4=-,>/>(*$#)3030*'(,%)2##$, -@1831_576_266_F3 -T30322223101312011300311121221333223 -+ -<@@?=;<?7=@>9,>@1$&&89$/:>7'3178%&6 -@1831_576_327_F3 -T22112331301313021321001332120332130 -+ -<@?@6@@;<@?><@>==3@:==<3@@>53<9><6= -@1831_576_331_F3 -T32012133301311223023011232112333030 -+ -;-2)+(*.*1/;5%.-9&#/1'+($*$##()%/$. -@1831_576_387_F3 -T00101211032031120300200222001230022 -+ -/8).$5#1#*%.$##.*#$%##-%,+,1#&%.%)) -@1831_576_406_F3 -T00223133010210122221320212103132011 -+ -<4<>%%14:*4656)&<251&2+3#&19,6&4>5( -@1831_576_449_F3 -T31312001121222231100020132132100220 -+ -(+'&'.,,$/+.)$$8&%#+?&,#)-&###7,+#* -@1831_576_519_F3 -T03011321130130133213131202130321131 -+ -==46<97@>2/6?;2<4A881>9121+<1/4.9+7 -@1831_576_603_F3 -T21003032313302312320131221001330311 -+ -@@46=@C.??<A79@@;-<@@>29B?>55<B7598 -@1831_576_655_F3 -T02001023130302322122200313123123102 -+ -=@AA9@@<6*>@@5/<@>9'=;>7+@?9>/9;+,% -@1831_576_677_F3 -T13330131023320301031013230210103022 -+ -6290&/*0#&'&,.2'#&*$&('#-%($*#%$)#% -@1831_576_718_F3 -T31232113331022231333313223132231213 -+ -$4###$0###%(#########,####%####$### -@1831_576_722_F3 -T31230320322120231333030031100313200 -+ -(*,-,##.)*&(*1%*(%(-2#+)-#.&-#%%$') -@1831_576_754_F3 -T30221231132103120112331303112133020 -+ -.4//#(.$)'',>(&#1$<,##%((,#5?#0*%1* -@1831_576_815_F3 -T23022113203032010120310102321001031 -+ -<3>@?9>@?B=>=;>A???=>:25=4.25?6<57. -@1831_576_882_F3 -T13230020122320223230022031020110122 -+ -?26?8?@:4>@>96??<<=5'1<>9846=<9<1>8 -@1831_576_898_F3 -T10230132312121033222231132231233213 -+ -=@@C2?C>?<>@886B?;?.??87=B<8<15??=. -@1831_576_923_F3 -T21322010320202013210121223010123122 -+ -76.51=;.699<96>;;49<;;11;<@59:9=647 -@1831_576_930_F3 -T21322103230123110323102012021020013 -+ -2#*0.2&.:((#'14'##-)#%$$2%#$/1&#%/# -@1831_576_1019_F3 -T22032121213231032210312001103122312 -+ -2<$>$,1,&++&@,.)'+/+#9'69/6'2(+-'9- -@1831_576_1068_F3 -T00020232013101330112220321203220211 -+ -:>><=4?;@7=??9?;9>5@9?:8@:=5';7;'#4 -@1831_576_1131_F3 -T10233122200222132200313011102302210 -+ -104@#@/@,4>9?2+?1571@',>=;(759;*92< -@1831_576_1168_F3 -T31013300131121323122002113301002010 -+ ->@CC6@@2?9=>7?;76<;467@;9,0%26'',4$ -@1831_576_1207_F3 -T21001132013000122220301213221213010 -+ -%$>2,(&?4?(,@:<&,@>?$&:8A%%=0.%,597 -@1831_576_1289_F3 -T03021210023110200323310302013121203 -+ -@9<>1B@@;7@@663==28,5':8<<,.=2>>.50 -@1831_576_1329_F3 -T01100302102020113003022000120002100 -+ -<>&0,870/A@@/5.;=;:'&@3'&$$%,+#($&2 -@1831_576_1367_F3 -T12231310311233110031222013332011023 -+ -??@@<>@@=@<@<=@>@??9:?<=>=<8;59@787 -@1831_576_1416_F3 -T33021233100123120313103133211203221 -+ -+';?..1.<@'.=+6.5?7<0-?7;(%=>56.98@ -@1831_576_1461_F3 -T32022221221112233100210223002100100 -+ -#1&74#(#(&##$#,'###%#%%#*#&%%##%%%' -@1831_576_1605_F3 -T30232100103132133321330310210101221 -+ -6<@C@@>1;@:;<<@@9@???9<3?5-21=4877, -@1831_576_1664_F3 -T31212101001312110320301201002011120 -+ -@@?>?@=A:@@>@='=<>=).>=9*8)(7#/++;) -@1831_576_1671_F3 -T22313332300211322113223102231322313 -+ -@@?@5>@@8&8?25#&)&5&&)15&&,&4%&,&6% -@1831_576_1729_F3 -T11233312313010012320101302101023030 -+ -@?@?<?<@>A?/==?>?7>?@8<?@>99;><+0=> -@1831_576_1880_F3 -T13032121323320213301001310130212003 -+ -0515/792,:,7/%/05,%$):+#8%2(1754))3 -@1831_576_1982_F3 -T00032312310201201333221212000011030 -+ -,@@?@,A><@9@=?@9B=8<6@@6@2<A?>.7<+@ -@1831_576_1987_F3 -T30022313313231221213220132001011320 -+ -)##()(#&##)%)/-#%$11#%3>'##&$,#$$'+ -@1831_576_2014_F3 -T31123201010100321122111102113021003 -+ -@@@9,B29-5>'?,+?79+/A';'2@'5&/9,6&1 -@1831_576_2028_F3 -T20131211210311112023201213120201100 -+ -5<>9>5'2(&707.8#&&39,0%7/#(#,*%&5*+ -@1831_577_40_F3 -T11111212330120012020200031313303003 -+ -92/4('.')(<*?#$)%&<,/39<(.2,+<=@611 -@1831_577_119_F3 -T33111010021103320103213121313000102 -+ -9>?C11)-1/)#;#/,850*+.+$$5550+%-.40 -@1831_577_133_F3 -T33213323012231300122223032223331322 -+ -/4@>>?=1?:+>@07@@><>@*<+1@15)96'2$) -@1831_577_255_F3 -T00332022110020300332022020202002232 -+ -7<=87@>69%**#&#-+$.#&&#+$-+%&%.,%5# -@1831_577_281_F3 -T03032301231212301013112222111210000 -+ -7-:B;8@=;>7@>4?=?+659?;5<7?;9@8(>:? -@1831_577_288_F3 -T01031120221303100221230021013201130 -+ -5;/79??&=B::298*6.7/+4&21,7,6?.7#'6 -@1831_577_322_F3 -T12003213220230103303201000130312202 -+ -9=;>4506;255464-<#7+194&2<?65968)7/ -@1831_577_362_F3 -T31203302330110131230331210121110220 -+ -62B?:@?@<?958=,3:,90:&'-99,6<5.($+6 -@1831_577_382_F3 -T32312123033111120321303230201332100 -+ -12957/:1))=76(*24;,3+:<.&.&-=1=2/5* -@1831_577_464_F3 -T13020221011130013102221333131203302 -+ -3=<7/<826)>#.'&4204+5#/041.7*91&756 -@1831_577_488_F3 -T13200302330322110200323132101120301 -+ -:48.,*>6566<?8=<=<2>6;94>;=9>@8924@ -@1831_577_511_F3 -T32232133031023313331312220133230333 -+ -#7/+&$:<7%6,$$%'%/+)#$7((&*3>16'0/+ -@1831_577_545_F3 -T00112131333222303222210031322103233 -+ ->><<9?<>?A<481@<@8==@76/61<95.5988- -@1831_577_559_F3 -T32321101303233120102011130022122002 -+ -.<@;??@>@?/2<.@1=>12=61/;=?.&2+92)' -@1831_577_562_F3 -T32331101301233110121000220031120031 -+ -#((&*&0%)1%)#($2-,***%/-,,))&,-.1'* -@1831_577_637_F3 -T22113312122202103031023120301031110 -+ -8-,4#>:-6+:8,&(5;3=0>7=68&1/9&'?;4, -@1831_577_641_F3 -T13031301101121223221212020032131113 -+ -&47;/':A;;5?:72,(=),#*?+.#&7$8#%7/' -@1831_577_692_F3 -T01122320200330103121202301211100220 -+ -@B,@?@B(@A?@+@@>@+?=>@'=<@<=<9=?75< diff -r 19d8ba4269ba -r 8bd2ace6c92d test-data/fastq_combiner_no_qual_ascii_out_1.fastqcssanger --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/fastq_combiner_no_qual_ascii_out_1.fastqcssanger Tue Mar 02 10:47:23 2010 -0500 @@ -0,0 +1,576 @@ +@1831_573_1004_F3 +T00030133312212111300011021310132222 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1050_F3 +T03330322230322112131010221102122113 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1067_F3 +T00023032023103330112220321200200002 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1219_F3 +T11211130300300301021212330201121310 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1242_F3 +T02132003121011302100130302112221121 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1333_F3 +T00200312330110101013212313222303112 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1362_F3 +T21203131001102231121211101111321131 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1448_F3 +T23101211223113320132212331313312022 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1490_F3 +T31312310323301210002210123101021011 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1523_F3 +T10322001220012223202202222001230222 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1578_F3 +T21202302100010020121100311022120111 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1647_F3 +T10222233301013033120132223202022123 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1684_F3 +T13310013212312012302121010221231123 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1769_F3 +T33220123030232212032021032302233131 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1853_F3 +T11000012111222211310103212122102331 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1943_F3 +T20300123032210232001222122001132111 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_573_1977_F3 +T22212302221310332321002303112011311 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_109_F3 +T13122332123301331032220222133301033 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_148_F3 +T01200113123030012202302312200010231 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_185_F3 +T21123333211302300321312212102123121 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_243_F3 +T30221011230013102201033131203302330 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_257_F3 +T00301133110002100302003000000102301 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_293_F3 +T23213210003000103010211331300320130 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_389_F3 +T21032213032101122333230212301312020 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_575_F3 +T33313322100212102033032123311211302 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_592_F3 +T33103330110123102223122023103310330 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_617_F3 +T20021031221222021210021322200223211 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_725_F3 +T32010020322130330333010031120313210 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_734_F3 +T31132301200020012302210322213222222 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_824_F3 +T30212100033032123311211302122020013 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_959_F3 +T11212130220131221111002020123311211 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_1062_F3 +T30112230030300221001032033012211012 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_1092_F3 +T02013221200031031212200000111130310 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_1103_F3 +T20313113203302010303131123021310121 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_1116_F3 +T21011310123202303021021112021231011 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_1194_F3 +T23303101033322220312200222013013312 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_1204_F3 +T21330132231321322010303023221203200 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_1306_F3 +T10332133020311023221213100301001220 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_1387_F3 +T12301331310032132101301303230121111 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_1431_F3 +T12011023331022213001123111301312011 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_1560_F3 +T32212313302203320020222113111011111 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_1591_F3 +T23202101330322130221230222201123202 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_1624_F3 +T20122200222132200313011102302210332 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_1826_F3 +T13012312120112021233030302313201111 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_1903_F3 +T30232100103132133321330310210101221 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_574_1961_F3 +T02333101331223303300200011100032200 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_54_F3 +T13331330322230200102132110132013200 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_80_F3 +T33133322233322221003332230323312313 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_192_F3 +T30013012111133003301010212123302011 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_197_F3 +T33312113010133020301131330001310032 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_223_F3 +T10121010002202131221210302100121020 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_420_F3 +T31110103220000101310112112001020212 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_434_F3 +T30312132120223101113223301211113311 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_444_F3 +T33022120112320220100202132332113320 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_459_F3 +T31330310210101223330110231120131100 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_506_F3 +T31210200111210121332321310110132301 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_569_F3 +T10210201321323001012232322323002203 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_622_F3 +T01100031122111023002323113231210111 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_644_F3 +T11332003221203131231202200030110130 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_663_F3 +T32210013303112103322311101322021210 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_681_F3 +T23131132033020103031013233200101021 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_711_F3 +T03032331231101231020121210002332121 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_730_F3 +T31010102200110302123032330331011111 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_904_F3 +T20111213300020123200333321131121211 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_938_F3 +T13103102220022130222233301013033120 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_970_F3 +T23201311301023133303023011202220221 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_991_F3 +T33312212031111111012212120321121210 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1138_F3 +T23320002011320012120333103233301321 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1157_F3 +T13121323330203331222022230133102321 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1180_F3 +T32003310122102323303101123331133110 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1283_F3 +T02232200301300220130032321323131333 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1302_F3 +T01201303312333123130200123201013021 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1310_F3 +T31332131312021303211310220101211133 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1321_F3 +T11001010233200122122022023000203212 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1373_F3 +T21213011223311001221321132013121220 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1419_F3 +T33222200303001021230212332001013020 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1436_F3 +T13210313021212303321202113301220331 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1442_F3 +T33132010022331132101132123132020222 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1454_F3 +T11131130011012021120222231313211113 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1500_F3 +T11010000223111301132313011130103021 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1535_F3 +T21312012030320112110211013300131121 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1724_F3 +T33123002323300220213232301000010010 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1829_F3 +T21033321320111321230233302313101021 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1898_F3 +T31330110303103131001110300102101330 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_575_1964_F3 +T22010201103202213200201301300232123 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_32_F3 +T13012100120333032211330300332022110 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_74_F3 +T30103313210232220102021223012112100 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_86_F3 +T10320000121033022010011030032211310 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_89_F3 +T02132333203332020020220033002121120 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_266_F3 +T30322223101312011300311121221333223 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_327_F3 +T22112331301313021321001332120332130 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_331_F3 +T32012133301311223023011232112333030 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_387_F3 +T00101211032031120300200222001230022 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_406_F3 +T00223133010210122221320212103132011 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_449_F3 +T31312001121222231100020132132100220 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_519_F3 +T03011321130130133213131202130321131 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_603_F3 +T21003032313302312320131221001330311 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_655_F3 +T02001023130302322122200313123123102 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_677_F3 +T13330131023320301031013230210103022 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_718_F3 +T31232113331022231333313223132231213 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_722_F3 +T31230320322120231333030031100313200 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_754_F3 +T30221231132103120112331303112133020 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_815_F3 +T23022113203032010120310102321001031 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_882_F3 +T13230020122320223230022031020110122 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_898_F3 +T10230132312121033222231132231233213 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_923_F3 +T21322010320202013210121223010123122 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_930_F3 +T21322103230123110323102012021020013 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1019_F3 +T22032121213231032210312001103122312 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1068_F3 +T00020232013101330112220321203220211 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1131_F3 +T10233122200222132200313011102302210 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1168_F3 +T31013300131121323122002113301002010 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1207_F3 +T21001132013000122220301213221213010 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1289_F3 +T03021210023110200323310302013121203 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1329_F3 +T01100302102020113003022000120002100 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1367_F3 +T12231310311233110031222013332011023 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1416_F3 +T33021233100123120313103133211203221 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1461_F3 +T32022221221112233100210223002100100 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1605_F3 +T30232100103132133321330310210101221 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1664_F3 +T31212101001312110320301201002011120 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1671_F3 +T22313332300211322113223102231322313 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1729_F3 +T11233312313010012320101302101023030 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1880_F3 +T13032121323320213301001310130212003 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1982_F3 +T00032312310201201333221212000011030 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_1987_F3 +T30022313313231221213220132001011320 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_2014_F3 +T31123201010100321122111102113021003 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_576_2028_F3 +T20131211210311112023201213120201100 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_40_F3 +T11111212330120012020200031313303003 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_119_F3 +T33111010021103320103213121313000102 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_133_F3 +T33213323012231300122223032223331322 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_255_F3 +T00332022110020300332022020202002232 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_281_F3 +T03032301231212301013112222111210000 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_288_F3 +T01031120221303100221230021013201130 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_322_F3 +T12003213220230103303201000130312202 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_362_F3 +T31203302330110131230331210121110220 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_382_F3 +T32312123033111120321303230201332100 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_464_F3 +T13020221011130013102221333131203302 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_488_F3 +T13200302330322110200323132101120301 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_511_F3 +T32232133031023313331312220133230333 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_545_F3 +T00112131333222303222210031322103233 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_559_F3 +T32321101303233120102011130022122002 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_562_F3 +T32331101301233110121000220031120031 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_637_F3 +T22113312122202103031023120301031110 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_641_F3 +T13031301101121223221212020032131113 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@1831_577_692_F3 +T01122320200330103121202301211100220 ++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff -r 19d8ba4269ba -r 8bd2ace6c92d test-data/fastq_combiner_no_qual_ascii_out_1.fastqsolid --- a/test-data/fastq_combiner_no_qual_ascii_out_1.fastqsolid Tue Mar 02 09:51:05 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,576 +0,0 @@ -@1831_573_1004_F3 -T00030133312212111300011021310132222 -+ -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -@1831_573_1050_F3 -T03330322230322112131010221102122113 -+ -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -@1831_573_1067_F3 -T00023032023103330112220321200200002 -+ -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -@1831_573_1219_F3 -T11211130300300301021212330201121310 -+ -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -@1831_573_1242_F3 -T02132003121011302100130302112221121 -+ -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -@1831_573_1333_F3 -T00200312330110101013212313222303112 -+ -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -@1831_573_1362_F3 -T21203131001102231121211101111321131 -+ -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -@1831_573_1448_F3 -T23101211223113320132212331313312022 -+ -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -@1831_573_1490_F3

1 0

[hg] galaxy 3458: Fix bug that prevented tags with capital lette...
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/19d8ba4269ba changeset: 3458:19d8ba4269ba user: jeremy goecks <jeremy.goecks(a)emory.edu> date: Tue Mar 02 09:51:05 2010 -0500 description: Fix bug that prevented tags with capital letters from being deleted. diffstat: lib/galaxy/model/__init__.py | 3 --- lib/galaxy/tags/tag_handler.py | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diffs (34 lines): diff -r 144c01a8db6e -r 19d8ba4269ba lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py Tue Mar 02 00:38:57 2010 -0500 +++ b/lib/galaxy/model/__init__.py Tue Mar 02 09:51:05 2010 -0500 @@ -1537,9 +1537,6 @@ self.value = None self.user_value = None - def __str__ ( self ): - return "%s(item_id=%s, item_tag=%s, user_tname=%s, value=%s, user_value=%s)" % (self.__class__.__name__, self.item_id, self.tag_id, self.user_tname, self.value. self.user_value ) - class HistoryTagAssociation ( ItemTagAssociation ): pass diff -r 144c01a8db6e -r 19d8ba4269ba lib/galaxy/tags/tag_handler.py --- a/lib/galaxy/tags/tag_handler.py Tue Mar 02 00:38:57 2010 -0500 +++ b/lib/galaxy/tags/tag_handler.py Tue Mar 02 09:51:05 2010 -0500 @@ -211,12 +211,12 @@ return tag - def _get_item_tag_assoc(self, user, item, tag_name): - """Return ItemTagAssociation object for an item and a tag string; returns None if there is - no such tag.""" - scrubbed_tag_name = self._scrub_tag_name(tag_name) + def _get_item_tag_assoc( self, user, item, tag_name ): + """Return ItemTagAssociation object for a user, item, and tag string; returns None if there is + no such association.""" + scrubbed_tag_name = self._scrub_tag_name( tag_name ) for item_tag_assoc in item.tags: - if ( item_tag_assoc.user == user ) and ( item_tag_assoc.tag.name == scrubbed_tag_name ): + if ( item_tag_assoc.user == user ) and ( item_tag_assoc.user_tname == scrubbed_tag_name ): return item_tag_assoc return None

1 0

[hg] galaxy 3457: psycopg2 scramble fix
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/144c01a8db6e changeset: 3457:144c01a8db6e user: Nate Coraor <nate(a)bx.psu.edu> date: Tue Mar 02 00:38:57 2010 -0500 description: psycopg2 scramble fix diffstat: lib/galaxy/eggs/scramble.py | 2 +- scripts/scramble/patches/psycopg2/setup.py | 252 --------------------------- scripts/scramble/scripts/psycopg2-linux.py | 79 ++++++++ scripts/scramble/scripts/psycopg2-solaris.py | 81 ++++++++ scripts/scramble/scripts/psycopg2.py | 45 ++-- 5 files changed, 184 insertions(+), 275 deletions(-) diffs (515 lines): diff -r 2f3b76827743 -r 144c01a8db6e lib/galaxy/eggs/scramble.py --- a/lib/galaxy/eggs/scramble.py Thu Feb 11 00:17:04 2010 -0500 +++ b/lib/galaxy/eggs/scramble.py Tue Mar 02 00:38:57 2010 -0500 @@ -167,7 +167,7 @@ "%s-%s.py" % ( self.name, platform ), "%s-%s.py" % ( self.name, '-'.join( platform.split( '-' )[:2] ) ), "%s-%s.py" % ( self.name, '-'.join( platform.split( '-' )[1:] ) ), - "%s-%s.py" % ( self.name, self.py ), + "%s-%s.py" % ( self.name, platform.split( '-' )[:2][-1] ), "%s-%s.py" % ( self.name, platform.split( '-' )[0] ), "%s.py" % self.name, "generic.py" ) diff -r 2f3b76827743 -r 144c01a8db6e scripts/scramble/patches/psycopg2/setup.py --- a/scripts/scramble/patches/psycopg2/setup.py Thu Feb 11 00:17:04 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,252 +0,0 @@ -# setup.py - distutils packaging -# -# Copyright (C) 2003-2004 Federico Di Gregorio <fog(a)debian.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2, or (at your option) any later -# version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTIBILITY -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. - -"""Python-PostgreSQL Database Adapter - -psycopg is a PostgreSQL database adapter for the Python programming -language. This is version 2, a complete rewrite of the original code to -provide new-style classes for connection and cursor objects and other sweet -candies. Like the original, psycopg 2 was written with the aim of being -very small and fast, and stable as a rock. - -psycopg is different from the other database adapter because it was -designed for heavily multi-threaded applications that create and destroy -lots of cursors and make a conspicuous number of concurrent INSERTs or -UPDATEs. psycopg 2 also provide full asycronous operations for the really -brave programmer. -""" - -classifiers = """\ -Development Status :: 4 - Beta -Intended Audience :: Developers -License :: OSI Approved :: GNU General Public License (GPL) -License :: OSI Approved :: Zope Public License -Programming Language :: Python -Programming Language :: C -Programming Language :: SQL -Topic :: Database -Topic :: Database :: Front-Ends -Topic :: Software Development -Topic :: Software Development :: Libraries :: Python Modules -Operating System :: Microsoft :: Windows -Operating System :: Unix -""" - -import os -import os.path -import sys -import popen2 -import ConfigParser -from glob import glob -from distutils.core import setup, Extension -from distutils.errors import DistutilsFileError -from distutils.command.build_ext import build_ext -from distutils.sysconfig import get_python_inc -from distutils.ccompiler import get_default_compiler - -assert sys.version_info[:2] >= ( 2, 4 ) - -PSYCOPG_VERSION = '2.0.6' -version_flags = [] - -PG_VERSION = '8.2.6' - -class psycopg_build_ext(build_ext): - """Conditionally complement the setup.cfg options file. - - This class configures the include_dirs, libray_dirs, libraries - options as required by the system. Most of the configuration happens - in finalize_options() method. - - If you want to set up the build step for a peculiar platform, add a - method finalize_PLAT(), where PLAT matches your sys.platform. - """ - user_options = build_ext.user_options[:] - user_options.extend([ - ('use-pydatetime', None, - "Use Python datatime objects for date and time representation."), - ('use-decimal', None, - "Use Decimal type even on Python 2.3 if the module is provided."), - ]) - - boolean_options = build_ext.boolean_options[:] - boolean_options.extend(('use-pydatetime', 'use-decimal', 'have-ssl')) - - def initialize_options(self): - build_ext.initialize_options(self) - self.use_pg_dll = 1 - self.pgdir = None - self.mx_include_dir = None - - def get_compiler(self): - """Return the name of the C compiler used to compile extensions. - - If a compiler was not explicitely set (on the command line, for - example), fall back on the default compiler. - """ - if self.compiler: - # distutils doesn't keep the type of self.compiler uniform; we - # compensate: - if isinstance(self.compiler, str): - name = self.compiler - else: - name = self.compiler.compiler_type - else: - name = get_default_compiler() - return name - - def finalize_darwin(self): - """Finalize build system configuration on darwin platform.""" - self.libraries.append('ssl') - self.libraries.append('crypto') - - def finalize_options(self): - """Complete the build system configuation.""" - build_ext.finalize_options(self) - - self.include_dirs.append(".") - self.include_dirs.append("postgresql-8.2.6/src/interfaces/libpq") - self.include_dirs.append("postgresql-8.2.6/src/include") - self.include_dirs.append("postgresql-8.2.6/src/port") - pgmajor, pgminor, pgpatch = PG_VERSION.split('.') - define_macros.append(("PG_MAJOR_VERSION", pgmajor)) - define_macros.append(("PG_MINOR_VERSION", pgminor)) - define_macros.append(("PG_PATCH_VERSION", pgpatch)) - - if hasattr(self, "finalize_" + sys.platform): - getattr(self, "finalize_" + sys.platform)() - -# let's start with macro definitions (the ones not already in setup.cfg) -define_macros = [] -include_dirs = [] - -# python version -define_macros.append(('PY_MAJOR_VERSION', str(sys.version_info[0]))) -define_macros.append(('PY_MINOR_VERSION', str(sys.version_info[1]))) - -# some macros related to python versions and features -if sys.version_info[0] >= 2 and sys.version_info[1] >= 3: - define_macros.append(('HAVE_PYBOOL','1')) - -# gather information to build the extension module -ext = [] ; data_files = [] - -# sources - -sources = [ - 'psycopgmodule.c', 'pqpath.c', 'typecast.c', - 'microprotocols.c', 'microprotocols_proto.c', - 'connection_type.c', 'connection_int.c', 'cursor_type.c', 'cursor_int.c', - 'adapter_qstring.c', 'adapter_pboolean.c', 'adapter_binary.c', - 'adapter_asis.c', 'adapter_list.c'] - -parser = ConfigParser.ConfigParser() -parser.read('setup.cfg') - -# Choose if to use Decimal type -use_decimal = int(parser.get('build_ext', 'use_decimal')) -if sys.version_info[0] >= 2 and ( - sys.version_info[1] >= 4 or (sys.version_info[1] == 3 and use_decimal)): - define_macros.append(('HAVE_DECIMAL','1')) - version_flags.append('dec') - -# Choose a datetime module -have_pydatetime = False -have_mxdatetime = False -use_pydatetime = int(parser.get('build_ext', 'use_pydatetime')) - -# check for mx package -if parser.has_option('build_ext', 'mx_include_dir'): - mxincludedir = parser.get('build_ext', 'mx_include_dir') -else: - mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx") -if os.path.exists(mxincludedir): - include_dirs.append(mxincludedir) - define_macros.append(('HAVE_MXDATETIME','1')) - sources.append('adapter_mxdatetime.c') - have_mxdatetime = True - version_flags.append('mx') - -# check for python datetime package -if os.path.exists(os.path.join(get_python_inc(plat_specific=1),"datetime.h")): - define_macros.append(('HAVE_PYDATETIME','1')) - sources.append('adapter_datetime.c') - have_pydatetime = True - version_flags.append('dt') - -# now decide which package will be the default for date/time typecasts -if have_pydatetime and use_pydatetime \ - or have_pydatetime and not have_mxdatetime: - define_macros.append(('PSYCOPG_DEFAULT_PYDATETIME','1')) -elif have_mxdatetime: - define_macros.append(('PSYCOPG_DEFAULT_MXDATETIME','1')) -else: - def e(msg): - sys.stderr.write("error: " + msg + "\n") - e("psycopg requires a datetime module:") - e(" mx.DateTime module not found") - e(" python datetime module not found") - e("Note that psycopg needs the module headers and not just the module") - e("itself. If you installed Python or mx.DateTime from a binary package") - e("you probably need to install its companion -dev or -devel package.") - sys.exit(1) - -# generate a nice version string to avoid confusion when users report bugs -for have in parser.get('build_ext', 'define').split(','): - if have == 'PSYCOPG_EXTENSIONS': - version_flags.append('ext') - elif have == 'HAVE_PQPROTOCOL3': - version_flags.append('pq3') -if version_flags: - PSYCOPG_VERSION_EX = PSYCOPG_VERSION + " (%s)" % ' '.join(version_flags) -else: - PSYCOPG_VERSION_EX = PSYCOPG_VERSION - -define_macros.append(('PSYCOPG_VERSION', '"'+PSYCOPG_VERSION_EX+'"')) - -if parser.has_option('build_ext', 'have_ssl'): - have_ssl = int(parser.get('build_ext', 'have_ssl')) -else: - have_ssl = 0 - -# build the extension - -sources = map(lambda x: os.path.join('psycopg', x), sources) -sources.append( 'postgresql-%s/src/port/pgstrcasecmp.c' % PG_VERSION ) -sources.append( 'postgresql-%s/src/backend/libpq/md5.c' % PG_VERSION ) -sources.extend( glob('postgresql-%s/src/interfaces/libpq/*.c' % PG_VERSION) ) - -ext.append(Extension("psycopg2._psycopg", sources, - define_macros=define_macros, - include_dirs=include_dirs, - undef_macros=[])) -setup(name="psycopg2", - version=PSYCOPG_VERSION, - maintainer="Federico Di Gregorio", - maintainer_email="fog(a)initd.org", - author="Federico Di Gregorio", - author_email="fog(a)initd.org", - url="http://initd.org/tracker/psycopg", - download_url = "http://initd.org/pub/software/psycopg2", - license="GPL with exceptions or ZPL", - platforms = ["any"], - description=__doc__.split("\n")[0], - long_description="\n".join(__doc__.split("\n")[2:]), - classifiers=filter(None, classifiers.split("\n")), - data_files=data_files, - package_dir={'psycopg2':'lib'}, - packages=['psycopg2'], - cmdclass={ 'build_ext': psycopg_build_ext }, - ext_modules=ext) - diff -r 2f3b76827743 -r 144c01a8db6e scripts/scramble/scripts/psycopg2-linux.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/scramble/scripts/psycopg2-linux.py Tue Mar 02 00:38:57 2010 -0500 @@ -0,0 +1,79 @@ +import os, sys, shutil +from distutils.sysconfig import get_config_var + +def prep_postgres( prepped, args ): + + pg_version = args['version'] + pg_srcdir = os.path.join( os.getcwd(), "postgresql-%s" % pg_version ) + + # set up environment + os.environ['CC'] = get_config_var('CC') + os.environ['CFLAGS'] = get_config_var('CFLAGS') + os.environ['LDFLAGS'] = get_config_var('LDFLAGS') + + if '-fPIC' not in os.environ['CFLAGS']: + os.environ['CFLAGS'] += ' -fPIC' + + # run configure + run( "./configure --prefix=%s/postgres --disable-dependency-tracking --enable-static --disable-shared --without-readline --with-thread-safety" % os.getcwd(), + os.path.join( os.getcwd(), "postgresql-%s" % pg_version ), + "Configuring postgres (./configure)" ) + + # compile + run( "make", os.path.join( pg_srcdir, 'src', 'interfaces', 'libpq' ), "Compiling libpq (cd src/interfaces/libpq; make)" ) + run( "make", os.path.join( pg_srcdir, 'src', 'bin', 'pg_config' ), "Compiling pg_config (cd src/bin/pg_config; make)" ) + + # install + run( "make install", os.path.join( pg_srcdir, 'src', 'interfaces', 'libpq' ), "Compiling libpq (cd src/interfaces/libpq; make install)" ) + run( "make install", os.path.join( pg_srcdir, 'src', 'bin', 'pg_config' ), "Compiling pg_config (cd src/bin/pg_config; make install)" ) + run( "make install", os.path.join( pg_srcdir, 'src', 'include' ), "Compiling pg_config (cd src/include; make install)" ) + + # create prepped archive + print "%s(): Creating prepped archive for future builds at:" % sys._getframe().f_code.co_name + print " ", prepped + compress( prepped, + 'postgres/bin', + 'postgres/include', + 'postgres/lib' ) + +if __name__ == '__main__': + + # change back to the build dir + if os.path.dirname( sys.argv[0] ) != "": + os.chdir( os.path.dirname( sys.argv[0] ) ) + + # find setuptools + sys.path.append( os.path.abspath( os.path.join( '..', '..', '..', 'lib' ) ) ) + from scramble_lib import * + + tag = get_tag() + + pg_version = ( tag.split( "_" ) )[1] + pg_archive_base = os.path.join( archives, "postgresql-%s" % pg_version ) + pg_archive = get_archive( pg_archive_base ) + pg_archive_prepped = os.path.join( archives, "postgresql-%s-%s.tar.gz" % ( pg_version, platform_noucs ) ) + + # clean up any existing stuff (could happen if you run scramble.py by hand) + clean( [ 'postgresql-%s' % pg_version ] ) + + # unpack postgres + unpack_dep( pg_archive, pg_archive_prepped, prep_postgres, dict( version=pg_version ) ) + + # localize setup.cfg + if not os.path.exists( 'setup.cfg.orig' ): + shutil.copy( 'setup.cfg', 'setup.cfg.orig' ) + f = open( 'setup.cfg', 'a' ) + f.write( '\npg_config=postgres/bin/pg_config\n' ) + f.write( '\nlibraries=crypt\n' ) + f.close() + + # tag + me = sys.argv[0] + sys.argv = [ me ] + if tag is not None: + sys.argv.append( "egg_info" ) + sys.argv.append( "--tag-build=%s" %tag ) + sys.argv.append( "bdist_egg" ) + + # go + execfile( "setup.py", globals(), locals() ) diff -r 2f3b76827743 -r 144c01a8db6e scripts/scramble/scripts/psycopg2-solaris.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/scramble/scripts/psycopg2-solaris.py Tue Mar 02 00:38:57 2010 -0500 @@ -0,0 +1,81 @@ +import os, sys, shutil +from distutils.sysconfig import get_config_var + +def prep_postgres( prepped, args ): + + pg_version = args['version'] + pg_srcdir = os.path.join( os.getcwd(), "postgresql-%s" % pg_version ) + + # set up environment + os.environ['CC'] = get_config_var('CC') + os.environ['CFLAGS'] = get_config_var('CFLAGS') + os.environ['LDFLAGS'] = get_config_var('LDFLAGS') + + cc = get_solaris_compiler() + if cc == 'cc': + os.environ['CFLAGS'] += ' -KPIC' + elif cc == 'gcc': + os.environ['CFLAGS'] += ' -fPIC -DPIC' + + # run configure + run( "./configure --prefix=%s/postgres --disable-dependency-tracking --enable-static --disable-shared --without-readline --with-thread-safety" % os.getcwd(), + os.path.join( os.getcwd(), "postgresql-%s" % pg_version ), + "Configuring postgres (./configure)" ) + + # compile + run( "gmake", os.path.join( pg_srcdir, 'src', 'interfaces', 'libpq' ), "Compiling libpq (cd src/interfaces/libpq; gmake)" ) + run( "gmake", os.path.join( pg_srcdir, 'src', 'bin', 'pg_config' ), "Compiling pg_config (cd src/bin/pg_config; gmake)" ) + + # install + run( "gmake install", os.path.join( pg_srcdir, 'src', 'interfaces', 'libpq' ), "Compiling libpq (cd src/interfaces/libpq; gmake install)" ) + run( "gmake install", os.path.join( pg_srcdir, 'src', 'bin', 'pg_config' ), "Compiling pg_config (cd src/bin/pg_config; gmake install)" ) + run( "gmake install", os.path.join( pg_srcdir, 'src', 'include' ), "Compiling pg_config (cd src/include; gmake install)" ) + + # create prepped archive + print "%s(): Creating prepped archive for future builds at:" % sys._getframe().f_code.co_name + print " ", prepped + compress( prepped, + 'postgres/bin', + 'postgres/include', + 'postgres/lib' ) + +if __name__ == '__main__': + + # change back to the build dir + if os.path.dirname( sys.argv[0] ) != "": + os.chdir( os.path.dirname( sys.argv[0] ) ) + + # find setuptools + sys.path.append( os.path.abspath( os.path.join( '..', '..', '..', 'lib' ) ) ) + from scramble_lib import * + + tag = get_tag() + + pg_version = ( tag.split( "_" ) )[1] + pg_archive_base = os.path.join( archives, "postgresql-%s" % pg_version ) + pg_archive = get_archive( pg_archive_base ) + pg_archive_prepped = os.path.join( archives, "postgresql-%s-%s.tar.gz" % ( pg_version, platform_noucs ) ) + + # clean up any existing stuff (could happen if you run scramble.py by hand) + clean( [ 'postgresql-%s' % pg_version ] ) + + # unpack postgres + unpack_dep( pg_archive, pg_archive_prepped, prep_postgres, dict( version=pg_version ) ) + + # localize setup.cfg + if not os.path.exists( 'setup.cfg.orig' ): + shutil.copy( 'setup.cfg', 'setup.cfg.orig' ) + f = open( 'setup.cfg', 'a' ) + f.write( '\npg_config=postgres/bin/pg_config\n' ) + f.close() + + # tag + me = sys.argv[0] + sys.argv = [ me ] + if tag is not None: + sys.argv.append( "egg_info" ) + sys.argv.append( "--tag-build=%s" %tag ) + sys.argv.append( "bdist_egg" ) + + # go + execfile( "setup.py", globals(), locals() ) diff -r 2f3b76827743 -r 144c01a8db6e scripts/scramble/scripts/psycopg2.py --- a/scripts/scramble/scripts/psycopg2.py Thu Feb 11 00:17:04 2010 -0500 +++ b/scripts/scramble/scripts/psycopg2.py Tue Mar 02 00:38:57 2010 -0500 @@ -1,43 +1,40 @@ -import os, sys, subprocess, tarfile, shutil, glob +import os, sys, shutil from distutils.sysconfig import get_config_var def prep_postgres( prepped, args ): pg_version = args['version'] - if pkg_resources.get_platform().startswith('solaris'): - make = 'gmake' - else: - make = 'make' + pg_srcdir = os.path.join( os.getcwd(), "postgresql-%s" % pg_version ) # set up environment os.environ['CC'] = get_config_var('CC') os.environ['CFLAGS'] = get_config_var('CFLAGS') os.environ['LDFLAGS'] = get_config_var('LDFLAGS') - # run configure (to generate pg_config.h) - run( "./configure --without-readline", + if '-fPIC' not in os.environ['CFLAGS']: + os.environ['CFLAGS'] += ' -fPIC' + + # run configure + run( "./configure --prefix=%s/postgres --disable-dependency-tracking --enable-static --disable-shared --without-readline --with-thread-safety" % os.getcwd(), os.path.join( os.getcwd(), "postgresql-%s" % pg_version ), "Configuring postgres (./configure)" ) - # create src/port/pg_config_paths.h - run( "%s pg_config_paths.h" % make, - os.path.join( os.getcwd(), "postgresql-%s" % pg_version, "src", "port" ), - "Creating postgresql-%s/src/port/pg_config_paths.h" % pg_version ) + # compile + run( "make", os.path.join( pg_srcdir, 'src', 'interfaces', 'libpq' ), "Compiling libpq (cd src/interfaces/libpq; make)" ) + run( "make", os.path.join( pg_srcdir, 'src', 'bin', 'pg_config' ), "Compiling pg_config (cd src/bin/pg_config; make)" ) - # remove win32 crap in libpq dir - for file in glob.glob( "postgresql-%s/src/interfaces/libpq/*win32*" % pg_version ): - print "prep_postgres(): Removing %s" % file - os.unlink( file ) + # install + run( "make install", os.path.join( pg_srcdir, 'src', 'interfaces', 'libpq' ), "Compiling libpq (cd src/interfaces/libpq; make install)" ) + run( "make install", os.path.join( pg_srcdir, 'src', 'bin', 'pg_config' ), "Compiling pg_config (cd src/bin/pg_config; make install)" ) + run( "make install", os.path.join( pg_srcdir, 'src', 'include' ), "Compiling pg_config (cd src/include; make install)" ) # create prepped archive print "%s(): Creating prepped archive for future builds at:" % sys._getframe().f_code.co_name print " ", prepped compress( prepped, - "postgresql-%s/src/include" % pg_version, - "postgresql-%s/src/port/pg_config_paths.h" % pg_version, - "postgresql-%s/src/port/pgstrcasecmp.c" % pg_version, - "postgresql-%s/src/backend/libpq/md5.c" % pg_version, - "postgresql-%s/src/interfaces/libpq" % pg_version ) + 'postgres/bin', + 'postgres/include', + 'postgres/lib' ) if __name__ == '__main__': @@ -62,8 +59,12 @@ # unpack postgres unpack_dep( pg_archive, pg_archive_prepped, prep_postgres, dict( version=pg_version ) ) - # get setup.py - shutil.copy( os.path.join( patches, 'psycopg2', 'setup.py' ), 'setup.py' ) + # localize setup.cfg + if not os.path.exists( 'setup.cfg.orig' ): + shutil.copy( 'setup.cfg', 'setup.cfg.orig' ) + f = open( 'setup.cfg', 'a' ) + f.write( '\npg_config=postgres/bin/pg_config\n' ) + f.close() # tag me = sys.argv[0]

1 0