[Robast-commits] r707 - branches/robast-0.9/pkg/RandVar/tests branches/robast-0.9/pkg/RobLox pkg/RobLox

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Thu Sep 12 12:24:23 CEST 2013


Author: stamats
Date: 2013-09-12 12:24:23 +0200 (Thu, 12 Sep 2013)
New Revision: 707

Modified:
   branches/robast-0.9/pkg/RandVar/tests/tests.Rout.save
   branches/robast-0.9/pkg/RobLox/DESCRIPTION
   branches/robast-0.9/pkg/RobLox/NAMESPACE
   pkg/RobLox/DESCRIPTION
   pkg/RobLox/NAMESPACE
Log:
some changes on description and namespace file

Modified: branches/robast-0.9/pkg/RandVar/tests/tests.Rout.save
===================================================================
--- branches/robast-0.9/pkg/RandVar/tests/tests.Rout.save	2013-09-12 10:19:55 UTC (rev 706)
+++ branches/robast-0.9/pkg/RandVar/tests/tests.Rout.save	2013-09-12 10:24:23 UTC (rev 707)
@@ -1,7 +1,6 @@
 
-R Under development (unstable) (2013-01-09 r61595) -- "Unsuffered Consequences"
+R Under development (unstable) (2013-09-11 r63902) -- "Unsuffered Consequences"
 Copyright (C) 2013 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
 Platform: x86_64-unknown-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -17,17 +16,18 @@
 Type 'q()' to quit R.
 
 > library(RandVar)
+Loading required package: distr
 Loading required package: startupmsg
 :startupmsg>  Utilities for start-up messages (version 0.8)
 :startupmsg> 
 :startupmsg>  For more information see ?"startupmsg",
 :startupmsg>  NEWS("startupmsg")
 
-Loading required package: distr
 Loading required package: sfsmisc
 Loading required package: SweaveListingUtils
 :SweaveListingUtils>  Utilities for Sweave together with
-:SweaveListingUtils>  TeX listings package (version 0.6)
+:SweaveListingUtils>  TeX listings package (version
+:SweaveListingUtils>  0.6.1)
 :SweaveListingUtils> 
 :SweaveListingUtils>  NOTE: Support for this package
 :SweaveListingUtils>  will stop soon.
@@ -55,7 +55,7 @@
 
 Attaching package: 'SweaveListingUtils'
 
-The following object is masked from 'package:base':
+The following objects are masked from 'package:base':
 
     library, require
 
@@ -81,7 +81,7 @@
 
 Attaching package: 'distr'
 
-The following object is masked from 'package:stats':
+The following objects are masked from 'package:stats':
 
     df, qqplot, sd
 
@@ -105,11 +105,11 @@
 
 Attaching package: 'distrEx'
 
-The following object is masked from 'package:stats':
+The following objects are masked from 'package:stats':
 
     IQR, mad, median, var
 
-:RandVar>  Implementation of random variables (version 0.9)
+:RandVar>  Implementation of random variables (version 0.9.2)
 :RandVar> 
 :RandVar>  For more information see ?"RandVar", NEWS("RandVar"), as
 :RandVar>  well as
@@ -139,7 +139,7 @@
 function (x) 
 {
 }
-<environment: 0x64561a8>
+<environment: 0x40946b0>
 
 > Domain(R1)
 NULL
@@ -409,7 +409,7 @@
     }
     t(f(x))
 }
-<environment: 0x5f5be28>
+<environment: 0x65c6580>
 
 > dimension(R6)
 [1] 6
@@ -498,13 +498,13 @@
 > ## "Math" group
 > system.time(Map(log(abs(R4))), gcFirst = TRUE)
    user  system elapsed 
-  0.004   0.000   0.001 
+  0.004   0.000   0.002 
 > system.time(Map(gamma(R7)), gcFirst = TRUE)
    user  system elapsed 
   0.000   0.000   0.002 
 > system.time(Map(exp(RL1)[[1]]), gcFirst = TRUE)
    user  system elapsed 
-  0.004   0.000   0.005 
+  0.004   0.000   0.003 
 > 
 > 
 > ## "Arith" group
