[Distr-commits] r825 - in branches/distr-2.4/pkg: SweaveListingUtils/tests/Examples distrEx/tests/Examples startupmsg/tests/Examples

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Sat Jun 30 14:10:13 CEST 2012


Author: stamats
Date: 2012-06-30 14:10:12 +0200 (Sat, 30 Jun 2012)
New Revision: 825

Modified:
   branches/distr-2.4/pkg/SweaveListingUtils/tests/Examples/SweaveListingUtils-Ex.Rout.save
   branches/distr-2.4/pkg/distrEx/tests/Examples/distrEx-Ex.Rout.save
   branches/distr-2.4/pkg/startupmsg/tests/Examples/startupmsg-Ex.Rout.save
Log:
updated Rout.save files to R  2.15.1

Modified: branches/distr-2.4/pkg/SweaveListingUtils/tests/Examples/SweaveListingUtils-Ex.Rout.save
===================================================================
--- branches/distr-2.4/pkg/SweaveListingUtils/tests/Examples/SweaveListingUtils-Ex.Rout.save	2012-06-18 08:22:44 UTC (rev 824)
+++ branches/distr-2.4/pkg/SweaveListingUtils/tests/Examples/SweaveListingUtils-Ex.Rout.save	2012-06-30 12:10:12 UTC (rev 825)
@@ -1,5 +1,5 @@
 
-R version 2.15.0 Patched (2012-05-26 r59450) -- "Easter Beagle"
+R version 2.15.1 Patched (2012-06-29 r59688) -- "Roasted Marshmallows"
 Copyright (C) 2012 The R Foundation for Statistical Computing
 ISBN 3-900051-07-0
 Platform: x86_64-unknown-linux-gnu (64-bit)
@@ -420,7 +420,7 @@
 \def\Code#1{{\tt\color{Rcolor} #1}}
 \def\file#1{{\tt #1}} 
 \def\pkg#1{{\tt "#1"}} 
-\newcommand{\pkgversion}{{\tt 2.3.4}}
+\newcommand{\pkgversion}{{\tt 2.4}}
 %------------------------------------------------------------------------------%
 Warning in setBaseOrRecommended(pkgs = pkgs) :
   number of items to replace is not a multiple of replacement length
@@ -651,28 +651,28 @@
 listFromMethods,linearizeMlist,languageEl<-,languageEl,isXS3Class,%
 isVirtualClass,isSealedMethod,isSealedClass,isGroup,isGrammarSymbol,%
 isGeneric,isClassUnion,isClassDef,isClass,insertSource,%
-insertMethod,initialize,initRefFields,initFieldArgs,inheritedSlotNames,%
-implicitGeneric,hasMethods,hasMethod,hasLoadAction,hasArg,%
-getVirtual,getValidity,getSubclasses,getSlots,getRefClass,%
-getPrototype,getProperties,getPackageName,getMethodsMetaData,getMethodsForDispatch,%
-getMethods,getMethod,getLoadActions,getGroupMembers,getGroup,%
-getGenerics,getGeneric,getFunction,getExtends,getDataPart,%
-getClasses,getClassPackage,getClassName,getClassDef,getClass,%
-getAllSuperClasses,getAllMethods,getAccess,generic.skeleton,functionBody<-,%
-functionBody,formalArgs,fixPre1.8,findUnique,findMethods,%
-findMethodSignatures,findMethod,findFunction,findClass,finalDefaultMethod,%
-extends,existsMethod,existsFunction,evalqOnLoad,evalSource,%
-evalOnLoad,emptyMethodsList,empty.dump,elNamed<-,elNamed,%
-el<-,el,dumpMethods,dumpMethod,doPrimitiveMethod,%
-defaultPrototype,defaultDumpName,conformMethod,completeSubclasses,completeExtends,%
-completeClassDefinition,coerce<-,coerce,classesToAM,className,%
-classMetaName,classLabel,checkSlotAssignment,cbind2,canCoerce,%
-callNextMethod,callGeneric,cacheMethod,cacheMetaData,cacheGenericsMetaData,%
-body<-,balanceMethodsList,assignMethodsMetaData,assignClassDef,asMethodDefinition,%
-as<-,allNames,allGenerics,addNextMethod,Summary,%
-SignatureMethod,S3Part<-,S3Part,S3Class<-,S3Class,%
-Quote,MethodsListSelect,MethodsList,MethodAddCoerce,Math2,%
-Logic,Complex,Compare,Arith%
+insertMethod,insertClassMethods,initialize,initRefFields,initFieldArgs,%
+inheritedSlotNames,implicitGeneric,hasMethods,hasMethod,hasLoadAction,%
+hasArg,getVirtual,getValidity,getSubclasses,getSlots,%
+getRefClass,getPrototype,getProperties,getPackageName,getMethodsMetaData,%
+getMethodsForDispatch,getMethods,getMethod,getLoadActions,getGroupMembers,%
+getGroup,getGenerics,getGeneric,getFunction,getExtends,%
+getDataPart,getClasses,getClassPackage,getClassName,getClassDef,%
+getClass,getAllSuperClasses,getAllMethods,getAccess,generic.skeleton,%
+functionBody<-,functionBody,formalArgs,fixPre1.8,findUnique,%
+findMethods,findMethodSignatures,findMethod,findFunction,findClass,%
+finalDefaultMethod,extends,existsMethod,existsFunction,evalqOnLoad,%
+evalSource,evalOnLoad,emptyMethodsList,empty.dump,elNamed<-,%
+elNamed,el<-,el,dumpMethods,dumpMethod,%
+doPrimitiveMethod,defaultPrototype,defaultDumpName,conformMethod,completeSubclasses,%
+completeExtends,completeClassDefinition,coerce<-,coerce,classesToAM,%
+className,classMetaName,classLabel,checkSlotAssignment,cbind2,%
+canCoerce,callNextMethod,callGeneric,cacheMethod,cacheMetaData,%
+cacheGenericsMetaData,body<-,balanceMethodsList,assignMethodsMetaData,assignClassDef,%
+asMethodDefinition,as<-,allNames,allGenerics,addNextMethod,%
+Summary,SignatureMethod,S3Part<-,S3Part,S3Class<-,%
+S3Class,Quote,MethodsListSelect,MethodsList,MethodAddCoerce,%
+Math2,Logic,Complex,Compare,Arith%
 },%
 keywordstyle={[9]{\bf\color{RRecomdcolor}}},%
 %
