[rkward-cvs] SF.net SVN: rkward-code:[4865] trunk/rkward/rkward/rbackend/rpackages/ rkward/R

[tfry at users.sf.net]

Revision: 4865
          http://sourceforge.net/p/rkward/code/4865
Author:   tfry
Date:     2014-10-01 16:59:24 +0000 (Wed, 01 Oct 2014)
Log Message:
-----------
Also accept matrix-objects in rk.results() (now produced by pareto.chart)

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R	2014-10-01 14:16:25 UTC (rev 4864)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R	2014-10-01 16:59:24 UTC (rev 4865)
@@ -155,7 +155,7 @@
 	on.exit (sink ())
 
 	# convert 2d tables to data.frames with values labelled
-	if (is.table(x) && (length(dim(x)) == 2)) {
+	if ((is.table(x) || is.matrix(x)) && (length(dim(x)) == 2)) {
 		rows = dim(x)[1]
 		cols = dim(x)[2]
 		if (is.null(titles)) {

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R	2014-10-01 14:16:25 UTC (rev 4864)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R	2014-10-01 16:59:24 UTC (rev 4865)
@@ -3,4 +3,4 @@
 # rkward/SetVersionNumber.cmake
 
 #' @export
-".rk.app.version" <- "0.6.1z+0.6.2+test1"
+".rk.app.version" <- "0.6.1z+0.6.2+test2"