@@ -521,7 +521,7 @@
     }
     1 * f2(x)
 }
-<environment: 0x99eff68>
+<environment: 0x683c7d0>
 
 [[2]]
 function (x) 
@@ -532,7 +532,7 @@
     }
     3 * f2(x)
 }
-<environment: 0x99eff68>
+<environment: 0x683c7d0>
 
 [[3]]
 function (x) 
@@ -543,7 +543,7 @@
     }
     5 * f2(x)
 }
-<environment: 0x99eff68>
+<environment: 0x683c7d0>
 
 [[4]]
 function (x) 
@@ -554,7 +554,7 @@
     }
     1 * f2(x)
 }
-<environment: 0x99eff68>
+<environment: 0x683c7d0>
 
 Warning message:
 In c(1, 3, 5) * R3 :
@@ -572,7 +572,7 @@
     }
     1:2 * f2(x)
 }
-<environment: 0x98a1940>
+<environment: 0x6784a18>
 
 [[2]]
 function (x) 
@@ -583,7 +583,7 @@
     }
     1:2 * f2(x)
 }
-<environment: 0x98a1940>
+<environment: 0x6784a18>
 
 [[3]]
 function (x) 
@@ -594,7 +594,7 @@
     }
     1:2 * f2(x)
 }
-<environment: 0x98a1940>
+<environment: 0x6784a18>
 
 [[4]]
 function (x) 
@@ -605,7 +605,7 @@
     }
     1:2 * f2(x)
 }
-<environment: 0x98a1940>
+<environment: 0x6784a18>
 
 > Map(2/R6)
 [[1]]
@@ -617,7 +617,7 @@
     }
     2/f2(x)
 }
-<environment: 0x97cb968>
+<environment: 0x66da7e0>
 
 [[2]]
 function (x) 
@@ -628,7 +628,7 @@
     }
     2/f2(x)
 }
-<environment: 0x97cb968>
+<environment: 0x66da7e0>
 
 [[3]]
 function (x) 
@@ -639,7 +639,7 @@
     }
     2/f2(x)
 }
-<environment: 0x97cb968>
+<environment: 0x66da7e0>
 
 [[4]]
 function (x) 
@@ -650,7 +650,7 @@
     }
     2/f2(x)
 }
-<environment: 0x97cb968>
+<environment: 0x66da7e0>
 
 [[5]]
 function (x) 
@@ -661,7 +661,7 @@
     }
     2/f2(x)
 }
-<environment: 0x97cb968>
+<environment: 0x66da7e0>
 
 [[6]]
 function (x) 
@@ -672,7 +672,7 @@
     }
     2/f2(x)
 }
-<environment: 0x97cb968>
+<environment: 0x66da7e0>
 
 > Map(c(1,3,5) %% R6)
 [[1]]
@@ -684,7 +684,7 @@
     }
     1%%f2(x)
 }
-<environment: 0x9709210>
+<environment: 0x6629168>
 
 [[2]]
 function (x) 
@@ -695,7 +695,7 @@
     }
     3%%f2(x)
 }
-<environment: 0x9709210>
+<environment: 0x6629168>
 
 [[3]]
 function (x) 
@@ -706,7 +706,7 @@
     }
     5%%f2(x)
 }
-<environment: 0x9709210>
+<environment: 0x6629168>
 
 [[4]]
 function (x) 
@@ -717,7 +717,7 @@
     }
     1%%f2(x)
 }
-<environment: 0x9709210>
+<environment: 0x6629168>
 
 [[5]]
 function (x) 
@@ -728,7 +728,7 @@
     }
     3%%f2(x)
 }
-<environment: 0x9709210>
+<environment: 0x6629168>
 
 [[6]]
 function (x) 
@@ -739,7 +739,7 @@
     }
     5%%f2(x)
 }
-<environment: 0x9709210>
+<environment: 0x6629168>
 
 > Map(R4 - 5)
 [[1]]
@@ -751,7 +751,7 @@
     }
     f1(x) - c(5, 5)
 }
