Skip to content

Commit f22a6e7

Browse files
pmcharrisonpmcharrison
authored
Merge pull request #5 from pmcharrison/consolidate
Consolidate
2 parents b2b48dd + 2bba32b commit f22a6e7

File tree

111 files changed

+10078
-249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+10078
-249
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ tests/testthat/cache/*
88
www
99
inst/shiny/cache
1010
.cache
11+
.DS_Store
12+
.idea
13+
.ipynb_checkpoints

‎DESCRIPTION

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: incon
22
Type: Package
33
Title: Computational Models of Simultaneous Consonance
4-
Version: 0.4.1
4+
Version: 0.5.0
55
Author: person("Peter", "Harrison", email = "[email protected]", role = c("aut", "cre"))
66
Depends: R (>= 3.4.0)
77
Maintainer: Peter Harrison <[email protected]>
@@ -10,42 +10,42 @@ License: MIT + file LICENSE
1010
Encoding: UTF-8
1111
LazyData: true
1212
Imports:
13+
assertthat,
1314
Rdpack (>= 0.11.0),
15+
gmp (>= 0.5.13.2),
1416
hrep (>= 0.10.0.9001),
15-
bowl18 (>= 0.1.0),
16-
corpdiss (>= 0.1.0.9000),
17-
dycon (>= 0.2.0),
18-
har18 (>= 0.1.0),
19-
jl12 (>= 0.1.0),
20-
parn88 (>= 0.2.0),
21-
parn94 (>= 0.2.3),
22-
stolz15 (>= 0.1.0),
23-
wang13 (>= 0.1.1),
17+
hht,
2418
checkmate (>= 1.9.4),
2519
magrittr (>= 1.5),
2620
purrr (>= 0.3.2),
2721
methods,
22+
gtools,
23+
Rcpp,
24+
numbers,
25+
phonTools,
2826
tibble (>= 2.1.3),
2927
dplyr (>= 0.8.3),
28+
rlang (>= 0.4.0),
3029
zeallot (>= 0.1.0),
3130
utils
3231
RdMacros: Rdpack
3332
Suggests:
3433
testthat (>= 2.1.1),
3534
knitr (>= 1.23),
3635
DT (>= 0.5),
37-
covr (>= 3.2.1)
38-
RoxygenNote: 6.1.1
36+
covr (>= 3.2.1),
37+
cowplot,
38+
ggplot2 (>= 3.1.0.9000),
39+
hcorp,
40+
shiny,
41+
shinydashboard,
42+
shinyjs,
43+
tuneR
44+
RoxygenNote: 7.3.1
3945
Remotes:
4046
pmcharrison/hrep,
41-
pmcharrison/bowl18,
42-
pmcharrison/corpdiss,
43-
pmcharrison/dycon,
44-
pmcharrison/har18,
45-
pmcharrison/jl12,
46-
pmcharrison/parn88,
47-
pmcharrison/parn94,
48-
pmcharrison/stolz15,
49-
pmcharrison/wang13
47+
pmcharrison/hcorp
5048
VignetteBuilder: knitr
5149
Byte-Compile: yes
50+
LinkingTo:
51+
Rcpp

‎Demo.ipynb

+444
Large diffs are not rendered by default.

‎NAMESPACE

+110
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,119 @@
11
# Generated by roxygen2: do not edit by hand
22

3+
S3method(as.character,fraction)
4+
S3method(bowl18_min_freq_dist,default)
5+
S3method(bowl18_min_freq_dist,fr_chord)
6+
S3method(complex_sonor,default)
7+
S3method(complex_sonor,parn94)
8+
S3method(corpus_dissonance_table,corpus)
9+
S3method(count_chords,corpus)
10+
S3method(double,fraction)
11+
S3method(expand_harmonics,fraction)
12+
S3method(expand_harmonics,rational_chord)
13+
S3method(fraction,numeric)
14+
S3method(gcd,rational_chord)
15+
S3method(half,fraction)
16+
S3method(huron_1994,default)
17+
S3method(huron_1994,int_vec)
18+
S3method(huron_1994,pc_set)
19+
S3method(jl_tonal_dissonance,default)
20+
S3method(jl_tonal_dissonance,pc_set)
21+
S3method(kl_div_from_uniform,smooth_spectrum)
22+
S3method(lcm,rational_chord)
23+
S3method(multiplicity,default)
24+
S3method(multiplicity,parn94)
25+
S3method(parn88,default)
26+
S3method(parn88,pc_set)
27+
S3method(parn94,default)
28+
S3method(parn94,sparse_pi_spectrum)
29+
S3method(pc_harmonicity,default)
30+
S3method(pc_harmonicity,milne_pc_spectrum)
31+
S3method(pc_harmonicity,pc_set)
32+
S3method(peak,milne_pc_spectrum)
33+
S3method(pitch_salience,default)
34+
S3method(pitch_salience,parn94)
35+
S3method(pitch_salience,pitch_salience)
36+
S3method(print,corpus_dissonance_table)
37+
S3method(pure_sonor,default)
38+
S3method(pure_sonor,parn94)
39+
S3method(rationalise_chord,pi_chord)
40+
S3method(roughness_hutch,default)
41+
S3method(roughness_hutch,sparse_fr_spectrum)
42+
S3method(roughness_seth,default)
43+
S3method(roughness_seth,sparse_fr_spectrum)
44+
S3method(roughness_vass,default)
45+
S3method(roughness_vass,sparse_fr_spectrum)
46+
S3method(roughness_wang,default)
47+
S3method(roughness_wang,sparse_fr_spectrum)
48+
S3method(smooth_log_periodicity,default)
49+
S3method(smooth_log_periodicity,pi_chord)
50+
S3method(sweep_harmonic_template,milne_pc_spectrum)
51+
S3method(sweep_harmonic_template,pc_set)
52+
S3method(type,corpus_dissonance_table)
53+
export(bowl18_min_freq_dist)
54+
export(complex_sonor)
55+
export(corpus_dissonance)
56+
export(corpus_dissonance_table)
57+
export(cosine_similarity)
58+
export(count_chords)
59+
export(demo_wang)
60+
export(get_free_field_threshold)
61+
export(get_overall_masking_level)
62+
export(get_partial_masking_level)
63+
export(get_pure_tone_audibility)
64+
export(get_pure_tone_audible_level)
65+
export(get_pure_tone_height)
66+
export(get_tone_salience)
67+
export(gill09_harmonicity)
368
export(har_19_composite_coef)
69+
export(huron_1994)
70+
export(huron_1994_weights)
71+
export(hutch_cbw)
72+
export(hutch_dissonance_function)
73+
export(hutch_g)
74+
export(hutch_visualise)
75+
export(hutch_y)
476
export(incon)
577
export(incon_models)
78+
export(jl_rule_1)
79+
export(jl_rule_2)
80+
export(jl_rule_3)
81+
export(jl_tonal_dissonance)
82+
export(kl_div_from_uniform)
683
export(list_models)
84+
export(multiplicity)
85+
export(parn88)
86+
export(parn94)
87+
export(parn94_params)
88+
export(pc_harmonicity)
89+
export(peak)
90+
export(pitch_commonality)
91+
export(pitch_distance)
92+
export(pitch_salience)
93+
export(pure_sonor)
94+
export(root)
95+
export(root_ambiguity)
96+
export(root_support_weights)
97+
export(roughness_hutch)
98+
export(roughness_seth)
99+
export(roughness_vass)
100+
export(roughness_wang)
101+
export(smooth_log_periodicity)
102+
export(sweep_harmonic_template)
103+
export(sweep_template)
104+
export(type)
105+
importFrom(Rcpp,sourceCpp)
106+
importFrom(Rdpack,reprompt)
7107
importFrom(magrittr,"%>%")
108+
importFrom(methods,"is")
109+
importFrom(methods,.valueClassTest)
110+
importFrom(methods,new)
111+
importFrom(rlang,".data")
112+
importFrom(stats,"approx")
113+
importFrom(stats,"cor")
114+
importFrom(stats,"fft")
115+
importFrom(stats,cor)
8116
importFrom(tibble,tibble)
117+
importFrom(utils,"capture.output")
9118
importFrom(zeallot,"%<-%")
119+
useDynLib(incon, .registration = TRUE)

‎NEWS.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# incon 0.5.0
2+
3+
- Consolidated all modelling dependencies into this package,
4+
to avoid having to download so many GitHub repositories on installation.
5+
16
# incon 0.4.1
27

38
- Addressing some minor dependency issues.

‎R/RcppExports.R

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Generated by using Rcpp::compileAttributes() -> do not edit by hand
2+
# Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
3+
4+
mod <- function(x, base) {
5+
.Call(`_incon_mod`, x, base)
6+
}
7+
8+
get_index <- function(x, index, offset) {
9+
.Call(`_incon_get_index`, x, index, offset)
10+
}
11+
12+
cosine_similarity_cpp <- function(x, template_, offset) {
13+
.Call(`_incon_cosine_similarity_cpp`, x, template_, offset)
14+
}
15+
16+
sweep_template_cpp <- function(x, template_) {
17+
.Call(`_incon_sweep_template_cpp`, x, template_)
18+
}
19+

‎R/imports.R

+30
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
1+
## usethis namespace: start
2+
#' @useDynLib incon, .registration = TRUE
3+
## usethis namespace: end
4+
NULL
5+
6+
## usethis namespace: start
7+
#' @importFrom Rcpp sourceCpp
8+
## usethis namespace: end
9+
NULL
10+
111
#' @importFrom magrittr "%>%"
212
NULL
313

414
#' @importFrom zeallot "%<-%"
515
NULL
16+
17+
#' @importFrom methods "is"
18+
NULL
19+
20+
#' @importFrom stats "approx" "cor" "fft"
21+
NULL
22+
23+
#' @importFrom tibble tibble
24+
NULL
25+
26+
#' @importFrom utils "capture.output"
27+
NULL
28+
29+
#' @importFrom rlang ".data"
30+
NULL
31+
32+
`.` <- NULL
33+
34+
#' @importFrom Rdpack reprompt
35+
NULL

0 commit comments

Comments
 (0)