[Distr-commits] r731 - branches/distr-2.4/pkg/SweaveListingUtils/R branches/distr-2.4/pkg/SweaveListingUtils/inst/doc branches/distr-2.4/pkg/distrDoc branches/distr-2.4/pkg/distrEllipse/R branches/distr-2.4/pkg/distrEx branches/distr-2.4/pkg/distrEx/R branches/distr-2.4/pkg/distrMod/R branches/distr-2.4/pkg/distrSim/R branches/distr-2.4/pkg/distrTEst/R branches/distr-2.4/pkg/distrTeach/R pkg/SweaveListingUtils pkg/SweaveListingUtils/R pkg/SweaveListingUtils/inst/doc pkg/distrDoc pkg/distrDoc/R pkg/distrEllipse pkg/distrEllipse/R pkg/distrEx pkg/distrEx/R pkg/distrMod pkg/distrMod/R pkg/distrSim pkg/distrSim/R pkg/distrTEst pkg/distrTEst/R pkg/distrTeach pkg/distrTeach/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Sep 2 18:03:25 CEST 2011
Author: ruckdeschel
Date: 2011-09-02 18:03:24 +0200 (Fri, 02 Sep 2011)
New Revision: 731
Added:
branches/distr-2.4/pkg/distrDoc/NAMESPACE
pkg/distrDoc/NAMESPACE
Modified:
branches/distr-2.4/pkg/SweaveListingUtils/R/SweaveListingUtils.R
branches/distr-2.4/pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw
branches/distr-2.4/pkg/distrEllipse/R/01.R
branches/distr-2.4/pkg/distrEx/NAMESPACE
branches/distr-2.4/pkg/distrEx/R/AllClass.R
branches/distr-2.4/pkg/distrMod/R/AllClass.R
branches/distr-2.4/pkg/distrSim/R/01.R
branches/distr-2.4/pkg/distrTEst/R/AllClasses.R
branches/distr-2.4/pkg/distrTeach/R/AllClass.R
pkg/SweaveListingUtils/DESCRIPTION
pkg/SweaveListingUtils/R/SweaveListingUtils.R
pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw
pkg/distrDoc/R/distrDoc.R
pkg/distrEllipse/DESCRIPTION
pkg/distrEllipse/R/01.R
pkg/distrEx/DESCRIPTION
pkg/distrEx/NAMESPACE
pkg/distrEx/R/AllClass.R
pkg/distrMod/DESCRIPTION
pkg/distrMod/R/AllClass.R
pkg/distrSim/DESCRIPTION
pkg/distrSim/R/01.R
pkg/distrTEst/DESCRIPTION
pkg/distrTEst/R/AllClasses.R
pkg/distrTeach/DESCRIPTION
pkg/distrTeach/R/AllClass.R
Log:
+pkg distrDoc gains a NAMESPACE
+removed calls to require from R source and instead use NAMESPACE directives
+in SweaveListingUtils changed chunk option strip.white from FALSE to false
Modified: branches/distr-2.4/pkg/SweaveListingUtils/R/SweaveListingUtils.R
===================================================================
--- branches/distr-2.4/pkg/SweaveListingUtils/R/SweaveListingUtils.R 2011-09-02 14:08:36 UTC (rev 730)
+++ branches/distr-2.4/pkg/SweaveListingUtils/R/SweaveListingUtils.R 2011-09-02 16:03:24 UTC (rev 731)
@@ -225,7 +225,9 @@
"?root=", PROJECT, sep ="") else base.url
if(is.null(.CacheFiles[[base.URL]])){
.CacheLength <<- .CacheLength + 1
- RL <- readLines(url(base.URL))
+ url.connection <- url(base.URL)
+ RL <- readLines(url.connection)
+ close(url.connection)
.CacheFiles[[base.URL]] <<- RL
}
.CacheFiles[[base.URL]]
Modified: branches/distr-2.4/pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw
===================================================================
--- branches/distr-2.4/pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw 2011-09-02 14:08:36 UTC (rev 730)
+++ branches/distr-2.4/pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw 2011-09-02 16:03:24 UTC (rev 731)
@@ -75,7 +75,7 @@
%\usepackage{Sweave}
\SweaveOpts{keep.source=TRUE}
% -------------------------------------------------------------------------------
- <<SweaveListingsPreparations, results=tex, echo=FALSE, strip.white="false">>=
+<<SweaveListingsPreparations, results=tex, echo=FALSE, strip.white=false>>=
require(SweaveListingUtils)
SweaveListingoptions(intermediate = FALSE)
SweaveListingPreparations()
@@ -266,7 +266,7 @@
%------------
\lstinputlisting[style=TeXstyle]{reqdistr.tex}
-<<Prepa, echo=FALSE, results=tex, strip.white=FALSE>>=
+<<Prepa, echo=FALSE, results=tex, strip.white=false>>=
require(distr)
@
@@ -439,7 +439,7 @@
% -------------------------------------------------------------------------------
which returns
-<<AllClass1, echo=FALSE, results=tex, strip.white=FALSE>>=
+<<AllClass1, echo=FALSE, results=tex, strip.white=false>>=
lstinputSourceFromRForge("distr","R","AllClasses.R","distr",
"## Class: BinomParameter", "#-")
@
@@ -458,7 +458,7 @@
\lstinputlisting[style=TeXstyle]{BinomParam.tex}
giving
-<<BinomParam, results=tex, echo=FALSE, strip.white=FALSE>>=
+<<BinomParam, results=tex, echo=FALSE, strip.white=false>>=
lstinputSourceFromRForge("distr","man","BinomParameter-class.Rd","distr")
@
Added: branches/distr-2.4/pkg/distrDoc/NAMESPACE
===================================================================
--- branches/distr-2.4/pkg/distrDoc/NAMESPACE (rev 0)
+++ branches/distr-2.4/pkg/distrDoc/NAMESPACE 2011-09-02 16:03:24 UTC (rev 731)
@@ -0,0 +1,11 @@
+import("methods")
+import("startupmsg")
+import("MASS")
+import("distr")
+import("distrEx")
+import("distrSim")
+import("RandVar")
+import("distrMod")
+import("distrTeach")
+import("distrTEst")
+import("startupmsg")
Modified: branches/distr-2.4/pkg/distrEllipse/R/01.R
===================================================================
--- branches/distr-2.4/pkg/distrEllipse/R/01.R 2011-09-02 14:08:36 UTC (rev 730)
+++ branches/distr-2.4/pkg/distrEllipse/R/01.R 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,8 +1,8 @@
.onLoad <- function(lib, pkg){
- require("methods", character = TRUE, quietly = TRUE)
- require("distrEx")
- require("distrSim")
- require(setRNG)
+# require("methods", character = TRUE, quietly = TRUE)
+# require("distrEx")
+# require("distrSim")
+# require(setRNG)
}
Modified: branches/distr-2.4/pkg/distrEx/NAMESPACE
===================================================================
--- branches/distr-2.4/pkg/distrEx/NAMESPACE 2011-09-02 14:08:36 UTC (rev 730)
+++ branches/distr-2.4/pkg/distrEx/NAMESPACE 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,5 +1,6 @@
useDynLib("distrEx")
+import("methods")
import("distr")
import("startupmsg")
Modified: branches/distr-2.4/pkg/distrEx/R/AllClass.R
===================================================================
--- branches/distr-2.4/pkg/distrEx/R/AllClass.R 2011-09-02 14:08:36 UTC (rev 730)
+++ branches/distr-2.4/pkg/distrEx/R/AllClass.R 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,7 +1,7 @@
.isEqual01 <- distr:::.isEqual01 ## for faster access due to local caching in package namespace
.onLoad <- function(lib, pkg){
- require("methods", character = TRUE, quietly = TRUE)
+# require("methods", character = TRUE, quietly = TRUE)
}
Modified: branches/distr-2.4/pkg/distrMod/R/AllClass.R
===================================================================
--- branches/distr-2.4/pkg/distrMod/R/AllClass.R 2011-09-02 14:08:36 UTC (rev 730)
+++ branches/distr-2.4/pkg/distrMod/R/AllClass.R 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,9 +1,9 @@
.onLoad <- function(lib, pkg){
- require("methods", character = TRUE, quietly = TRUE)
-## are the following calls to require necessary?
- require("distr", character = TRUE, quietly = TRUE)
- require("distrEx", character = TRUE, quietly = TRUE)
- require("RandVar", character = TRUE, quietly = TRUE)
+# require("methods", character = TRUE, quietly = TRUE)
+### are the following calls to require necessary?
+# require("distr", character = TRUE, quietly = TRUE)
+# require("distrEx", character = TRUE, quietly = TRUE)
+# require("RandVar", character = TRUE, quietly = TRUE)
}
.onAttach <- function(library, pkg){
Modified: branches/distr-2.4/pkg/distrSim/R/01.R
===================================================================
--- branches/distr-2.4/pkg/distrSim/R/01.R 2011-09-02 14:08:36 UTC (rev 730)
+++ branches/distr-2.4/pkg/distrSim/R/01.R 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,6 +1,6 @@
.onLoad <- function(lib, pkg){
- require("methods", character = TRUE, quietly = TRUE)
- require(setRNG)
+# require("methods", character = TRUE, quietly = TRUE)
+# require(setRNG)
}
setClassUnion("vectororNULL", c("vector","NULL"))
Modified: branches/distr-2.4/pkg/distrTEst/R/AllClasses.R
===================================================================
--- branches/distr-2.4/pkg/distrTEst/R/AllClasses.R 2011-09-02 14:08:36 UTC (rev 730)
+++ branches/distr-2.4/pkg/distrTEst/R/AllClasses.R 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,5 +1,5 @@
.onLoad <- function(lib, pkg){
- require("methods", character = TRUE, quietly = TRUE)
+# require("methods", character = TRUE, quietly = TRUE)
}
Modified: branches/distr-2.4/pkg/distrTeach/R/AllClass.R
===================================================================
--- branches/distr-2.4/pkg/distrTeach/R/AllClass.R 2011-09-02 14:08:36 UTC (rev 730)
+++ branches/distr-2.4/pkg/distrTeach/R/AllClass.R 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,5 +1,5 @@
.onLoad <- function(lib, pkg){
- require("methods", character = TRUE, quietly = TRUE)
+# require("methods", character = TRUE, quietly = TRUE)
}
Modified: pkg/SweaveListingUtils/DESCRIPTION
===================================================================
--- pkg/SweaveListingUtils/DESCRIPTION 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/SweaveListingUtils/DESCRIPTION 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,7 +1,7 @@
Package: SweaveListingUtils
Title: Utilities for Sweave together with TeX listings package
Encoding: latin1
-Version: 0.5.1
+Version: 0.5.2
Depends: R(>= 2.10.0), startupmsg
Suggests: distr, MASS, survival
Imports: stats
@@ -13,7 +13,7 @@
source code
Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
License: LGPL-3
-Date: 2011-02-14
+Date: 2011-09-02
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
SVNRevision: 699
Modified: pkg/SweaveListingUtils/R/SweaveListingUtils.R
===================================================================
--- pkg/SweaveListingUtils/R/SweaveListingUtils.R 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/SweaveListingUtils/R/SweaveListingUtils.R 2011-09-02 16:03:24 UTC (rev 731)
@@ -225,7 +225,9 @@
"?root=", PROJECT, sep ="") else base.url
if(is.null(.CacheFiles[[base.URL]])){
.CacheLength <<- .CacheLength + 1
- RL <- readLines(url(base.URL))
+ url.connection <- url(base.URL)
+ RL <- readLines(url.connection)
+ close(url.connection)
.CacheFiles[[base.URL]] <<- RL
}
.CacheFiles[[base.URL]]
Modified: pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw
===================================================================
--- pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw 2011-09-02 16:03:24 UTC (rev 731)
@@ -75,7 +75,7 @@
%\usepackage{Sweave}
\SweaveOpts{keep.source=TRUE}
% -------------------------------------------------------------------------------
-<<SweaveListingsPreparations, results=tex, echo=FALSE, strip.white="false">>=
+<<SweaveListingsPreparations, results=tex, echo=FALSE, strip.white=false>>=
require(SweaveListingUtils)
SweaveListingoptions(intermediate = FALSE)
SweaveListingPreparations()
@@ -266,7 +266,7 @@
%------------
\lstinputlisting[style=TeXstyle]{reqdistr.tex}
-<<Prepa, echo=FALSE, results=tex, strip.white=FALSE>>=
+<<Prepa, echo=FALSE, results=tex, strip.white=false>>=
require(distr)
@
@@ -439,7 +439,7 @@
% -------------------------------------------------------------------------------
which returns
-<<AllClass1, echo=FALSE, results=tex, strip.white=FALSE>>=
+<<AllClass1, echo=FALSE, results=tex, strip.white=false>>=
lstinputSourceFromRForge("distr","R","AllClasses.R","distr",
"## Class: BinomParameter", "#-")
@
@@ -458,7 +458,7 @@
\lstinputlisting[style=TeXstyle]{BinomParam.tex}
giving
-<<BinomParam, results=tex, echo=FALSE, strip.white=FALSE>>=
+<<BinomParam, results=tex, echo=FALSE, strip.white=false>>=
lstinputSourceFromRForge("distr","man","BinomParameter-class.Rd","distr")
@
Added: pkg/distrDoc/NAMESPACE
===================================================================
--- pkg/distrDoc/NAMESPACE (rev 0)
+++ pkg/distrDoc/NAMESPACE 2011-09-02 16:03:24 UTC (rev 731)
@@ -0,0 +1,11 @@
+import("methods")
+import("startupmsg")
+import("MASS")
+import("distr")
+import("distrEx")
+import("distrSim")
+import("RandVar")
+import("distrMod")
+import("distrTeach")
+import("distrTEst")
+import("startupmsg")
Modified: pkg/distrDoc/R/distrDoc.R
===================================================================
--- pkg/distrDoc/R/distrDoc.R 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/distrDoc/R/distrDoc.R 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,5 +1,5 @@
.onLoad <- function(lib, pkg) { # extended 03-28-06: P.R.
- require("methods", character = TRUE, quietly = TRUE)
+ # require("methods", character = TRUE, quietly = TRUE)
}
.onAttach <- function(libname, pkgname)
Modified: pkg/distrEllipse/DESCRIPTION
===================================================================
--- pkg/distrEllipse/DESCRIPTION 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/distrEllipse/DESCRIPTION 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,6 +1,6 @@
Package: distrEllipse
-Version: 2.3
-Date: 2010-12-03
+Version: 2.3.1
+Date: 2011-09-02
Title: S4 classes for elliptically contoured distributions
Depends: R(>= 2.8.0), methods, graphics, mvtnorm, setRNG(>= 2006.2-1), distr(>= 2.2),
distrEx(>= 2.2), distrSim(>= 2.2), startupmsg
Modified: pkg/distrEllipse/R/01.R
===================================================================
--- pkg/distrEllipse/R/01.R 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/distrEllipse/R/01.R 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,8 +1,8 @@
.onLoad <- function(lib, pkg){
- require("methods", character = TRUE, quietly = TRUE)
- require("distrEx")
- require("distrSim")
- require(setRNG)
+# require("methods", character = TRUE, quietly = TRUE)
+# require("distrEx")
+# require("distrSim")
+# require(setRNG)
}
Modified: pkg/distrEx/DESCRIPTION
===================================================================
--- pkg/distrEx/DESCRIPTION 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/distrEx/DESCRIPTION 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,6 +1,6 @@
Package: distrEx
-Version: 2.3
-Date: 2010-12-03
+Version: 2.3.1
+Date: 2011-09-02
Title: Extensions of package distr
Description: Extensions of package distr and some additional functionality
Depends: R(>= 2.6.0), methods, distr(>= 2.2), evd, actuar, startupmsg
Modified: pkg/distrEx/NAMESPACE
===================================================================
--- pkg/distrEx/NAMESPACE 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/distrEx/NAMESPACE 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,5 +1,5 @@
useDynLib("distrEx")
-
+import("methods")
import("distr")
import("startupmsg")
Modified: pkg/distrEx/R/AllClass.R
===================================================================
--- pkg/distrEx/R/AllClass.R 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/distrEx/R/AllClass.R 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,7 +1,7 @@
.isEqual01 <- distr:::.isEqual01 ## for faster access due to local caching in package namespace
.onLoad <- function(lib, pkg){
- require("methods", character = TRUE, quietly = TRUE)
+# require("methods", character = TRUE, quietly = TRUE)
}
Modified: pkg/distrMod/DESCRIPTION
===================================================================
--- pkg/distrMod/DESCRIPTION 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/distrMod/DESCRIPTION 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,6 +1,6 @@
Package: distrMod
-Version: 2.3.1
-Date: 2011-02-14
+Version: 2.3.2
+Date: 2011-09-02
Title: Object oriented implementation of probability models
Description: Object oriented implementation of probability models based on packages 'distr' and
'distrEx'
Modified: pkg/distrMod/R/AllClass.R
===================================================================
--- pkg/distrMod/R/AllClass.R 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/distrMod/R/AllClass.R 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,9 +1,9 @@
.onLoad <- function(lib, pkg){
- require("methods", character = TRUE, quietly = TRUE)
+# require("methods", character = TRUE, quietly = TRUE)
## are the following calls to require necessary?
- require("distr", character = TRUE, quietly = TRUE)
- require("distrEx", character = TRUE, quietly = TRUE)
- require("RandVar", character = TRUE, quietly = TRUE)
+# require("distr", character = TRUE, quietly = TRUE)
+# require("distrEx", character = TRUE, quietly = TRUE)
+# require("RandVar", character = TRUE, quietly = TRUE)
}
.onAttach <- function(library, pkg){
Modified: pkg/distrSim/DESCRIPTION
===================================================================
--- pkg/distrSim/DESCRIPTION 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/distrSim/DESCRIPTION 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,6 +1,6 @@
Package: distrSim
-Version: 2.3
-Date: 2010-12-03
+Version: 2.3.1
+Date: 2011-09-02
Title: Simulation classes based on package distr
Depends: R(>= 2.6.0), methods, graphics, setRNG(>= 2006.2-1), distr(>= 2.2), startupmsg
Suggests: distrEx(>= 2.2)
Modified: pkg/distrSim/R/01.R
===================================================================
--- pkg/distrSim/R/01.R 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/distrSim/R/01.R 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,6 +1,6 @@
.onLoad <- function(lib, pkg){
- require("methods", character = TRUE, quietly = TRUE)
- require(setRNG)
+# require("methods", character = TRUE, quietly = TRUE)
+# require(setRNG)
}
setClassUnion("vectororNULL", c("vector","NULL"))
Modified: pkg/distrTEst/DESCRIPTION
===================================================================
--- pkg/distrTEst/DESCRIPTION 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/distrTEst/DESCRIPTION 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,6 +1,6 @@
Package: distrTEst
-Version: 2.3
-Date: 2010-12-03
+Version: 2.3.1
+Date: 2011-09-02
Title: Estimation and Testing classes based on package distr
Depends: R(>= 2.6.0), methods, graphics, setRNG(>= 2006.2-1), distr(>= 2.2), distrSim(>= 2.2),
startupmsg
Modified: pkg/distrTEst/R/AllClasses.R
===================================================================
--- pkg/distrTEst/R/AllClasses.R 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/distrTEst/R/AllClasses.R 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,5 +1,5 @@
.onLoad <- function(lib, pkg){
- require("methods", character = TRUE, quietly = TRUE)
+# require("methods", character = TRUE, quietly = TRUE)
}
Modified: pkg/distrTeach/DESCRIPTION
===================================================================
--- pkg/distrTeach/DESCRIPTION 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/distrTeach/DESCRIPTION 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,6 +1,6 @@
Package: distrTeach
-Version: 2.3
-Date: 2010-12-03
+Version: 2.3.1
+Date: 2011-09-02
Title: Extensions of package distr for teaching Stochastics/Statistics in secondary school
Description: Extensions of package distr and some additional functionality
Depends: R(>= 2.2.0), methods, distr(>= 2.2), distrEx(>= 2.2), startupmsg
Modified: pkg/distrTeach/R/AllClass.R
===================================================================
--- pkg/distrTeach/R/AllClass.R 2011-09-02 14:08:36 UTC (rev 730)
+++ pkg/distrTeach/R/AllClass.R 2011-09-02 16:03:24 UTC (rev 731)
@@ -1,5 +1,5 @@
.onLoad <- function(lib, pkg){
- require("methods", character = TRUE, quietly = TRUE)
+# require("methods", character = TRUE, quietly = TRUE)
}
More information about the Distr-commits
mailing list