Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mirrors
biopet.biopet
Commits
e735b32d
Commit
e735b32d
authored
Dec 09, 2016
by
Sander Bollen
Browse files
fix dependency issue
parent
9ae30190
Changes
3
Hide whitespace changes
Inline
Side-by-side
biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/DepthOfCoverage.scala
View file @
e735b32d
...
@@ -18,31 +18,31 @@ class DepthOfCoverage(val root: Configurable) extends CommandLineGATK {
...
@@ -18,31 +18,31 @@ class DepthOfCoverage(val root: Configurable) extends CommandLineGATK {
@Output
(
fullName
=
"out"
,
shortName
=
"o"
,
doc
=
"File name base to which coverage metric should be written"
)
@Output
(
fullName
=
"out"
,
shortName
=
"o"
,
doc
=
"File name base to which coverage metric should be written"
)
var
out
:
File
=
_
var
out
:
File
=
_
@Output
private
var
_summaryFile
:
File
=
_
private
var
_summaryFile
:
File
=
_
@Output
private
var
_statisticsFile
:
File
=
_
private
var
_statisticsFile
:
File
=
_
@Output
private
var
_intervalSummaryFile
:
File
=
_
private
var
_intervalSummaryFile
:
File
=
_
@Output
private
var
_intervalStatisticsFile
:
File
=
_
private
var
_intervalStatisticsFile
:
File
=
_
@Output
private
var
_geneSummaryFile
:
File
=
_
private
var
_geneSummaryFile
:
File
=
_
@Output
private
var
_geneStatisticsFile
:
File
=
_
private
var
_geneStatisticsFile
:
File
=
_
@Output
private
var
_cumulativeCoverageCountsFile
:
File
=
_
private
var
_cumulativeCoverageCountsFile
:
File
=
_
@Output
private
var
_cumulativeCoverageProportionsFile
:
File
=
_
private
var
_cumulativeCoverageProportionsFile
:
File
=
_
@Output
def
summaryFile
=
new
File
(
out
+
".sample_summary"
)
var
summaryFile
=
_summaryFile
def
statisticsFile
=
new
File
(
out
+
".sample_statistics"
)
@Output
def
intervalSummaryFile
=
new
File
(
out
+
".sample_interval_summary"
)
var
statisticsFile
=
_statisticsFile
def
intervalStatisticsFile
=
new
File
(
out
+
".sample_interval_statistics"
)
@Output
def
geneSummaryFile
=
new
File
(
out
+
".sample_gene_summary"
)
var
intervalSummaryFile
=
_intervalSummaryFile
def
geneStatisticsFile
=
new
File
(
out
+
".sample_gene_statistics"
)
@Output
def
cumulativeCoverageCountsFile
=
new
File
(
out
+
".sample_cumulative_coverage_counts"
)
var
intervalStatisticsFile
=
_intervalStatisticsFile
def
cumulativeCoverageProportionsFile
=
new
File
(
out
+
".sample_cumulative_coverage_proportions"
)
@Output
var
geneSummaryFile
=
_geneSummaryFile
@Output
var
geneStatisticsFile
=
_geneStatisticsFile
@Output
var
culumativeCoverageCountsFile
=
_cumulativeCoverageCountsFile
@Output
var
cumulativeCoverageProportionsFile
=
_cumulativeCoverageProportionsFile
@Input
(
required
=
false
)
@Input
(
required
=
false
)
var
calculateCoverageOverGenes
:
Option
[
File
]
=
config
(
"calculate_coverage_over_genes"
,
namespace
=
"depth_of_coverage"
,
default
=
None
)
var
calculateCoverageOverGenes
:
Option
[
File
]
=
config
(
"calculate_coverage_over_genes"
,
namespace
=
"depth_of_coverage"
,
default
=
None
)
...
@@ -92,14 +92,14 @@ class DepthOfCoverage(val root: Configurable) extends CommandLineGATK {
...
@@ -92,14 +92,14 @@ class DepthOfCoverage(val root: Configurable) extends CommandLineGATK {
if
(
out
==
null
)
{
if
(
out
==
null
)
{
throw
new
IllegalStateException
(
"You must set the <out> variable"
)
throw
new
IllegalStateException
(
"You must set the <out> variable"
)
}
}
_summaryFile
=
new
File
(
out
+
".sample_
summary
"
)
_summaryFile
=
summary
File
_statisticsFile
=
new
File
(
out
+
".sample_
statistics
"
)
_statisticsFile
=
statistics
File
_intervalSummaryFile
=
new
File
(
out
+
".sample_
interval
_s
ummary
"
)
_intervalSummaryFile
=
interval
S
ummary
File
_intervalStatisticsFile
=
new
File
(
out
+
".sample_
interval
_s
tatistics
"
)
_intervalStatisticsFile
=
interval
S
tatistics
File
_geneSummaryFile
=
new
File
(
out
+
".sample_
gene
_s
ummary
"
)
_geneSummaryFile
=
gene
S
ummary
File
_geneStatisticsFile
=
new
File
(
out
+
".sample_
gene
_s
tatistics
"
)
_geneStatisticsFile
=
gene
S
tatistics
File
_cumulativeCoverageCountsFile
=
new
File
(
out
+
".sample_
cumulative
_c
overage
_c
ounts
"
)
_cumulativeCoverageCountsFile
=
cumulative
C
overage
C
ounts
File
_cumulativeCoverageProportionsFile
=
new
File
(
out
+
".sample_
cumulative
_c
overage
_p
roportions
"
)
_cumulativeCoverageProportionsFile
=
cumulative
C
overage
P
roportions
File
}
}
override
def
cmdLine
=
{
override
def
cmdLine
=
{
...
...
biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/xhmm/XhmmDiscover.scala
View file @
e735b32d
...
@@ -22,10 +22,10 @@ class XhmmDiscover(val root: Configurable) extends Xhmm with Summarizable {
...
@@ -22,10 +22,10 @@ class XhmmDiscover(val root: Configurable) extends Xhmm with Summarizable {
@Input
@Input
var
r
:
File
=
_
var
r
:
File
=
_
@Output
private
var
_outputXcnvAuxFile
:
File
=
_
private
var
_outputXcnvAuxFile
:
File
=
_
@Output
def
outputXcnvAuxFile
=
new
File
(
outputXcnv
.
getAbsolutePath
+
".aux"
)
var
outputXcnvAuxFile
=
_outputXcnvAuxFile
var
xhmmAnalysisName
:
String
=
_
var
xhmmAnalysisName
:
String
=
_
...
@@ -34,7 +34,7 @@ class XhmmDiscover(val root: Configurable) extends Xhmm with Summarizable {
...
@@ -34,7 +34,7 @@ class XhmmDiscover(val root: Configurable) extends Xhmm with Summarizable {
if
(
outputXcnv
==
null
)
{
if
(
outputXcnv
==
null
)
{
throw
new
IllegalStateException
(
"Must set output file"
)
throw
new
IllegalStateException
(
"Must set output file"
)
}
}
_outputXcnvAuxFile
=
new
File
(
outputXcnv
.
getAbsolutePath
+
".aux"
)
_outputXcnvAuxFile
=
outputXcnv
AuxFile
}
}
def
cmdLine
=
{
def
cmdLine
=
{
...
...
kopisu/src/main/scala/nl/lumc/sasc/biopet/pipelines/kopisu/methods/XhmmMethod.scala
View file @
e735b32d
...
@@ -36,7 +36,7 @@ class XhmmMethod(val root: Configurable) extends CnvMethod with Reference {
...
@@ -36,7 +36,7 @@ class XhmmMethod(val root: Configurable) extends CnvMethod with Reference {
def
biopetScript
()
=
{
def
biopetScript
()
=
{
val
depths
=
inputBams
.
map
{
keyValuePair
=>
val
depths
=
inputBams
.
map
{
keyValuePair
=>
DepthOfCoverage
(
this
,
List
(
keyValuePair
.
_2
),
swapExt
(
xhmmDir
,
".bam"
,
".dcov"
),
List
(
targets
))
DepthOfCoverage
(
this
,
List
(
keyValuePair
.
_2
),
swapExt
(
xhmmDir
,
keyValuePair
.
_2
,
".bam"
,
".dcov"
),
List
(
targets
))
}.
toList
}.
toList
addAll
(
depths
)
addAll
(
depths
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment