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

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Sat Apr 26 18:33:38 CEST 2014 

Author: tomsnijders
Date: 2014-04-26 18:33:37 +0200 (Sat, 26 Apr 2014)
New Revision: 274

Modified:
   pkg/RSiena/ChangeLog
   pkg/RSiena/DESCRIPTION
   pkg/RSiena/R/sienaRIDynamics.r
   pkg/RSiena/man/RSiena-package.Rd
   pkg/RSiena/src/siena07internals.cpp
   pkg/RSienaTest/ChangeLog
   pkg/RSienaTest/DESCRIPTION
   pkg/RSienaTest/R/sienaBayes.r
   pkg/RSienaTest/R/sienaRIDynamics.r
   pkg/RSienaTest/man/RSiena-package.Rd
   pkg/RSienaTest/src/siena07internals.cpp
Log:
Very small corrections.

Modified: pkg/RSiena/ChangeLog
===================================================================
--- pkg/RSiena/ChangeLog	2014-04-25 13:31:39 UTC (rev 273)
+++ pkg/RSiena/ChangeLog	2014-04-26 16:33:37 UTC (rev 274)
@@ -1,3 +1,8 @@
+2014-04-26 R-Forge Revision 274
+Changes in RSiena and RSienaTest:
+   * Replaced (!strcmp...) by (!(strcmp...)) one more time
+     in sienainternals07.cpp.
+ 
 2014-04-25 R-Forge Revision 273
 Changes in RSiena and RSienaTest:
    * NAMESPACE: removed entries sienaRIDynamics with the corresponding
@@ -11,7 +16,9 @@
    * Small change in print01Report.r to improve reporting
      two files of composition change.
    * sienaRI.r: require that <<file>> argument is not NULL for non-Windows
-     operating systems.
+     operating systems.	 
+Changes in RSienaTest:
+   * Minor changes in sienaBayes.r.
 
 2014-04-17 R-Forge Revision 272
 Changes in RSiena and RSienaTest:

Modified: pkg/RSiena/DESCRIPTION
===================================================================
--- pkg/RSiena/DESCRIPTION	2014-04-25 13:31:39 UTC (rev 273)
+++ pkg/RSiena/DESCRIPTION	2014-04-26 16:33:37 UTC (rev 274)
@@ -1,8 +1,8 @@
 Package: RSiena
 Type: Package
 Title: Siena - Simulation Investigation for Empirical Network Analysis
-Version: 1.1-273
-Date: 2014-04-25
+Version: 1.1-274
+Date: 2014-04-26
 Author: Ruth Ripley, Krists Boitmanis, Tom A.B. Snijders
 Depends: R (>= 2.15.0)
 Imports: Matrix

Modified: pkg/RSiena/R/sienaRIDynamics.r
===================================================================
--- pkg/RSiena/R/sienaRIDynamics.r	2014-04-25 13:31:39 UTC (rev 273)
+++ pkg/RSiena/R/sienaRIDynamics.r	2014-04-26 16:33:37 UTC (rev 274)
@@ -231,6 +231,7 @@
 standardize <- function(values = NULL)
 {
 	newValues <- values/sum(values)
+	newValues
 } 
 
 

