[Rsiena-commits] r67 - in pkg/RSienaTest: . R

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

Author: ripleyrm
Date: 2010-03-17 15:22:32 +0100 (Wed, 17 Mar 2010)
New Revision: 67

Modified:
   pkg/RSienaTest/R/maxlikecalc.r
   pkg/RSienaTest/R/phase3.r
   pkg/RSienaTest/R/printInitialDescription.r
   pkg/RSienaTest/R/siena01.r
   pkg/RSienaTest/changeLog
Log:
Minor fixes

Modified: pkg/RSienaTest/R/maxlikecalc.r
===================================================================
--- pkg/RSienaTest/R/maxlikecalc.r	2010-03-17 14:13:57 UTC (rev 66)
+++ pkg/RSienaTest/R/maxlikecalc.r	2010-03-17 14:22:32 UTC (rev 67)
@@ -82,7 +82,8 @@
                 ps<- exp(fs)
             ##    ps[is.na(mat1[i,])|is.na(mat2[i,])]<- 0
                 ps<- ps/sum(ps)
-                ss<- sweep(ss,2,ss[i,])
+               ## ss<- sweep(ss,2,ss[i,])
+               ## browser()
                 wmean<- apply(ss*ps,2,sum)
                 if (varmat)
                 {

Modified: pkg/RSienaTest/R/phase3.r
===================================================================
--- pkg/RSienaTest/R/phase3.r	2010-03-17 14:13:57 UTC (rev 66)
+++ pkg/RSienaTest/R/phase3.r	2010-03-17 14:22:32 UTC (rev 67)
@@ -126,7 +126,7 @@
             }
         }
         if (nit <= 5 || nit == 10 || (int==1 && nit %% z$writefreq == 0 ) ||
-            (int > 1 && (z$writefreq - 1) < z$n3%/%int &&
+            (int > 1 && (z$writefreq + 1) < z$n3%/%int &&
              nit %in% nits[seq(z$writefreq + 1, x$n3 %/% int,
                                           z$writefreq)]))
         {

Modified: pkg/RSienaTest/R/printInitialDescription.r
===================================================================
--- pkg/RSienaTest/R/printInitialDescription.r	2010-03-17 14:13:57 UTC (rev 66)
+++ pkg/RSienaTest/R/printInitialDescription.r	2010-03-17 14:22:32 UTC (rev 67)
@@ -97,9 +97,8 @@
                 if (startCol > nobs)
                     break
             }
-            if (sum(gpatts$types == "oneMode") > 0)
+            if (sum(gpatts$types != "bipartite") > 0)
             {
-                netnames <- gpatts$netnames[net]
                 if (nData > 1)
                 {
                     averageOutDegree <-
@@ -112,7 +111,7 @@
                     averageOutDegree <- gpatts$"averageOutDegree"
                 }
                 Report("\n", outf)
-                if (nData > 1 || sum(atts$types == "oneMode") > 1)
+                if (nData > 1 || sum(atts$types != "behavior") > 1)
                 {
                     Report("The average degrees are: ", outf)
                     Report(paste(names(data), round(averageOutDegree, 3),

Modified: pkg/RSienaTest/R/siena01.r
===================================================================
--- pkg/RSienaTest/R/siena01.r	2010-03-17 14:13:57 UTC (rev 66)
+++ pkg/RSienaTest/R/siena01.r	2010-03-17 14:22:32 UTC (rev 67)
@@ -465,6 +465,8 @@
             degs[i] <- as.integer(tclvalue(maxdfVar[[i, 2]]))
         }
         names(degs) <- depvarnames[maxDegree]
+        condvarno <- 0
+        condname <- ""
         if (cond)
         {
             if (ndepvars == 1)

Modified: pkg/RSienaTest/changeLog
===================================================================
--- pkg/RSienaTest/changeLog	2010-03-17 14:13:57 UTC (rev 66)
+++ pkg/RSienaTest/changeLog	2010-03-17 14:22:32 UTC (rev 67)
@@ -1,3 +1,10 @@
+2010-03-17 R-forge revision 67
+
+	* 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