@@ -2077,7 +2077,7 @@
 > 
 > readPkgVersion(package = "distr")
      Version
-[1,] "2.3.4"
+[1,] "2.4"  
 > 
 > 
 > 
@@ -3321,7 +3321,7 @@
 > ### * <FOOTER>
 > ###
 > cat("Time elapsed: ", proc.time() - get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  0.336 0.012 1.873 0 0 
+Time elapsed:  0.308 0.04 2.315 0 0 
 > grDevices::dev.off()
 null device 
           1 

Modified: branches/distr-2.4/pkg/distrEx/tests/Examples/distrEx-Ex.Rout.save
===================================================================
--- branches/distr-2.4/pkg/distrEx/tests/Examples/distrEx-Ex.Rout.save	2012-06-18 08:22:44 UTC (rev 824)
+++ branches/distr-2.4/pkg/distrEx/tests/Examples/distrEx-Ex.Rout.save	2012-06-30 12:10:12 UTC (rev 825)
@@ -1,7 +1,8 @@
 
-R version 2.10.0 beta (2009-10-15 r50107)
-Copyright (C) 2009 The R Foundation for Statistical Computing
+R version 2.15.1 Patched (2012-06-29 r59688) -- "Roasted Marshmallows"
+Copyright (C) 2012 The R Foundation for Statistical Computing
 ISBN 3-900051-07-0
+Platform: x86_64-unknown-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
 You are welcome to redistribute it under certain conditions.
@@ -17,78 +18,13 @@
 'help.start()' for an HTML browser interface to help.
 Type 'q()' to quit R.
 
-> ### * <HEADER>
-> ###
-> attach(NULL, name = "CheckExEnv")
-> assign("nameEx",
-+        local({
-+ 	   s <- "__{must remake R-ex/*.R}__"
-+            function(new) {
-+                if(!missing(new)) s <<- new else s
-+            }
-+        }),
-+        pos = "CheckExEnv")
-> ## Add some hooks to label plot pages for base and grid graphics
-> assign("base_plot_hook",
-+        function() {
-+            pp <- par(c("mfg","mfcol","oma","mar"))
-+            if(all(pp$mfg[1:2] == c(1, pp$mfcol[2]))) {
-+                outer <- (oma4 <- pp$oma[4]) > 0; mar4 <- pp$mar[4]
-+                mtext(sprintf("help(\"%s\")", nameEx()), side = 4,
-+                      line = if(outer)max(1, oma4 - 1) else min(1, mar4 - 1),
-+                outer = outer, adj = 1, cex = .8, col = "orchid", las=3)
-+            }
-+        },
-+        pos = "CheckExEnv")
-> assign("grid_plot_hook",
-+        function() {
-+            grid::pushViewport(grid::viewport(width=grid::unit(1, "npc") -
-+                               grid::unit(1, "lines"), x=0, just="left"))
-+            grid::grid.text(sprintf("help(\"%s\")", nameEx()),
-+                            x=grid::unit(1, "npc") + grid::unit(0.5, "lines"),
-+                            y=grid::unit(0.8, "npc"), rot=90,
-+                            gp=grid::gpar(col="orchid"))
-+        },
-+        pos = "CheckExEnv")
-> setHook("plot.new",     get("base_plot_hook", pos = "CheckExEnv"))
-> setHook("persp",        get("base_plot_hook", pos = "CheckExEnv"))
-> setHook("grid.newpage", get("grid_plot_hook", pos = "CheckExEnv"))
-> assign("cleanEx",
-+        function(env = .GlobalEnv) {
-+ 	   rm(list = ls(envir = env, all.names = TRUE), envir = env)
-+            RNGkind("default", "default")
-+ 	   set.seed(1)
-+    	   options(warn = 1)
-+ 	   .CheckExEnv <- as.environment("CheckExEnv")
-+ 	   delayedAssign("T", stop("T used instead of TRUE"),
-+ 		  assign.env = .CheckExEnv)
-+ 	   delayedAssign("F", stop("F used instead of FALSE"),
-+ 		  assign.env = .CheckExEnv)
-+ 	   sch <- search()
-+ 	   newitems <- sch[! sch %in% .oldSearch]
-+ 	   for(item in rev(newitems))
-+                eval(substitute(detach(item), list(item=item)))
-+ 	   missitems <- .oldSearch[! .oldSearch %in% sch]
-+ 	   if(length(missitems))
-+ 	       warning("items ", paste(missitems, collapse=", "),
-+ 		       " have been removed from the search path")
-+        },
-+        pos = "CheckExEnv")
-> assign("ptime", proc.time(), pos = "CheckExEnv")
-> ## at least one package changes these via ps.options(), so do this
-> ## before loading the package.
-> ## Use postscript as incomplete files may be viewable, unlike PDF.
-> ## Choose a size that is close to on-screen devices, fix paper
-> grDevices::ps.options(width = 7, height = 7, paper = "a4", reset = TRUE)
-> grDevices::postscript("distrEx-Ex.ps")
-> 
-> assign("par.postscript", graphics::par(no.readonly = TRUE), pos = "CheckExEnv")
-> options(contrasts = c(unordered = "contr.treatment", ordered = "contr.poly"))
+> pkgname <- "distrEx"
+> source(file.path(R.home("share"), "R", "examples-header.R"))
 > options(warn = 1)
 > library('distrEx')
 Loading required package: distr
 Loading required package: startupmsg
-:startupmsg>  Utilities for start-up messages (version 0.7)
+:startupmsg>  Utilities for start-up messages (version 0.8)
 :startupmsg> 
 :startupmsg>  For more information see ?"startupmsg",
 :startupmsg>  NEWS("startupmsg")
@@ -96,7 +32,7 @@
 Loading required package: sfsmisc
 Loading required package: SweaveListingUtils
 :SweaveListingUtils>  Utilities for Sweave together with
-:SweaveListingUtils>  TeX listings package (version 0.4)
+:SweaveListingUtils>  TeX listings package (version 0.6)
 :SweaveListingUtils> 
 :SweaveListingUtils>  Some functions from package 'base'
 :SweaveListingUtils>  are intentionally masked ---see
@@ -115,16 +51,14 @@
 :SweaveListingUtils>  vignette("ExampleSweaveListingUtils").
 
 
-Attaching package: 'SweaveListingUtils'
+Attaching package: ‘SweaveListingUtils’
 
+The following object(s) are masked from ‘package:base’:
 
-	The following object(s) are masked from package:base :
+    library, require
 
-	 library,
-	 require 
-
-:distr>  Object orientated implementation of distributions (version
-:distr>  2.2)
+:distr>  Object oriented implementation of distributions (version
+:distr>  2.4)
 :distr> 
 :distr>  Attention: Arithmetics on distribution objects are
 :distr>  understood as operations on corresponding random variables
@@ -143,30 +77,21 @@
 :distr>  vignette("distr").
 
 
-Attaching package: 'distr'
+Attaching package: ‘distr’
 
+The following object(s) are masked from ‘package:stats’:
 
-	The following object(s) are masked from package:stats :
+    df, qqplot, sd
 
-	 df,
-	 qqplot,
-	 sd 
-
-Loading required package: evd
-Loading required package: actuar
-
-Attaching package: 'actuar'
-
-
-	The following object(s) are masked from package:grDevices :
-
-	 cm 
-
-:distrEx>  Extensions of package distr (version 2.2)
+:distrEx>  Extensions of package distr (version 2.4)
 :distrEx> 
 :distrEx>  Note: Packages "e1071", "moments", "fBasics" should be
-:distrEx>  attached /before/ package "distrEx". See distrExMASK().
+:distrEx>  attached /before/ package "distrEx". See
+:distrEx>  distrExMASK().Note: Extreme value distribution
+:distrEx>  functionality has been moved to
 :distrEx> 
+:distrEx>        package "RobExtremes". See distrExMOVED().
+:distrEx> 
 :distrEx>  For more information see ?"distrEx", NEWS("distrEx"), as
 :distrEx>  well as
 :distrEx>    http://distr.r-forge.r-project.org/
@@ -175,20 +100,16 @@
 :distrEx>  vignette("distr").
 
 
-Attaching package: 'distrEx'
+Attaching package: ‘distrEx’
 
+The following object(s) are masked from ‘package:stats’:
 
-	The following object(s) are masked from package:stats :
+    IQR, mad, median, var
 
-	 IQR,
-	 mad,
-	 median,
-	 var 
-
 > 
 > assign(".oldSearch", search(), pos = 'CheckExEnv')
-> assign(".oldNS", loadedNamespaces(), pos = 'CheckExEnv')
-> cleanEx(); nameEx("AbscontCondDistribution-class")
+> cleanEx()
+> nameEx("AbscontCondDistribution-class")
 > ### * AbscontCondDistribution-class
 > 
 > flush(stderr()); flush(stdout())
@@ -202,13 +123,14 @@
 > new("AbscontCondDistribution")
 Distribution object of class: AbscontCondDistribution
 ## cond:
-An object of class “Condition”
+An object of class "Condition"
 Slot "name":
 [1] "a condition"
 
 > 
 > 
-> cleanEx(); nameEx("AsymTotalVarDist")
+> cleanEx()
+> nameEx("AsymTotalVarDist")
 > ### * AsymTotalVarDist
 > 
 > flush(stderr()); flush(stdout())
@@ -233,12 +155,13 @@
 > 
 > ### ** Examples
 > 
-> AsymTotalVarDist(Norm(), Gumbel(), rho=0.3)
+> AsymTotalVarDist(Norm(), UnivarMixingDistribution(Norm(1,2),Norm(0.5,3),
++                  mixCoeff=c(0.2,0.8)), rho=0.3)
 asym. total variation distance 
-                     0.2316870 
+                     0.5311789 
 > AsymTotalVarDist(Norm(), Td(10), rho=0.3)
 asym. total variation distance 
-                    0.03412602 
+                    0.03412603 
 > AsymTotalVarDist(Norm(mean = 50, sd = sqrt(25)), Binom(size = 100), rho=0.3) # mutually singular
 asym. total variation distance 
                              1 
@@ -260,15 +183,16 @@
                      0.8343428 
 > AsymTotalVarDist(y, Norm(), asis.smooth.discretize = "smooth", rho=0.3)
 asym. total variation distance 
-                     0.6326863 
+                     0.6326877 
 > 
 > AsymTotalVarDist(rbinom(50, size = 20, prob = 0.5), Binom(size = 20, prob = 0.5), rho=0.3)
 asym. total variation distance 
-                     0.2925150 
+                      0.292515 
 > 
 > 
 > 
-> cleanEx(); nameEx("Condition-class")
+> cleanEx()
+> nameEx("Condition-class")
 > ### * Condition-class
 > 
 > flush(stderr()); flush(stdout())
@@ -280,13 +204,14 @@
 > 
 > ### ** Examples
 > new("Condition")
-An object of class “Condition”
+An object of class "Condition"
 Slot "name":
 [1] "a condition"
 
 > 
 > 
-> cleanEx(); nameEx("ContaminationSize")
+> cleanEx()
+> nameEx("ContaminationSize")
 > ### * ContaminationSize
 > 
 > flush(stderr()); flush(stdout())
@@ -334,7 +259,8 @@
 > 
 > 
 > 
-> cleanEx(); nameEx("ConvexContamination")
+> cleanEx()
+> nameEx("ConvexContamination")
 > ### * ConvexContamination
 > 
 > flush(stderr()); flush(stdout())
@@ -360,7 +286,8 @@
 > 
 > 
 > 
-> cleanEx(); nameEx("CvMDist")
+> cleanEx()
+> nameEx("CvMDist")
 > ### * CvMDist
 > 
 > flush(stderr()); flush(stdout())
@@ -375,12 +302,14 @@
 > 
 > ### ** Examples
 > 
-> CvMDist(Norm(), Gumbel())
+> CvMDist(Norm(), UnivarMixingDistribution(Norm(1,2),Norm(0.5,3),
++                  mixCoeff=c(0.2,0.8)))
 CvM distance 
-   0.1227136 
-> CvMDist(Norm(), Gumbel(), mu = Norm())
+   0.1812994 
+> CvMDist(Norm(), UnivarMixingDistribution(Norm(1,2),Norm(0.5,3),
++                  mixCoeff=c(0.2,0.8)),mu=Norm())
 CvM distance 
-   0.1227136 
+   0.1812994 
 > CvMDist(Norm(), Td(10))
 CvM distance 
   0.00933072 
@@ -392,20 +321,21 @@
   0.06084579 
 > CvMDist(rnorm(100),Norm())
 CvM distance 
-  0.04673208 
+  0.04673118 
 > CvMDist((rbinom(50, size = 20, prob = 0.5)-10)/sqrt(5), Norm())
 CvM distance 
-  0.07266983 
+  0.07267501 
 > CvMDist(rbinom(50, size = 20, prob = 0.5), Binom(size = 20, prob = 0.5))
 CvM distance 
-   0.1205683 
+  0.07435729 
 > CvMDist(rbinom(50, size = 20, prob = 0.5), Binom(size = 20, prob = 0.5), mu = Pois())
 CvM distance 
  0.001969063 
 > 
 > 
 > 
-> cleanEx(); nameEx("DiscreteCondDistribution-class")
+> cleanEx()
+> nameEx("DiscreteCondDistribution-class")
 > ### * DiscreteCondDistribution-class
 > 
 > flush(stderr()); flush(stdout())
@@ -419,13 +349,14 @@
 > new("DiscreteCondDistribution")
 Distribution object of class: DiscreteCondDistribution
 ## cond:
-An object of class “Condition”
+An object of class "Condition"
 Slot "name":
 [1] "a condition"
 
 > 
 > 
-> cleanEx(); nameEx("DiscreteMVDistribution-class")
+> cleanEx()
+> nameEx("DiscreteMVDistribution-class")
 > ### * DiscreteMVDistribution-class
 > 
 > flush(stderr()); flush(stdout())
@@ -477,7 +408,7 @@
 > param(D2)
 NULL
 > img(D2)
-An object of class “EuclideanSpace”
+An object of class "EuclideanSpace"
 Slot "dimension":
 [1] 2
 
@@ -489,7 +420,8 @@
 > 
 > 
 > 
-> cleanEx(); nameEx("DiscreteMVDistribution")
+> cleanEx()
+> nameEx("DiscreteMVDistribution")
 > ### * DiscreteMVDistribution
 > 
 > flush(stderr()); flush(stdout())
@@ -531,7 +463,8 @@
 > 
 > 
 > 
-> cleanEx(); nameEx("E")
+> cleanEx()
+> nameEx("E")
 > ### * E
 > 
 > flush(stderr()); flush(stdout())
@@ -579,7 +512,8 @@
 > ###   E,Fd,missing,missing-method E,Gammad,missing,missing-method
 > ###   E,Gammad,function,missing-method E,Geom,missing,missing-method
 > ###   E,Gumbel,missing,missing-method E,GPareto,missing,missing-method
-> ###   E,GPareto,function,missing-method E,Hyper,missing,missing-method
+> ###   E,GPareto,function,missing-method E,GEV,missing,missing-method
+> ###   E,GEV,function,missing-method E,Hyper,missing,missing-method
 > ###   E,Logis,missing,missing-method E,Lnorm,missing,missing-method
 > ###   E,Nbinom,missing,missing-method E,Norm,missing,missing-method
 > ###   E,Pareto,missing,missing-method E,Pois,missing,missing-method
@@ -666,7 +600,8 @@
 > 
 > 
 > 
-> cleanEx(); nameEx("EuclCondition-class")
+> cleanEx()
+> nameEx("EuclCondition-class")
 > ### * EuclCondition-class
 > 
 > flush(stderr()); flush(stdout())
@@ -685,7 +620,8 @@
 > 
 > 
 > 
-> cleanEx(); nameEx("EuclCondition")
+> cleanEx()
+> nameEx("EuclCondition")
 > ### * EuclCondition
 > 
 > flush(stderr()); flush(stdout())
@@ -712,7 +648,8 @@
 > 
 > 
 > 
-> cleanEx(); nameEx("GLIntegrate")
+> cleanEx()
+> nameEx("GLIntegrate")
 > ### * GLIntegrate
 > 
 > flush(stderr()); flush(stdout())
@@ -725,201 +662,14 @@
 > ### ** Examples
 > 
 > integrate(dnorm, -1.96, 1.96)
-0.9500042 with absolute error < 1.0e-11
+0.9500042 with absolute error < 1e-11
 > GLIntegrate(dnorm, -1.96, 1.96)
 [1] 0.9500042
 > 
 > 
 > 
-> cleanEx(); nameEx("GPareto-class")
-> ### * GPareto-class
-> 
-> flush(stderr()); flush(stdout())
-> 
-> ### Name: GPareto-class
-> ### Title: Generalized Pareto distribution
-> ### Aliases: GPareto-class initialize,GPareto-method loc,GPareto-method
-> ###   loc<-,GPareto-method location,GPareto-method
-> ###   location<-,GPareto-method scale,GPareto-method scale<-,GPareto-method
-> ###   shape,GPareto-method shape<-,GPareto-method +,GPareto,numeric-method
-> ###   *,GPareto,numeric-method
-> ### Keywords: distribution
-> 
-> ### ** Examples
-> 
-> (P1 <- new("GPareto", loc = 0, scale = 1,shape = 0))
-Distribution Object of Class: GPareto
- loc: 0
- scale: 1
- shape: 0
-> plot(P1)
-> shape(P1)
-[1] 0
-> loc(P1)
-[1] 0
-> scale(P1) <- 4
-> loc(P1) <- 2
-> plot(P1)
-> 
-> 
-> 
-> cleanEx(); nameEx("GPareto")
-> ### * GPareto
-> 
-> flush(stderr()); flush(stdout())
-> 
-> ### Name: GPareto
-> ### Title: Generating function for GPareto-class
-> ### Aliases: GPareto
-> ### Keywords: distribution
-> 
-> ### ** Examples
-> 
-> (P1 <- GPareto(loc = 0, scale = 1, shape = 0))
-Distribution Object of Class: Exp
- rate: 1
-> plot(P1)
-> 
-> E(GPareto()) 
-[1] 1
-> E(P1, function(x){x^2})
-[1] 1.999971
-> 
-> 
-> 
-> 
-> cleanEx(); nameEx("GParetoParameter-class")
-> ### * GParetoParameter-class
-> 
-> flush(stderr()); flush(stdout())
-> 
-> ### Name: GParetoParameter-class
-> ### Title: Parameter of generalized Pareto distributions
-> ### Aliases: GParetoParameter-class loc,GParetoParameter-method
-> ###   loc<-,GParetoParameter-method location,GParetoParameter-method
-> ###   location<-,GParetoParameter-method scale,GParetoParameter-method
-> ###   scale<-,GParetoParameter-method shape,GParetoParameter-method
-> ###   shape<-,GParetoParameter-method
-> ### Keywords: distribution models
-> 
-> ### ** Examples
-> 
-> new("GParetoParameter")
-An object of class “GParetoParameter”
-Slot "loc":
-[1] 0
-
-Slot "scale":
-[1] 1
-
-Slot "shape":
-[1] 0
-
-Slot "name":
-[1] "Parameter of a generalized Pareto distribution"
-
-> 
-> 
-> 
-> cleanEx(); nameEx("Gumbel-class")
-> ### * Gumbel-class
-> 
-> flush(stderr()); flush(stdout())
-> 
-> ### Name: Gumbel-class
-> ### Title: Gumbel distribution
-> ### Aliases: Gumbel-class initialize,Gumbel-method loc,Gumbel-method
-> ###   loc<-,Gumbel-method scale,Gumbel-method scale<-,Gumbel-method
-> ###   +,Gumbel,numeric-method *,Gumbel,numeric-method
-> ### Keywords: distribution
-> 
-> ### ** Examples
-> 
-> (G1 <- new("Gumbel", loc = 1, scale = 2))
-Distribution Object of Class: Gumbel
- loc: 1
- scale: 2
-> plot(G1)
-> loc(G1)
-[1] 1
-> scale(G1)
-[1] 2
-> loc(G1) <- -1
-> scale(G1) <- 2
-> plot(G1)
-> 
-> 
-> 
-> cleanEx(); nameEx("Gumbel")
-> ### * Gumbel
-> 
-> flush(stderr()); flush(stdout())
-> 
-> ### Name: Gumbel
-> ### Title: Generating function for Gumbel-class
-> ### Aliases: Gumbel
-> ### Keywords: distribution
-> 
-> ### ** Examples
-> 
-> (G1 <- Gumbel(loc = 1, scale = 2))
-Distribution Object of Class: Gumbel
- loc: 1
- scale: 2
-> plot(G1)
-> loc(G1)
-[1] 1
-> scale(G1)
-[1] 2
-> loc(G1) <- -1
-> scale(G1) <- 2
-> plot(G1)
-> 
-> E(Gumbel()) # Euler's constant
-[1] -0.5772157
-> E(G1, function(x){x^2})
-[1] 6.60347
-> 
-> ## The function is currently defined as
-> function(loc = 0, scale = 1){ 
-+   new("Gumbel", loc = loc, scale = scale)
-+ }
-function (loc = 0, scale = 1) 
-{
-    new("Gumbel", loc = loc, scale = scale)
-}
-> 
-> 
-> 
-> cleanEx(); nameEx("GumbelParameter-class")
-> ### * GumbelParameter-class
-> 
-> flush(stderr()); flush(stdout())
-> 
-> ### Name: GumbelParameter-class
-> ### Title: Paramter of Gumbel distributions
-> ### Aliases: GumbelParameter-class loc loc,GumbelParameter-method loc<-
-> ###   loc<-,GumbelParameter-method scale,GumbelParameter-method
-> ###   scale<-,GumbelParameter-method
-> ### Keywords: distribution models
-> 
-> ### ** Examples
-> 
-> new("GumbelParameter")
-An object of class “GumbelParameter”
-Slot "loc":
-[1] 0
-
-Slot "scale":
-[1] 1
-
-Slot "name":
-[1] "parameter of a Gumbel distribution"
-
-> 
-> 
-> 
-> cleanEx(); nameEx("HellingerDist")
+> cleanEx()
+> nameEx("HellingerDist")
 > ### * HellingerDist
 > 
 > flush(stderr()); flush(stdout())
@@ -944,9 +694,10 @@
 > 
 > ### ** Examples
 > 
-> HellingerDist(Norm(), Gumbel())
+> HellingerDist(Norm(), UnivarMixingDistribution(Norm(1,2),Norm(0.5,3),
++                  mixCoeff=c(0.2,0.8)))
 Hellinger distance 
-         0.2204792 
+         0.4604849 
 > HellingerDist(Norm(), Td(10))
 Hellinger distance 
          0.0598968 
@@ -963,7 +714,7 @@
          0.3287617 
 > HellingerDist(x, Norm(), asis.smooth.discretize = "smooth")
 Hellinger distance 
-         0.1904838 
+         0.1904784 
 > 
 > y <- (rbinom(50, size = 20, prob = 0.5)-10)/sqrt(5)
 > HellingerDist(y, Norm())
@@ -971,7 +722,7 @@
          0.7596996 
 > HellingerDist(y, Norm(), asis.smooth.discretize = "smooth")
 Hellinger distance 
-         0.5283272 
+          0.528329 
 > 
 > HellingerDist(rbinom(50, size = 20, prob = 0.5), Binom(size = 20, prob = 0.5))
 Hellinger distance 
@@ -979,7 +730,8 @@
 > 
 > 
 > 
-> cleanEx(); nameEx("KolmogorovDist")
+> cleanEx()
+> nameEx("KolmogorovDist")
 > ### * KolmogorovDist
 > 
 > flush(stderr()); flush(stdout())
@@ -1002,9 +754,10 @@
 > 
 > ### ** Examples
 > 
-> KolmogorovDist(Norm(), Gumbel())
+> KolmogorovDist(Norm(), UnivarMixingDistribution(Norm(1,2),Norm(0.5,3),
++                  mixCoeff=c(0.2,0.8)))
 Kolmogorov distance 
-          0.1501485 
+          0.3092684 
 > KolmogorovDist(Norm(), Td(10))
 Kolmogorov distance 
          0.01554215 
@@ -1016,17 +769,18 @@
          0.08863266 
 > KolmogorovDist(Norm(), rnorm(100))
 Kolmogorov distance 
-          0.0659914 
+          0.1149486 
 > KolmogorovDist((rbinom(50, size = 20, prob = 0.5)-10)/sqrt(5), Norm())
 Kolmogorov distance 
-               0.14 
+          0.1673604 
 > KolmogorovDist(rbinom(50, size = 20, prob = 0.5), Binom(size = 20, prob = 0.5))
 Kolmogorov distance 
-          0.1282777 
+         0.03172234 
 > 
 > 
 > 
-> cleanEx(); nameEx("LMCondDistribution")
+> cleanEx()
+> nameEx("LMCondDistribution")
 > ### * LMCondDistribution
 > 
 > flush(stderr()); flush(stdout())
@@ -1062,7 +816,7 @@
     }
     0 + cond %*% 1 + 1 * r(n, ...)
 }