-<environment: 0x969f040>
+<environment: 0x65ccb90>
 
 [[2]]
 function (x) 
@@ -762,7 +762,7 @@
     }
     f1(x) - c(5, 5)
 }
-<environment: 0x969f040>
+<environment: 0x65ccb90>
 
 [[3]]
 function (x) 
@@ -773,7 +773,7 @@
     }
     f1(x) - c(5, 5)
 }
-<environment: 0x969f040>
+<environment: 0x65ccb90>
 
 [[4]]
 function (x) 
@@ -784,7 +784,7 @@
     }
     f1(x) - c(5, 5)
 }
-<environment: 0x969f040>
+<environment: 0x65ccb90>
 
 > Map(R6 %/% 2)
 [[1]]
@@ -796,7 +796,7 @@
     }
     f1(x)%/%2
 }
-<environment: 0x95c14a8>
+<environment: 0x652f718>
 
 [[2]]
 function (x) 
@@ -807,7 +807,7 @@
     }
     f1(x)%/%2
 }
-<environment: 0x95c14a8>
+<environment: 0x652f718>
 
 [[3]]
 function (x) 
@@ -818,7 +818,7 @@
     }
     f1(x)%/%2
 }
-<environment: 0x95c14a8>
+<environment: 0x652f718>
 
 [[4]]
 function (x) 
@@ -829,7 +829,7 @@
     }
     f1(x)%/%2
 }
-<environment: 0x95c14a8>
+<environment: 0x652f718>
 
 [[5]]
 function (x) 
@@ -840,7 +840,7 @@
     }
     f1(x)%/%2
 }
-<environment: 0x95c14a8>
+<environment: 0x652f718>
 
 [[6]]
 function (x) 
@@ -851,7 +851,7 @@
     }
     f1(x)%/%2
 }
-<environment: 0x95c14a8>
+<environment: 0x652f718>
 
 > Map(R3 ^ R3)
 [[1]]
@@ -867,7 +867,7 @@
     }
     f1(x)^f2(x)
 }
-<environment: 0x92aef90>
+<environment: 0x6405690>
 
 [[2]]
 function (x) 
@@ -882,7 +882,7 @@
     }
     f1(x)^f2(x)
 }
-<environment: 0x92aef90>
+<environment: 0x6405690>
 
 [[3]]
 function (x) 
@@ -897,7 +897,7 @@
     }
     f1(x)^f2(x)
 }
-<environment: 0x92aef90>
+<environment: 0x6405690>
 
 [[4]]
 function (x) 
@@ -912,7 +912,7 @@
     }
     f1(x)^f2(x)
 }
-<environment: 0x92aef90>
+<environment: 0x6405690>
 
 > Map(R7 * R7)
 [[1]]
@@ -928,7 +928,7 @@
     }
     f1(x) * f2(x)
 }
-<environment: 0x65731f8>
+<environment: 0x6310318>
 
 [[2]]
 function (x) 
@@ -943,7 +943,7 @@
     }
     f1(x) * f2(x)
 }
-<environment: 0x65731f8>
+<environment: 0x6310318>
 
 [[3]]
 function (x) 
@@ -958,7 +958,7 @@
     }
     f1(x) * f2(x)
 }
-<environment: 0x65731f8>
+<environment: 0x6310318>
 
 [[4]]
 function (x) 
@@ -973,7 +973,7 @@
     }
     f1(x) * f2(x)
 }
-<environment: 0x65731f8>
+<environment: 0x6310318>
 
 > Map((1 + RL1)[[1]])
 [[1]]
@@ -985,7 +985,7 @@
     }
     1 + f2(x)
 }
-<environment: 0x64ee8d0>
+<environment: 0x629da28>
 
 [[2]]
 function (x) 
@@ -996,7 +996,7 @@
     }
     1 + f2(x)
 }
-<environment: 0x64ee8d0>
+<environment: 0x629da28>
 
 [[3]]
 function (x) 
@@ -1007,7 +1007,7 @@
     }
     1 + f2(x)
 }
-<environment: 0x64ee8d0>
+<environment: 0x629da28>
 
 [[4]]
 function (x) 
