miga-base 1.3.13.10 → 1.3.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 805637216225db5718e2a8a085046a64beae0ec816da3ecc01fda274194b83aa
-  data.tar.gz: 7c063bcd35554dd6ac7784ddeb37cf3a8e5b1f3ac3349f3ba4af9c5a7425806b
+  metadata.gz: 2459aa0f06af71628701bc0a71c1830bd21fc24d5c3e0999c8f59b6bce8b6cf6
+  data.tar.gz: 1590b03b5dfbe42241dd943a61388ff2e22a4956c6e9169d321a9bb857b9713f
 SHA512:
-  metadata.gz: 74fe73270087e6ceb32fea09e2a2b13e1f8687c96fe39b42f68c0fdbea5d172b15ab946843ba184667071c34f3080a3e12613b7ecf078d90656514f96654044b
-  data.tar.gz: 6d4e2ff50403236cdc90349aa67263590781c7ff4694cafb2bf35b81b57480026f3f59543145181e20f71b4cbee85d5682adf11d9813e86ea25ef1c40291c345
+  metadata.gz: cf4da3f0519c77fd290e92650a6a53b871d678516eda891ef15272e0fa5a8b4aa518a4531211b0ee9d78ca2e42798f6421b41a3980c3f6e64a159f78bf105e9a
+  data.tar.gz: e771646155d87a7f8e7896b5cfa121f94a60dbce78cd5be0231faf42e7f4aa2b75de4c3fdf043dadb33d07a67bca180d12a12871d1066bff73a454eecdf565a5

data/lib/miga/cli/action/browse.rb

@@ -179,7 +179,7 @@ class MiGA::Cli::Action::Browse < MiGA::Cli::Action
     str
       .to_s.unmiga_name
       .sub(/^./, &:upcase)
-      .gsub(/(Aai|Ani|Ogs|Cds|Ssu|Rds|ani95|aai90| db$| ssu )/, &:upcase)
+      .gsub(/(Aai|Ani|Ogs|Cds|Ssu|Rds|Rda|ani95|aai90| db$| ssu )/, &:upcase)
       .sub(/Haai/, 'hAAI')
       .sub(/Mytaxa/, 'MyTaxa')
       .sub(/ pvalue$/, ' p-value')

data/lib/miga/project/result.rb

@@ -55,10 +55,13 @@ module MiGA::Project::Result
   ##
   # Add result of any type +:*_distances+ at +base+ (no +_opts+ supported).
   def add_result_distances(base, _opts)
-    return nil unless result_files_exist?(base, %w[.rds .txt])
+    return nil unless result_files_exist?(base, ['.txt']) &&
+      (result_files_exist?(base, ['.rds']) ||
+       result_files_exist?(base, ['.rda']))
 
     r = MiGA::Result.new("#{base}.json")
     r.add_file(:rds,    'miga-project.rds')
+    r.add_file(:rda,    'miga-project.rda')
     r.add_file(:rdata,  'miga-project.Rdata') # Legacy file
     r.add_file(:matrix, 'miga-project.txt')
     r.add_file(:log,    'miga-project.log') # Legacy file
@@ -84,6 +87,7 @@ module MiGA::Project::Result
 
     r = add_result_iter_clades(base)
     r.add_file(:aai_dist_rds, 'miga-project.dist.rds')
+    r.add_file(:aai_dist_rda, 'miga-project.dist.rda')
     r.add_file(:aai_tree,     'miga-project.aai.nwk')
     r.add_file(:proposal,     'miga-project.proposed-clades')
     r.add_file(:clades_aai90, 'miga-project.aai90-clades')
@@ -108,6 +112,7 @@ module MiGA::Project::Result
     r = add_result_iter_clades(base)
     r.add_file(:ani_tree, 'miga-project.ani.nwk')
     r.add_file(:ani_dist_rds, 'miga-project.dist.rds')
+    r.add_file(:ani_dist_rda, 'miga-project.dist.rda')
     r
   end
 

data/lib/miga/version.rb

