[Hepi-commits] r4 - / pkg pkg/R pkg/inst pkg/man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Jul 23 18:47:18 CEST 2016
Author: mbeer
Date: 2016-07-23 18:47:18 +0200 (Sat, 23 Jul 2016)
New Revision: 4
Modified:
/
pkg/DESCRIPTION
pkg/NAMESPACE
pkg/R/hepi.R
pkg/R/hepi.hf.R
pkg/R/hepi.hf2.R
pkg/inst/CITATION
pkg/man/hepi-package.Rd
Log:
Updated package to version 1.0-2
Property changes on:
___________________________________________________________________
Added: svn:ignore
+ .Rproj.user
hepi.Rproj
.Rhistory
Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION 2008-11-14 15:04:18 UTC (rev 3)
+++ pkg/DESCRIPTION 2016-07-23 16:47:18 UTC (rev 4)
@@ -1,13 +1,14 @@
Package: hepi
+Version: 1.0-2
+Date: 2016-07-23
Title: Functions for estimating hedonic elementary price indices
-Date: 2008-09-14
-Version: 1.0-1
-Author: Michael Beer <r-hepi at michael.beer.name>
+Authors at R: person("Michael", "Beer", role = c("aut", "cre"),
+ email = "r-hepi at michael.beer.name")
Description: This package provides a set of functions
for estimating hedonic functions and hedonic elementary price indices.
-Maintainer: Michael Beer <r-hepi at michael.beer.name>
-License: GPL (version 2 or later) See file LICENCE.
+License: GPL-2
Depends: R (>= 2.2.0), methods
+Imports: stats
Suggests: MASS, spdep
LazyLoad: yes
URL: http://www.michael.beer.name/r-hepi
Modified: pkg/NAMESPACE
===================================================================
--- pkg/NAMESPACE 2008-11-14 15:04:18 UTC (rev 3)
+++ pkg/NAMESPACE 2016-07-23 16:47:18 UTC (rev 4)
@@ -1,3 +1,3 @@
exportClasses("hedonic.function")
exportPattern("^[^\\.]")
-importFrom(stats)
+import(stats, methods)
Modified: pkg/R/hepi.R
===================================================================
--- pkg/R/hepi.R 2008-11-14 15:04:18 UTC (rev 3)
+++ pkg/R/hepi.R 2016-07-23 16:47:18 UTC (rev 4)
@@ -1,5 +1,3 @@
-.onLoad <- function(lib, pkg) require(methods)
-
.validHF <- function(object) {
if(!is.element("data", names(formals(object at .Data))))
return("The candidate hedonic function needs to have a formal argument named 'data'")
Modified: pkg/R/hepi.hf.R
===================================================================
--- pkg/R/hepi.hf.R 2008-11-14 15:04:18 UTC (rev 3)
+++ pkg/R/hepi.hf.R 2016-07-23 16:47:18 UTC (rev 4)
@@ -6,7 +6,7 @@
if(!is(full.formula, "formula"))
stop("'full.formula' must be a proper formula object")
- if(allow.variable.selection && !require("MASS"))
+ if(allow.variable.selection && !requireNamespace("MASS"))
stop("the 'MASS' package is needed for variable selection")
if(allow.variable.selection && !is(min.formula, "formula"))
@@ -33,7 +33,7 @@
stop("an object named 'learndata.build.hf.lm' must not exist in '.GlobalEnv' since it would be overwritten")
assign("learndata.build.hf.lm", learndata.build.hf.lm, envir = .GlobalEnv)
- hf.model <- stepAIC(hf.model, scope = list(upper = full.formula, lower = min.formula))
+ hf.model <- MASS::stepAIC(hf.model, scope = list(upper = full.formula, lower = min.formula))
remove("learndata.build.hf.lm", envir = .GlobalEnv)
}
Modified: pkg/R/hepi.hf2.R
===================================================================
--- pkg/R/hepi.hf2.R 2008-11-14 15:04:18 UTC (rev 3)
+++ pkg/R/hepi.hf2.R 2016-07-23 16:47:18 UTC (rev 4)
@@ -6,7 +6,7 @@
if(!is(full.formula, "formula"))
stop("'full.formula' must be a proper formula object")
- if(allow.variable.selection && !require("MASS"))
+ if(allow.variable.selection && !requireNamespace("MASS"))
stop("the 'MASS' package is needed for variable selection")
if(allow.variable.selection && !is(min.formula, "formula"))
@@ -77,7 +77,7 @@
stop("an object named 'datam' must not exist in '.GlobalEnv' since it would be overwritten")
assign("datam", datam, envir = .GlobalEnv)
- hf.model.n <- try(stepAIC(hf.model, scope = list(upper = full.formula.m, lower = min.formula), trace=0), silent=TRUE)
+ hf.model.n <- try(MASS::stepAIC(hf.model, scope = list(upper = full.formula.m, lower = min.formula), trace=0), silent=TRUE)
remove("datam", envir = .GlobalEnv)
if(class(hf.model.n) != "try-error") {
hf.model <- hf.model.n
Modified: pkg/inst/CITATION
===================================================================
--- pkg/inst/CITATION 2008-11-14 15:04:18 UTC (rev 3)
+++ pkg/inst/CITATION 2016-07-23 16:47:18 UTC (rev 4)
@@ -1,16 +1,8 @@
-citHeader("To cite the hepi package in publications use:")
-
-citEntry(entry = "phdthesis",
+bibentry(bibtype="PhdThesis",
title = "Hedonic Elementary Price Indices: Axiomatic Foundation and Estimation Techniques",
- author = personList(person(first="Michael", last="Beer")),
+ author = person(given="Michael", family="Beer"),
school = "University of Fribourg Switzerland",
year = 2007,
url = "http://www.michael.beer.name/phdthesis.pdf",
isbn = "978-3-033-01099-4",
-
- textVersion =
- paste("Beer M. (2007)",
- "Hedonic Elementary Price Indices: Axiomatic Foundation and Estimation Techniques.",
- "PhD thesis. University of Fribourg Switzerland.",
- "http://www.michael.beer.name/phdthesis/")
-)
+)
\ No newline at end of file
Modified: pkg/man/hepi-package.Rd
===================================================================
--- pkg/man/hepi-package.Rd 2008-11-14 15:04:18 UTC (rev 3)
+++ pkg/man/hepi-package.Rd 2016-07-23 16:47:18 UTC (rev 4)
@@ -11,10 +11,11 @@
\details{
\tabular{ll}{
Package: \tab hepi\cr
-Date: \tab 2008-11-10\cr
-Version: \tab 1.0-1\cr
-License: \tab GPL (version 2 or later) See file LICENCE.\cr
+Date: \tab 2016-07-23\cr
+Version: \tab 1.0-2\cr
+License: \tab GPL-2\cr
Depends: \tab R (>= 2.2.0), methods\cr
+Imports: \tab stats\cr
Suggests: \tab MASS, spdep\cr
LazyLoad: \tab yes\cr
URL: \tab http://www.michael.beer.name/r-hepi\cr
More information about the Hepi-commits
mailing list