@@ -1018,7 +1018,7 @@
     }
     1 + f2(x)
 }
-<environment: 0x64ee8d0>
+<environment: 0x629da28>
 
 > Map((RL1 * 2)[[2]])
 [[1]]
@@ -1030,7 +1030,7 @@
     }
     f1(x) * 2
 }
-<environment: 0x6434530>
+<environment: 0x4b96f88>
 
 [[2]]
 function (x) 
@@ -1041,7 +1041,7 @@
     }
     f1(x) * 2
 }
-<environment: 0x6434530>
+<environment: 0x4b96f88>
 
 [[3]]
 function (x) 
@@ -1052,7 +1052,7 @@
     }
     f1(x) * 2
 }
-<environment: 0x6434530>
+<environment: 0x4b96f88>
 
 [[4]]
 function (x) 
@@ -1063,7 +1063,7 @@
     }
     f1(x) * 2
 }
-<environment: 0x6434530>
+<environment: 0x4b96f88>
 
 [[5]]
 function (x) 
@@ -1074,7 +1074,7 @@
     }
     f1(x) * 2
 }
-<environment: 0x6434530>
+<environment: 0x4b96f88>
 
 [[6]]
 function (x) 
@@ -1085,11 +1085,11 @@
     }
     f1(x) * 2
 }
-<environment: 0x6434530>
+<environment: 0x4b96f88>
 
 > system.time(Map((RL1 %% RL1)[[3]]), gcFirst = TRUE)
    user  system elapsed 
-  0.004   0.000   0.006 
+  0.004   0.000   0.005 
 > 
 > 
 > ## "%*%"
@@ -1159,7 +1159,7 @@
     }
     f1(x) + c(13L, 15L) %*% f2(x)
 }
-<environment: 0x976a010>
+<environment: 0x665fe78>
 > M1[2,]
 [1]  2  4  6  8 10 12 14 16
 > Map(R8)[[2]]
@@ -1195,7 +1195,7 @@
     }
     f1(x) + c(14L, 16L) %*% f2(x)
 }
-<environment: 0x976a010>
+<environment: 0x665fe78>
 > M2 <- matrix(1:2, ncol = 2)
 > (R9 <- M2 %*% R7)
 An object of class "EuclRandMatrix" 
@@ -1245,7 +1245,7 @@
     }
     f1(x) + 2L %*% f2(x)
 }
-<environment: 0x92bd730>
+<environment: 0x63ec358>
 
 [[2]]
 function (x) 
@@ -1264,7 +1264,7 @@
     }
     f1(x) + 2L %*% f2(x)
 }
-<environment: 0x661feb8>
+<environment: 0x6347510>
 
 > Map(1:4 %*% R3) # inner product
 [[1]]
@@ -1300,7 +1300,7 @@
     }
     f1(x) + 4L %*% f2(x)
 }
-<environment: 0x64a2b30>
+<environment: 0x5b79018>
 
 > Map(1:2 %*% R7) # corresponds to Map(t(1:2) %*% R7)
 [[1]]
@@ -1320,7 +1320,7 @@
     }
     f1(x) + 2L %*% f2(x)
 }
-<environment: 0x5e672c0>
+<environment: 0x4c1a1c8>
 
 [[2]]
 function (x) 
@@ -1339,7 +1339,7 @@
     }
     f1(x) + 2L %*% f2(x)
 }
-<environment: 0x5400900>
+<environment: 0x4b32950>
 
 > Map(R4 %*% 1:8) # inner product
 [[1]]
@@ -1411,7 +1411,7 @@
     }
     t(f(x))
 }
-<environment: 0x620b6e0>
+<environment: 0x486ade8>
 
 > Map(R9 %*% 3:4)
 [[1]]
@@ -1467,7 +1467,7 @@
     }
     t(f(x))
 }
-<environment: 0x6081da8>
+<environment: 0x46990f8>
 
 > Map(R9 %*% matrix(1:4, nrow = 2))
 [[1]]
@@ -1523,7 +1523,7 @@
     }
     t(f(x))
 }
