-
Notifications
You must be signed in to change notification settings - Fork 2
fixes to loading config file and a few other little things #1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
cboursnell
wants to merge
22
commits into
blahah:master
Choose a base branch
from
cboursnell:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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 5068acd
fixed conflicts after fetch
cboursnell 3488b19
Merge branch 'master' of github.com:blahah/assemblotron
cboursnell 95e2d61
fixed soap denovo test
cboursnell 2e14db0
optimiser and verbosity option
cboursnell b4b7c37
Merge branch 'master' of github.com:blahah/assemblotron into upstream
cboursnell f4af095
enable writing when creating config file
cboursnell 517347c
changed spaces to underscores in the config file filename
cboursnell 8ce456b
bump
cboursnell e29b457
Merge branch 'master' of github.com:blahah/assemblotron into upstream
cboursnell f4198c0
merged changes from blahah
cboursnell 0bdcc42
removed colons from config filename
cboursnell 65fa72f
merge from upstream
cboursnell c21df10
merge from upstream branch
cboursnell aa7875d
gemfile.lock changed again
cboursnell 6d14d23
actually doing stuff with the optimiser global option
cboursnell 944d9ed
fixed file path bug
cboursnell f38aaab
ignore config files
cboursnell 602121e
added option to only do assembly and no scoring
cboursnell 082f7ce
the biopsy settings object now gets passed global options from atron
cboursnell 9749562
objective that doesn't do anything and returns a score of 0
cboursnell e11cfee
merge upstream master
cboursnell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,9 @@ spec/reports | |
| test/tmp | ||
| test/version_tmp | ||
| tmp | ||
| *~ | ||
| *fastq | ||
| *config | ||
|
|
||
| # YARD artifacts | ||
| .yardoc | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,4 +39,4 @@ module Assemblotron | |
| end | ||
| Object.send :include, Yell::Loggable | ||
|
|
||
| end # Assemblotron | ||
| end # Assemblotron | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -129,4 +129,4 @@ def run_soap params | |
| end | ||
| end | ||
|
|
||
| end # SoapDenovoTrans | ||
| end # SoapDenovoTrans | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.