From a2ff837ec7dbe2602a07f8e6448830238df18fb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Pelletier?= <franc00018@gmail.com>
Date: Wed, 5 Mar 2014 22:20:16 -0500
Subject: [PATCH] =?UTF-8?q?Correction=20ordre=20des=20param=C3=A8tres=20mG?=
 =?UTF-8?q?AL=20et=20cmGAL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 R/cmGAL.R                                                   | 6 +++---
 R/mGAL.R                                                    | 6 +++---
 man/cmGAL.Rd                                                | 6 +++---
 man/mGAL.Rd                                                 | 6 +++---
 ...ce.GMM.gradient.Rd => mean.variance.GMM.gradient.GAL.Rd} | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)
 rename man/{mean.variance.GMM.gradient.Rd => mean.variance.GMM.gradient.GAL.Rd} (71%)

diff --git a/R/cmGAL.R b/R/cmGAL.R
index d01f500..280fa6c 100644
--- a/R/cmGAL.R
+++ b/R/cmGAL.R
@@ -7,19 +7,19 @@
 ###############################################################################
 
 #' Centered moments of the GAL distribution
-#' @param order Order of raw moment
 #' @param param Parameter vector
+#' @param order Order of raw moment
 #' @param type Choose between "mu" or "kappa" parametrization
 #' @param log Logical for log-parameters
 #' @return A numeric value of the centered moment
 #' @export cmGAL
 #' @author Francois Pelletier
-cmGAL <- function(order,param,type="mu",log=FALSE)
+cmGAL <- function(param,order,type="mu",log=FALSE)
 {
 	testparGAL(param,type,log)
 	if(log)
 	{
-		return(cmGAL(order,exp(param),type,log=FALSE))
+		return(cmGAL(exp(param),order,type,log=FALSE))
 	}
 	else
 	{
diff --git a/R/mGAL.R b/R/mGAL.R
index e82b210..360c67e 100644
--- a/R/mGAL.R
+++ b/R/mGAL.R
@@ -7,19 +7,19 @@
 
 
 #' Raw moments of the GAL distribution
-#' @param order Order of raw moment
 #' @param param Parameter vector
+#' @param order Order of raw moment
 #' @param type Choose between "mu" or "kappa" parametrization
 #' @param log Logical for log-parameters
 #' @return A numeric value of the raw moment
 #' @export mGAL
 #' @author Francois Pelletier
-mGAL <- function(order,param,type="mu",log=FALSE)
+mGAL <- function(param,order,type="mu",log=FALSE)
 {
 	testparGAL(param,type,log)
 	if(log)
 	{
-		return(mGAL(order,exp(param),type,log=FALSE))
+		return(mGAL(exp(param),order,type,log=FALSE))
 	}
 	else
 	{
diff --git a/man/cmGAL.Rd b/man/cmGAL.Rd
index eb93c64..acef006 100644
--- a/man/cmGAL.Rd
+++ b/man/cmGAL.Rd
@@ -2,13 +2,13 @@
 \alias{cmGAL}
 \title{Centered moments of the GAL distribution}
 \usage{
-cmGAL(order, param, type = "mu", log = FALSE)
+cmGAL(param, order, type = "mu", log = FALSE)
 }
 \arguments{
-  \item{order}{Order of raw moment}
-
   \item{param}{Parameter vector}
 
+  \item{order}{Order of raw moment}
+
   \item{type}{Choose between "mu" or "kappa"
   parametrization}
 
diff --git a/man/mGAL.Rd b/man/mGAL.Rd
index f0cb99b..aa6031c 100644
--- a/man/mGAL.Rd
+++ b/man/mGAL.Rd
@@ -2,13 +2,13 @@
 \alias{mGAL}
 \title{Raw moments of the GAL distribution}
 \usage{
-mGAL(order, param, type = "mu", log = FALSE)
+mGAL(param, order, type = "mu", log = FALSE)
 }
 \arguments{
-  \item{order}{Order of raw moment}
-
   \item{param}{Parameter vector}
 
+  \item{order}{Order of raw moment}
+
   \item{type}{Choose between "mu" or "kappa"
   parametrization}
 
diff --git a/man/mean.variance.GMM.gradient.Rd b/man/mean.variance.GMM.gradient.GAL.Rd
similarity index 71%
rename from man/mean.variance.GMM.gradient.Rd
rename to man/mean.variance.GMM.gradient.GAL.Rd
index 4321694..7a3ccf8 100644
--- a/man/mean.variance.GMM.gradient.Rd
+++ b/man/mean.variance.GMM.gradient.GAL.Rd
@@ -1,8 +1,8 @@
-\name{mean.variance.GMM.gradient}
-\alias{mean.variance.GMM.gradient}
+\name{mean.variance.GMM.gradient.GAL}
+\alias{mean.variance.GMM.gradient.GAL}
 \title{Gradient of the GMM moment conditions on mean and variance}
 \usage{
-\method{mean}{variance.GMM.gradient}(param, Data, type = "mu")
+\method{mean}{variance.GMM.gradient.GAL}(param, Data, type = "mu")
 }
 \arguments{
   \item{param}{GAL parameters}