Skip to content

Commit

Permalink
version 1.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mjpnijmeijer authored and cran-robot committed Jun 15, 2017
1 parent 0c3ffc4 commit 6fa3144
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 14 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
@@ -1,7 +1,7 @@
Package: lmvar
Type: Package
Title: Linear Regression with Non-Constant Variances
Version: 1.2.0
Version: 1.2.1
Author: Posthuma Partners <info@posthuma-partners.nl>
Maintainer: Marco Nijmeijer <nijmeijer@posthuma-partners.nl>
Description: Runs a linear regression in which both the expected value and the variance can vary per observation. The expected values mu follows the standard linear model mu = X_mu * beta_mu. The standard deviation sigma follows the model log(sigma) = X_sigma * beta_sigma. The package comes with two vignettes: 'Intro' gives an introduction, 'Math' gives mathematical details.
Expand All @@ -13,6 +13,6 @@ RoxygenNote: 6.0.1
Suggests: testthat, knitr, rmarkdown, R.rsp, MASS
VignetteBuilder: knitr, R.rsp
NeedsCompilation: no
Packaged: 2017-06-13 15:51:55 UTC; Marc
Packaged: 2017-06-15 08:16:57 UTC; Marc
Repository: CRAN
Date/Publication: 2017-06-13 16:00:20 UTC
Date/Publication: 2017-06-15 15:08:33 UTC
12 changes: 6 additions & 6 deletions MD5
@@ -1,12 +1,12 @@
5e0e41df192d7ed45dde3cdeaed5f978 *DESCRIPTION
2befcdf1a1f14cbb808b975e348afe8c *DESCRIPTION
4ce3ed1c66a42a72cd5b3febd1f1a16b *NAMESPACE
377f3a045e8041e2996dca6cec144aba *NEWS.md
dfe1e25621105668314a7b4817e2cec5 *NEWS.md
799ae591e93eb076cea0d9f8150235dd *R/AIC.lmvar.R
b0137d370c4c1a01bc5ceb87d8cc6285 *R/alias.lmvar.R
c5a11e9f3431dd97d7e32a2df0f1fbd5 *R/beta_sigma_names.R
6d527a34b60bbee5b434a3eb19b542a3 *R/coef.lmvar.R
569f75beeb1ccb83d5a8498860dcb96f *R/cv.lm.R
f9123a0713ff45139fa5f88b4e0ffa34 *R/cv.lmvar.R
2d12baa90e8309faaa22f35879634516 *R/cv.lmvar.R
e2a1a06a401c6301a201079f420b545c *R/dfree.R
39b90ad72cc9880282de9bf614d68133 *R/examples/AIC_examples.R
bd9d7d3681defffd188f22a59df22c77 *R/examples/alias_examples.R
Expand Down Expand Up @@ -41,12 +41,12 @@ e34da130a7e9f2e880f57e0985175699 *R/predict.lmvar.R
da4359eb750fb52cb6f5913f4d34f8f3 *R/summary.lmvar.R
7edbf99718bd27c73eef02ba0b3962bf *R/vcov.lmvar.R
e4c8237c288027acdfbbff7b085b7e2f *README.md
c579eb4b11dc36f29724cfa28a9f628b *build/vignette.rds
8147b6d474cbae50e6870e445787ccde *build/vignette.rds
f82e1918a45923e06c52f5e55835e713 *inst/doc/Intro.R
2439946a1cce9cce99a20fe0c0a740d1 *inst/doc/Intro.Rmd
efa4ae4859bb34f929d9168060eedee3 *inst/doc/Intro.html
4ff1aab4c952dc60441900fb5ffab43d *inst/doc/Intro.html
30cacce24029165a47ad57078be7c082 *inst/doc/Math.ltx
0084360a46fbb21339b861db499dec59 *inst/doc/Math.pdf
55070256ee4c711e3a7a9dd9fac14479 *inst/doc/Math.pdf
cdc8775371ef46701cbbfdd098441d22 *man/AIC.lmvar.Rd
40be9e23383ce6cfb87f6158572eab2e *man/alias.lmvar.Rd
96870ffeb6e33b5476b9014730e99d0f *man/beta_sigma_names.Rd
Expand Down
5 changes: 5 additions & 0 deletions NEWS.md
@@ -1,3 +1,8 @@
Version 1.2.1
-------------

* Fix show-stopper that prevents 'cv.lmvar' from running.

Version 1.2.0
-------------

Expand Down
6 changes: 3 additions & 3 deletions R/cv.lmvar.R
Expand Up @@ -134,9 +134,6 @@ cv.lmvar <- function( object, k = 10, ks_test = FALSE, log = FALSE, seed = NULL,
set.seed(seed)
}

# Set excluded rows
excluded_rows = is.element( 1:length(y), exclude)

# Retrieve info from object
y = object$y
X_mu = object$X_mu
Expand All @@ -146,6 +143,9 @@ cv.lmvar <- function( object, k = 10, ks_test = FALSE, log = FALSE, seed = NULL,
slvr_options_object = object$slvr_options
control = object$control

# Set excluded rows
excluded_rows = is.element( 1:length(y), exclude)

# Set solver options
for (option in names(slvr_options_object)){
if (!(option %in% names(slvr_options))){
Expand Down
Binary file modified build/vignette.rds
Binary file not shown.
4 changes: 2 additions & 2 deletions inst/doc/Intro.html
Expand Up @@ -12,7 +12,7 @@

<meta name="author" content="Posthuma Partners" />

<meta name="date" content="2017-06-13" />
<meta name="date" content="2017-06-15" />

<title>A linear model with non-constant variances</title>

Expand Down Expand Up @@ -70,7 +70,7 @@

<h1 class="title toc-ignore">A linear model with non-constant variances</h1>
<h4 class="author"><em>Posthuma Partners</em></h4>
<h4 class="date"><em>2017-06-13</em></h4>
<h4 class="date"><em>2017-06-15</em></h4>



Expand Down
Binary file modified inst/doc/Math.pdf
Binary file not shown.

0 comments on commit 6fa3144

Please sign in to comment.