[Distr-commits] r898 - in branches/distr-2.5/pkg: distr distrEx/R distrMod distrMod/R

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

Author: ruckdeschel
Date: 2013-09-07 01:02:10 +0200 (Sat, 07 Sep 2013)
New Revision: 898

Modified:
   branches/distr-2.5/pkg/distr/NAMESPACE
   branches/distr-2.5/pkg/distrEx/R/AllClass.R
   branches/distr-2.5/pkg/distrMod/NAMESPACE
   branches/distr-2.5/pkg/distrMod/R/0distrModUtils.R
Log:
exported some utilities from distr and distrMod

Modified: branches/distr-2.5/pkg/distr/NAMESPACE
===================================================================
--- branches/distr-2.5/pkg/distr/NAMESPACE	2013-09-06 20:55:06 UTC (rev 897)
+++ branches/distr-2.5/pkg/distr/NAMESPACE	2013-09-06 23:02:10 UTC (rev 898)
@@ -3,6 +3,7 @@
 importFrom("graphics", "plot")
 importFrom("sfsmisc", "D1ss")
 import("startupmsg")
+import("SweaveListingUtils")
 
 export("Beta", "Binom", "Cauchy", "Chisq",  
        "Dirac","Exp", "DExp", "Fd", "Gammad", 
@@ -93,3 +94,5 @@
        "DistrSymmList") 
 export("qqbounds","igamma")
 exportMethods("qqplot")
+export(".isEqual",".isEqual01", ".inArgs", ".fillList", 
+       ".presubs", ".makeLenAndOrder", ".DistrCollapse")
\ No newline at end of file

Modified: branches/distr-2.5/pkg/distrEx/R/AllClass.R
===================================================================
--- branches/distr-2.5/pkg/distrEx/R/AllClass.R	2013-09-06 20:55:06 UTC (rev 897)
+++ branches/distr-2.5/pkg/distrEx/R/AllClass.R	2013-09-06 23:02:10 UTC (rev 898)
@@ -1,13 +1,3 @@
-.isEqual <- function(p0, p1, tol = min( getdistrOption("TruncQuantile")/2,
-                                          .Machine$double.eps^.7
-                                          ))
-                abs(p0-p1)< tol
-.isEqual01 <- function(x) .isEqual(x,0)|.isEqual(x,1)
-.inArgs <- function(arg, fct)
-          {as.character(arg) %in% names(formals(fct))}
-
-
-
 .onLoad <- function(lib, pkg){
 #    require("methods", character = TRUE, quietly = TRUE)
 }

Modified: branches/distr-2.5/pkg/distrMod/NAMESPACE
===================================================================
--- branches/distr-2.5/pkg/distrMod/NAMESPACE	2013-09-06 20:55:06 UTC (rev 897)
+++ branches/distr-2.5/pkg/distrMod/NAMESPACE	2013-09-06 23:02:10 UTC (rev 898)
@@ -83,3 +83,4 @@
 export("L2LocationUnknownScaleFamily", "L2ScaleUnknownLocationFamily")
 export("meRes", "get.criterion.fct")
 export("addAlphTrsp2col")
+export(".deleteDim",".isUnitMatrix")
\ No newline at end of file

Modified: branches/distr-2.5/pkg/distrMod/R/0distrModUtils.R
===================================================================
--- branches/distr-2.5/pkg/distrMod/R/0distrModUtils.R	2013-09-06 20:55:06 UTC (rev 897)
+++ branches/distr-2.5/pkg/distrMod/R/0distrModUtils.R	2013-09-06 23:02:10 UTC (rev 898)
@@ -1,3 +1,9 @@
+.isUnitMatrix <- function(m){
+### checks whether m is unit matrix
+              m.row <- nrow(m)
+              isTRUE(all.equal(m, diag(m.row), check.attributes = FALSE))
+              }
+
 .deleteDim <- function(x){
      attribs <- attributes(x)
      attribs$dim <- NULL
@@ -64,12 +70,6 @@
  ### end of borrowed code  
 
 
-.isUnitMatrix <- function(m){                                                                  
-### checks whether m is unit matrix
-              m.row <- nrow(m)
-              isTRUE(all.equal(m, diag(m.row), check.attributes = FALSE))
-              }
-
 .validTrafo <- function(trafo, dimension, dimensionwithN){
 ##checks whether trafo is valid
   ret <- FALSE