[Distr-commits] r887 - branches/distr-2.5/pkg/distr branches/distr-2.5/pkg/distrDoc branches/distr-2.5/pkg/distrMod pkg/distr pkg/distrDoc pkg/distrMod pkg/utils
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Feb 16 15:21:06 CET 2013
Author: ruckdeschel
Date: 2013-02-16 15:21:05 +0100 (Sat, 16 Feb 2013)
New Revision: 887
Added:
pkg/utils/finde.R
Removed:
pkg/utils/finde.r
Modified:
branches/distr-2.5/pkg/distr/DESCRIPTION
branches/distr-2.5/pkg/distrDoc/DESCRIPTION
branches/distr-2.5/pkg/distrMod/DESCRIPTION
pkg/distr/DESCRIPTION
pkg/distrDoc/DESCRIPTION
pkg/distrMod/DESCRIPTION
Log:
now require R(>= 2.14.0) for all pkgs with Vignettes (as folder vignettes is only treated correctly from then on)
Modified: branches/distr-2.5/pkg/distr/DESCRIPTION
===================================================================
--- branches/distr-2.5/pkg/distr/DESCRIPTION 2013-02-16 13:59:42 UTC (rev 886)
+++ branches/distr-2.5/pkg/distr/DESCRIPTION 2013-02-16 14:21:05 UTC (rev 887)
@@ -5,7 +5,7 @@
Description: S4 Classes and Methods for distributions
Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla
Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
-Depends: R(>= 2.2.0), methods, graphics, startupmsg, sfsmisc, SweaveListingUtils
+Depends: R(>= 2.14.0), methods, graphics, startupmsg, sfsmisc, SweaveListingUtils
Suggests: distrEx, SweaveListingUtils
Imports: stats
ByteCompile: yes
Modified: branches/distr-2.5/pkg/distrDoc/DESCRIPTION
===================================================================
--- branches/distr-2.5/pkg/distrDoc/DESCRIPTION 2013-02-16 13:59:42 UTC (rev 886)
+++ branches/distr-2.5/pkg/distrDoc/DESCRIPTION 2013-02-16 14:21:05 UTC (rev 887)
@@ -7,7 +7,7 @@
distrMod, distrSim, distrTEst, distrTeach, and distrEllipse
Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla
Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
-Depends: R(>= 2.6.0), tools, startupmsg, distr(>= 2.2.0), distrEx(>= 2.2.0), distrSim(>=
+Depends: R(>= 2.14.0), tools, startupmsg, distr(>= 2.2.0), distrEx(>= 2.2.0), distrSim(>=
2.2.0), distrTEst(>= 2.2.0), distrTeach(>= 2.2.0), RandVar(>= 0.7), distrMod(>= 2.2.0),
MASS, methods
Suggests: Biobase, SweaveListingUtils
Modified: branches/distr-2.5/pkg/distrMod/DESCRIPTION
===================================================================
--- branches/distr-2.5/pkg/distrMod/DESCRIPTION 2013-02-16 13:59:42 UTC (rev 886)
+++ branches/distr-2.5/pkg/distrMod/DESCRIPTION 2013-02-16 14:21:05 UTC (rev 887)
@@ -6,7 +6,7 @@
'distrEx'
Author: Matthias Kohl, Peter Ruckdeschel
Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
-Depends: R(>= 2.6.0), methods, startupmsg, distr(>= 2.2), distrEx(>= 2.4), RandVar(>= 0.6.3),
+Depends: R(>= 2.14.0), methods, startupmsg, distr(>= 2.2), distrEx(>= 2.4), RandVar(>= 0.6.3),
MASS, stats4
ByteCompile: yes
License: LGPL-3
Modified: pkg/distr/DESCRIPTION
===================================================================
--- pkg/distr/DESCRIPTION 2013-02-16 13:59:42 UTC (rev 886)
+++ pkg/distr/DESCRIPTION 2013-02-16 14:21:05 UTC (rev 887)
@@ -5,7 +5,7 @@
Description: S4 Classes and Methods for distributions
Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla
Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
-Depends: R(>= 2.2.0), methods, graphics, startupmsg, sfsmisc, SweaveListingUtils
+Depends: R(>= 2.14.0), methods, graphics, startupmsg, sfsmisc, SweaveListingUtils
Suggests: distrEx, SweaveListingUtils
Imports: stats
ByteCompile: yes
Modified: pkg/distrDoc/DESCRIPTION
===================================================================
--- pkg/distrDoc/DESCRIPTION 2013-02-16 13:59:42 UTC (rev 886)
+++ pkg/distrDoc/DESCRIPTION 2013-02-16 14:21:05 UTC (rev 887)
@@ -7,7 +7,7 @@
distrMod, distrSim, distrTEst, distrTeach, and distrEllipse
Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla
Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
-Depends: R(>= 2.6.0), tools, startupmsg, distr(>= 2.2.0), distrEx(>= 2.2.0), distrSim(>=
+Depends: R(>= 2.14.0), tools, startupmsg, distr(>= 2.2.0), distrEx(>= 2.2.0), distrSim(>=
2.2.0), distrTEst(>= 2.2.0), distrTeach(>= 2.2.0), RandVar(>= 0.7), distrMod(>= 2.2.0),
MASS, methods
Suggests: Biobase, SweaveListingUtils
Modified: pkg/distrMod/DESCRIPTION
===================================================================
--- pkg/distrMod/DESCRIPTION 2013-02-16 13:59:42 UTC (rev 886)
+++ pkg/distrMod/DESCRIPTION 2013-02-16 14:21:05 UTC (rev 887)
@@ -6,7 +6,7 @@
'distrEx'
Author: Matthias Kohl, Peter Ruckdeschel
Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
-Depends: R(>= 2.6.0), methods, startupmsg, distr(>= 2.2), distrEx(>= 2.4), RandVar(>= 0.6.3),
+Depends: R(>= 2.14.0), methods, startupmsg, distr(>= 2.2), distrEx(>= 2.4), RandVar(>= 0.6.3),
MASS, stats4
ByteCompile: yes
License: LGPL-3
Copied: pkg/utils/finde.R (from rev 883, pkg/utils/finde.r)
===================================================================
--- pkg/utils/finde.R (rev 0)
+++ pkg/utils/finde.R 2013-02-16 14:21:05 UTC (rev 887)
@@ -0,0 +1,57 @@
+finde <- function(x = "nchar", dir="C:/rtest/distr/pkg/distr/R", ext = "R", rec = FALSE){
+ ow <- getwd()
+ on.exit(setwd(ow))
+ infind <- function(dir0){
+ setwd(dir0)
+ cat("\n")
+ findL <- function(y){
+ zz <- readLines(y)
+ lgr <- grep(x,zz)
+ if(length(lgr>0)){
+ if(rec)
+ cat(paste(dir0,"/",y,sep="")," :: ",paste(lgr),"\n")
+ else cat(y," :: ",paste(lgr),"\n")
+ }
+ invisible()
+ }
+ ext0 <- if(ext=="") "" else paste("\\.", ext, sep="")
+ DIR <- grep(ext0, dir(, rec = rec), value=TRUE)
+ s <- lapply(DIR,findL)
+ }
+infind(dir)
+}
+#finde(x="Wow6432Node", dir ="C:/R/devel/src/gnuwin32", rec=TRUE, ext="")
+
+#finde(x="getPos", dir ="C:/rtest/distr/branches/distr-2.4/pkg/distrMod/", rec=TRUE)
+finde(x="roptest\\(", dir ="C:/rtest/robast/branches/robast-0.9/pkg/ROptEst/", rec=TRUE)
+finde(x="getSlots\\(", dir ="C:/rtest/distr/branches/distr-2.4/pkg/distrMod/", rec=TRUE)
+finde(x="\"loc\"", dir ="C:/rtest/distr/branches/distr-2.4/pkg/distrEx/", rec=TRUE)
+finde(x=".makeQNew", dir ="C:/rtest/distr/pkg/distr/R")
+finde(x="http://distr\\.r-forge\\.r-project\\.org/distr\\.pdf", dir ="C:/rtest/distr/", rec=TRUE)
+finde(x="cniper.+\\(", dir ="C:/rtest/robast/branches/robast-0.9/pkg", rec=TRUE)
+
+ersetze <- function(x0 = "nchar", x1="nchar", dir="C:/rtest/distr/pkg/distr/R", ext = "R", rec = FALSE){
+ ow <- getwd()
+ on.exit(setwd(ow))
+ infind <- function(dir0){
+ setwd(dir0)
+ cat("\n")
+ findL <- function(y){
+ zz <- readLines(y)
+ lgr <- grep(x0,zz)
+ writeLines(gsub(x0,x1,zz),y)
+ if(length(lgr>0)){
+ if(rec)
+ cat(paste(dir0,"/",y,sep="")," :: ",paste(lgr),"\n")
+ else cat(y," :: ",paste(lgr),"\n")
+ }
+ invisible()
+ }
+ ext0 <- if(ext=="") "" else paste("\\.", ext, sep="")
+ DIR <- grep(ext0, dir(, rec = rec), value=TRUE)
+ s <- lapply(DIR,findL)
+ }
+infind(dir)
+}
+ersetze(x0="href=\"distr.pdf\"",x1="href=\"http://cran.r-project.org/web/packages/distrDoc/vignettes/distr.pdf\"", dir ="C:/rtest/distr/www", rec=TRUE,ext="html")
+ersetze(x0="peter.ruckdeschel at uni-bayreuth.de",x1="peter.ruckdeschel at itwm.fraunhofer.de", dir ="C:/rtest/distr/www", rec=TRUE, ext="html")
Deleted: pkg/utils/finde.r
===================================================================
--- pkg/utils/finde.r 2013-02-16 13:59:42 UTC (rev 886)
+++ pkg/utils/finde.r 2013-02-16 14:21:05 UTC (rev 887)
@@ -1,57 +0,0 @@
-finde <- function(x = "nchar", dir="C:/rtest/distr/pkg/distr/R", ext = "R", rec = FALSE){
- ow <- getwd()
- on.exit(setwd(ow))
- infind <- function(dir0){
- setwd(dir0)
- cat("\n")
- findL <- function(y){
- zz <- readLines(y)
- lgr <- grep(x,zz)
- if(length(lgr>0)){
- if(rec)
- cat(paste(dir0,"/",y,sep="")," :: ",paste(lgr),"\n")
- else cat(y," :: ",paste(lgr),"\n")
- }
- invisible()
- }
- ext0 <- if(ext=="") "" else paste("\\.", ext, sep="")
- DIR <- grep(ext0, dir(, rec = rec), value=TRUE)
- s <- lapply(DIR,findL)
- }
-infind(dir)
-}
-#finde(x="Wow6432Node", dir ="C:/R/devel/src/gnuwin32", rec=TRUE, ext="")
-
-#finde(x="getPos", dir ="C:/rtest/distr/branches/distr-2.4/pkg/distrMod/", rec=TRUE)
-finde(x="roptest\\(", dir ="C:/rtest/robast/branches/robast-0.9/pkg/ROptEst/", rec=TRUE)
-finde(x="getSlots\\(", dir ="C:/rtest/distr/branches/distr-2.4/pkg/distrMod/", rec=TRUE)
-finde(x="\"loc\"", dir ="C:/rtest/distr/branches/distr-2.4/pkg/distrEx/", rec=TRUE)
-finde(x=".makeQNew", dir ="C:/rtest/distr/pkg/distr/R")
-finde(x="http://distr\\.r-forge\\.r-project\\.org/distr\\.pdf", dir ="C:/rtest/distr/", rec=TRUE)
-finde(x="cniper.+\\(", dir ="C:/rtest/robast/branches/robast-0.9/pkg", rec=TRUE)
-
-ersetze <- function(x0 = "nchar", x1="nchar", dir="C:/rtest/distr/pkg/distr/R", ext = "R", rec = FALSE){
- ow <- getwd()
- on.exit(setwd(ow))
- infind <- function(dir0){
- setwd(dir0)
- cat("\n")
- findL <- function(y){
- zz <- readLines(y)
- lgr <- grep(x0,zz)
- writeLines(gsub(x0,x1,zz),y)
- if(length(lgr>0)){
- if(rec)
- cat(paste(dir0,"/",y,sep="")," :: ",paste(lgr),"\n")
- else cat(y," :: ",paste(lgr),"\n")
- }
- invisible()
- }
- ext0 <- if(ext=="") "" else paste("\\.", ext, sep="")
- DIR <- grep(ext0, dir(, rec = rec), value=TRUE)
- s <- lapply(DIR,findL)
- }
-infind(dir)
-}
-ersetze(x0="href=\"distr.pdf\"",x1="href=\"http://cran.r-project.org/web/packages/distrDoc/vignettes/distr.pdf\"", dir ="C:/rtest/distr/www", rec=TRUE,ext="html")
-ersetze(x0="peter.ruckdeschel at uni-bayreuth.de",x1="peter.ruckdeschel at itwm.fraunhofer.de", dir ="C:/rtest/distr/www", rec=TRUE, ext="html")
More information about the Distr-commits
mailing list