-<environment: 0x5a6f620>
+<environment: 0x451b408>
 > d(D1)
 function (x, cond, log = FALSE, ...) 
 {
@@ -1084,7 +838,7 @@
     else d0 <- d0/1
     return(d0)
 }
-<environment: 0x5a6f620>
+<environment: 0x451b408>
 > p(D1)
 function (q, cond, lower.tail = TRUE, log.p = FALSE, ...) 
 {
@@ -1111,7 +865,7 @@
             p0 <- log(p0)
     return(p0)
 }
-<environment: 0x5a6f620>
+<environment: 0x451b408>
 > q(D1)
 function (p, cond, lower.tail = TRUE, log.p = FALSE, ...) 
 {
@@ -1135,7 +889,7 @@
         argList <- c(argList, dots)
     1 * do.call(q, argList) + 0 + as.vector(cond %*% 1)
 }
-<environment: 0x5a6f620>
+<environment: 0x451b408>
 > param(D1)
 name:	parameter of a linear regression model
 theta:	1
@@ -1159,7 +913,8 @@
 > 
 > 
 > 
-> cleanEx(); nameEx("LMParameter-class")
+> cleanEx()
+> nameEx("LMParameter-class")
 > ### * LMParameter-class
 > 
 > flush(stderr()); flush(stdout())
