[Robast-commits] r566 - in branches/robast-0.9/pkg: ROptEst RobAStBase RobExtremes RobExtremes/inst/AddMaterial/interpolation

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Sat Jan 26 21:33:49 CET 2013


Author: ruckdeschel
Date: 2013-01-26 21:33:49 +0100 (Sat, 26 Jan 2013)
New Revision: 566

Modified:
   branches/robast-0.9/pkg/ROptEst/DESCRIPTION
   branches/robast-0.9/pkg/RobAStBase/DESCRIPTION
   branches/robast-0.9/pkg/RobExtremes/DESCRIPTION
   branches/robast-0.9/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationsmanipulations.R
Log:
RobASt-Pkgs: DESCRIPTION depends become stricter (requiring distrMod, distrEx, distr >=2.4 to be on the safe side)

Modified: branches/robast-0.9/pkg/ROptEst/DESCRIPTION
===================================================================
--- branches/robast-0.9/pkg/ROptEst/DESCRIPTION	2013-01-26 13:50:54 UTC (rev 565)
+++ branches/robast-0.9/pkg/ROptEst/DESCRIPTION	2013-01-26 20:33:49 UTC (rev 566)
@@ -4,7 +4,7 @@
 Title: Optimally robust estimation
 Description: Optimally robust estimation in general smoothly parameterized models using S4
         classes and methods.
