version 0.2-3

DESCRIPTION

@@ -2,8 +2,8 @@ Package: vcrpart
 Type: Package
 Title: Tree-Based Varying Coefficient Regression for Generalized Linear
         and Ordinal Mixed Models
-Version: 0.2-2
-Date: 2014-10-24
+Version: 0.2-3
+Date: 2014-11-24
 Authors@R: c(
   person("Reto", "Buergin", role = c("aut", "cre", "cph"), email = "rbuergin@gmx.ch"),
   person("Gilbert", "Ritschard", role = c("ctb", "ths"), 
@@ -17,8 +17,8 @@ Imports: stats, grid, graphics, methods, nlme, rpart, numDeriv, ucminf,
 URL: http://vcrpart.wordpress.com
 LazyLoad: yes
 NeedsCompilation: yes
-Packaged: 2014-11-07 17:28:59 UTC; reto
+Packaged: 2014-11-25 07:26:37 UTC; reto
 Author: Reto Buergin [aut, cre, cph],
   Gilbert Ritschard [ctb, ths]
 Repository: CRAN
-Date/Publication: 2014-11-08 02:13:19
+Date/Publication: 2014-11-25 09:24:41

MD5

@@ -1,20 +1,20 @@
-6d24e99c18c914344785bf01d1b715a6 *DESCRIPTION
-dfae833697182c8bb7f3b3572b2413e6 *NAMESPACE
-4ad832a72530f1d077cd0296dbcdecb7 *NEWS
+d9422ace5f5ef22d494ef37fbf19f831 *DESCRIPTION
+adcba7e46ec21c27cfea94b0454d05f9 *NAMESPACE
+dc7c790c64c073850f833738ae0a4f59 *NEWS
 8b40e51cf24df0eb99503a7070b84a93 *R/AAA.R
 b70bc37834d2f3b8c94d9d1c0020c614 *R/AllGeneric.R
 91d50efd23854dea04fca307a8c9ce97 *R/fvcm.R
 80b84163397dcda539b20d9ab51c56e7 *R/import.R
 0801b64fedea58af67c400f8b0e15bd2 *R/olmm-methods.R
 7e4d28175b9184bf3a0992401f277072 *R/olmm-utils.R
 ecdcf046dcbb466c4cf29bc7e9efaf8a *R/olmm.R
-b6c73716e8ea10810b0ef419e666217c *R/otsplot.R
+f4e45051571cc6994e06109412d540af *R/otsplot.R
 2af1d39305eedf8fc4128b14307e1317 *R/tvcm-cv.R
 32a6d478af156ed579d5909795d5cc98 *R/tvcm-methods.R
 d7de761ae5514253233d0540ddd85ec5 *R/tvcm-plot.R
-3d45fc591fdde7ffc882b8add1448436 *R/tvcm-utils.R
+cd08110234d8f5bbcb6833bab79abad8 *R/tvcm-utils.R
 efa265167aaa866b67a1acd78df5a859 *R/tvcm.R
-759f474cb091fa4062bec1eaabfdd8de *R/utils.R
+645eb28d9f7e8259dfb5edf34edbb34b *R/utils.R
 8562fccdfc9dc113b72f8eb8df66bf57 *data/PL.RData
 a2c9a87cf50549fd5802cbb6a88d281a *data/movie.RData
 72890e1f368da6d42d9cf9414c5396e0 *data/poverty.RData
@@ -23,18 +23,19 @@ ea62be4e5d10df5bc683725a7f7935f6 *data/schizo.RData
 80e2db657049956161e19e3e3c2bdd32 *data/vcrpart_1.RData
 cb803decf95c39567f648e1e5e0ddb45 *data/vcrpart_2.RData
 3ddf5ac69dc37253946b83c5bfd5fca7 *data/vcrpart_3.RData
-c2c0ec5bc767a17c65b372996eb094bc *inst/CITATION
+3cd9ba9d0476859aa2f24592acd9629b *inst/CITATION
 3bc5b4abcf89156967fbf807a9125ee6 *man/PL.Rd
+7141810b94046f0dbfa66fd3e0477a6a *man/contr-wsum.Rd
 02a3675b72ff9f699d45dab0183780b8 *man/fvcm-methods.Rd
-2ad931e91f7922156d825b32e68df10a *man/fvcm.Rd
+9b47db74c740a7be156dce5564cf350f *man/fvcm.Rd
 edb080c605c0dacb43ae037d6199abd4 *man/movie.Rd
-f66f99d711ddf32948fbf9b39c63b888 *man/olmm-control.Rd
-e7cc5a4ab52c84577dd32c4c04219ef1 *man/olmm-gefp.Rd
-c0635745a839f49a8ffaa66ffcacdb65 *man/olmm-methods.Rd
+01062811412189130594c3983d1868ee *man/olmm-control.Rd
+85658aad587f90ada41ff1808c725904 *man/olmm-gefp.Rd
+82d6b519900b895e47ac8bb7fe83971f *man/olmm-methods.Rd
 e58a118afbf3ff05498f9e5bbc73e893 *man/olmm-predict.Rd
 c914ee5c769aacd190558f0b967f1072 *man/olmm-summary.Rd
 99fd9612846185c8b253368ad62640bc *man/olmm.Rd
-913e87ac8d1158061b59644190ef8984 *man/otsplot.Rd
+79da070b250ee6646ecbda2e4d33fcb3 *man/otsplot.Rd
 b5d023f2e25d796fc013667de0bf0c2b *man/poverty.Rd
 198b4f1a33689dc49700c02f14e42510 *man/schizo.Rd
 830a40f120259f6c1e30cce2f06a224e *man/tvcglm.Rd
@@ -43,7 +44,7 @@ fc4d871d97b9315c31c720307d4b481c *man/tvcm-control.Rd
 c2434053aa241bce6f70d969bf385e25 *man/tvcm-methods.Rd
 0fa2459d031af80f1b4dbd7d3d1da797 *man/tvcm-plot.Rd
 395961700e672d7ba7f7901564e83892 *man/tvcm.Rd
-8c644871c09cae7e14ca6ad204a0dee3 *man/tvcolmm.Rd
+81b709a611fe8b1ac9d3d6ebb806bab2 *man/tvcolmm.Rd
 158d7c7045232f33bd35bf5c39dcedcf *man/vcrpart-demo.Rd
 a14ef1287c994bf09c716cc21d50517f *man/vcrpart-formula.Rd
 1e0af65b11fb043bd18f7982291d076f *src/Makevars

NAMESPACE

@@ -28,6 +28,7 @@ export(
   adjacent,
   baseline,
   cumulative,
+  contr.wsum,
   cvloss,
   extract,
   fixef,

NEWS

@@ -1,3 +1,14 @@
+Changes in Version 0.2-3
+
+    o    Added contr.wsum function
+
+    o    Added 'seed' argument to 'otsplot_control'
+
+    o    Internal changes for exhaustive search of 'tvcm'
+
+    o    Improved documentation
+
+
 Changes in Version 0.2-2
 
     o    Added seed option to 'tvcm_control'.

R/otsplot.R

@@ -1,6 +1,6 @@
 ##' -------------------------------------------------------- #
 ##' Author:          Reto Buergin, rbuergin@gmx.ch
-##' Date:            2014-09-08
+##' Date:            2014-11-10
 ##'
 ##' Description:
 ##' Ordinal time series plot and utility functions.
@@ -23,12 +23,13 @@
 ##'                       sequences
 ##'
 ##' Modifications:
+##' 2014-11-10: added 'seed' argument to 'otsplot'
 ##' 2014-09-08: partial substitution of 'rep' by 'rep.int'
 ##' 2014-09-07: added header
 ##' -------------------------------------------------------- #
 
 otsplot_control <- function(cex = 1, lwd = 1/4, col = NULL,
-                            hide.col = grey(0.8),
+                            hide.col = grey(0.8), seed = NULL,
                             lorder = c("background", "foreground") ,
                             lcourse = c("upwards", "downwards"),
                             grid.scale = 1/5, grid.lwd = 1/2,
@@ -108,6 +109,12 @@ otsplot.default <- function(x, y, subject, weights, groups,
   cArgs <- do.call("olmm_control", cArgs)
   control <- appendDefArgs(cArgs, control)
 
+  ## set seed
+  if (!exists(".Random.seed", envir = .GlobalEnv)) runif(1)
+  oldSeed <- get(".Random.seed", mode="numeric", envir=globalenv())
+  if (!is.null(control$seed)) set.seed(control$seed)
+  RNGstate <- .Random.seed
+
   ## check compatibility between 'filter' and 'lorder' control argument
   if (!is.null(filter)) control$plot_gp$lorder <- "foreground"
 
@@ -451,6 +458,9 @@ otsplot.default <- function(x, y, subject, weights, groups,
 
   pts <- reshape(pts, varying = list(freq = freqCols, width = widthCols, col = colCols), v.names = c("freq", "width", "col"), timevar = "groups", times = 1L:nGroups, direction = "long")
   lns <- reshape(lns, varying = list(freq = freqCols, width = widthCols, col = colCols), v.names = c("freq", "width", "col"), timevar = "groups", times = 1L:nGroups, direction = "long")
+
+  ## reset seed
+  assign(".Random.seed", oldSeed, envir=globalenv())
 
   ## plot data object
   return(structure(