-<environment: 0x9807a68>
+<environment: 0x443c0c8>
 
 [[2]]
 function (x) 
@@ -1578,7 +1578,7 @@
     }
     t(f(x))
 }
-<environment: 0x9807a68>
+<environment: 0x443c0c8>
 
 > (R10 <- R3 %*% matrix(1:16, ncol = 4))
 An object of class "EuclRandMatrix" 
@@ -1623,7 +1623,7 @@
     }
     t(f(x))
 }
-<environment: 0x95d3128>
+<environment: 0x420e730>
 
 [[2]]
 function (x) 
@@ -1662,7 +1662,7 @@
     }
     t(f(x))
 }
-<environment: 0x95d3128>
+<environment: 0x420e730>
 
 [[3]]
 function (x) 
@@ -1701,7 +1701,7 @@
     }
     t(f(x))
 }
-<environment: 0x95d3128>
+<environment: 0x420e730>
 
 [[4]]
 function (x) 
@@ -1740,7 +1740,7 @@
     }
     t(f(x))
 }
-<environment: 0x95d3128>
+<environment: 0x420e730>
 
 > R3 %*% R3 # inner product
 An object of class "EuclRandMatrix" 
@@ -1754,7 +1754,7 @@
 Range:	Euclidean Space with dimension 1 
 > system.time(R9 %*% R7, gcFirst = TRUE)
    user  system elapsed 
-  0.004   0.000   0.005 
+  0.004   0.000   0.004 
 > (RL3 <- diag(dimension(RL1)) %*% RL1)
 An object of class "EuclRandMatrix" 
 Dim of Map:	 14 1 
@@ -1765,7 +1765,7 @@
 > ## %m% "matrix multiplication" for 'EuclRandVarList'
 > system.time(RL4 <- EuclRandVarList(t(R3[1:2]), R7) %m% EuclRandVarList(R6, R9), gcFirst = TRUE)
    user  system elapsed 
-  0.028   0.000   0.027 
+  0.028   0.000   0.028 
 > 
 > ## integration
 > MVD <- DiscreteMVDistribution(supp = matrix(c(r(Pois(5))(10), r(Pois(5))(10)), ncol = 2))
@@ -1976,4 +1976,4 @@
 > q("no")
 > proc.time()
    user  system elapsed 
- 13.072   0.084  13.197 
+ 12.192   0.088  12.319 

Modified: branches/robast-0.9/pkg/RobLox/DESCRIPTION
===================================================================
--- branches/robast-0.9/pkg/RobLox/DESCRIPTION	2013-09-12 10:19:55 UTC (rev 706)
+++ branches/robast-0.9/pkg/RobLox/DESCRIPTION	2013-09-12 10:24:23 UTC (rev 707)
@@ -1,11 +1,11 @@
 Package: RobLox
 Version: 0.9.1
-Date: 2013-01-29
+Date: 2013-09-11
 Title: Optimally robust influence curves and estimators for location and scale
 Description: Functions for the determination of optimally robust influence curves and
         estimators in case of normal location and/or scale
-Depends: R(>= 2.14.0), stats, lattice, RColorBrewer, RandVar(>= 0.9.2), Biobase, 
-         distr(>= 2.5.2), distrMod(>= 2.5.2), RobAStBase(>= 0.9)
+Depends: R(>= 2.14.0), stats, distrMod(>= 2.5.2), RobAStBase(>= 0.9)
+Imports: lattice, RColorBrewer, Biobase, RandVar(>= 0.9.2), distr(>= 2.5.2)
 Suggests: MASS
 Author: Matthias Kohl <Matthias.Kohl at stamats.de>
 Maintainer: Matthias Kohl <Matthias.Kohl at stamats.de>

Modified: branches/robast-0.9/pkg/RobLox/NAMESPACE
===================================================================
--- branches/robast-0.9/pkg/RobLox/NAMESPACE	2013-09-12 10:19:55 UTC (rev 706)
+++ branches/robast-0.9/pkg/RobLox/NAMESPACE	2013-09-12 10:24:23 UTC (rev 707)
@@ -5,9 +5,9 @@
 importClassesFrom("distr","Reals")
 importFrom("RandVar", "EuclRandVarList", "RealRandVariable")		 
 importClassesFrom("RandVar", "EuclRandVarList", "RealRandVariable")		 
