[Rsiena-commits] r57 - in pkg: RSiena RSiena/R RSienaTest RSienaTest/R

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

Author: ripleyrm
Date: 2010-02-11 19:07:10 +0100 (Thu, 11 Feb 2010)
New Revision: 57

Modified:
   pkg/RSiena/R/siena01.r
   pkg/RSiena/changeLog
   pkg/RSienaTest/R/siena01.r
   pkg/RSienaTest/changeLog
Log:
Fix to bug stopping update of initial values at end of estimation via siena01Gui

Modified: pkg/RSiena/R/siena01.r
===================================================================
--- pkg/RSiena/R/siena01.r	2010-02-11 16:52:13 UTC (rev 56)
+++ pkg/RSiena/R/siena01.r	2010-02-11 18:07:10 UTC (rev 57)
@@ -577,7 +577,7 @@
                     use <- which(myeff$include)
                     initValues <- rep(0, length(use))
                     initValues[estimAns$condvar] <- estimAns$rate
-                    initValues[!estimAns$condvar] <- estimAns$theta
+                    initValues[-estimAns$condvar] <- estimAns$theta
                     myeff$initialValue[myeff$include] <<- initValues
                 }
                 else

Modified: pkg/RSiena/changeLog
===================================================================
--- pkg/RSiena/changeLog	2010-02-11 16:52:13 UTC (rev 56)
+++ pkg/RSiena/changeLog	2010-02-11 18:07:10 UTC (rev 57)
@@ -1,5 +1,10 @@
-2010-02-11 R-forge revision 56 
+2010-02-11 R-forge revision 57
 
+	* R/siena01.r: fix bug which stopped Siena update of effects
+	initial values after conditional estimation.
+
+2010-02-11 R-forge revision 56
+
 	* DESCRIPTION, man/RSiena-package.Rd: new version number 1.0.10
 	* src/model/effects/generic/*, src/model/effects/effectfactory.cpp:
 	multiple networks
@@ -15,14 +20,14 @@
 2010-02-11 R-forge revision 53
 
 	* R/siena01.r: fixed bug in editing all effects
-	
-2010-02-07 R-forge revision 52 
 
-	* R/globals.r, R/siena07.r, man/siena07.Rd: 
+2010-02-07 R-forge revision 52
+
+	* R/globals.r, R/siena07.r, man/siena07.Rd:
 	new silent option with no output.
 	* tests/parallel.R, tests/parallel.Rout.save: suppress progress
 	message output and include prints of results.
-	
+
 2010-02-04 R-forge revision 51
 
 	* data/allEffects/csv: Bug in covariate behavior effects
@@ -30,7 +35,7 @@
 	changes for Win64
 	* r/effects.r: minor fixes to getEffects function (default effects
 	for multiple dependent networks.)
-	
+
 2010-01-28 R-forge revision 48
 
 	* R/simstatsc.r: fixed bug in sort order of effects

Modified: pkg/RSienaTest/R/siena01.r
===================================================================
--- pkg/RSienaTest/R/siena01.r	2010-02-11 16:52:13 UTC (rev 56)
+++ pkg/RSienaTest/R/siena01.r	2010-02-11 18:07:10 UTC (rev 57)
@@ -577,7 +577,7 @@
                     use <- which(myeff$include)
                     initValues <- rep(0, length(use))
                     initValues[estimAns$condvar] <- estimAns$rate
-                    initValues[!estimAns$condvar] <- estimAns$theta
+                    initValues[-estimAns$condvar] <- estimAns$theta
                     myeff$initialValue[myeff$include] <<- initValues
                 }
                 else

Modified: pkg/RSienaTest/changeLog
===================================================================
--- pkg/RSienaTest/changeLog	2010-02-11 16:52:13 UTC (rev 56)
+++ pkg/RSienaTest/changeLog	2010-02-11 18:07:10 UTC (rev 57)
@@ -1,22 +1,27 @@
+2010-02-11 R-forge revision 57
+
+	* R/siena01.r: fix bug which stopped Siena update of effects
+	initial values after conditional estimation.
+
 2010-02-11 R-forge revision 55 (cf revision 52)
 
-	* R/globals.r, R/siena07.r, man/siena07.Rd: 
+	* R/globals.r, R/siena07.r, man/siena07.Rd:
 	new silent option with no output.
 	* tests/parallel.R, tests/parallel.Rout.save: suppress progress
 	message output and include prints of results.
-	
+
 2010-02-11 R-forge revision 54
 
 	* R/print07Report.r: source formatting
 	* data/allEffects.csv: bug in covariate behavior effects
 	* configure.win, src/Makefile.win, src/win32/Makefile:
 	changes for Win64
-	
+
 2010-02-11 R-forge revision 53
 
 	* R/siena01.r: fixed bug in editing all effects
-	
 
+
 2010-02-01 R-forge Revision 50
 
 	* doc/s_man400.tex