]> git.donarmstrong.com Git - biopieces.git/commitdiff
upgraded find_genes
authormartinahansen <martinahansen@74ccb610-7750-0410-82ae-013aeee3265d>
Mon, 11 Oct 2010 12:48:23 +0000 (12:48 +0000)
committermartinahansen <martinahansen@74ccb610-7750-0410-82ae-013aeee3265d>
Mon, 11 Oct 2010 12:48:23 +0000 (12:48 +0000)
git-svn-id: http://biopieces.googlecode.com/svn/trunk@1106 74ccb610-7750-0410-82ae-013aeee3265d

bp_bin/find_genes
code_ruby/Maasha/lib/doc/created.rid
code_ruby/Maasha/lib/doc/index.html

index f80fa88f7022e56851dc4d9d93d055121f6b04e9..2880a3627ed18930122f7860ac5ec906f8d9152e 100755 (executable)
@@ -37,7 +37,7 @@ use Maasha::Filesys;
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
-my ( $options, $in, $out, $record, $tmp_dir, $tmp_file, $fh_out, $fh_in, $entry, $chunk, @lines, $line, $s_id, $type, $s_beg, $s_end, $strand, @fields );
+my ( $options, $in, $out, $record, $tmp_dir, $tmp_file, $fh_out, $fh_in, $entry, $chunk, @lines, $line, $s_id, $type, $s_beg, $s_end, $strand, @fields, $def );
 
 $options = Maasha::Biopieces::parse_options();
 
@@ -57,7 +57,11 @@ while ( $record = Maasha::Biopieces::get_record( $in ) )
     Maasha::Biopieces::put_record( $record, $out );
 }
 
-Maasha::Common::run( "draft_prodigal.pl", "< $tmp_file > $tmp_file.out 2> /dev/null" );
+if ( $options->{ 'verbise' } ) {
+    Maasha::Common::run( "prodigal", "< $tmp_file > $tmp_file.out" );
+} else {
+    Maasha::Common::run( "prodigal", "< $tmp_file > $tmp_file.out 2> /dev/null" );
+}
 
 $fh_in = Maasha::Filesys::file_read_open( "$tmp_file.out" );
 
@@ -71,46 +75,63 @@ while ( $chunk = <$fh_in> )
 
     $line = shift @lines;
 
-    if ( $line =~ /.*>(.+)/ )
+    if ( $line =~ /^DEFINITION\s+(.+)/ )
     {
-        $s_id = $1;
-
-        foreach $line ( @lines )
-        {
-            @fields = split " ", $line;
+        $def  = $1;
 
-            $type   = $fields[ 0 ];
+        if ( $def =~ /seqhdr="([^"]+)"/ ) {
+            $s_id = $1;
+        } else {
+            Maasha::Common::error( qq(BAD sequence header: $def) );
+        }
 
-            if ( $fields[ 1 ] =~ /complement/ ) {
-                $strand = "-"; 
-            } else {
-                $strand = "+"; 
-            }
+        $line = shift @lines;
 
-            if ( $fields[ 1 ] =~ /(\d+)\.\.>?(\d+)/ )
-            {
-                $s_beg = $1;
-                $s_end = $2;
-            }
-            else
+        if ( $line =~ /^FEATURES/ )
+        {
+            foreach $line ( @lines )
             {
-                Maasha::Common::error( qq(BAD locator: $line) );
+                next if $line =~ /.+\//;
+
+                @fields = split " ", $line;
+
+                $type   = $fields[ 0 ];
+
+                if ( $fields[ 1 ] =~ /complement/ ) {
+                    $strand = "-"; 
+                } else {
+                    $strand = "+"; 
+                }
+
+                if ( $fields[ 1 ] =~ /(\d+)\.\.>?(\d+)/ )
+                {
+                    $s_beg = $1;
+                    $s_end = $2;
+                }
+                else
+                {
+                    Maasha::Common::error( qq(BAD locator: $line) );
+                }
+
+                $record = {
+                    S_ID   => $s_id,
+                    S_BEG  => $s_beg - 1,
+                    S_END  => $s_end - 1,
+                    Q_ID   => $type,
+                    STRAND => $strand,
+                };
+
+                Maasha::Biopieces::put_record( $record, $out );
             }
-
-            $record = {
-                S_ID   => $s_id,
-                S_BEG  => $s_beg - 1,
-                S_END  => $s_end - 1,
-                Q_ID   => $type,
-                STRAND => $strand,
-            };
-
-            Maasha::Biopieces::put_record( $record, $out );
+        }
+        else
+        {
+            Maasha::Common::error( qq(BAD feature: $line) );
         }
     }
     else
     {
-        Maasha::Commom::error( qq(BAD definition: $line) );
+        Maasha::Common::error( qq(BAD definition: $line) );
     }
 }
 
