[Sciviews-commits] r11 - pkg/svIDE/R

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

Author: phgrosjean
Date: 2008-06-13 12:43:26 +0200 (Fri, 13 Jun 2008)
New Revision: 11

Modified:
   pkg/svIDE/R/TinnR.R
Log:
Changes in trObjList() in svIDE

Modified: pkg/svIDE/R/TinnR.R
===================================================================
--- pkg/svIDE/R/TinnR.R	2008-06-12 09:58:03 UTC (rev 10)
+++ pkg/svIDE/R/TinnR.R	2008-06-13 10:43:26 UTC (rev 11)
@@ -26,13 +26,13 @@
 		res <- data.frame(t(data.frame(strsplit(res, "\t"))),
 			stringsAsFactors = FALSE)[ , -5]
 	}
-	colnames(res) <- c("Name", "Dims", "Group", "Class")
+	colnames(res) <- c("Name", "Dim", "Group", "Class")
 	rownames(res) <- NULL
 
 	# Group conversion
 	GrpTable <- c(
 		"vector",      "vector",    "vector",     "vector",
-		"vector",      "vector",    "vector",     "table",
+		"vector",      "vector",    "vector",     "data.frame",
 		"list",        "function",  "other",      "other",
 		"other",       "other")
 	names(GrpTable) <- c(
@@ -44,6 +44,7 @@
 	NewGroup[NewGroup == "vector" & (regexpr("x", res$Dims) > -1)] <- "array"
 	NewGroup[NewGroup == "array" &
 		(regexpr("^[0-9]+x[0-9]+$", res$Dims) > -1)] <- "matrix"
+	NewGroup[res$Class == "table"] <- "table"
 	res$Group <- NewGroup
 
 	# Filter according to group