On my way to regenerate wjd_tpc

Author: klaus

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: parkR
 Type: Package
 Title: Generating monophonic jazz solos for chord sequences and more
-Version: 0.5.5
+Version: 0.5.6
 Authors@R: c(
   person("Klaus", "Frieler", email = "[email protected]", role = c("aut","cre"))
   )
@@ -16,7 +16,7 @@ Depends:
     R (>= 3.5.0),
 Imports:
     tidyverse (>= 1.3.1),
-    ggplot2,
+    ggplot2 (>= 3.4.0),
     ggthemes,
     dplyr,
     tibble,

NAMESPACE

@@ -7,6 +7,7 @@ export(cdpcx_hist)
 export(chorus_to_mcsv2)
 export(classify_int_pattern)
 export(clean_scale)
+export(cpc_hist)
 export(cpc_plot_solo)
 export(create_leadsheet)
 export(create_leadsheet_from_chord_db)

R/chords.R

@@ -740,7 +740,7 @@ parse_wjd_form_part <- function(form_part){
 }
 
 split_wjd_changes <- function(changes, id = ""){
-  print(id)
+  messagef("Splitting chords for %s", id)
   lines <- strsplit(changes, "\n")[[1]]
   parts <- purrr::map_dfr(lines, parse_wjd_form_part)
   #browser()
@@ -758,6 +758,7 @@ split_wjd_changes <- function(changes, id = ""){
            bar_number  = bar_number + bar_offset) %>%
     select(-bar_offset) %>%
     mutate(id = id)
+  #browser()
   parts
 
 }
@@ -803,9 +804,13 @@ get_random_chord <- function(chord_db = parkR::irb){
 
 expand_chord_changes <- function(split_changes, num_choruses = 1, max_bar = NULL, with_key_analysis = T){
   n_ids <- length(unique(split_changes$id))
+  messagef("***Expanding %d chord changes", n_ids)
   if(n_ids > 1){
-    return(purrr::map_dfr(ids, function(i){
-      expand_chord_changes(split_changes %>% filter(id == i))
+    return(purrr::map_dfr(unique(split_changes$id), function(i){
+      #messagef("### Recursive for %s", i)
+      tmp <- expand_chord_changes(split_changes %>% filter(id == i))
+      #messagef("### Recursive return for %s", i)
+      tmp
     }))
   }
   chorus_length <- max(split_changes$bar_number)
@@ -817,10 +822,11 @@ expand_chord_changes <- function(split_changes, num_choruses = 1, max_bar = NULL
   }
   if(with_key_analysis){
     #browser()
+    messagef("Enter key analysis (%d, %s)", length(unique(split_changes$id)), unique(split_changes$id))
+    #print()
     ka <- key_analysis(chord_stream = split_changes$original)
     if(sum(ka$unique) == nrow(ka)){
       split_changes <- bind_cols(split_changes, ka %>% select(local_key, local_scale_degree, tonic, tonic_pc))
-
     }
     else{
       messagef("Could not find unique key analysis")
@@ -829,9 +835,9 @@ expand_chord_changes <- function(split_changes, num_choruses = 1, max_bar = NULL
   }
 
   one_chorus <-
-    purrr::map_dfr(1:nrow(split_changes),function(row_id){
+    purrr::map_dfr(1:nrow(split_changes), function(row_id){
       t <- split_changes[row_id,]
-      purrr::map_dfr(seq(t$beat_pos, t$beat_pos + t$duration-1), function(b){
+      purrr::map_dfr(seq(t$beat_pos, t$beat_pos + t$duration - 1), function(b){
         t %>% select(-beat_pos) %>%  mutate(beat_pos = b)
       })
     })
@@ -844,6 +850,18 @@ expand_chord_changes <- function(split_changes, num_choruses = 1, max_bar = NULL
   multi_choruses
 }
 
+create_wjd_local_key_annotations <- function(data = jazzodata::wjd_meta){
+  map_dfr(unique(data$id), function(i){
+    tmp <- data %>% filter(id == i)
+    parkR:::create_expanded_wjd_chord(tmp %>% select(id, chord_changes),
+                                      num_choruses = tmp %>% pull(chorus_count),
+                                      with_key_analysis = T)
+
+  }) %>%
+    mutate(melid = as.integer(factor(id)),
+           beat_id = sprintf("%s_%s_%s", melid, beat_pos, bar_number))
+
+}
 create_expanded_wjd_chord <- function(changes, num_choruses = NULL, max_bar = NULL, with_key_analysis  = F ){
   purrr::map2_dfr(changes$chord_changes,
            changes$id,

R/harmonic_analysis.R

@@ -108,7 +108,7 @@ get_intrinsic_scale_degree <- function(chord_label, chord_pos = NULL){
     keys <- add_key(keys, "maj", chord)#Ij7
     keys <- add_key(keys, "maj", chord, offset = 7)#IVj7
     keys <- add_key(keys, "min", chord, offset = 4)#VIbj7
-    keys <- add_key(keys, "min", chord, offset = -3)#IIIbj7
+    #keys <- add_key(keys, "min", chord, offset = -3)#IIIbj7
   }
   if(ctype == "maj"){
     keys <- add_key(keys, "X", chord, offset = 5)#V
@@ -144,13 +144,15 @@ get_intrinsic_scale_degree <- function(chord_label, chord_pos = NULL){
   }
   if(ctype == "7"){
     keys <- add_key(keys, "X", chord, offset = +5)     #V7
-    keys <- add_key(keys, "X", chord, offset = -1)     #IIb7
+    if(chord$ext != "sus"){
+      keys <- add_key(keys, "X", chord, offset = -1)     #IIb7
+    }
     if(!nzchar(chord$ext)){
       keys <- add_key(keys, "blues", chord, offset = 0)  #I7
       keys <- add_key(keys, "blues", chord, offset = -5) #IV7
     }
-    keys <- add_key(keys, "min", chord, offset = -8)    #VIb7 in minor
-    #keys <- add_key(keys, "maj", chord, offset = 1)
+    #keys <- add_key(keys, "min", chord, offset = -8)    #VIb7 in minor
+    keys <- add_key(keys, "maj", chord, offset = 1)      #VII7
   }
   if(ctype == "6"){
     keys <- add_key(keys, "maj", chord)#I6
@@ -470,7 +472,7 @@ key_analysis <- function(lead_sheet = NULL, chord_stream = NULL, with_ii_v_filte
   if(single_chord){
     ret <- chord_stream %>% filter((chord_pc - tonic_pc) %% 12 == 0)
     if(nrow(ret) == 0){
-      chord_stream[1,]
+      ret <- chord_stream[1,]
     }
     return(ret %>%
              mutate(chord_pos = 1,