@@ -12,7 +12,7 @@ module MiGA
   # - String indicating release status:
   #   - rc* release candidate, not released as gem
   #   - [0-9]+ stable release, released as gem
-  VERSION = [1.3, 13, 10].freeze
+  VERSION = [1.3, 14, 1].freeze
 
   ##
   # Nickname for the current major.minor version.

data/scripts/aai_distances.bash

@@ -40,15 +40,16 @@ rm "miga-project.txt.lno"
 # R-ify
 cat <<R | R --vanilla
 file <- gzfile("miga-project.txt.gz")
-aai <- read.table(
-  file, sep = "\t", header = TRUE, as.is = TRUE, quote = "",
-  stringsAsFactors = FALSE, comment.char = "", nrows = $LNO,
-  colClasses = c("character", "character",
-                 "numeric", "numeric", "integer", "integer")
-)
-saveRDS(aai, file = "miga-project.rds")
-if(sum(aai[, "a"] != aai[, "b"]) > 0) {
-  h <- hist(aai[aai[, "a"] != aai[, "b"], "value"], breaks = 100, plot = FALSE)
+text <- readLines(file, n = $LNO + 1, ok = FALSE)
+list <- strsplit(text[-1], "\t", fixed = TRUE)
+a <- sapply(list, function(x) x[1])
+b <- sapply(list, function(x) x[2])
+d <- sapply(list, function(x) 1 - (as.numeric(x[3]) / 100))
+save(a, b, d, file = "miga-project.rda")
+
+non_self <- a != b
+if(sum(non_self) > 0) {
+  h <- hist((1 - d[non_self]) * 100, breaks = 100, plot = FALSE)
   len <- length(h[["breaks"]])
   write.table(
     cbind(h[["breaks"]][-len], h[["breaks"]][-1], h[["counts"]]),

data/scripts/ani_distances.bash

@@ -34,15 +34,16 @@ rm "miga-project.txt.lno"
 # R-ify
 cat <<R | R --vanilla
 file <- gzfile("miga-project.txt.gz")
-ani <- read.table(
-  file, sep = "\t", header = TRUE, as.is = TRUE, quote = "",
-  stringsAsFactors = FALSE, comment.char = "", nrows = $LNO,
-  colClasses = c("character", "character",
-                 "numeric", "numeric", "integer", "integer")
-)
-saveRDS(ani, file = "miga-project.rds")
-if(sum(ani[, "a"] != ani[, "b"]) > 0) {
-  h <- hist(ani[ani[, "a"] != ani[, "b"], "value"], breaks = 100, plot = FALSE)
+text <- readLines(file, n = $LNO + 1, ok = FALSE)
+list <- strsplit(text[-1], "\t", fixed = TRUE)
+a <- sapply(list, function(x) x[1])
+b <- sapply(list, function(x) x[2])
+d <- sapply(list, function(x) 1 - (as.numeric(x[3]) / 100))
+save(a, b, d, file = "miga-project.rda")
+
+non_self <- a != b
+if(sum(non_self) > 0) {
+  h <- hist((1 - d[non_self]) * 100, breaks = 100, plot = FALSE)
   len <- length(h[["breaks"]])
   write.table(
     cbind(h[["breaks"]][-len], h[["breaks"]][-1], h[["counts"]]),

data/utils/find-medoid.R

@@ -16,15 +16,14 @@ if(Sys.getenv("MIGA") == ""){
   ))
 }
 
-find_medoids <- function (ani.df, out, clades) {
-  if(nrow(ani.df) == 0) return(NULL)
-  ani.df$d <- 1 - (ani.df$value/100)
-  dist <- enve.df2dist(ani.df, "a", "b", "d", default.d = max(ani.df$d) * 1.2)
+find_medoids <- function (a, b, d, out, clades) {
+  if (length(d) == 0) return(NULL)
+  dist <- enve.df2dist(cbind(a, b, d), "a", "b", "d", default.d = max(d) * 1.2)
   dist <- as.matrix(dist)
   cl <- read.table(clades, header = FALSE, sep = "\t", as.is = TRUE)[,1]
   cl.s <- c()
   medoids <- c()
-  for(i in cl){
+  for (i in cl) {
     lab <- strsplit(i, ",")[[1]]
     if(length(lab) == 1) {
       lab.s <- lab
@@ -44,6 +43,12 @@ find_medoids <- function (ani.df, out, clades) {
 
 #= Main
 cat("Finding Medoids\n")
-ani <- readRDS(argv[1])
-find_medoids(ani.df = ani, out = argv[2], clades = argv[3])
+if (grepl("\\.rds$", argv[1])) {
+  ani <- readRDS(argv[1])
+  find_medoids(ani$a, ani$b, 1 - (ani$value / 100),
+    out = argv[2], clades = argv[3])
+} else {
+  load(argv[1]) # assume .rda
+  find_medoids(a, b, d, out = argv[2], clades = argv[3])
+}
 

data/utils/subclade/pipeline.rb

@@ -48,9 +48,10 @@ module MiGA::SubcladeRunner::Pipeline
     # Find genomospecies medoids
     src = File.expand_path('utils/find-medoid.R', MiGA::MiGA.root_path)
     dir = opts[:gsp_metric] == 'aai' ? '02.aai' : '03.ani'
+    dat = "../../09.distances/#{dir}/miga-project.rda"
+    dat = "../../09.distances/#{dir}/miga-project.rds" unless File.exist?(dat)
     run_cmd([
-      'Rscript', src, "../../09.distances/#{dir}/miga-project.rds",
-      'miga-project.gsp-medoids', 'miga-project.gsp-clades'
+      'Rscript', src, dat, 'miga-project.gsp-medoids', 'miga-project.gsp-clades'
     ])
     if File.exist? 'miga-project.gsp-clades.sorted'
       File.rename 'miga-project.gsp-clades.sorted', 'miga-project.gsp-clades'

data/utils/subclades.R

@@ -338,18 +338,25 @@ ggplotColours <- function (n = 6, h = c(0, 360) + 15, alpha = 1) {
 }
 
 ani_distance <- function (ani_file, sel) {
-  # Try to locate rds, otherwise read gzipped table
-  rds <- gsub("\\.txt\\.gz$", ".rds", ani_file)
-  if (file.exists(rds)) {
-    sim <- readRDS(rds)
+  # Try to locate rda, then rds, and otherwise read gzipped table
+  rda <- gsub("\\.txt\\.gz$", ".rda", ani_file)
+  if (file.exists(rda)) {
+    load(rda) # Should already contain `a`, `b`, and `d` as vectors
   } else {
-    sim <- read.table(gzfile(ani_file), sep = "\t", header = TRUE, as.is = TRUE)
-  }
+    rds <- gsub("\\.txt\\.gz$", ".rds", ani_file)
+    if (file.exists(rds)) {
+      sim <- readRDS(rds)
+    } else {
+      sim <- read.table(
+        gzfile(ani_file), sep = "\t", header = TRUE, as.is = TRUE
+      )
+    }
 
-  # Extract individual variables to deal with very large matrices
-  a <- sim$a
-  b <- sim$b
-  d <- 1 - (sim$value / 100)
+    # Extract individual variables to deal with very large matrices
+    a <- sim$a
+    b <- sim$b
+    d <- 1 - (sim$value / 100)
+  }
   
   # If there is no data, end process
   if (length(a) == 0) return(NULL)
@@ -359,7 +366,7 @@ ani_distance <- function (ani_file, sel) {
   if (!is.na(sel) && file.exists(sel)) {
     say("Filter selection")
     ids <- read.table(sel, sep = "\t", head = FALSE, as.is = TRUE)[,1]
-    sel.idx <- which(sim$a %in% ids & sim$b %in% ids)
+    sel.idx <- which(a %in% ids & b %in% ids)
     a <- a[sel.idx]
     b <- b[sel.idx]
     d <- d[sel.idx]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miga-base
 version: !ruby/object:Gem::Version
-  version: 1.3.13.10
+  version: 1.3.14.1
 platform: ruby
 authors:
 - Luis M. Rodriguez-R