@@ -1179,7 +934,8 @@
 > 
 > 
 > 
-> cleanEx(); nameEx("LMParameter")
+> cleanEx()
+> nameEx("LMParameter")
 > ### * LMParameter
 > 
 > flush(stderr()); flush(stdout())
@@ -1210,7 +966,8 @@
 > 
 > 
 > 
-> cleanEx(); nameEx("MultivariateDistribution-class")
+> cleanEx()
+> nameEx("MultivariateDistribution-class")
 > ### * MultivariateDistribution-class
 > 
 > flush(stderr()); flush(stdout())
@@ -1229,7 +986,8 @@
 > 
 > 
 > 
-> cleanEx(); nameEx("OAsymTotalVarDist")
+> cleanEx()
+> nameEx("OAsymTotalVarDist")
 > ### * OAsymTotalVarDist
 > 
 > flush(stderr()); flush(stdout())
@@ -1254,9 +1012,10 @@
 > 
 > ### ** Examples
 > 
-> OAsymTotalVarDist(Norm(), Gumbel())
+> OAsymTotalVarDist(Norm(), UnivarMixingDistribution(Norm(1,2),Norm(0.5,3),
++                  mixCoeff=c(0.2,0.8)))
 minimal asym. total variation distance 
-                             0.2642218 
+                             0.6278316 
 > OAsymTotalVarDist(Norm(), Td(10))
 minimal asym. total variation distance 
                             0.04191508 
