[Rsiena-commits] r103 - in pkg/RSienaTest: . doc man

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

Author: jalospinoso
Date: 2010-06-10 17:56:00 +0200 (Thu, 10 Jun 2010)
New Revision: 103

Modified:
   pkg/RSienaTest/changeLog
   pkg/RSienaTest/doc/s_man400.tex
   pkg/RSienaTest/man/setEffect.Rd
   pkg/RSienaTest/man/sienaTimeTest.Rd
Log:
Now we pass checks... :-)

Modified: pkg/RSienaTest/changeLog
===================================================================
--- pkg/RSienaTest/changeLog	2010-06-10 15:27:48 UTC (rev 102)
+++ pkg/RSienaTest/changeLog	2010-06-10 15:56:00 UTC (rev 103)
@@ -1,11 +1,11 @@
-2010-06-08 R-forge revision 100/101
+2010-06-08 R-forge revision 100-103
 
 	* R/sienaTimeTest.r: added changing covariate functionality to
 	sienaTimeFix for RateX effects. Deleted includeTimeDummy.
 	* man/includeTimeDummy.r: deleted.
 	* man/sienaTimeTest.r: changed includeTimeDummy to setEffects
 	* man/plot.sienaTimeTest.r: changed includeTimeDummy to setEffects
-	* doc/s_man400.tex: changed includeTimeDummy to setEffects
+	* doc/s_man400.tex: changed includeTimeDummy to setEffects.
 
 2010-06-08 R-forge revision 99
 

Modified: pkg/RSienaTest/doc/s_man400.tex
===================================================================
--- pkg/RSienaTest/doc/s_man400.tex	2010-06-10 15:27:48 UTC (rev 102)
+++ pkg/RSienaTest/doc/s_man400.tex	2010-06-10 15:56:00 UTC (rev 103)
@@ -1491,8 +1491,10 @@
 
 # Add a few time dummy terms:
 
-    myeff3<- setEffect(myeff2, recip, balance, timeDummy="2")
+    myeff3<- setEffect(myeff2, recip, timeDummy="2")
+    myeff3<- setEffect(myeff3,  balance, timeDummy="2")
 
+
 # And estimate the new model:
 
 ans3 <- siena07(mymodel2, data=mydata2, effects=myeff2, batch=TRUE)
@@ -3756,9 +3758,9 @@
 with time dummies. You
 can include these in your model simply via the function
 \begin{verbatim}
-myeffects <- setEffect(myeffects, density, reciprocity, timeDummy="2,3,6")
+myeffects <- setEffect(myeffects, density, timeDummy="2,3,6")
 \end{verbatim}
-which would add three time dummy terms to each effect listed in the function.
+which would add three time dummied density effects.
 
 We recommend that you start with simple models, and use the score type test for
 assessing heterogeneity, i.e., if \texttt{ans} is the object of results produced
@@ -4804,7 +4806,7 @@
 If as a consequence of this analysis you wish to add time dummy terms,
 this may be done via
 \begin{verbatim}
-myeff <- setEffect(myeff, recip, balance, timeDummy="2")
+myeff <- setEffect(myeff, recip, timeDummy="2")
 ans3 <- siena07(mymodel, data=mydata, effects=myeff, batch=TRUE)
 \end{verbatim}
 and testing again,
@@ -7851,7 +7853,8 @@
 (Programmers should consult the changeLog file on CRAN or in the R-forge
 repository.)
 \begin{itemize}
-\item 2010-06-10 R-forge revision 100/101: Removed includeTimeDummy, as it duplicates functionality for setEffects. Fixed RateX so that it works with changing actor covariates as well.
+\item 2010-06-10 R-forge revision 100-102: Removed includeTimeDummy, as it duplicates functionality for setEffects. Fixed RateX so that it works with changing actor covariates as well. Made some modifications so that setEffects is only ever called with oneEffect, as includeTime
+Dummy had accepted more than one effect.
 \item 2010-06-08 R-forge revision 99
 Fix to bug introduced in revision 98: bipartite networks could not have 'loops'
 \item 2010-06-08 R-forge revision 98

Modified: pkg/RSienaTest/man/setEffect.Rd
===================================================================
--- pkg/RSienaTest/man/setEffect.Rd	2010-06-10 15:27:48 UTC (rev 102)
+++ pkg/RSienaTest/man/setEffect.Rd	2010-06-10 15:56:00 UTC (rev 103)
@@ -28,8 +28,8 @@
 }
   \item{initialValue}{Initial value required. Default 0.
 }
-\item{timeDummy}{string: Comma delimited string of which periods to
-dummy. Alternately, use the corresponding column on your effect object}.
+	\item{timeDummy}{string: Comma delimited string of which periods to
+	dummy. Alternately, use the corresponding column on your effect object.
 }
   \item{include}{Boolean. default TRUE, but can be switched to FALSE to
 	turn off an effect.}
@@ -70,7 +70,7 @@
 mynet2 <- sienaNet(s50a, type="behavior")
 mydata <- sienaDataCreate(mynet1, mynet2)
 myeff <- getEffects(mydata)
-myeff <- setEffect(myeff, outInv, 3) ##parameter
+myeff <- setEffect(myeff, outInv, 3, timeDummy="2") ##parameter
 }
 % Add one or more standard keywords, see file 'KEYWORDS' in the
 % R documentation directory.

Modified: pkg/RSienaTest/man/sienaTimeTest.Rd
===================================================================
--- pkg/RSienaTest/man/sienaTimeTest.Rd	2010-06-10 15:27:48 UTC (rev 102)
+++ pkg/RSienaTest/man/sienaTimeTest.Rd	2010-06-10 15:56:00 UTC (rev 103)
@@ -91,7 +91,8 @@
 
 ## Suppose that we wish to include two time dummies.
 ## Add them in the following way:
-myeff <- setEffect(myeff, recip, balance, timeDummy="2")
+myeff <- setEffect(myeff, recip, timeDummy="2")
+myeff <- setEffect(myeff, balance, timeDummy="2")
 ans2 <- siena07(mymodel, data=mydata, effects=myeff, batch=TRUE)
 
 ## Re-assess the time heterogeneity