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

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

Author: ripleyrm
Date: 2010-04-25 03:57:02 +0200 (Sun, 25 Apr 2010)
New Revision: 83

Modified:
   pkg/RSiena/R/effectsMethods.r
   pkg/RSiena/changeLog
   pkg/RSienaTest/R/effectsMethods.r
   pkg/RSienaTest/changeLog
Log:
Fix bug to edit.sienaEffects introduced when changing variable name to pass checks!

Modified: pkg/RSiena/R/effectsMethods.r
===================================================================
--- pkg/RSiena/R/effectsMethods.r	2010-04-24 20:31:53 UTC (rev 82)
+++ pkg/RSiena/R/effectsMethods.r	2010-04-25 01:57:02 UTC (rev 83)
@@ -110,8 +110,8 @@
     priorityColumns <- c("name", "effectName", "type", "include", "fix",
                          "test", "initialValue", "parm", "shortName")
     priorityX <- name[, priorityColumns]
-    notPriorityX <- name[, -c(match(priorityColumns, names(x)))]
-    x <- cbind(priorityX, notPriorityX)
+    notPriorityX <- name[, -c(match(priorityColumns, names(name)))]
+    name <- cbind(priorityX, notPriorityX)
 
     ## get edit.data.frame to do the actual edit
     tmp <- NextMethod(, , edit.row.names=FALSE)

Modified: pkg/RSiena/changeLog
===================================================================
--- pkg/RSiena/changeLog	2010-04-24 20:31:53 UTC (rev 82)
+++ pkg/RSiena/changeLog	2010-04-25 01:57:02 UTC (rev 83)
@@ -1,3 +1,7 @@
+2010-04-25 R-forge revision 83
+
+	* R/effectsMethods.r: fix bug introduced trying to pass checks
+
 2010-04-24 R-forge revision 82
 
 	* R/effectsMethods.r, man/print.sienaEffects.Rd,

Modified: pkg/RSienaTest/R/effectsMethods.r
===================================================================
--- pkg/RSienaTest/R/effectsMethods.r	2010-04-24 20:31:53 UTC (rev 82)
+++ pkg/RSienaTest/R/effectsMethods.r	2010-04-25 01:57:02 UTC (rev 83)
@@ -110,8 +110,8 @@
     priorityColumns <- c("name", "effectName", "type", "include", "fix",
                          "test", "initialValue", "parm", "shortName")
     priorityX <- name[, priorityColumns]
-    notPriorityX <- name[, -c(match(priorityColumns, names(x)))]
-    x <- cbind(priorityX, notPriorityX)
+    notPriorityX <- name[, -c(match(priorityColumns, names(name)))]
+    name <- cbind(priorityX, notPriorityX)
 
     ## get edit.data.frame to do the actual edit
     tmp <- NextMethod(, , edit.row.names=FALSE)

Modified: pkg/RSienaTest/changeLog
===================================================================
--- pkg/RSienaTest/changeLog	2010-04-24 20:31:53 UTC (rev 82)
+++ pkg/RSienaTest/changeLog	2010-04-25 01:57:02 UTC (rev 83)
@@ -1,3 +1,7 @@
+2010-04-25 R-forge revision 83
+
+	* R/effectsMethods.r: fix bug introduced trying to pass checks
+
 2010-04-24 R-forge revision 82
 
 	* R/effectsMethods.r, man/print.sienaEffects.Rd,
@@ -483,7 +487,7 @@
 
 2010-01-02 R-forge revision 34 RSiena and RSienaTest
 
-	* R/sienaprint.r:  corrected layout of sienaFitThetaTable for
+	* R/sienaprint.r: corrected layout of sienaFitThetaTable for
 	models with both behavior and network variables
 
 2010-01-01 R-forge revision 33 RSiena and RSienaTest