@@ -1273,7 +1032,7 @@
                              0.8150567 
 > OAsymTotalVarDist(x, Norm(), asis.smooth.discretize = "smooth")
 minimal asym. total variation distance 
-                              0.345616 
+                             0.3454698 
 > 
 > y <- (rbinom(50, size = 20, prob = 0.5)-10)/sqrt(5)
 > OAsymTotalVarDist(y, Norm())
@@ -1281,7 +1040,7 @@
                              0.9201529 
 > OAsymTotalVarDist(y, Norm(), asis.smooth.discretize = "smooth")
 minimal asym. total variation distance 
-                             0.7539696 
+                             0.7539651 
 > 
 > OAsymTotalVarDist(rbinom(50, size = 20, prob = 0.5), Binom(size = 20, prob = 0.5))
 minimal asym. total variation distance 
@@ -1289,94 +1048,8 @@
 > 
 > 
 > 
-> cleanEx(); nameEx("Pareto-class")
-> ### * Pareto-class
-> 
-> flush(stderr()); flush(stdout())
-> 
-> ### Name: Pareto-class
-> ### Title: Pareto distribution
-> ### Aliases: Pareto-class initialize,Pareto-method shape,Pareto-method
-> ###   shape<-,Pareto-method Min,Pareto-method Min<-,Pareto-method
-> ### Keywords: distribution
-> 
-> ### ** Examples
-> 
-> (P1 <- new("Pareto", shape = 1, Min = 2))
-Distribution Object of Class: Pareto
- shape: 1
- Min: 2
-> plot(P1)
-> shape(P1)
-[1] 1
-> Min(P1)
-[1] 2
-> shape(P1) <- 4
-> Min(P1) <- 2
-> plot(P1)
-> 
-> 
-> 
-> cleanEx(); nameEx("Pareto")
-> ### * Pareto
-> 
-> flush(stderr()); flush(stdout())
-> 
-> ### Name: Pareto
-> ### Title: Generating function for Pareto-class
-> ### Aliases: Pareto
-> ### Keywords: distribution
-> 
-> ### ** Examples
-> 
-> (P1 <- Pareto(shape = 1, Min = 1))
-Distribution Object of Class: Pareto
- shape: 1
- Min: 1
-> plot(P1)
-> 
-> E(Pareto()) 
-[1] Inf
-> E(P1, function(x){x^2})
-[1] 41
-> 
-> ## The function is currently defined as
-> function(shape = 1, Min = 1) 
-+                new("Pareto", shape = shape, Min = Min)
-function (shape = 1, Min = 1) 
-new("Pareto", shape = shape, Min = Min)
-> 
-> 
-> 
-> cleanEx(); nameEx("ParetoParameter-class")
-> ### * ParetoParameter-class
-> 
-> flush(stderr()); flush(stdout())
-> 
-> ### Name: ParetoParameter-class
-> ### Title: Paramter of Pareto distributions
-> ### Aliases: ParetoParameter-class shape shape,ParetoParameter-method
-> ###   shape<- shape<-,ParetoParameter-method Min,ParetoParameter-method
-> ###   Min<-,ParetoParameter-method
-> ### Keywords: distribution models
-> 
-> ### ** Examples
-> 
-> new("ParetoParameter")
-An object of class “ParetoParameter”
-Slot "shape":
-[1] 1
-
-Slot "Min":
-[1] 1
-
-Slot "name":
-[1] "Parameter of a Pareto distribution"
-
-> 
-> 
-> 
-> cleanEx(); nameEx("PrognCondDistribution-class")
+> cleanEx()
+> nameEx("PrognCondDistribution-class")
 > ### * PrognCondDistribution-class
 > 
 > flush(stderr()); flush(stdout())
