Skip to content
Snippets Groups Projects
Commit 10873179 authored by bow's avatar bow
Browse files

Remove addAllJobs from CufflinksProducer

parent acdacee9
No related branches found
No related tags found
No related merge requests found
...@@ -38,6 +38,9 @@ trait CufflinksProducer { this: Gentrap#Sample => ...@@ -38,6 +38,9 @@ trait CufflinksProducer { this: Gentrap#Sample =>
case otherwise => throw new IllegalStateException("Unexpected cufflinks type: " + otherwise.toString) case otherwise => throw new IllegalStateException("Unexpected cufflinks type: " + otherwise.toString)
} }
/** Container for all jobs in this job set */
def jobs = Seq(cufflinksJob, geneFpkmJob, isoformFpkmJob)
/** The main cufflinks job */ /** The main cufflinks job */
lazy val cufflinksJob: Cufflinks = { lazy val cufflinksJob: Cufflinks = {
val job = new Cufflinks(pipeline) { val job = new Cufflinks(pipeline) {
...@@ -73,8 +76,5 @@ trait CufflinksProducer { this: Gentrap#Sample => ...@@ -73,8 +76,5 @@ trait CufflinksProducer { this: Gentrap#Sample =>
job.output = new File(cufflinksJob.output_dir, s"$sampleId.isoformss_fpkm_$name") job.output = new File(cufflinksJob.output_dir, s"$sampleId.isoformss_fpkm_$name")
job job
} }
/** Adds all contained jobs to Queue */
def addAllJobs(): Unit = { pipeline.add(cufflinksJob); pipeline.add(geneFpkmJob); pipeline.add(isoformFpkmJob) }
} }
} }
...@@ -691,9 +691,9 @@ class Gentrap(val root: Configurable) extends QScript with MultiSampleQScript wi ...@@ -691,9 +691,9 @@ class Gentrap(val root: Configurable) extends QScript with MultiSampleQScript wi
basesPerExonJob.foreach(add(_)) basesPerExonJob.foreach(add(_))
// symlink results with distinct extensions ~ actually to make it easier to use MergeTables on these as well // symlink results with distinct extensions ~ actually to make it easier to use MergeTables on these as well
// since the Queue argument parser doesn't play nice with Map[_, _] types // since the Queue argument parser doesn't play nice with Map[_, _] types
cufflinksStrictJobSet.foreach(_.addAllJobs()) cufflinksStrictJobSet.foreach(_.jobs.foreach(add(_)))
cufflinksGuidedJobSet.foreach(_.addAllJobs()) cufflinksGuidedJobSet.foreach(_.jobs.foreach(add(_)))
cufflinksBlindJobSet.foreach(_.addAllJobs()) cufflinksBlindJobSet.foreach(_.jobs.foreach(add(_)))
// add variant calling job if requested // add variant calling job if requested
varCallJob.foreach(add(_)) varCallJob.foreach(add(_))
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment