Fxied some small bug in find_wba_by_phrases, formmatting, typos

Author: klaus

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: parkR
 Type: Package
 Title: Generating monophonic jazz solos for chord sequences and more
-Version: 0.5.6
+Version: 0.5.7
 Authors@R: c(
   person("Klaus", "Frieler", email = "[email protected]", role = c("aut","cre"))
   )

R/bigram_stack.R

@@ -243,7 +243,14 @@ get_all_subgrams <- function(bigram_stack, bi_enc, level, mode = "all"){
 }
 
 #' @export
-ngram_analysis <- function(x, max_level = Inf, with_overlap = T, min_level = 2, min_n = 2, min_DF = 1, excess_n = 1, ids = NULL){
+ngram_analysis <- function(x,
+                           max_level = Inf,
+                           with_overlap = T,
+                           min_level = 2,
+                           min_n = 2,
+                           min_DF = 1,
+                           excess_n = 1,
+                           ids = NULL){
   #if(is.null(ids)){
   #  if("id" %in% names(x) && is.dataframe(x)){
   #    ids <- x$ids

R/convert.R

@@ -4,7 +4,7 @@ beats_per_bar <- 4
 
 #' phrase_to_mcsv2
 #'
-#' This function format a generated phrase to mcsv2-like data fraem
+#' This function format a generated phrase to mcsv2-like data frame
 #'
 #' @param phrase_tbl (data frame) generated phrase data.frame
 #' @param tempo (double scale) Tempo (bpm) of  the generated solo.
@@ -38,7 +38,7 @@ phrase_to_mcsv2 <- function(phrase_tbl, tempo = 120, phrase_id = 1, chorus_id =
 
 #' chorus_to_mcsv2
 #'
-#' This function formats a generated chorus to mcsv2-compatible data fraem
+#' This function formats a generated chorus to mcsv2-compatible data frame
 #'
 #' @param chorus_tbl (data frame) generated phrases in data.frame
 #' @param tempo (double scale) Tempo (bpm) of  the generated solo.
@@ -55,7 +55,7 @@ chorus_to_mcsv2 <- function(chorus_tbl, tempo = 120, chorus_id = 1){
 
 #' solo_to_mcsv2
 #'
-#' This function formats a generated solo to mcsv2-compatible data fraem
+#' This function formats a generated solo to mcsv2-compatible data frame
 #'
 #' @param solo_tbl (data frame) generated phrases in data.frame
 #' @param tempo (double scale) Tempo (bpm) of  the generated solo.

R/interval_grammar.R

@@ -92,7 +92,7 @@ int_span <- function(start, end){
 
 #' @export
 vec_to_value <- function(int_vec){
-  sprintf("[%s]", paste(int_vec, collapse=","))
+  sprintf("[%s]", paste(int_vec, collapse = ","))
 }
 
 add_overlaps <- function(data, type = c("all", "pre", "post")) {
@@ -479,8 +479,7 @@ fill_up_classes <- function(int_vector, class_df){
                      direction = sign(sum(int_vector[1:l])),
                      value = vec_to_value(int_vector[1:l]),
                      start = 1,
-                     end = l,
-                     stringsAsFactors = F)
+                     end = l)
     return(prefix)
   }
   events <- int_span(class_df$start, class_df$end)
@@ -1005,9 +1004,10 @@ find_wba_by_phrase <- function(data, id = NULL){
   }
   phrases <- unique(data$phrase_id)
   ret <- list()
+  int_col <- ifelse("int" %in% names(data), "int", "int_raw")
   for(i in phrases){
     #print(sprintf("Checking phrase %d", i))
-    int_vector <- data[data$phrase_id == i,]$int_raw %>% na.omit()
+    int_vector <- data[data$phrase_id == i, ] %>% pull(!!int_col) %>% na.omit()
     #ignore last interval because it belongs to next phrase
     tmp <- find_wba(int_vector[1:(length(int_vector)-1)])
     tmp$phrase_id <- i