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

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

Author: tomsnijders
Date: 2019-12-16 16:39:36 +0100 (Mon, 16 Dec 2019)
New Revision: 344

Modified:
   pkg/RSiena/ChangeLog
   pkg/RSiena/R/maxlikec.r
   pkg/RSienaTest/ChangeLog
   pkg/RSienaTest/DESCRIPTION
   pkg/RSienaTest/R/maxlikec.r
   pkg/RSienaTest/man/RSiena-package.Rd
Log:
Version 1.2-19. Matrix changed to matrix in maxlike.c (strange error for R-devel 3.6.1).

Modified: pkg/RSiena/ChangeLog
===================================================================
--- pkg/RSiena/ChangeLog	2019-12-16 13:13:36 UTC (rev 343)
+++ pkg/RSiena/ChangeLog	2019-12-16 15:39:36 UTC (rev 344)
@@ -1,4 +1,4 @@
-2019-12-16 R-Forge Revision 342, package version 1.2-19.
+2019-12-16 R-Forge Revision 344, package version 1.2-19.
 Changes in RSiena and RSienaTest:
    * SienaTimeTest: some corrections with consequences probably only if
      one effect is being tested; or is left after automatic exclusion

Modified: pkg/RSiena/R/maxlikec.r
===================================================================
--- pkg/RSiena/R/maxlikec.r	2019-12-16 13:13:36 UTC (rev 343)
+++ pkg/RSiena/R/maxlikec.r	2019-12-16 15:39:36 UTC (rev 344)
@@ -185,12 +185,12 @@
     ## of the matrix. Need to be put into a symmetric matrix.
     ## Tricky part is getting the rates in the right place!
     ## Note that we do not yet deal with rate effects other than the basic
-    dff <- as(Matrix(0, z$pp, z$pp), "dsyMatrix")
+    dff <- as(matrix(0, z$pp, z$pp), "dsyMatrix")
     nPeriods <- length(derivList)
 	dff2 <- vector("list", nPeriods)
 	if (z$byWave)
 	{
-		tmp <- as(Matrix(0, z$pp, z$pp), "dsyMatrix")
+		tmp <- as(matrix(0, z$pp, z$pp), "dsyMatrix")
 		dff2[] <- tmp
 	}
     for (period in 1:nPeriods)

Modified: pkg/RSienaTest/ChangeLog
===================================================================
--- pkg/RSienaTest/ChangeLog	2019-12-16 13:13:36 UTC (rev 343)
+++ pkg/RSienaTest/ChangeLog	2019-12-16 15:39:36 UTC (rev 344)
@@ -1,4 +1,4 @@
-2019-12-15 R-Forge Revision 342, package version 1.2-19.
+2019-12-16 R-Forge Revision 344, package version 1.2-19.
 Changes in RSiena and RSienaTest:
    * SienaTimeTest: some corrections with consequences probably only if
      one effect is being tested; or is left after automatic exclusion

Modified: pkg/RSienaTest/DESCRIPTION
===================================================================
--- pkg/RSienaTest/DESCRIPTION	2019-12-16 13:13:36 UTC (rev 343)
+++ pkg/RSienaTest/DESCRIPTION	2019-12-16 15:39:36 UTC (rev 344)
@@ -3,7 +3,7 @@
 Type: Package
 Title: Siena - Simulation Investigation for Empirical Network Analysis
 Version: 1.2-19
-Date: 2019-12-15
+Date: 2019-12-16
 Author: Ruth Ripley, Krists Boitmanis, Tom A.B. Snijders, Felix Schoenenberger,
    Nynke Niezink
 Depends: R (>= 2.15.0)

Modified: pkg/RSienaTest/R/maxlikec.r
===================================================================
--- pkg/RSienaTest/R/maxlikec.r	2019-12-16 13:13:36 UTC (rev 343)
+++ pkg/RSienaTest/R/maxlikec.r	2019-12-16 15:39:36 UTC (rev 344)
@@ -184,12 +184,12 @@
     ## of the matrix. Need to be put into a symmetric matrix.
     ## Tricky part is getting the rates in the right place!
     ## Note that we do not yet deal with rate effects other than the basic
-    dff <- as(Matrix(0, z$pp, z$pp), "dsyMatrix")
+    dff <- as(matrix(0, z$pp, z$pp), "dsyMatrix")
     nPeriods <- length(derivList)
 	dff2 <- vector("list", nPeriods)
 	if (z$byWave)
 	{
-		tmp <- as(Matrix(0, z$pp, z$pp), "dsyMatrix")
+		tmp <- as(matrix(0, z$pp, z$pp), "dsyMatrix")
 		dff2[] <- tmp
 	}
     for (period in 1:nPeriods)

Modified: pkg/RSienaTest/man/RSiena-package.Rd
===================================================================
--- pkg/RSienaTest/man/RSiena-package.Rd	2019-12-16 13:13:36 UTC (rev 343)
+++ pkg/RSienaTest/man/RSiena-package.Rd	2019-12-16 15:39:36 UTC (rev 344)
@@ -50,7 +50,7 @@
     Package: \tab RSienaTest\cr
     Type: \tab Package\cr
     Version: \tab 1.2-19\cr
-    Date: \tab 2019-12-15\cr
+    Date: \tab 2019-12-16\cr
     Depends: \tab R (>= 3.0.0)\cr
     Imports: \tab Matrix\cr
     Suggests: \tab tcltk, network, codetools, lattice, MASS, parallel,