[Uwgarp-commits] r159 - in pkg/GARPFRM: R man

[noreply at r-forge.r-project.org]

Author: tfillebeen
Date: 2014-04-01 07:40:01 +0200 (Tue, 01 Apr 2014)
New Revision: 159

Modified:
   pkg/GARPFRM/R/capm.R
   pkg/GARPFRM/man/consumption.Rd
Log:
manual TODOs done

Modified: pkg/GARPFRM/R/capm.R
===================================================================
--- pkg/GARPFRM/R/capm.R	2014-04-01 01:34:26 UTC (rev 158)
+++ pkg/GARPFRM/R/capm.R	2014-04-01 05:40:01 UTC (rev 159)
@@ -22,7 +22,7 @@
 
 #' Capital Asset Pricing Model
 #' 
-#' TODO: Need a better description of the CAPM
+#' CAPM describes the relationship between risk and (expected) return
 #' 
 #' Retrieves alphas, betas, as well as pvalue and tstats. 
 #' The CAPM is used to determine a theoretically appropriate rate of return

Modified: pkg/GARPFRM/man/consumption.Rd
===================================================================
--- pkg/GARPFRM/man/consumption.Rd	2014-04-01 01:34:26 UTC (rev 158)
+++ pkg/GARPFRM/man/consumption.Rd	2014-04-01 05:40:01 UTC (rev 159)
@@ -3,17 +3,18 @@
 \alias{consumption}
 \title{consumption data}
 \description{
-Monthly consumption data of what?
+Monthly consumption data (CPI: Consumer Price Index) from the Bureau of Labor Statistics (BLS)
 }
 \usage{consumption}
 \details{
-Where did we get the consumption data?
-What are the details of the consumption data? Consumption of what?
+Data is retrieved from the BLS
+The CPI represents changes in prices of all goods and services purchased for consumption by urban households.
+Prices are taken throughout the month.
 
-see \url{TODO}
+see \url{http://www.bls.gov/opub/hom/pdf/homch17.pdf}
 }
 \format{xts object with monthly observations}
-\source{\url{TODO}}
+\source{\url{http://www.bls.gov/cpi/cpiovrvw.htm}}
 \references{
 
 }