Skip to content

Commit

Permalink
defaults to 2 process and corrects some validations
Browse files Browse the repository at this point in the history
  • Loading branch information
averissimo committed Oct 20, 2016
1 parent ca1e215 commit bb9c48c
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 5 deletions.
6 changes: 3 additions & 3 deletions config/config_blast.rb
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,9 @@ def validate_config
'db_and_queries', String,
'Should be the query parent directory')
if !@store.query.key?('folders') || !@store.query.folders.is_a?(Array)
log_required_sub.call('folders', 'query.list', '\n - (folder name)')
else @store.query.folders.size == 0
log_required_sub.call('folders', 'query.list', '\n - (at least one folder name)')
log_required_sub.call('folders', 'query.folders', '\n - (folder name)')
elsif @store.query.folders.size == 0
log_required_sub.call('folders', 'query.folders', '\n - (at least one folder name)')
end
end
#
Expand Down
7 changes: 6 additions & 1 deletion config/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,13 @@ prune_identical:
#
#
# output directory options:
# - dir: output directory's name
# - ext: extension for blast files
# - dir: corresponds to the directory's name and path where will be stored the results. By default, it is set to “output".
# - extension: extension for blast files, by default “.out”.
# - intermediate: corresponds to the directory’s name where will be saved all the intermediate files generated by MassBlast.
# - blast_results: corresponds to the directory’s name where will be saved all the Blast results generated by Blast+.
# - fastas: corresponds to the directory’s name where will be saved all the fasta files generated by MassBlast.
#
output:
dir: output
extension: .out
Expand Down
2 changes: 2 additions & 0 deletions test/blastn/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ use_threads: 1
debug:
file: ../../output/log.blastn_rspec.txt
show_stdout_if_file: false

annotation_dir: ../../db_and_queries/annotation
#
#
# Opts are engine specific, the default in user.yml
Expand Down
2 changes: 2 additions & 0 deletions test/tblastn/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ use_threads: 1
debug:
file: ../../output/log.tblastn_rspec.txt
show_stdout_if_file: false

annotation_dir: ../../db_and_queries/annotation
#
#
# Opts are engine specific, the default in user.yml
Expand Down
2 changes: 2 additions & 0 deletions test/tblastx/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ use_threads: 1
debug:
file: ../../output/log.tblastx_rspec.txt
show_stdout_if_file: false

annotation_dir: ../../db_and_queries/annotation
#
#
# Opts are engine specific, the default in user.yml
Expand Down
2 changes: 1 addition & 1 deletion user.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ separate_db: true
#
# number of threads to use
# only valid with separate_db option
use_threads: 1
use_threads: 2
#
# path to debugging file, change it in respect to user.yml
debug:
Expand Down

0 comments on commit bb9c48c

Please sign in to comment.