big_simon 0.2.1 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 624fd8e70d43c1a556b9c846e599dd928cd0c081
4
- data.tar.gz: 456b7aec02cd33c6d0145d144fb83504daa0ef07
3
+ metadata.gz: 980c3ecda67dca9161c5b0c9f8585157a46305be
4
+ data.tar.gz: 26f3eee3f8758d738e8963ef514b9c555106e858
5
5
  SHA512:
6
- metadata.gz: 431d7b1f0f44af912b42adf458df8a15ff9b60139b5c6c27318e442b00a55f94b289b59e4518f9005b52d5b26de712ea2bd142c8a152558a98c47e4ede7a2a82
7
- data.tar.gz: 6282c6ce73c86f4276934760c4b9decf2d758d962b5c43b7d84048e420fda41eee97d9c0fe1a681479f93daee16a1545f79fee56aba41e0fd0d06eec0debf9ab
6
+ metadata.gz: d4d93aeb93b23e4fb08ed1cb0a8d4b144f3ddab2d5cb521cdde25a278b779eb97431294f6f33166f16ff664cffd8bb6371194034fe4000ce1b5030c4e3641ba9
7
+ data.tar.gz: 5678b2858ebf3e586c8246aba357dc9b376494dd43d091acc4156421a54b6078612f5319b5a4c21bf641d8b84c9ce4eaf4f904be39c0adc180349adb561b2c67
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- big_simon (0.2.1)
4
+ big_simon (0.2.2)
5
5
  parallel
6
6
  parse_fasta (~> 2.5, >= 2.5.2)
7
7
  rya (~> 0.4.0)
data/exe/big_simon CHANGED
@@ -82,43 +82,19 @@ wish_outf = BigSimon::Runners.wish BigSimon::WISH, tmpdir_virus, tmpdir_host, tm
82
82
  vhm_outf = BigSimon::Runners.vir_host_matcher BigSimon::VHM, tmpdir_virus, tmpdir_host, tmpdir
83
83
 
84
84
  # TODO separate the parser from the runner for mummer.
85
- host_info_mummer = BigSimon::Runners.mummer BigSimon::MUMMER, tmpdir_virus, tmpdir_host, tmpdir, threads
86
-
87
- puts "mummer"
88
- pp host_info_mummer
89
- puts
85
+ host_info_mummer = BigSimon::Runners.mummer BigSimon::MUMMER, tmpdir_virus, tmpdir_host, tmpdir, threads, all_seq_lengths
90
86
 
91
87
  # TODO separate the parser from the runner for homology
92
- host_info_homology = BigSimon::Runners.homology tmpdir_virus, tmpdir_host, tmpdir, threads
93
-
94
- puts "homology"
95
- pp host_info_homology
96
- puts
97
-
88
+ host_info_homology = BigSimon::Runners.homology tmpdir_virus, tmpdir_host, tmpdir, threads, all_seq_lengths
98
89
 
99
90
 
100
91
  host_info_wish = BigSimon::Parsers.wish wish_outf
101
92
  host_info_vhm = BigSimon::Parsers.vir_host_matcher vhm_outf
102
93
 
103
- puts "wish"
104
- pp host_info_wish
105
- puts
106
-
107
- puts "vhm"
108
- pp host_info_vhm
109
- puts
110
-
111
94
 
112
95
  host_info_simple_names = BigSimon::Pipeline.collate_host_results [host_info_wish, host_info_vhm, host_info_mummer, host_info_homology], programs
113
96
  host_info = BigSimon::Pipeline.map_taxa host_info_simple_names, name_map_virus, name_map_host
114
97
 
115
- puts
116
- pp host_info_simple_names
117
- puts
118
-
119
- puts
120
- pp host_info
121
- puts
122
98
 
123
99
  # Just a basic all info file
124
100
  # File.open all_predictions_fname, "w" do |f|
@@ -137,8 +113,6 @@ end
137
113
 
138
114
  scores_files.each do |program, files|
139
115
  files.each do |name, file|
140
- puts "LALA 3: #{[program, name, file]} #{%w[virus host score].join}"
141
-
142
116
  file.puts %w[virus host score].join "\t"
143
117
  end
144
118
  end
@@ -150,8 +124,6 @@ host_info.each do |virus, h1|
150
124
  h2[:scores].each do |program, score|
151
125
  lines[[virus, host, program]] = [score]
152
126
 
153
- puts "LALA: #{[virus, host, score]}"
154
-
155
127
  scores_files[program][:raw].puts [virus, host, score].join "\t"
156
128
  end
157
129
 
@@ -159,9 +131,6 @@ host_info.each do |virus, h1|
159
131
  h2[:scaled_scores].each do |program, score|
160
132
  lines[[virus, host, program]] << score
161
133
 
162
- puts "LALA 2: #{[virus, host, score]}"
163
-
164
-
165
134
  scores_files[program][:scaled].puts [virus, host, score].join "\t"
166
135
  end
167
136
 
@@ -88,7 +88,7 @@ module BigSimon
88
88
 
89
89
  combined_seq_length = all_seq_lengths[virus] + all_seq_lengths[host]
90
90
 
91
- score = ary[3].to_i / combined_seq_length * 1000
91
+ score = ary[3].to_i / combined_seq_length.to_f * 1000
92
92
 
93
93
 
94
94
  # unless hit_table[virus].has_key? host
@@ -1,5 +1,5 @@
1
1
  module BigSimon
2
- VERSION = "0.2.1"
2
+ VERSION = "0.2.2"
3
3
 
4
4
  COPYRIGHT = "2018 Ryan Moore"
5
5
  CONTACT = "moorer@udel.edu"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: big_simon
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryan Moore