Change names of the *.q functions to *_q

This commit is contained in:
2019-02-08 10:45:55 +01:00
parent 657aaa734d
commit cf80ff9f6a
7 changed files with 100 additions and 73 deletions

View File

@@ -1,23 +1,23 @@
#' @author Eric Coissac
#' @export
H.q = function(x,q=1) {
sum(x * log.q(1/x,q),na.rm = TRUE)
H_q = function(x,q=1) {
sum(x * log_q(1/x,q),na.rm = TRUE)
}
#' @author Eric Coissac
#' @export
D.q = function(x,q=1) {
exp.q(H.q(x,q),q)
D_q = function(x,q=1) {
exp_q(H_q(x,q),q)
}
#' @author Eric Coissac
#' @export
H.spectrum = function(x,q=1) {
sapply(q,function(Q) H.q(x,Q))
H_spectrum = function(x,q=1) {
sapply(q,function(Q) H_q(x,Q))
}
#' @author Eric Coissac
#' @export
D.spectrum = function(x,q=1) {
sapply(q,function(Q) D.q(x,Q))
D_spectrum = function(x,q=1) {
sapply(q,function(Q) D_q(x,Q))
}

View File

@@ -13,7 +13,7 @@ NULL
#'
#' @author Eric Coissac
#' @export
log.q = function(x,q=1) {
log_q = function(x,q=1) {
if (q==1)
log(x)
else (x^(1-q)-1)/(1-q)
@@ -27,7 +27,7 @@ log.q = function(x,q=1) {
#'
#' @author Eric Coissac
#' @export
exp.q = function(x,q=1,base=exp(1)) {
exp_q = function(x,q=1,base=exp(1)) {
if (q==1)
exp(x)
else