passing parameter for ADX (smoothing) calculation about ttr HOT 7 CLOSED

Index: R/ADX.R
===================================================================
--- R/ADX.R (revision 186)
+++ R/ADX.R (working copy)
@@ -29,6 +29,7 @@
 #'High-Low-Close prices.
 #'@param n Number of periods to use for DX calculation (not ADX calculation).
 #'@param maType A function or a string naming the function to be called.
+#'@param nadx Number of periods to use for ADX (smoothing) calculation.
 #'@param \dots Other arguments to be passed to the \code{maType} function.
 #'@return A object of the same class as \code{HLC} or a matrix (if
 #'\code{try.xts} fails) containing the columns:
@@ -66,7 +67,7 @@
 #'
 #'@export
 "ADX" <-
-function(HLC, n=14, maType, ...) {
+function(HLC, n=14, maType, nadx=n, ...) {

   # Welles Wilder's Directional Movement Index

@@ -77,7 +78,7 @@
   DMIp <- ifelse( dH==dL | (dH< 0 & dL< 0), 0, ifelse( dH >dL, dH, 0 ) )
   DMIn <- ifelse( dH==dL | (dH< 0 & dL< 0), 0, ifelse( dH <dL, dL, 0 ) )

-  TR    <- ATR(HLC)[,"tr"]
+  TR    <- ATR(HLC, n= n)[,"tr"]
   TRsum <- wilderSum(TR, n=n)

   DIp <- 100 * wilderSum(DMIp, n=n) / TRsum
@@ -85,7 +86,7 @@

   DX  <- 100 * ( abs(DIp - DIn) / (DIp + DIn) )

-  maArgs <- list(n=n, ...)
+  maArgs <- list(n=nadx, ...)

   # Default Welles Wilder EMA
   if(missing(maType)) {

> identical(TTR::ADX(ttrc[,c("High", "Low", "Close")], n=20),TTR::ADX(ttrc[,c("High", "Low", "Close")], n=20, maType="EMA", wilder=T))
[1] TRUE
> identical(TTR::ADX(ttrc[,c("High", "Low", "Close")], n=20),TTR::ADX(ttrc[,c("High", "Low", "Close")], n=20, maType="EMA"))
[1] FALSE

> identical(RSI(ttrc[,'Close'], n = 10), RSI(ttrc[,'Close'], n = 10, maType = 'EMA', wilder=TRUE))
[1] TRUE
> identical(RSI(ttrc[,'Close'], n = 10), RSI(ttrc[,'Close'], n = 10, maType = 'EMA'))
[1] FALSE

index cb42038..90224eb 100644
--- a/R/ADX.R
+++ b/R/ADX.R
@@ -93,6 +93,19 @@ function(HLC, n=14, maType, ...) {
     maArgs$wilder <- TRUE
   }

+  if (is.list(maType)) {
+    # If MA function has 'n' arg, see if it's populated in maType;
+    # if it isn't, populate it with ADX's formal 'n'
+    if (!is.null( formals(maType[[1]])$n ) && is.null(maType$n)) {
+      maType$n <- n
+    }
+    maArgs <- maType[-1]
+    maType <- maType[[1]]
+  }
+  if (maType == 'EMA' && is.null(maArgs$wilder)) {
+    maArgs$wilder <- TRUE
+  }
+
   ADX <- do.call( maType, c( list(DX), maArgs ) )

   result <- cbind( DIp, DIn, DX, ADX )