-importFrom("distrMod","NormLocationFamily","NormLocationScaleFamily","symmetricBias", "NormType")
-importClassesFrom("distrMod","L2LocationFamily","NormLocationFamily","NormLocationScaleFamily")
-importMethodsFrom("distrMod","distribution","main", "addInfo<-", "Infos", "Infos<-",
+importFrom("distrMod", "NormLocationFamily", "NormLocationScaleFamily", "symmetricBias", "NormType")
+importClassesFrom("distrMod", "L2LocationFamily", "NormLocationFamily", "NormLocationScaleFamily")
+importMethodsFrom("distrMod", "distribution", "main", "addInfo<-", "Infos", "Infos<-",
                   "normtype", "biastype","normtype<-","biastype<-", "estimate")
 importFrom("RobAStBase","generateIC","ContNeighborhood")
 importClassesFrom("RobAStBase","HampelWeight","ALEstimate","kStepEstimate","ContNeighborhood")

Modified: pkg/RobLox/DESCRIPTION
===================================================================
--- pkg/RobLox/DESCRIPTION	2013-09-12 10:19:55 UTC (rev 706)
+++ pkg/RobLox/DESCRIPTION	2013-09-12 10:24:23 UTC (rev 707)
@@ -4,8 +4,8 @@
 Title: Optimally robust influence curves and estimators for location and scale
 Description: Functions for the determination of optimally robust influence curves and
         estimators in case of normal location and/or scale
-Depends: R(>= 2.14.0), stats, lattice, RColorBrewer, RandVar, Biobase, distr(>= 2.5.2), distrMod(>= 2.5.2),
-        RobAStBase(>= 0.9.2)
+Depends: R(>= 2.14.0), stats, distrMod(>= 2.5.2), RobAStBase(>= 0.9)
+Imports: lattice, RColorBrewer, Biobase, RandVar(>= 0.9.2), distr(>= 2.5.2)
 Suggests: MASS
 Author: Matthias Kohl <Matthias.Kohl at stamats.de>
 Maintainer: Matthias Kohl <Matthias.Kohl at stamats.de>

Modified: pkg/RobLox/NAMESPACE
===================================================================
--- pkg/RobLox/NAMESPACE	2013-09-12 10:19:55 UTC (rev 706)
+++ pkg/RobLox/NAMESPACE	2013-09-12 10:24:23 UTC (rev 707)
@@ -3,11 +3,11 @@
 importFrom("RColorBrewer","brewer.pal")
 importFrom("distr", "q","Reals")
 importClassesFrom("distr","Reals")
-importFrom("RandVar", "EuclRandVarList", "RealRandVariable")		 
-importClassesFrom("RandVar", "EuclRandVarList", "RealRandVariable")		 
-importFrom("distrMod","NormLocationFamily","NormLocationScaleFamily","symmetricBias", "NormType")
-importClassesFrom("distrMod","L2LocationFamily","NormLocationFamily","NormLocationScaleFamily")
-importMethodsFrom("distrMod","distribution","main", "addInfo<-", "Infos", "Infos<-",
+importFrom("RandVar", "EuclRandVarList", "RealRandVariable")         
+importClassesFrom("RandVar", "EuclRandVarList", "RealRandVariable")      
+importFrom("distrMod", "NormLocationFamily", "NormLocationScaleFamily", "symmetricBias", "NormType")
+importClassesFrom("distrMod", "L2LocationFamily", "NormLocationFamily", "NormLocationScaleFamily")
+importMethodsFrom("distrMod", "distribution", "main", "addInfo<-", "Infos", "Infos<-",
                   "normtype", "biastype","normtype<-","biastype<-", "estimate")
 importFrom("RobAStBase","generateIC","ContNeighborhood")
 importClassesFrom("RobAStBase","HampelWeight","ALEstimate","kStepEstimate","ContNeighborhood")



More information about the Robast-commits mailing list