[Rsiena-commits] r32 - pkg/RSiena/R

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

Author: ripleyrm
Date: 2010-01-01 23:24:36 +0100 (Fri, 01 Jan 2010)
New Revision: 32

Modified:
   pkg/RSiena/R/print07Report.r
   pkg/RSiena/R/simstatsc.r
Log:
Standard error of rate estimates for conditional estimation needed to be square rooted. Minor changes to R interaction code (not yet functional in RSiena)

Modified: pkg/RSiena/R/print07Report.r
===================================================================
--- pkg/RSiena/R/print07Report.r	2009-12-31 16:22:27 UTC (rev 31)
+++ pkg/RSiena/R/print07Report.r	2010-01-01 22:24:36 UTC (rev 32)
@@ -58,14 +58,14 @@
                        tmp <- paste(' 0.', nnstr, ' Rate parameter period ',
                                     1:nn, '              ',
                                     format(round(z$rate,4),width=9),
-                                    '  (',format(round(z$vrate,4),width=9),
+                                    '  (',format(round(sqrt(z$vrate),4),width=9),
                                     ')\n', sep = '')
                    }                   else{
                        tmp <- paste(' 0.', nnstr,
                                     'Rate parameter cond. variable period ',
                                     1:nn, '              ',
                                     format(round(z$rate,4),width=9),
-                                    '  (',format(round(z$vrate,4),width=9),
+                                    '  (',format(round(sqrt(z$vrate),4),width=9),
                                     ')\n',   sep='')
                    }
                    Report(tmp, outf, sep='')

Modified: pkg/RSiena/R/simstatsc.r
===================================================================
--- pkg/RSiena/R/simstatsc.r	2009-12-31 16:22:27 UTC (rev 31)
+++ pkg/RSiena/R/simstatsc.r	2010-01-01 22:24:36 UTC (rev 32)
@@ -3,7 +3,7 @@
 # *
 # * Web: http://www.stats.ox.ac.uk/~snidjers/siena
 # *
-# * File: siena01.r
+# * File: simstatsc.r
 # *
 # * Description: This module contains the code for simulating the process,
 # * communicating with C++.
@@ -1300,7 +1300,7 @@
                else
                {
                    if (inter1$name != inter2$name ||
-                       inter1$name != inter1$name3)
+                       inter1$name != inter3$name)
                    {
                        stop("invalid interaction specification:",
                             "must all be same network")
@@ -1310,7 +1310,7 @@
                inters <- rbind(inter1, inter2, inter3)
                egos <- which(inters$interactionType == "ego")
                egoCount <- length(egos)
-               dyads <- which(inters$interactionType == "dyad")
+               dyads <- which(inters$interactionType == "dyadic")
                dyadCount <- length(dyads)
                if (twoway)
                {