Author: jarioksa
Date: 2008-10-29 08:49:04 +0100 (Wed, 29 Oct 2008)
New Revision: 536
Modified:
branches/1.15/R/permatfull.R
branches/1.15/inst/ChangeLog
Log:
fixed row/column mix-up in permatfull in branches/1.15 (bugfix part of r525 by hand)
Modified: branches/1.15/R/permatfull.R
===================================================================
--- branches/1.15/R/permatfull.R 2008-10-29 07:36:48 UTC (rev 535)
+++ branches/1.15/R/permatfull.R 2008-10-29 07:49:04 UTC (rev 536)
@@ -31,11 +31,11 @@
else perm[[i]][id,] <- commsimulator(m[id,], method="r00")
if (fixedmar == "rows")
for (i in 1:times)
- if (count) perm[[i]][id,] <- apply(m[id,], 2, sample)
+ if (count) perm[[i]][id,] <- apply(m[id,], 1, sample)
else perm[[i]][id,] <- commsimulator(m[id,], method="r0")
if (fixedmar == "columns")
for (i in 1:times)
- if (count) perm[[i]][id,] <- t(apply(m[id,], 1, sample))
+ if (count) perm[[i]][id,] <- t(apply(m[id,], 2, sample))
else perm[[i]][id,] <- commsimulator(m[id,], method="c0")
if (fixedmar == "both")
for (i in 1:times)
Modified: branches/1.15/inst/ChangeLog
===================================================================
--- branches/1.15/inst/ChangeLog 2008-10-29 07:36:48 UTC (rev 535)
+++ branches/1.15/inst/ChangeLog 2008-10-29 07:49:04 UTC (rev 536)
@@ -5,6 +5,9 @@
Version 1.15-1 (opened October 10, 2008)
+ * fixed row/column mix-up in permatfull (the bugfix part of r525
+ transferred by hand).
+
* merged r533: warning of ties in nesteddisc().
* merged r526: typo in wcmdscale() result object item.