Fixed a minor bug which only affects paired-end reads for reporting how many alignmen...

[rsem.git] / rsem-calculate-expression

diff --git a/rsem-calculate-expression b/rsem-calculate-expression
index f16975545d37dd64e589197b5a2be70d39b596dc..fec2e310471c331d4bdf3b745ad4c129f2f5aee1 100755 (executable)
--- a/rsem-calculate-expression
+++ b/rsem-calculate-expression
@@ -2,9 +2,12 @@
 
 use Getopt::Long;
 use Pod::Usage;
-use File::Basename;
+use FindBin;
+use lib $FindBin::Bin;
 use strict;
 
+use rsem_perl_utils qw(runCommand collectResults showVersionInfo);
+
 #const
 my $BURNIN = 200;
 my $NCV = 1000;
@@ -18,10 +21,6 @@ my $status = 0;
 
 my $read_type = 1; # default, single end with qual
 
-my @transcript_title = ("transcript_id", "gene_id", "length", "effective_length", "expected_count", "TPM", "FPKM", "IsoPct", "pme_expected_count", "pme_TPM", "pme_FPKM", "IsoPct_from_pme_TPM", "TPM_ci_lower_bound", "TPM_ci_upper_bound", "FPKM_ci_lower_bound", "FPKM_ci_upper_bound");
-
-my @gene_title = ("gene_id", "transcript_id(s)", "length", "effective_length", "expected_count", "TPM", "FPKM", "pme_expected_count", "pme_TPM", "pme_FPKM", "TPM_ci_lower_bound", "TPM_ci_upper_bound", "FPKM_ci_lower_bound", "FPKM_ci_upper_bound");
-
 my $bowtie_path = "";
 my $C = 2;
 my $E = 99999999;
@@ -62,6 +61,8 @@ my $keep_intermediate_files = 0;
 
 my $strand_specific = 0;
 
+my $version = 0;
+
 my $mTime = 0;
 my ($time_start, $time_end, $time_alignment, $time_rsem, $time_ci) = (0, 0, 0, 0, 0);
 
@@ -105,11 +106,14 @@ GetOptions("keep-intermediate-files" => \$keep_intermediate_files,
           "calc-ci" => \$calcCI,
           "ci-memory=i" => \$NMB,
           "time" => \$mTime,
+          "version" => \$version,
           "q|quiet" => \$quiet,
           "h|help" => \$help) or pod2usage(-exitval => 2, -verbose => 2);
 
-pod2usage(-verbose => 2) if ($help == 1);
+my $dir = "$FindBin::Bin/";
 
+pod2usage(-verbose => 2) if ($help == 1);
+&showVersionInfo($dir) if ($version == 1);
 
 #check parameters and options
 
@@ -186,7 +190,6 @@ my ($mate_minL, $mate_maxL) = (1, $maxL);
 
 if ($bowtie_path ne "") { $bowtie_path .= "/"; }
 
-my ($fn, $dir, $suf) = fileparse($0);
 my $command = "";
 
 if (!$is_sam && !$is_bam) {
@@ -343,68 +346,6 @@ if ($mTime) {
     close(OUTPUT);
 }
 
-# command, {err_msg}
-sub runCommand {
-    print $_[0]."\n";
-    my $status = system($_[0]);
-    if ($status != 0) {
-        my $errmsg = "";
-        if (scalar(@_) > 1) { $errmsg .= $_[1]."\n"; }
-        $errmsg .= "\"$_[0]\" failed! Plase check if you provide correct parameters/options for the pipeline!\n";
-        print $errmsg;
-        exit(-1);
-    }
-    print "\n";
-}
- 
-# inpF, outF
-sub collectResults {
-    my $local_status;
-    my ($inpF, $outF);
-    my @results = ();
-    my $line;
-
-    $inpF = $_[1];
-    $outF = $_[2];
-
-    $local_status = open(INPUT, $inpF);
-    if ($local_status == 0) { print "Fail to open file $inpF!\n"; exit(-1); }
-    
-    @results = ();
-    
-    while ($line = <INPUT>) {
-       chomp($line);
-       my @local_arr = split(/\t/, $line);
-       push(@results, \@local_arr); 
-    }
-
-    close(INPUT);
-
-    $local_status = open(OUTPUT, ">$outF");
-    if ($local_status == 0) { print "Fail to create file $outF!\n"; exit(-1); }
-
-    my $n = scalar(@results);
-    my $m = scalar(@{$results[0]});
-
-    $" = "\t";
-
-    my @out_arr = ();
-    for (my $i = 0; $i < $n; $i++) {
-       if ($_[0] eq "isoform") { push(@out_arr, $transcript_title[$i]); }
-       elsif ($_[0] eq "gene") { push(@out_arr, $gene_title[$i]); }
-       else { print "A bug on 'collectResults' is detected!\n"; exit(-1); }
-    }
-    print OUTPUT "@out_arr\n";
-
-    for (my $i = 0; $i < $m; $i++) {
-       @out_arr = ();
-       for (my $j = 0; $j < $n; $j++) { push(@out_arr, $results[$j][$i]); }
-       print OUTPUT "@out_arr\n"; 
-    }
-
-    close(OUTPUT);
-}
-
 __END__
 
 =head1 NAME