-Depends: R(>= 2.10.0), methods, distr(>= 2.0), distrEx(>= 2.0), distrMod(>= 2.0), RandVar(>=
+Depends: R(>= 2.10.0), methods, distr(>= 2.4), distrEx(>= 2.4), distrMod(>= 2.4), RandVar(>=
         0.6.4), RobAStBase
 Suggests: RobLox, MASS
 Author: Matthias Kohl, Peter Ruckdeschel

Modified: branches/robast-0.9/pkg/RobAStBase/DESCRIPTION
===================================================================
--- branches/robast-0.9/pkg/RobAStBase/DESCRIPTION	2013-01-26 13:50:54 UTC (rev 565)
+++ branches/robast-0.9/pkg/RobAStBase/DESCRIPTION	2013-01-26 20:33:49 UTC (rev 566)
@@ -3,7 +3,7 @@
 Date: 2012-06-05
 Title: Robust Asymptotic Statistics
 Description: Base S4-classes and functions for robust asymptotic statistics.
-Depends: R(>= 2.12.0), methods, rrcov, distr(>= 2.0), distrEx(>= 2.0), distrMod(>= 2.0), RandVar(>=
+Depends: R(>= 2.12.0), methods, rrcov, distr(>= 2.4), distrEx(>= 2.4), distrMod(>= 2.4), RandVar(>=
         0.6.3)
 Suggests: ROptEst
 Author: Matthias Kohl, Peter Ruckdeschel

Modified: branches/robast-0.9/pkg/RobExtremes/DESCRIPTION
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/DESCRIPTION	2013-01-26 13:50:54 UTC (rev 565)
+++ branches/robast-0.9/pkg/RobExtremes/DESCRIPTION	2013-01-26 20:33:49 UTC (rev 566)
@@ -5,8 +5,8 @@
 Description: Optimally robust estimation for extreme value distributions 
              using S4 classes and methods (based on packages distr, distrEx, 
 			 distrMod, RobAStBase, and ROptEst)
-Depends: R (>= 2.14.0), methods, distr(>= 2.3), distrEx(>= 2.3), RandVar(>= 0.8), 
-         distrMod(>= 2.4), RobAStBase(>= 0.8), ROptEst(>= 0.8), robustbase(>= 0.8-0),
+Depends: R (>= 2.14.0), methods, distr(>= 2.4), distrEx(>= 2.4), RandVar(>= 0.8), 
+         distrMod(>= 2.4), RobAStBase(>= 0.9), ROptEst(>= 0.9), robustbase(>= 0.8-0),
 		 evd, actuar
 Author: Peter Ruckdeschel, Matthias Kohl, Nataliya Horbenko
 Maintainer: Peter Ruckdeschel <peter.ruckdeschel at itwm.fraunhofer.de>

Modified: branches/robast-0.9/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationsmanipulations.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationsmanipulations.R	2013-01-26 13:50:54 UTC (rev 565)
+++ branches/robast-0.9/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationsmanipulations.R	2013-01-26 20:33:49 UTC (rev 566)
@@ -74,12 +74,40 @@
 
 ls(envir=nE); f(); ls(envir=nE)
 
+
+fu <- function(xi){
+  ext <- if(getRversion()<"2.16") "\\.O$" else "\\.N$"
+  lapply(grep(ext,w,val=T), function(x) {
+    print(x)
+    u <- get(x,envir=nE);
+    for(i in 1:length(u)){
+        ni <- names(u)[i]
+        print(ni)
+        print(!grepl("Sn",x))
+        if(!grepl("Sn",x)){
+           len <- length(u[[i]]$fct)
+           yi <- sapply(1:len, function(j) u[[i]]$fct[[j]](xi))
+           if(length(xi)==1) yi <- matrix(yi,ncol=len)
+           colnames(yi) <- c("b","a1.a", "a2.a", "a1.i", "a2.i", "A11.a",
+                   "A12.a", "A21.a", "A22.a", "A11.i", "A12.i", "A21.i", "A22.i")
+           print(cbind(xi,yi))
+        }else{
+           Sn <- u[[i]]$fct(xi)
+           print(cbind(xi,Sn))
+        }
+    }
+    return(invisible(NULL))
+    })
+  return(invisible(NULL))
+}
+
 require(RobExtremes)
 .basepath <- "C:/rtest/RobASt/branches/robast-0.9/pkg"
 .myFolder <- file.path(.basepath,"RobExtremesBuffer")
 .myFolderA <- file.path(.basepath,"RobExtremesBuffer/all2")
 .myFolderW <- file.path(.basepath,"RobExtremesBuffer/WTS2")
 fn2 <- file.path(.myFolder,"tmp2/sysdata.rda")
+fn3 <- file.path(.myFolder,"tmp3/sysdata.rda")
 fn00=file.path(.myFolderW,"tmp0/sysdata.rda")
 fn01=file.path(.myFolderW,"tmp1/sysdata.rda")
 fn02=file.path(.myFolderW,"tmp2/sysdata.rda")
@@ -88,12 +116,12 @@
 #fn2=file.path(.myFoldera,"sysdata-1.rda")
 #RobExtremes:::.recomputeInterpolators(c(fn01,fn02, fn1), sysRdaFolder = .myFolderA, overwrite=TRUE, translate=FALSE)
 file.copy(fnA,fn1, overwrite=T)
-RobExtremes:::.recomputeInterpolators(c(fn02, fn01, fn1), sysRdaFolder = .myFolderA, overwrite=TRUE, translate=FALSE)
+RobExtremes:::.recomputeInterpolators(c(fn3,fn1), sysRdaFolder = .myFolderA, overwrite=TRUE, translate=FALSE)
 nE= new.env()
 load(fnA,envir=nE)
 w = ls(all=T,envir=nE)
 lapply(w, function(x) {u=get(x,envir=nE); print(x);print(names(u))})
-lapply(grep("\\.N$",w,val=T), function(x) {u=get(x,envir=nE); for(i in 1:length(u)){if(length(u)<4){ print(u[[i]]$fct[[1]](0.3)); print(u[[i]]$fct[[2]](0.3))}else{print(u[[i]]$fct(0.3))}}})
+#lapply(grep("\\.N$",w,val=T), function(x) {u=get(x,envir=nE); for(i in 1:length(u)){if(length(u)<4){ print(u[[i]]$fct[[1]](0.3)); print(u[[i]]$fct[[2]](0.3))}else{print(u[[i]]$fct(0.3))}}})
 
 .basepath <- "C:/rtest/RobASt/branches/robast-0.9/pkg"
 .myFolderA <- file.path(.basepath,"RobExtremesBuffer/all2")
@@ -106,30 +134,5 @@
 load(fnA,envir=nE)
 w = ls(all=T,envir=nE)
 lapply(w, function(x) {u=get(x,envir=nE); print(x);print(names(u))})
-lapply(grep("\\.O$",w,val=T), function(x) {u=get(x,envir=nE); for(i in 1:length(u)){if(length(u)<4){ print(u[[i]]$fct[[1]](0.3)); print(u[[i]]$fct[[2]](0.3))}else{print(u[[i]]$fct(0.3))}}})
-
-fu <- function(xi){
-  ext <- if(getRversion()<"2.16") "\\.O$" else "\\.N$"
-  lapply(grep(ext,w,val=T), function(x) {
-    print(x)
-    u <- get(x,envir=nE);
-    for(i in 1:length(u)){
-        ni <- names(u)[i]
-        print(ni)
-        print(!grepl("Sn",x))
-        if(!grepl("Sn",x)){
-           len <- length(u[[i]]$fct)
-           yi <- sapply(1:len, function(j) u[[i]]$fct[[j]](xi))
-           if(length(xi)==1) yi <- matrix(yi,ncol=len)
-           colnames(yi) <- c("b","a1.a", "a2.a", "a1.i", "a2.i", "A11.a",
-                   "A12.a", "A21.a", "A22.a", "A11.i", "A12.i", "A21.i", "A22.i")
-           print(cbind(xi,yi))
-        }else{
-           Sn <- u[[i]]$fct(xi)
-           print(cbind(xi,Sn))
-        }
-    }
-    return(invisible(NULL))
-    })
-  return(invisible(NULL))
-}
+#lapply(grep("\\.O$",w,val=T), function(x) {u=get(x,envir=nE); for(i in 1:length(u)){if(length(u)<4){ print(u[[i]]$fct[[1]](0.3)); print(u[[i]]$fct[[2]](0.3))}else{print(u[[i]]$fct(0.3))}}})
+fu(c(0.05,0.2,0.7,1,1.5,2,4))



More information about the Robast-commits mailing list