@@ -1394,7 +1067,8 @@
 Range:	Real Space with dimension 1
 > 
 > 
-> cleanEx(); nameEx("PrognCondDistribution")
+> cleanEx()
+> nameEx("PrognCondDistribution")
 > ### * PrognCondDistribution
 > 
 > flush(stderr()); flush(stdout())
@@ -1414,7 +1088,8 @@
 > 
 > 
 > 
-> cleanEx(); nameEx("PrognCondition-class")
+> cleanEx()
+> nameEx("PrognCondition-class")
 > ### * PrognCondition-class
 > 
 > flush(stderr()); flush(stdout())
@@ -1430,7 +1105,8 @@
 Range:	Euclidean Space with dimension 1
 > 
 > 
-> cleanEx(); nameEx("TotalVarDist")
+> cleanEx()
+> nameEx("TotalVarDist")
 > ### * TotalVarDist
 > 
 > flush(stderr()); flush(stdout())
@@ -1455,12 +1131,13 @@
 > 
 > ### ** Examples
 > 
-> TotalVarDist(Norm(), Gumbel())
+> TotalVarDist(Norm(), UnivarMixingDistribution(Norm(1,2),Norm(0.5,3),
++                  mixCoeff=c(0.2,0.8)))
 total variation distance 
-               0.1501365 
+               0.4677806 
 > TotalVarDist(Norm(), Td(10))
 total variation distance 
