Several changes

Author: klaus

DESCRIPTION

@@ -30,8 +30,10 @@ Imports:
     httr,
     jsonlite,
     furrr,
-    future
+    future,
+    usethis
 Suggests:
-    jazzodata,
     devtools (>= 1.13.6)
-RoxygenNote: 7.1.1
+Remotes:
+    github/klausfrieler/jazzodata
+RoxygenNote: 7.2.0

R/DTL_interface.R

@@ -159,7 +159,7 @@ DTL_similarity_search_results_fast <- function(search_patterns = "1,2,1,2,1,2,1,
     max_edit_distance <- map_int(value_to_vec(search_patterns), length) %>% min()
   }
   future::plan(multisession)
-  results <- furrr:::future_map_dfr(search_patterns, function(pattern){
+  results <- furrr::future_map_dfr(search_patterns, function(pattern){
     search_id <- DTL_similarity_search(pattern,
                                        transformation,
                                        database_names,

R/harmonic_analysis.R

@@ -19,7 +19,7 @@ get_triad_type <- function(chord_type){
 #' @param key (string) valid key symbol
 #' @param as_df (boolean) flag whether to return a data.frame or string vector
 #'
-#' @return
+#' @return Either a vector of strings or a tibble object
 #' @export
 get_scale_degree_code <- function(chord_label, key, as_df = FALSE){
     #browser()

R/interval_grammar.R

@@ -2,14 +2,14 @@
 
 #' printf
 #' Combines sprintf and print
-#' @param ...
+#' @param ... Arguments to be passed to message()
 #'
 #' @export
 printf <- function(...) print(sprintf(...))
 
 #' messagef
 #' Combines sprintf and message
-#' @param ...
+#' @param ... Arguments to be passed to message()
 #'
 #' @export
 messagef <- function(...) if(parkR::parkr_options()$debug) message(sprintf(...))

data-raw/data_import.R

@@ -1,16 +1,4 @@
 library(tidyverse)
-F_blues <- tibble(chord = c("F7","Bb7", "F7",  "Cmin7", "F7", "Bb7", "Bb7", "F7", "F7", "Gmin7", "C7", "F7", "F7"),
-                duration = as.integer(c(4, 4, 4, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4)))
-F_blues <- F_blues %>% mutate(length_ticks = duration * 4) %>%
-  mutate(parsed = map(chord, parkR::parse_chord)) %>%
-  tidyr::unnest(cols = parsed)
-F_blues$onset_ticks <- cumsum(F_blues$length_ticks)
-F_blues$onset_ticks <- F_blues$onset_ticks - F_blues$onset_ticks[1]
-F_blues$beat <- (floor(F_blues$onset_ticks/4) %% 4 ) + 1
-F_blues$bar <- floor(F_blues$onset_ticks/16) + 1
-
-usethis::use_data(F_blues, overwrite = TRUE)
-
 # omnibook_transforms <- read.csv("data-raw/omnibook_transforms.csv", sep = ";", stringsAsFactors = F) %>%
 #   as_tibble() %>%
 #     mutate(pos = 1:nrow(.))