[Desire-commits] r14 - in packages/loglognorm: . R man

[noreply at r-forge.r-project.org]

Author: olafm
Date: 2008-05-19 13:44:13 +0200 (Mon, 19 May 2008)
New Revision: 14

Modified:
   packages/loglognorm/DESCRIPTION
   packages/loglognorm/NAMESPACE
   packages/loglognorm/R/loglognorm.R
   packages/loglognorm/man/dloglognorm.Rd
Log:
* Export mloglognorm
* Fix check warnings


Modified: packages/loglognorm/DESCRIPTION
===================================================================
--- packages/loglognorm/DESCRIPTION	2008-05-19 11:39:52 UTC (rev 13)
+++ packages/loglognorm/DESCRIPTION	2008-05-19 11:44:13 UTC (rev 14)
@@ -1,5 +1,5 @@
 Package: loglognorm
-Version: 0.9.3
+Version: 0.9.4
 Date: 2008-05-19
 Title: Double log normal distribution functions
 Author:

Modified: packages/loglognorm/NAMESPACE
===================================================================
--- packages/loglognorm/NAMESPACE	2008-05-19 11:39:52 UTC (rev 13)
+++ packages/loglognorm/NAMESPACE	2008-05-19 11:44:13 UTC (rev 14)
@@ -4,5 +4,6 @@
 export(ploglognorm)
 export(qloglognorm)
 export(rloglognorm)
+export(mloglognorm)
 export(eloglognorm)
 export(vloglognorm)

Modified: packages/loglognorm/R/loglognorm.R
===================================================================
--- packages/loglognorm/R/loglognorm.R	2008-05-19 11:39:52 UTC (rev 13)
+++ packages/loglognorm/R/loglognorm.R	2008-05-19 11:44:13 UTC (rev 14)
@@ -20,15 +20,15 @@
 rloglognorm <- function(n, mean=0, sd=1)
   .External("qloglognorm", runif(n), mean=mean, sd=sd, PACKAGE="loglognorm")
 
-mloglognorm <- function(mean, sd, moment)  
+mloglognorm <- function(moment, mean, sd)
   .External("mloglognorm", mean, sd, moment, PACKAGE="loglognorm")
 
 eloglognorm <- function(mean, sd)
   .External("mloglognorm", mean, sd, rep(1, length(mean)), PACKAGE="loglognorm")
 
 vloglognorm <- function(mean, sd) {
-  m1 <- mloglognorm(mean, sd, rep(1, length(mean)))
-  m2 <- mloglognorm(mean, sd, rep(2, length(mean)))
+  m1 <- mloglognorm(rep(1, length(mean)), mean, sd)
+  m2 <- mloglognorm(rep(2, length(mean)), mean, sd)
   return (m2 - m1^2)
 }
 

Modified: packages/loglognorm/man/dloglognorm.Rd
===================================================================
--- packages/loglognorm/man/dloglognorm.Rd	2008-05-19 11:39:52 UTC (rev 13)
+++ packages/loglognorm/man/dloglognorm.Rd	2008-05-19 11:44:13 UTC (rev 14)
@@ -3,7 +3,9 @@
 \alias{ploglognorm}
 \alias{qloglognorm}
 \alias{rloglognorm}
+\alias{mloglognorm}
 \alias{eloglognorm}
+\alias{vloglognorm}
 \title{The Double Log Normal Distribution}
 \description{
   Density, distribution function, quantile function, random generation
@@ -15,7 +17,7 @@
 ploglognorm(q, mean = 0, sd = 1)
 qloglognorm(p, mean = 0, sd = 1)
 rloglognorm(n, mean = 0, sd = 1)
-mloglognorm(mean, sd, moment)
+mloglognorm(moment, mean, sd)
 eloglognorm(mean, sd)
 vloglognorm(mean, sd)
 }