[Robast-commits] r872 - in branches/robast-1.0/pkg: . RobAStRDA RobAStRDA/R

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

Author: ruckdeschel
Date: 2016-04-24 00:07:06 +0200 (Sun, 24 Apr 2016)
New Revision: 872

Modified:
   branches/robast-1.0/pkg/20160423NotToCRAN.txt
   branches/robast-1.0/pkg/RobAStRDA/DESCRIPTION
   branches/robast-1.0/pkg/RobAStRDA/R/Comment.R
   branches/robast-1.0/pkg/RobAStRDA/R/interpolAux.R
   branches/robast-1.0/pkg/RobAStRDA/R/sysdata.rda
Log:
in parallel: RobAStRDA in branch 1.0

Modified: branches/robast-1.0/pkg/20160423NotToCRAN.txt
===================================================================
--- branches/robast-1.0/pkg/20160423NotToCRAN.txt	2016-04-23 22:04:35 UTC (rev 871)
+++ branches/robast-1.0/pkg/20160423NotToCRAN.txt	2016-04-23 22:07:06 UTC (rev 872)
@@ -28,3 +28,13 @@
 link to non CRAN-repos in a suggests/depends field of another package.
 
 Any help appreciated, best, Peter
+
+argh: sorry been a long day...
+
+The package version 
+  just sent was using the wrong data base; I have fixed 
+  this; the effect though is still the same as in the 
+  previous submission, but now, due to some more grids 
+  my colleagues have produced by now, the package has 
+  even grown a bit larger = 4.5 MB xz compressed, 10 MB 
+  during R CMD check... 
\ No newline at end of file

Modified: branches/robast-1.0/pkg/RobAStRDA/DESCRIPTION
===================================================================
--- branches/robast-1.0/pkg/RobAStRDA/DESCRIPTION	2016-04-23 22:04:35 UTC (rev 871)
+++ branches/robast-1.0/pkg/RobAStRDA/DESCRIPTION	2016-04-23 22:07:06 UTC (rev 872)
@@ -6,11 +6,14 @@
              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="helped with manual smoothing of the interpolators"), 
+		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 itwm.fraunhofer.de"))
+		person("Peter", "Ruckdeschel", role=c("cre", "cph"), email="peter.ruckdeschel at uni-oldenburg.de"))
 LazyData: yes
 ByteCompile: yes
 License: LGPL-3

Modified: branches/robast-1.0/pkg/RobAStRDA/R/Comment.R
===================================================================
--- branches/robast-1.0/pkg/RobAStRDA/R/Comment.R	2016-04-23 22:04:35 UTC (rev 871)
+++ branches/robast-1.0/pkg/RobAStRDA/R/Comment.R	2016-04-23 22:07:06 UTC (rev 872)
@@ -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: branches/robast-1.0/pkg/RobAStRDA/R/interpolAux.R
===================================================================
--- branches/robast-1.0/pkg/RobAStRDA/R/interpolAux.R	2016-04-23 22:04:35 UTC (rev 871)
+++ branches/robast-1.0/pkg/RobAStRDA/R/interpolAux.R	2016-04-23 22:07:06 UTC (rev 872)
@@ -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: branches/robast-1.0/pkg/RobAStRDA/R/sysdata.rda
===================================================================
(Binary files differ)