The R Project SVN R

Rev

Rev 7886 | Rev 8628 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7886 Rev 8505
Line 461... Line 461...
461 
	nry = INTEGER(ydims)[0];
 461 
	nry = INTEGER(ydims)[0];
462 
	ncy = INTEGER(ydims)[1];
 462 
	ncy = INTEGER(ydims)[1];
463 
	nrx = 0;
 463 
	nrx = 0;
464 
	ncx = 0;
 464 
	ncx = 0;
465 
	if (PRIMVAL(op) == 0) {
 465 
	if (PRIMVAL(op) == 0) {
466 
	    if (LENGTH(x) == nry) {
 466 
	    if (LENGTH(x) == nry) { /* x as row vector */
467 
		nrx = 1;
 467 
		nrx = 1;
468 
		ncx = LENGTH(x);
 468 
		ncx = LENGTH(x);
469 
	    }
 469 
	    }
470 
	    else if (LENGTH(x) == ncy) {
 470 
	    else if (nry == 1) { /* x as col vector */
471 
		ncx=1;
 - 
 
472 
		nrx=LENGTH(x);
 - 
 
473 
	    }
 - 
 
474 
	    if (nry * ncy == 1) {
 - 
 
475 
		nrx = LENGTH(x);
 471 
		nrx = LENGTH(x);
476 
		ncx = 1;
 472 
		ncx = 1;
477 
	    }
 473 
	    }
478 
	}
 474 
	}
479 
	else {
 475 
	else {
Line 487... Line 483...
487 
	nrx = INTEGER(xdims)[0];
 483 
	nrx = INTEGER(xdims)[0];
488 
	ncx = INTEGER(xdims)[1];
 484 
	ncx = INTEGER(xdims)[1];
489 
	nry = 0;
 485 
	nry = 0;
490 
	ncy = 0;
 486 
	ncy = 0;
491 
	if (PRIMVAL(op) == 0) {
 487 
	if (PRIMVAL(op) == 0) {
492 
	    if (LENGTH(y) == ncx) {
 488 
	    if (LENGTH(y) == ncx) { /* y as col vector */
493 
		nry = LENGTH(y);
 489 
		nry = LENGTH(y);
494 
		ncy = 1;
 490 
		ncy = 1;
495 
	    }
 491 
	    }
496 
	    else if (LENGTH(y) == nrx){
 492 
	    else if (ncx == 1){ /* y as row vector */
497 
		ncy = LENGTH(y);
 - 
 
498 
		nry = 1;
 493 
		nry = 1;
499 
	    }
 - 
 
500 
	    if (nrx * ncx == 1) {
 - 
 
501 
		ncy = LENGTH(y);
 494 
		ncy = LENGTH(y);
502 
		nry = 1;
 - 
 
503 
	    }
 495 
	    }
504 
	}
 496 
	}
505 
	else {
 497 
	else {
506 
	    if (LENGTH(y) == nrx) {
 498 
	    if (LENGTH(y) == nrx) {
507 
		nry = LENGTH(y);
 499 
		nry = LENGTH(y);