[Robast-commits] r871 - in pkg/RobAStRDA: . R inst inst/AddMaterial/interpolation man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Apr 24 00:04:36 CEST 2016
Author: ruckdeschel
Date: 2016-04-24 00:04:35 +0200 (Sun, 24 Apr 2016)
New Revision: 871
Modified:
pkg/RobAStRDA/DESCRIPTION
pkg/RobAStRDA/NAMESPACE
pkg/RobAStRDA/R/Comment.R
pkg/RobAStRDA/R/interpolAux.R
pkg/RobAStRDA/R/sysdata.rda
pkg/RobAStRDA/inst/AddMaterial/interpolation/interpolationscripts.R
pkg/RobAStRDA/inst/NEWS
pkg/RobAStRDA/man/0RobRDA-package.Rd
Log:
RobAStRDA -- next try for CRAN
Modified: pkg/RobAStRDA/DESCRIPTION
===================================================================
--- pkg/RobAStRDA/DESCRIPTION 2016-04-23 21:37:22 UTC (rev 870)
+++ pkg/RobAStRDA/DESCRIPTION 2016-04-23 22:04:35 UTC (rev 871)
@@ -1,17 +1,25 @@
Package: RobAStRDA
-Version: 0.9
-Date: 2013-09-11
-Title: sysdata.rda for packages of RobASt - Family of Pkgs
-Description: sysdata.rda for packages of RobASt - Family of Pkgs; is currently used by pkg RobExtremes only.
-Depends: R (>= 2.14.0), methods
-Author: Peter Ruckdeschel, Matthias Kohl
-Maintainer: Peter Ruckdeschel <peter.ruckdeschel at itwm.fraunhofer.de>
+Version: 1.0.1
+Date: 2016-04-23
+Title: Interpolation Grids for Packages of RobASt - Family of Pkgs
+Description: Includes sysdata.rda file for packages of RobASt - family of packages; is
+ currently used by package RobExtremes only.
+Depends: R (>= 2.14.0)
+Authors at R: c(person("Matthias", "Kohl", role=c("aut", "cph")), person("Bernhard", "Spangl",
+ role="ctb", comment="contributed smoothed grid values of the Lagrange multipliers"),
+ person("Sascha", "Desmettre", role="ctb", comment="contributed smoothed grid values of
+ the Lagrange multipliers"), person("Eugen", "Massini", role="ctb", comment="contributed
+ an interactive smoothing routine for smoothing the Lagrange multipliers and smoothed
+ grid values of the Lagrange multipliers"), person("Mykhailo", "Pupashenko", role="ctb",
+ comment="helped with manual smoothing of the interpolators"), person("Daria",
+ "Pupashenko", role="ctb", comment="helped with manual smoothing of the interpolators"),
+ person("Gerald", "Kroisandt", role="ctb", comment="helped with manual smoothing of the
+ interpolators"), person("Peter", "Ruckdeschel", role=c("cre", "cph"),
+ email="peter.ruckdeschel at uni-oldenburg.de"))
LazyData: yes
-LazyLoad: yes
-SysDataCompression: xz
ByteCompile: yes
License: LGPL-3
URL: http://robast.r-forge.r-project.org/
LastChangedDate: {$LastChangedDate: 2011-09-30 11:10:33 +0200 (Fr, 30 Sep 2011) $}
LastChangedRevision: {$LastChangedRevision: 453 $}
-SVNRevision: 694
+SVNRevision: 869
Modified: pkg/RobAStRDA/NAMESPACE
===================================================================
--- pkg/RobAStRDA/NAMESPACE 2016-04-23 21:37:22 UTC (rev 870)
+++ pkg/RobAStRDA/NAMESPACE 2016-04-23 22:04:35 UTC (rev 871)
@@ -0,0 +1,5 @@
+ importFrom("stats", "approxfun", "predict", "smooth.spline",
+ "splinefun")
+ importFrom("utils", "head", "read.csv", "read.table")
+
+
Modified: pkg/RobAStRDA/R/Comment.R
===================================================================
--- pkg/RobAStRDA/R/Comment.R 2016-04-23 21:37:22 UTC (rev 870)
+++ pkg/RobAStRDA/R/Comment.R 2016-04-23 22:04:35 UTC (rev 871)
@@ -3,4 +3,4 @@
### CRAN-packages ROptEst and RobExtremes
### more specifically: see ?.RMXE.xi resp. ?.RMXE.th
### and contents of (system) folder of package RobExtremes,
-### i.e., dir(file.path(system.file(package="RobExtremes"),"AddMaterial","interpolation"))
\ No newline at end of file
+### i.e., dir(file.path(system.file(package="RobExtremes"),"AddMaterial","interpolation"))
Modified: pkg/RobAStRDA/R/interpolAux.R
===================================================================
--- pkg/RobAStRDA/R/interpolAux.R 2016-04-23 21:37:22 UTC (rev 870)
+++ pkg/RobAStRDA/R/interpolAux.R 2016-04-23 22:04:35 UTC (rev 871)
@@ -67,6 +67,7 @@
.readGridFromCSV <- function(fromFileCSV){
rg <- read.table(fromFileCSV, colClasses=rep("character",2), sep=" ", header=FALSE)
+ print(head(rg))
nrg <- nrow(rg)
Grid <- matrix(as.numeric(as.matrix(rg)),nrow=nrg)
@@ -158,9 +159,10 @@
le <- length(fromFileCSV)
CSVlist <- vector("list",le)
if(le>0) for(i in 1:le){
+ print(fromFileCSV[i])
CSVlist[[i]] <- .readGridFromCSV(fromFileCSV[i])
- nameInSysdata <- CSVlist[[i]]$namInSysdata
- namPFam <- CSVlist[[i]]$namPFam
+ nameInSysdata <- CSVlist[[i]][["namInSysdata"]]
+ namPFam <- CSVlist[[i]][["namPFam"]]
Grid <- CSVlist[[i]]$Grid
### check whether object nameInSysdata already exists (ie. some
## grids for this family already exist) or not
Modified: pkg/RobAStRDA/R/sysdata.rda
===================================================================
(Binary files differ)
Modified: pkg/RobAStRDA/inst/AddMaterial/interpolation/interpolationscripts.R
===================================================================
--- pkg/RobAStRDA/inst/AddMaterial/interpolation/interpolationscripts.R 2016-04-23 21:37:22 UTC (rev 870)
+++ pkg/RobAStRDA/inst/AddMaterial/interpolation/interpolationscripts.R 2016-04-23 22:04:35 UTC (rev 871)
@@ -13,7 +13,7 @@
#####
oldwd <- getwd()
-.basepath <- "C:/rtest/RobASt/branches/robast-0.9/pkg"
+.basepath <- "C:/rtest/RobASt/branches/robast-1.0/pkg"
.myFolderFrom <- file.path(.basepath,"RobExtremesBuffer")
myRDA0 <- file.path(.basepath,"RobExtremesBuffer/sysdata.rda")
#myRDA <- file.path(.basepath,"RobExtremesBuffer/sysdata.rda")
Modified: pkg/RobAStRDA/inst/NEWS
===================================================================
--- pkg/RobAStRDA/inst/NEWS 2016-04-23 21:37:22 UTC (rev 870)
+++ pkg/RobAStRDA/inst/NEWS 2016-04-23 22:04:35 UTC (rev 871)
@@ -8,6 +8,22 @@
information)
#######################################
+version 1.0
+#######################################
+
+user-visible CHANGES:
++ title changed to title style / capitalization
+
+GENERAL ENHANCEMENTS:
+
+under the hood:
++ warning methods about not importing from methods ...
++ enhanced imports in DESCRIPTION by explicating second order imports
+
+BUGFIXES:
+
+
+#######################################
version 0.9
#######################################
Modified: pkg/RobAStRDA/man/0RobRDA-package.Rd
===================================================================
--- pkg/RobAStRDA/man/0RobRDA-package.Rd 2016-04-23 21:37:22 UTC (rev 870)
+++ pkg/RobAStRDA/man/0RobRDA-package.Rd 2016-04-23 22:04:35 UTC (rev 871)
@@ -3,7 +3,7 @@
\alias{RobRDA}
\docType{package}
\title{
-RobRDA a sysdata.rda only package
+Interpolation Grids for Packages of RobASt - Family of Pkgs
}
\description{
This package only contains sysdata.rda (with corresponding interpolation grids
@@ -31,16 +31,14 @@
\details{
\tabular{ll}{
Package: \tab RobAStRDA \cr
-Version: \tab 0.9 \cr
-Date: \tab 2013-09-11 \cr
-Depends: \tab R (>= 2.14.0), methods \cr
-Imports: ROptEst (>= 0.9)
+Version: \tab 1.0 \cr
+Date: \tab 2016-04-23 \cr
+Depends: \tab R (>= 2.14.0) \cr
LazyData: \tab yes \cr
-LazyLoad: \tab yes \cr
ByteCompile: \tab yes \cr
License: \tab LGPL-3 \cr
URL: \tab http://robast.r-forge.r-project.org/\cr
-SVNRevision: \tab 694 \cr
+SVNRevision: \tab 869 \cr
}
}
More information about the Robast-commits
mailing list