The R Project SVN – R – Diff – /trunk/src/main/array.c

     ydims = getAttrib(y, R_DimSymbol);
     ldx = length(xdims);
     ldy = length(ydims);
     if (ldx != 2 && ldy != 2) {		/* x and y non-matrices */
+	// for crossprod, allow two cases: n x n ==> (1,n) x (n,1);  1 x n = (n, 1) x (1, n)
-	if (PRIMVAL(op) == 0) {
+	if (PRIMVAL(op) == 1 && LENGTH(x) == 1) {
-	    nrx = 1;
+	    nrx = ncx = nry = 1;
-	    ncx = LENGTH(x);
+	    ncy = LENGTH(y);
+	}
 	else {
-	    nrx = LENGTH(x);
+	    nry = LENGTH(y);
-	    ncx = 1;
+	    ncy = 1;
+	    if (PRIMVAL(op) == 0) {
+		nrx = 1;
+		ncx = LENGTH(x);
+		if(ncx == 1) {	        // y as row vector
+		    ncy = nry;
+		    nry = 1;
+		}
+	    }
+	    else {
+		nrx = LENGTH(x);
+		ncx = 1;
+	    }
+	}
-	nry = LENGTH(y);
-	ncy = 1;
+    }
     else if (ldx != 2) {		/* x not a matrix */
 	nry = INTEGER(ydims)[0];
 	ncy = INTEGER(ydims)[1];
 	nrx = 0;
+	}
 	else if (PRIMVAL(op) == 1) { /* crossprod() */
 	    if (LENGTH(y) == nrx) {	/* y is a col vector */
 		nry = nrx;
 		ncy = 1;
+	    } else if (nrx == 1) {	// y as row vector
+		nry = 1;
+		ncy = LENGTH(y);
+	    }
+	}
+	else { // tcrossprod
+	    if (nrx == 1) {		// y as row vector
+		nry = 1;
+		ncy = LENGTH(y);
+	    }
-	else { /* tcrossprod --		y is a col vector */
+	    else {			// y is a col vector
-	    nry = LENGTH(y);
+		nry = LENGTH(y);
-	    ncy = 1;
+		ncy = 1;
+	    }
+	}
+    }
     else {				/* x and y matrices */
 	nrx = INTEGER(xdims)[0];
 	ncx = INTEGER(xdims)[1];
 	error(_("invalid 'ncol' value (< 0)"));
     int mn = (nr < nc) ? nr : nc;
     if (mn > 0 && LENGTH(x) == 0)
 	error(_("'x' must have positive length"));
- #ifndef LONG_VECTOR_SUPPORT
+#ifndef LONG_VECTOR_SUPPORT
    if ((double)nr * (double)nc > INT_MAX)
 	error(_("too many elements specified"));
 #endif
    if (TYPEOF(x) == CPLXSXP) {

The R Project SVN R

(root)/trunk/src/main/array.c @ 63243 – Rev 66289 → 66495