index 120565f76fe02050550e7c4030e00d8476d1fcb8..7d21b41e72809aeb994d170f7aae16be20edeabe 100644 (file)
@@ -1 +1,4 @@
-Wed, 18 Aug 2010 21:48:07 +0200
+Mon, 27 Sep 2010 12:56:47 +0200
+biopieces.rb   Mon, 13 Sep 2010 09:27:58 +0200
+fasta.rb       Mon, 06 Sep 2010 16:36:25 +0200
+seq.rb Mon, 20 Sep 2010 10:38:53 +0200
index b25b07df1394ad8614f41b674b39bcadcfba5b25..7622b70052f12d8c63d0a9c4f7192e645957c916 100644 (file)
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+       "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 
-    RDoc Documentation
-
-  -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-  <title>RDoc Documentation</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+       <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+
+       <title>RDoc Documentation</title>
+
+       <link type="text/css" media="screen" href="rdoc.css" rel="stylesheet" />
+
+       <script src="js/jquery.js" type="text/javascript" charset="utf-8"></script>
+       <script src="js/thickbox-compressed.js" type="text/javascript" charset="utf-8"></script>
+       <script src="js/quicksearch.js" type="text/javascript" charset="utf-8"></script>
+       <script src="js/darkfish.js" type="text/javascript" charset="utf-8"></script>
+
 </head>
