[rkward-cvs] rkward/rkward/rbackend/rpackages/rkward/R internal.R,1.19,1.20

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/rbackend/rpackages/rkward/R
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1345/rbackend/rpackages/rkward/R

Modified Files:
	internal.R 
Log Message:
Remove code duplication for object classification. Make dimensionality information more generic. Untested.

Index: internal.R
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/rpackages/rkward/R/internal.R,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** internal.R	14 Oct 2005 16:26:05 -0000	1.19
--- internal.R	9 Dec 2005 16:06:32 -0000	1.20
***************
*** 25,29 ****
  	if (is.function (x)) type = type + 128
  	if (!is.null (attr (x, ".rk.meta"))) type = type + 256
! 	c (type, dim (x))
  }
  
--- 25,31 ----
  	if (is.function (x)) type = type + 128
  	if (!is.null (attr (x, ".rk.meta"))) type = type + 256
! 	d <- dim (x)
! 	if (length (d) < 1) d = length (d);	# handling for objects that according to R do not have a dimension (such as vectors, functions, etc.)
! 	c (type, d)
  }