[Rsiena-commits] r68 - in pkg/RSiena: . R

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

Author: ripleyrm
Date: 2010-03-21 16:37:21 +0100 (Sun, 21 Mar 2010)
New Revision: 68

Modified:
   pkg/RSiena/DESCRIPTION
   pkg/RSiena/R/sienaDataCreateFromSession.r
   pkg/RSiena/changeLog
Log:
Allow siena nets to have periods which don't start at 1. New version number

Modified: pkg/RSiena/DESCRIPTION
===================================================================
--- pkg/RSiena/DESCRIPTION	2010-03-17 14:22:32 UTC (rev 67)
+++ pkg/RSiena/DESCRIPTION	2010-03-21 15:37:21 UTC (rev 68)
@@ -1,12 +1,12 @@
 Package: RSiena
 Type: Package
 Title: Siena - Simulation Investigation for Empirical Network Analysis
-Version: 1.0.10
-Date: 2010-02-11
+Version: 1.0.11
+Date: 2010-03-21
 Author: Various
 Depends: R (>= 2.9.0), xtable
 Imports: Matrix
-Suggests: tcltk, rlecuyer, snow, network, codetools
+Suggests: tcltk, snow, rlecuyer, network, codetools, lattice
 SystemRequirements: GNU make, tcl/tk 8.5, Tktable
 Maintainer: Ruth Ripley <ruth at stats.ox.ac.uk>
 Description: Fits models to longitudinal networks

Modified: pkg/RSiena/R/sienaDataCreateFromSession.r
===================================================================
--- pkg/RSiena/R/sienaDataCreateFromSession.r	2010-03-17 14:22:32 UTC (rev 67)
+++ pkg/RSiena/R/sienaDataCreateFromSession.r	2010-03-21 15:37:21 UTC (rev 68)
@@ -254,7 +254,8 @@
         gpsession <- session[session$Group == gps[i], ]
         ops <- turnoffwarn()
         gpsessionperiods <- unlist(strsplit(gpsession$Period, " "))
-        observations <- max(as.numeric(gpsessionperiods), na.rm=TRUE)
+      ##  observations <- max(as.numeric(gpsessionperiods), na.rm=TRUE)
+        observations <- length(unique(gpsessionperiods))
         turnonwarn(ops)
         gpfiles <- files[session$Group == gps[i]]
         objnames <- unique(gpsession$Name)

Modified: pkg/RSiena/changeLog
===================================================================
--- pkg/RSiena/changeLog	2010-03-17 14:22:32 UTC (rev 67)
+++ pkg/RSiena/changeLog	2010-03-21 15:37:21 UTC (rev 68)
@@ -1,3 +1,15 @@
+2010-03-21 R-forge revision 68 new version number 1.0.11 for RSiena
+
+	* R/sienaDataCreateFromSession.r: allow periods to be numbered
+	other than from 1 in siena net input.
+
+2010-03-17 R-forge revision 67 (RSienaTest only)
+
+	* R/siena01.r: fix to creation of model for unconditional estimation
+	* R/phase3.r: fix to timing of progress reports for multiple processors
+	* R/printInitialDescription.r: fix, was crashing with one mode and
+	bipartite networks together
+
 2010-03-17 R-forge revision 66
 
 	* R/simstatsc.r: bug fix: user interaction effects did not work