-               0.0310744 
+              0.03107182 
 > TotalVarDist(Norm(mean = 50, sd = sqrt(25)), Binom(size = 100)) # mutually singular
 total variation distance 
                        1 
@@ -1490,7 +1167,8 @@
 > 
 > 
 > 
-> cleanEx(); nameEx("UnivariateCondDistribution-class")
+> cleanEx()
+> nameEx("UnivariateCondDistribution-class")
 > ### * UnivariateCondDistribution-class
 > 
 > flush(stderr()); flush(stdout())
@@ -1507,13 +1185,14 @@
 > new("UnivariateCondDistribution")
 Distribution object of class: UnivariateCondDistribution
 ## cond:
-An object of class “Condition”
+An object of class "Condition"
 Slot "name":
 [1] "a condition"
 
 > 
 > 
-> cleanEx(); nameEx("Var")
+> cleanEx()
+> nameEx("Var")
 > ### * Var
 > 
 > flush(stderr()); flush(stdout())
@@ -1527,11 +1206,10 @@
 > ###   var,AffLinLatticeDistribution-method var,CompoundDistribution-method
 > ###   var,Arcsine-method var,Beta-method var,Binom-method var,Cauchy-method
 > ###   var,Chisq-method var,Dirac-method var,DExp-method var,Exp-method
