[Robast-commits] r768 - branches/robast-1.0/pkg/ROptEstOld/R

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

Author: ruckdeschel
Date: 2014-07-28 13:33:01 +0200 (Mon, 28 Jul 2014)
New Revision: 768

Added:
   branches/robast-1.0/pkg/ROptEstOld/R/internalUtilsFromDistr.R
Modified:
   branches/robast-1.0/pkg/ROptEstOld/R/AllClass.R
   branches/robast-1.0/pkg/ROptEstOld/R/AllInitialize.R
Log:
[ROptEstOld] removed ::: internal dependencies (within distr&robast-Fam's of pkgs) by copying respective routines

Modified: branches/robast-1.0/pkg/ROptEstOld/R/AllClass.R
===================================================================
--- branches/robast-1.0/pkg/ROptEstOld/R/AllClass.R	2014-07-27 09:53:59 UTC (rev 767)
+++ branches/robast-1.0/pkg/ROptEstOld/R/AllClass.R	2014-07-28 11:33:01 UTC (rev 768)
@@ -30,10 +30,10 @@
                                       p1 <- if(log.p) exp(p) else p
 
                                       in01 <- (p1>1 | p1<0)
-                                      i01 <- distr:::.isEqual01(p1)
+                                      i01 <- .isEqual01(p1)
                                       i0 <- (i01 & p1<1)
                                       i1 <- (i01 & p1>0)
-                                      ii01 <- distr:::.isEqual01(p1) | in01
+                                      ii01 <- .isEqual01(p1) | in01
 
                                       p0 <- p
                                       p0[ii01] <- if(log.p) log(0.5) else 0.5
@@ -391,3 +391,4 @@
                                 "!= dimension of 'stand'"))
                 return(TRUE)
             })
+

Modified: branches/robast-1.0/pkg/ROptEstOld/R/AllInitialize.R
===================================================================
--- branches/robast-1.0/pkg/ROptEstOld/R/AllInitialize.R	2014-07-27 09:53:59 UTC (rev 767)
+++ branches/robast-1.0/pkg/ROptEstOld/R/AllInitialize.R	2014-07-28 11:33:01 UTC (rev 768)
@@ -20,10 +20,10 @@
                         p1 <- if(log.p) exp(p) else p
                                                                         
                         in01 <- (p1>1 | p1<0)
-                        i01 <- distr:::.isEqual01(p1)
+                        i01 <- .isEqual01(p1)
                         i0 <- (i01 & p1<1)   
                         i1 <- (i01 & p1>0)
-                        ii01 <- distr:::.isEqual01(p1) | in01
+                        ii01 <- .isEqual01(p1) | in01
                                       
                         p0 <- p
                         p0[ii01] <- if(log.p) log(0.5) else 0.5

Added: branches/robast-1.0/pkg/ROptEstOld/R/internalUtilsFromDistr.R
===================================================================
--- branches/robast-1.0/pkg/ROptEstOld/R/internalUtilsFromDistr.R	                        (rev 0)
+++ branches/robast-1.0/pkg/ROptEstOld/R/internalUtilsFromDistr.R	2014-07-28 11:33:01 UTC (rev 768)
@@ -0,0 +1,9 @@
+#------------------------------------
+#### utilities copied from package distr v.2.6  svn-rev 943
+#------------------------------------
+
+.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)