Modified: pkg/RSiena/man/RSiena-package.Rd
===================================================================
--- pkg/RSiena/man/RSiena-package.Rd	2014-04-25 13:31:39 UTC (rev 273)
+++ pkg/RSiena/man/RSiena-package.Rd	2014-04-26 16:33:37 UTC (rev 274)
@@ -44,8 +44,8 @@
 \tabular{ll}{
 Package: \tab RSiena\cr
 Type: \tab Package\cr
-Version: \tab 1.1-273\cr
-Date: \tab 2014-04-25\cr
+Version: \tab 1.1-274\cr
+Date: \tab 2014-04-26\cr
 Depends: \tab R (>= 2.15.0)\cr
 Imports: \tab Matrix\cr
 Suggests: \tab tcltk, network, codetools, lattice, MASS, parallel,

Modified: pkg/RSiena/src/siena07internals.cpp
===================================================================
--- pkg/RSiena/src/siena07internals.cpp	2014-04-25 13:31:39 UTC (rev 273)
+++ pkg/RSiena/src/siena07internals.cpp	2014-04-26 16:33:37 UTC (rev 274)
@@ -1206,7 +1206,7 @@
 
 				if (strcmp(setting, "") == 0)
 				{
-					if (!strcmp(netType, "behavior") == 0)
+					if (!(strcmp(netType, "behavior") == 0))
 					{
 						NetworkLongitudinalData * pNetwork =
 							pData->pNetworkData(networkName);

Modified: pkg/RSienaTest/ChangeLog
===================================================================
--- pkg/RSienaTest/ChangeLog	2014-04-25 13:31:39 UTC (rev 273)
+++ pkg/RSienaTest/ChangeLog	2014-04-26 16:33:37 UTC (rev 274)
@@ -1,3 +1,8 @@
+2014-04-26 R-Forge Revision 274
+Changes in RSiena and RSienaTest:
+   * Replaced (!strcmp...) by (!(strcmp...)) one more time
+     in sienainternals07.cpp.
+ 
 2014-04-25 R-Forge Revision 273
 Changes in RSiena and RSienaTest:
    * NAMESPACE: removed entries sienaRIDynamics with the corresponding
@@ -11,7 +16,9 @@
    * Small change in print01Report.r to improve reporting
      two files of composition change.
    * sienaRI.r: require that <<file>> argument is not NULL for non-Windows
-     operating systems.
+     operating systems.	 
+Changes in RSienaTest:
+   * Minor changes in sienaBayes.r.
 
 2014-04-17 R-Forge Revision 272
 Changes in RSiena and RSienaTest:

Modified: pkg/RSienaTest/DESCRIPTION
===================================================================
--- pkg/RSienaTest/DESCRIPTION	2014-04-25 13:31:39 UTC (rev 273)
+++ pkg/RSienaTest/DESCRIPTION	2014-04-26 16:33:37 UTC (rev 274)
@@ -1,8 +1,8 @@
 Package: RSienaTest
 Type: Package
 Title: Siena - Simulation Investigation for Empirical Network Analysis
-Version: 1.1-273
-Date: 2014-04-25
+Version: 1.1-274
+Date: 2014-04-26
 Author: Ruth Ripley, Krists Boitmanis, Tom A.B. Snijders
 Depends: R (>= 2.15.0)
 Imports: Matrix

Modified: pkg/RSienaTest/R/sienaBayes.r
===================================================================
--- pkg/RSienaTest/R/sienaBayes.r	2014-04-25 13:31:39 UTC (rev 273)
+++ pkg/RSienaTest/R/sienaBayes.r	2014-04-26 16:33:37 UTC (rev 274)
@@ -148,7 +148,6 @@
 # STILL TO BE CHECKED
         iter <- 0
 		nearGoal <- rep(FALSE, z$nGroup+2)
-        success <- rep(FALSE, z$nGroup+2)
 		pastSuccesses <- rep(0, z$nGroup+2)
 		groups <- c(rep(TRUE, z$nGroup), FALSE, FALSE)
 		cat('improveMH\n')
@@ -1019,8 +1018,8 @@
 		flush.console()
 #cat("cyc\n")
 #browser()
-		scores.ans.last <- t(cyc$ans.last$fra) # the scores a z$pp by z$nGroups matrix
-		dfra.ans.last <- cyc$ans.last$dff # the Hessian a sparse z$pp by z$pp matrix
+#		scores.ans.last <- t(cyc$ans.last$fra) # the scores a z$pp by z$nGroups matrix
+#		dfra.ans.last <- cyc$ans.last$dff # the Hessian a sparse z$pp by z$pp matrix
 		if (frequentist)
 		{
 			RobbinsMonro(bgain)
@@ -1415,7 +1414,7 @@
 	# number of parameters per group:
 	npars <- sum(startupGlobal$effects$group==1)
 	# number of Dependent variables:
-	nDepvar <- length(unique(startupGlobal$effects$name))
+#	nDepvar <- length(unique(startupGlobal$effects$name))
 	if (ngroups >= 2)
 	{
 	#	if ((startupGlobal$pp - npars)%%(ngroups-1) != 0)

Modified: pkg/RSienaTest/R/sienaRIDynamics.r
===================================================================
--- pkg/RSienaTest/R/sienaRIDynamics.r	2014-04-25 13:31:39 UTC (rev 273)
+++ pkg/RSienaTest/R/sienaRIDynamics.r	2014-04-26 16:33:37 UTC (rev 274)
@@ -231,6 +231,7 @@
 standardize <- function(values = NULL)
 {
 	newValues <- values/sum(values)
+	newValues
 } 
 
 

Modified: pkg/RSienaTest/man/RSiena-package.Rd
===================================================================
--- pkg/RSienaTest/man/RSiena-package.Rd	2014-04-25 13:31:39 UTC (rev 273)
+++ pkg/RSienaTest/man/RSiena-package.Rd	2014-04-26 16:33:37 UTC (rev 274)
@@ -46,8 +46,8 @@
 \tabular{ll}{
 Package: \tab RSienaTest\cr
 Type: \tab Package\cr
-Version: \tab 1.1-273\cr
-Date: \tab 2014-04-25\cr
+Version: \tab 1.1-274\cr
+Date: \tab 2014-04-26\cr
 Depends: \tab R (>= 2.15.0)\cr
 Imports: \tab Matrix\cr
 Suggests: \tab tcltk, network, codetools, lattice, MASS, parallel,

Modified: pkg/RSienaTest/src/siena07internals.cpp
===================================================================
--- pkg/RSienaTest/src/siena07internals.cpp	2014-04-25 13:31:39 UTC (rev 273)
+++ pkg/RSienaTest/src/siena07internals.cpp	2014-04-26 16:33:37 UTC (rev 274)
@@ -1206,7 +1206,7 @@
 
 				if (strcmp(setting, "") == 0)
 				{
-					if (!strcmp(netType, "behavior") == 0)
+					if (!(strcmp(netType, "behavior") == 0))
 					{
 						NetworkLongitudinalData * pNetwork =
 							pData->pNetworkData(networkName);

More information about the Rsiena-commits mailing list