-> ###   var,Fd-method var,Gammad-method var,Geom-method var,Gumbel-method
-> ###   var,GPareto-method var,Hyper-method var,Logis-method var,Lnorm-method
-> ###   var,Nbinom-method var,Norm-method var,Pareto-method var,Pois-method
-> ###   var,Unif-method var,Weibull-method var,Td-method sd sd-methods
-> ###   sd,UnivariateDistribution-method sd,Norm-method median
+> ###   var,Fd-method var,Gammad-method var,Geom-method var,Hyper-method
+> ###   var,Logis-method var,Lnorm-method var,Nbinom-method var,Norm-method
+> ###   var,Pois-method var,Unif-method var,Weibull-method var,Td-method sd
+> ###   sd-methods sd,UnivariateDistribution-method sd,Norm-method median
 > ###   median,ANY-method median-methods median,UnivariateDistribution-method
 > ###   median,UnivariateCondDistribution-method
 > ###   median,AffLinDistribution-method
@@ -1539,19 +1217,18 @@
 > ###   median,AffLinDiscreteDistribution-method
 > ###   median,AffLinLatticeDistribution-method median,Arcsine-method
 > ###   median,Cauchy-method median,Dirac-method median,DExp-method
-> ###   median,Exp-method median,Geom-method median,Gumbel-method
-> ###   median,GPareto-method median,Logis-method median,Lnorm-method
-> ###   median,Norm-method median,Pareto-method median,Unif-method IQR
+> ###   median,Exp-method median,Geom-method median,Logis-method
+> ###   median,Lnorm-method median,Norm-method median,Unif-method IQR
 > ###   IQR-methods IQR,ANY-method IQR,UnivariateDistribution-method
 > ###   IQR,UnivariateCondDistribution-method IQR,AffLinDistribution-method
 > ###   IQR,AffLinAbscontDistribution-method
 > ###   IQR,AffLinDiscreteDistribution-method
 > ###   IQR,AffLinLatticeDistribution-method IQR,DiscreteDistribution-method
 > ###   IQR,Arcsine-method IQR,Cauchy-method IQR,Dirac-method IQR,DExp-method
-> ###   IQR,Exp-method IQR,Geom-method IQR,Gumbel-method IQR,GPareto-method
-> ###   IQR,Logis-method IQR,Norm-method IQR,Pareto-method IQR,Unif-method
-> ###   mad mad,ANY-method mad-methods mad,UnivariateDistribution-method
-> ###   mad,AffLinDistribution-method mad,AffLinAbscontDistribution-method
+> ###   IQR,Exp-method IQR,Geom-method IQR,Logis-method IQR,Norm-method
+> ###   IQR,Unif-method mad mad,ANY-method mad-methods
+> ###   mad,UnivariateDistribution-method mad,AffLinDistribution-method
+> ###   mad,AffLinAbscontDistribution-method
 > ###   mad,AffLinDiscreteDistribution-method
 > ###   mad,AffLinLatticeDistribution-method mad,Cauchy-method
 > ###   mad,Dirac-method mad,DExp-method mad,Exp-method mad,Geom-method
@@ -1565,9 +1242,8 @@
 > ###   skewness,Beta-method skewness,Binom-method skewness,Cauchy-method
 > ###   skewness,Chisq-method skewness,Dirac-method skewness,DExp-method
 > ###   skewness,Exp-method skewness,Fd-method skewness,Gammad-method
-> ###   skewness,Geom-method skewness,Gumbel-method skewness,GPareto-method
-> ###   skewness,Hyper-method skewness,Logis-method skewness,Lnorm-method
-> ###   skewness,Nbinom-method skewness,Norm-method skewness,Pareto-method
+> ###   skewness,Geom-method skewness,Hyper-method skewness,Logis-method
+> ###   skewness,Lnorm-method skewness,Nbinom-method skewness,Norm-method
 > ###   skewness,Pois-method skewness,Unif-method skewness,Weibull-method
 > ###   skewness,Td-method kurtosis kurtosis-methods kurtosis,ANY-method
 > ###   kurtosis,UnivariateDistribution-method
[TRUNCATED]

To get the complete diff run:
    svnlook diff /svnroot/distr -r 825


More information about the Distr-commits mailing list