-<frameset rows="20%, 80%">
-    <frameset cols="25%,35%,45%">
-        <frame src="fr_file_index.html"   title="Files" name="Files" />
-        <frame src="fr_class_index.html"  name="Classes" />
-        <frame src="fr_method_index.html" name="Methods" />
-    </frameset>
-    <frame src="files/fasta_rb.html" name="docwin" />
-</frameset>
+<body class="indexpage">
+
+       
+       <h1>RDoc Documentation</h1>
+
+       
+       <p>This is the API documentation for 'RDoc Documentation'.</p>
+       
+
+       
+       
+
+       <h2 id="classes">Classes/Modules</h2>
+       <ul>
+               
+               <li class="class"><a href="Biopieces.html">Biopieces</a></li>
+               
+               <li class="class"><a href="CastError.html">CastError</a></li>
+               
+               <li class="class"><a href="Casts.html">Casts</a></li>
+               
+               <li class="class"><a href="Digest.html">Digest</a></li>
+               
+               <li class="class"><a href="DigestError.html">DigestError</a></li>
+               
+               <li class="class"><a href="Fasta.html">Fasta</a></li>
+               
+               <li class="class"><a href="FastaError.html">FastaError</a></li>
+               
+               <li class="class"><a href="OptionHandler.html">OptionHandler</a></li>
+               
+               <li class="class"><a href="Seq.html">Seq</a></li>
+               
+               <li class="class"><a href="SeqError.html">SeqError</a></li>
+               
+               <li class="class"><a href="Status.html">Status</a></li>
+               
+               <li class="class"><a href="Stream.html">Stream</a></li>
+               
+       </ul>
+
+       <h2 id="methods">Methods</h2>
+       <ul>
+               
+                       <li><a href="Biopieces.html#method-c-new">::new &mdash; Biopieces</a></li>
+               
+                       <li><a href="Digest.html#method-c-new">::new &mdash; Digest</a></li>
+               
+                       <li><a href="OptionHandler.html#method-c-new">::new &mdash; OptionHandler</a></li>
+               
+                       <li><a href="Seq.html#method-c-new">::new &mdash; Seq</a></li>
+               
+                       <li><a href="Casts.html#method-c-new">::new &mdash; Casts</a></li>
+               
+                       <li><a href="Fasta.html#method-c-new">::new &mdash; Fasta</a></li>
+               
+                       <li><a href="Stream.html#method-c-nread">::nread &mdash; Stream</a></li>
+               
+                       <li><a href="Stream.html#method-c-nwrite">::nwrite &mdash; Stream</a></li>
+               
+                       <li><a href="Fasta.html#method-c-open">::open &mdash; Fasta</a></li>
+               
+                       <li><a href="Stream.html#method-c-open">::open &mdash; Stream</a></li>
+               
+                       <li><a href="Stream.html#method-c-read">::read &mdash; Stream</a></li>
+               
+                       <li><a href="Stream.html#method-c-write">::write &mdash; Stream</a></li>
+               
+                       <li><a href="Stream.html#method-c-zipped%3F">::zipped? &mdash; Stream</a></li>
+               
+                       <li><a href="Fasta.html#method-c-zopen">::zopen &mdash; Fasta</a></li>
+               
+                       <li><a href="Stream.html#method-c-zread">::zread &mdash; Stream</a></li>
+               
+                       <li><a href="Stream.html#method-c-zwrite">::zwrite &mdash; Stream</a></li>
+               
+                       <li><a href="Casts.html#method-i-check">#check &mdash; Casts</a></li>
+               
+                       <li><a href="Casts.html#method-i-check_duplicates">#check_duplicates &mdash; Casts</a></li>
+               
+                       <li><a href="Casts.html#method-i-check_keys">#check_keys &mdash; Casts</a></li>
+               
+                       <li><a href="Casts.html#method-i-check_val_allowed">#check_val_allowed &mdash; Casts</a></li>
+               
+                       <li><a href="Casts.html#method-i-check_val_default">#check_val_default &mdash; Casts</a></li>
+               
+                       <li><a href="Casts.html#method-i-check_val_disallowed">#check_val_disallowed &mdash; Casts</a></li>
+               
+                       <li><a href="Casts.html#method-i-check_val_long">#check_val_long &mdash; Casts</a></li>
+               
+                       <li><a href="Casts.html#method-i-check_val_mandatory">#check_val_mandatory &mdash; Casts</a></li>
+               
+                       <li><a href="Casts.html#method-i-check_val_short">#check_val_short &mdash; Casts</a></li>
+               
+                       <li><a href="Casts.html#method-i-check_val_type">#check_val_type &mdash; Casts</a></li>
+               
+                       <li><a href="Casts.html#method-i-check_values">#check_values &mdash; Casts</a></li>
+               
+                       <li><a href="Fasta.html#method-i-close">#close &mdash; Fasta</a></li>
+               
+                       <li><a href="Seq.html#method-i-complement">#complement &mdash; Seq</a></li>
+               
+                       <li><a href="Status.html#method-i-delete">#delete &mdash; Status</a></li>
+               
+                       <li><a href="Digest.html#method-i-disambiguate">#disambiguate &mdash; Digest</a></li>
+               
+                       <li><a href="Biopieces.html#method-i-each">#each &mdash; Biopieces</a></li>
+               
+                       <li><a href="Fasta.html#method-i-each">#each &mdash; Fasta</a></li>
+               
+                       <li><a href="Digest.html#method-i-each">#each &mdash; Digest</a></li>
+               
+                       <li><a href="Biopieces.html#method-i-each_record">#each_record &mdash; Biopieces</a></li>
+               
+                       <li><a href="Seq.html#method-i-generate">#generate &mdash; Seq</a></li>
+               
+                       <li><a href="Fasta.html#method-i-get_entry">#get_entry &mdash; Fasta</a></li>
+               
+                       <li><a href="Status.html#method-i-get_tmpdir">#get_tmpdir &mdash; Status</a></li>
+               
+                       <li><a href="Seq.html#method-i-is_dna%3F">#is_dna? &mdash; Seq</a></li>
+               
+                       <li><a href="Seq.html#method-i-is_protein%3F">#is_protein? &mdash; Seq</a></li>
+               
+                       <li><a href="Seq.html#method-i-is_rna%3F">#is_rna? &mdash; Seq</a></li>
+               
+                       <li><a href="Seq.html#method-i-len">#len &mdash; Seq</a></li>
+               
+                       <li><a href="Seq.html#method-i-length">#length &mdash; Seq</a></li>
+               
+                       <li><a href="Status.html#method-i-log">#log &mdash; Status</a></li>
+               
+                       <li><a href="Casts.html#method-i-long_to_sym">#long_to_sym &mdash; Casts</a></li>
+               
+                       <li><a href="Biopieces.html#method-i-mktmpdir">#mktmpdir &mdash; Biopieces</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-options_check">#options_check &mdash; OptionHandler</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-options_check_allowed">#options_check_allowed &mdash; OptionHandler</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-options_check_dir">#options_check_dir &mdash; OptionHandler</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-options_check_disallowed">#options_check_disallowed &mdash; OptionHandler</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-options_check_file">#options_check_file &mdash; OptionHandler</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-options_check_files">#options_check_files &mdash; OptionHandler</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-options_check_int">#options_check_int &mdash; OptionHandler</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-options_check_mandatory">#options_check_mandatory &mdash; OptionHandler</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-options_check_uint">#options_check_uint &mdash; OptionHandler</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-options_default">#options_default &mdash; OptionHandler</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-options_glob">#options_glob &mdash; OptionHandler</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-options_parse">#options_parse &mdash; OptionHandler</a></li>
+               
+                       <li><a href="Biopieces.html#method-i-parse">#parse &mdash; Biopieces</a></li>
+               
+                       <li><a href="Status.html#method-i-path">#path &mdash; Status</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-print_usage_and_exit">#print_usage_and_exit &mdash; OptionHandler</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-print_usage_full%3F">#print_usage_full? &mdash; OptionHandler</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-print_usage_short%3F">#print_usage_short? &mdash; OptionHandler</a></li>
+               
+                       <li><a href="Biopieces.html#method-i-puts">#puts &mdash; Biopieces</a></li>
+               
+                       <li><a href="Fasta.html#method-i-puts">#puts &mdash; Fasta</a></li>
+               
+                       <li><a href="Seq.html#method-i-revcomp">#revcomp &mdash; Seq</a></li>
+               
+                       <li><a href="Seq.html#method-i-reverse">#reverse &mdash; Seq</a></li>
+               
+                       <li><a href="Seq.html#method-i-reverse_complement">#reverse_complement &mdash; Seq</a></li>
+               
+                       <li><a href="Status.html#method-i-set">#set &mdash; Status</a></li>
+               
+                       <li><a href="Status.html#method-i-set_tmpdir">#set_tmpdir &mdash; Status</a></li>
+               
+                       <li><a href="Status.html#method-i-time_diff">#time_diff &mdash; Status</a></li>
+               
+                       <li><a href="Seq.html#method-i-to_bp">#to_bp &mdash; Seq</a></li>
+               
+                       <li><a href="Seq.html#method-i-to_dna">#to_dna &mdash; Seq</a></li>
+               
+                       <li><a href="Seq.html#method-i-to_fasta">#to_fasta &mdash; Seq</a></li>
+               
+                       <li><a href="Seq.html#method-i-to_rna">#to_rna &mdash; Seq</a></li>
+               
+                       <li><a href="Casts.html#method-i-ubiquitous">#ubiquitous &mdash; Casts</a></li>
+               
+                       <li><a href="OptionHandler.html#method-i-wiki_path">#wiki_path &mdash; OptionHandler</a></li>
+               
+       </ul>
+
+       <div id="validator-badges">
+               <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+               <p><small>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish
+                       Rdoc Generator</a> 1.1.6</small>.</p>
+       </div>
+</body>
 </html>