Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
37c181c
fixes to loading config file and a few other little things
cboursnell Dec 19, 2013
5068acd
fixed conflicts after fetch
cboursnell Apr 22, 2014
3488b19
Merge branch 'master' of github.com:blahah/assemblotron
cboursnell Apr 22, 2014
95e2d61
fixed soap denovo test
cboursnell Apr 22, 2014
2e14db0
optimiser and verbosity option
cboursnell Apr 25, 2014
b4b7c37
Merge branch 'master' of github.com:blahah/assemblotron into upstream
cboursnell Apr 25, 2014
f4af095
enable writing when creating config file
cboursnell Apr 25, 2014
517347c
changed spaces to underscores in the config file filename
cboursnell Apr 25, 2014
8ce456b
bump
cboursnell Apr 25, 2014
e29b457
Merge branch 'master' of github.com:blahah/assemblotron into upstream
cboursnell Apr 25, 2014
f4198c0
merged changes from blahah
cboursnell Apr 25, 2014
0bdcc42
removed colons from config filename
cboursnell Apr 25, 2014
65fa72f
merge from upstream
cboursnell Apr 29, 2014
c21df10
merge from upstream branch
cboursnell Apr 29, 2014
aa7875d
gemfile.lock changed again
cboursnell Apr 29, 2014
6d14d23
actually doing stuff with the optimiser global option
cboursnell Apr 29, 2014
944d9ed
fixed file path bug
cboursnell Apr 30, 2014
f38aaab
ignore config files
cboursnell May 29, 2014
602121e
added option to only do assembly and no scoring
cboursnell May 29, 2014
082f7ce
the biopsy settings object now gets passed global options from atron
cboursnell May 29, 2014
9749562
objective that doesn't do anything and returns a score of 0
cboursnell May 29, 2014
e11cfee
merge upstream master
cboursnell Nov 10, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ spec/reports
test/tmp
test/version_tmp
tmp
*~
*fastq
*config

# YARD artifacts
.yardoc
Expand Down
2 changes: 1 addition & 1 deletion bin/atron
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,4 @@ if !(options[:timelimit].nil?)
options[:timelimit] = ChronicDuration.parse(options[:timelimit]);
end

Assemblotron::Controller.new(options).run
Assemblotron::Controller.new(options).run
2 changes: 1 addition & 1 deletion lib/assemblotron.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ module Assemblotron
end
Object.send :include, Yell::Loggable

end # Assemblotron
end # Assemblotron
2 changes: 1 addition & 1 deletion lib/assemblotron/assemblers/soap_denovo_trans.rb
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,4 @@ def run_soap params
end
end

end # SoapDenovoTrans
end # SoapDenovoTrans
5 changes: 0 additions & 5 deletions lib/assemblotron/assemblers/soap_denovo_trans.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ name: SoapDenovoTrans
shortname: sdt
output: {}
parameters:
config:
type: string
opt: false
desc: 'Path to SoapDenovoTrans config file'
required: true
left:
type: string
opt: false
Expand Down
12 changes: 12 additions & 0 deletions lib/assemblotron/objectives/no_score.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# An objective function that returns 0
#
# This class conforms to the API for a Biopsy::ObjectiveFunction.
class NoScore < Biopsy::ObjectiveFunction

# Don't do anything just return 0.
#
# @return [Integer] 0,
def run (raw_output, output_files, threads)
return 0
end
end
2 changes: 1 addition & 1 deletion test/test_soap_denovo_trans.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class TestSoapDenovoTrans < Minitest::Test
:insertsize => '200',
:l => 'l.fq',
:r => 'r.fq',
:path => 'SOAPdenovo-Trans',
:path => 'SOAPdenovo-Trans-127mer',

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use the new Ruby 1.9 hash syntax.

:memory => 12,
:threads => 8,
:out => 1,
Expand Down