[Mattice-commits] r147 - in pkg: R inst/doc

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

Author: andrew_hipp
Date: 2009-01-11 05:10:22 +0100 (Sun, 11 Jan 2009)
New Revision: 147

Added:
   pkg/inst/doc/maticce.pdf
Modified:
   pkg/R/ouSim.hansenBatch.R
   pkg/inst/doc/maticce.Rnw
Log:
fixing an error in ouSim.hansenBatch.R; adding pdf'd vignette

Modified: pkg/R/ouSim.hansenBatch.R
===================================================================
--- pkg/R/ouSim.hansenBatch.R	2009-01-11 02:31:45 UTC (rev 146)
+++ pkg/R/ouSim.hansenBatch.R	2009-01-11 04:10:22 UTC (rev 147)
@@ -8,7 +8,7 @@
   return(outdata)
 }
 
-ouSim.hansenBatch <- function(object, ...) ouSim(summary(object))
+ouSim.hansenBatch <- function(object, ...) ouSim(summary(object), ...)
 
 ouSim.hansentree <- function(object, ...) {
   analysis <- object

Modified: pkg/inst/doc/maticce.Rnw
===================================================================
--- pkg/inst/doc/maticce.Rnw	2009-01-11 02:31:45 UTC (rev 146)
+++ pkg/inst/doc/maticce.Rnw	2009-01-11 04:10:22 UTC (rev 147)
@@ -39,9 +39,9 @@
 In case you aren't familiar with \code{R}, the following commands will get you started.
 
 <<startAnalysis, fig=FALSE>>=
-library(maticce) # load the maticce package into memory; also loads the required ouch package
+# library(maticce) # load the maticce package into memory; also loads the required ouch package
+library(ouch)
 data(carex)
-#load('C:/Documents and Settings/Mortonarb/My Documents/mattice/pkg/DATA/carex.rda') # load demonstration data
 attach(carex)
 ovales.tree <- ape2ouch(ovales.tree) # make the tree an ouchtree object
 @
@@ -112,7 +112,7 @@
 \begin{figure}[h]
 \centering
 <<ouSim, fig=TRUE, width=30, height =15, echo=TRUE>>=
-ouSim.ha.4.2 <- ouSim(ha.4.2, ovales.tree)
+ouSim.ha.4.2 <- ouSim(ha.4.2, tree = ovales.tree)
 plot(ouSim.ha.4.2, colors = ou2)
 @
 \caption{Simulated character on \code{ovales.tree} at model-averaged theta values, with coloring according to \code{ou2}}

Added: pkg/inst/doc/maticce.pdf
===================================================================
(Binary files differ)


Property changes on: pkg/inst/doc/maticce.pdf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream