=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/mat.c,v retrieving revision 1.1 retrieving revision 1.16 diff -u -p -r1.1 -r1.16 --- OpenXM_contrib2/asir2000/engine/mat.c 1999/12/03 07:39:08 1.1 +++ OpenXM_contrib2/asir2000/engine/mat.c 2009/11/24 04:34:30 1.16 @@ -1,29 +1,83 @@ -/* $OpenXM: OpenXM/src/asir99/engine/mat.c,v 1.1.1.1 1999/11/10 08:12:26 noro Exp $ */ +/* + * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED + * All rights reserved. + * + * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited, + * non-exclusive and royalty-free license to use, copy, modify and + * redistribute, solely for non-commercial and non-profit purposes, the + * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and + * conditions of this Agreement. For the avoidance of doubt, you acquire + * only a limited right to use the SOFTWARE hereunder, and FLL or any + * third party developer retains all rights, including but not limited to + * copyrights, in and to the SOFTWARE. + * + * (1) FLL does not grant you a license in any way for commercial + * purposes. You may use the SOFTWARE only for non-commercial and + * non-profit purposes only, such as academic, research and internal + * business use. + * (2) The SOFTWARE is protected by the Copyright Law of Japan and + * international copyright treaties. If you make copies of the SOFTWARE, + * with or without modification, as permitted hereunder, you shall affix + * to all such copies of the SOFTWARE the above copyright notice. + * (3) An explicit reference to this SOFTWARE and its copyright owner + * shall be made on your publication or presentation in any form of the + * results obtained by use of the SOFTWARE. + * (4) In the event that you modify the SOFTWARE, you shall notify FLL by + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification + * for such modification or the source code of the modified part of the + * SOFTWARE. + * + * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL + * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND + * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES' + * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY + * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY. + * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, + * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL + * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES + * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES + * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY + * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF + * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART + * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY + * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, + * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. + * + * $OpenXM: OpenXM_contrib2/asir2000/engine/mat.c,v 1.15 2005/12/21 23:18:16 noro Exp $ +*/ #include "ca.h" +#include "../parse/parse.h" +extern int StrassenSize; +/* remove miser type +void mulmatmat_miser(); +*/ + void addmat(vl,a,b,c) VL vl; MAT a,b,*c; { int row,col,i,j; - MAT t; - pointer *ab,*bb,*tb; - - if ( !a ) - *c = b; - else if ( !b ) - *c = a; - else if ( (a->row != b->row) || (a->col != b->col) ) { - *c = 0; error("addmat : size mismatch"); - } else { - row = a->row; col = a->col; - MKMAT(t,row,col); - for ( i = 0; i < row; i++ ) - for ( j = 0, ab = BDY(a)[i], bb = BDY(b)[i], tb = BDY(t)[i]; - j < col; j++ ) - addr(vl,(Obj)ab[j],(Obj)bb[j],(Obj *)&tb[j]); - *c = t; - } + MAT t; + pointer *ab,*bb,*tb; + + if ( !a ) + *c = b; + else if ( !b ) + *c = a; + else if ( (a->row != b->row) || (a->col != b->col) ) { + *c = 0; error("addmat : size mismatch add"); + } else { + row = a->row; col = a->col; + MKMAT(t,row,col); + for ( i = 0; i < row; i++ ) + for ( j = 0, ab = BDY(a)[i], bb = BDY(b)[i], tb = BDY(t)[i]; + j < col; j++ ) + arf_add(vl,(Obj)ab[j],(Obj)bb[j],(Obj *)&tb[j]); + *c = t; + } } void submat(vl,a,b,c) @@ -31,35 +85,151 @@ VL vl; MAT a,b,*c; { int row,col,i,j; - MAT t; - pointer *ab,*bb,*tb; + MAT t; + pointer *ab,*bb,*tb; - if ( !a ) - chsgnmat(b,c); - else if ( !b ) - *c = a; - else if ( (a->row != b->row) || (a->col != b->col) ) { - *c = 0; error("submat : size mismatch"); - } else { - row = a->row; col = a->col; - MKMAT(t,row,col); - for ( i = 0; i < row; i++ ) - for ( j = 0, ab = BDY(a)[i], bb = BDY(b)[i], tb = BDY(t)[i]; - j < col; j++ ) - subr(vl,(Obj)ab[j],(Obj)bb[j],(Obj *)&tb[j]); - *c = t; - } + if ( !a ) + chsgnmat(b,c); + else if ( !b ) + *c = a; + else if ( (a->row != b->row) || (a->col != b->col) ) { + *c = 0; error("submat : size mismatch sub"); + } else { + row = a->row; col = a->col; + MKMAT(t,row,col); + for ( i = 0; i < row; i++ ) + for ( j = 0, ab = BDY(a)[i], bb = BDY(b)[i], tb = BDY(t)[i]; + j < col; j++ ) + arf_sub(vl,(Obj)ab[j],(Obj)bb[j],(Obj *)&tb[j]); + *c = t; + } } +/* remove miser type +void addmat_miser(vl,a,b,c,ar0,ac0,ar1,ac1,br0,bc0,br1,bc1) +VL vl; +MAT a,b,*c; +int ar0,ac0,ar1,ac1,br0,bc0,br1,bc1; +{ + int row,col,i,j; + MAT t; + pointer *ab,*bb,*tb; + row = ar1 - ar0 + 1; col = ac1 - ac0 + 1; + + if ( !a ) + *c = b; + else if ( !b ) + *c = a; + else if ( (row != br1 - br0 + 1) || (col != bc1 - bc0 + 1) ) { + *c = 0; error("addmat : size mismatch add"); + } else { + MKMAT(t,row,col); + for ( i = 0; i < row; i++ ) { + if (i+ar0 > a->row-1) { + ab = NULL; + } else { + ab = BDY(a)[i+ar0]; + } + if (i+br0 > b->row-1) { + bb = NULL; + } else { + bb = BDY(b)[i+br0]; + } + tb = BDY(t)[i]; + for ( j =0; j < col; j++ ) { + if ((ab == NULL || j+ac0 > a->col-1) && (bb == NULL || j+bc0 > b->col-1)) { + arf_add(vl,NULL,NULL,(Obj *)&tb[j]); + } else if ((ab != NULL && j+ac0 <= a->col-1) && (bb == NULL || j+bc0 > b->col-1)){ + arf_add(vl,(Obj)ab[j+ac0],NULL,(Obj *)&tb[j]); + } else if ((ab == NULL || j+ac0 > a->col-1) && (bb != NULL && j+bc0 <= b->col-1)) { + arf_add(vl,NULL, (Obj)bb[j+bc0],(Obj *)&tb[j]); + } else { + arf_add(vl,(Obj)ab[j+ac0],(Obj)bb[j+bc0],(Obj *)&tb[j]); + } + + } + } + *c = t; + } +} + +void submat_miser(vl,a,b,c,ar0,ac0,ar1,ac1,br0,bc0,br1,bc1) +VL vl; +MAT a,b,*c; +int ar0,ac0,ar1,ac1,br0,bc0,br1,bc1; +{ + int row,col,i,j; + MAT t; + pointer *ab,*bb,*tb; + + row = ar1 - ar0 + 1; col = ac1 - ac0 + 1; + + if ( !a ) + chsgnmat(b,c); + else if ( !b ) + *c = a; + else if ( (row != br1 - br0 + 1) || (col != bc1 - bc0 + 1) ) { + *c = 0; error("submat : size mismatch sub"); + } else { + MKMAT(t,row,col); + for ( i = 0; i < row; i++ ) { + if (i+ar0 > a->row-1) { + ab = NULL; + } else { + ab = BDY(a)[i+ar0]; + } + if (i+br0 > b->row-1) { + bb = NULL; + } else { + bb = BDY(b)[i+br0]; + } + tb = BDY(t)[i]; + for ( j =0; j < col; j++ ) { + if ((ab == NULL || j+ac0 > a->col-1) && (bb == NULL || j+bc0 > b->col-1)) { + arf_sub(vl,NULL,NULL,(Obj *)&tb[j]); + } else if ((ab != NULL && j+ac0 <= a->col-1) && (bb == NULL || j+bc0 > b->col-1)){ + arf_sub(vl,(Obj)ab[j+ac0],NULL,(Obj *)&tb[j]); + } else if ((ab == NULL || j+ac0 > a->col-1) && (bb != NULL && j+bc0 <= b->col-1)) { + arf_sub(vl,NULL, (Obj)bb[j+bc0],(Obj *)&tb[j]); + } else { + arf_sub(vl,(Obj)ab[j+ac0],(Obj)bb[j+bc0],(Obj *)&tb[j]); + } + + } + } + *c = t; + } +} +*/ + void mulmat(vl,a,b,c) VL vl; Obj a,b,*c; { - if ( !a || !b ) + VECT vect; + MAT mat; + + if ( !a && !b ) *c = 0; - else if ( OID(a) <= O_R ) + else if ( !a || !b ) { + if ( !a ) + a = b; + switch ( OID(a) ) { + case O_VECT: + MKVECT(vect,((VECT)a)->len); + *c = (Obj)vect; + break; + case O_MAT: + MKMAT(mat,((MAT)a)->row,((MAT)a)->col); + *c = (Obj)mat; + break; + default: + *c = 0; + break; + } + } else if ( OID(a) <= O_R || OID(a) == O_DP ) mulrmat(vl,(Obj)a,(MAT)b,(MAT *)c); - else if ( OID(b) <= O_R ) + else if ( OID(b) <= O_R || OID(b) == O_DP ) mulrmat(vl,(Obj)b,(MAT)a,(MAT *)c); else switch ( OID(a) ) { @@ -76,7 +246,10 @@ Obj a,b,*c; case O_VECT: mulmatvect(vl,(MAT)a,(VECT)b,(VECT *)c); break; case O_MAT: - mulmatmat(vl,(MAT)a,(MAT)b,(MAT *)c); break; + mulmatmat(vl, (MAT)a, (MAT)b, (MAT *)c); break; +/* remove miser type + mulmatmat_miser(vl,(MAT)a,(MAT)b,(MAT *)c, 0,0, ((MAT)a)->row-1, ((MAT)a)->col-1, 0,0,((MAT)b)->row-1, ((MAT)b)->col-1); break; +*/ default: notdef(vl,a,b,c); break; } @@ -99,7 +272,7 @@ Obj a,b,*c; else if ( OID(b) > O_R ) notdef(vl,a,b,c); else { - divr(vl,(Obj)ONE,b,&t); mulrmat(vl,t,(MAT)a,(MAT *)c); + arf_div(vl,(Obj)ONE,b,&t); mulrmat(vl,t,(MAT)a,(MAT *)c); } } @@ -118,7 +291,7 @@ MAT a,*b; for ( i = 0; i < row; i++ ) for ( j = 0, ab = BDY(a)[i], tb = BDY(t)[i]; j < col; j++ ) - chsgnr((Obj)ab[j],(Obj *)&tb[j]); + arf_chsgn((Obj)ab[j],(Obj *)&tb[j]); *b = t; } } @@ -129,9 +302,22 @@ MAT a; Obj r; MAT *c; { + int n,i; + MAT t; + if ( !a ) *c = 0; - else if ( !r || !NUM(r) || !RATN(r) || + else if ( !r ) { + if ( a->row != a->col ) { + *c = 0; error("pwrmat : non square matrix"); + } else { + n = a->row; + MKMAT(t,n,n); + for ( i = 0; i < n; i++ ) + t->body[i][i] = ONE; + *c = t; + } + } else if ( !NUM(r) || !RATN(r) || !INT(r) || (SGN((Q)r)<0) || (PL(NM((Q)r))>1) ) { *c = 0; error("pwrmat : invalid exponent"); } else if ( a->row != a->col ) { @@ -178,7 +364,7 @@ MAT b,*c; for ( i = 0; i < row; i++ ) for ( j = 0, bb = BDY(b)[i], tb = BDY(t)[i]; j < col; j++ ) - mulr(vl,(Obj)a,(Obj)bb[j],(Obj *)&tb[j]); + arf_mul(vl,(Obj)a,(Obj)bb[j],(Obj *)&tb[j]); *c = t; } } @@ -187,26 +373,426 @@ void mulmatmat(vl,a,b,c) VL vl; MAT a,b,*c; { - int arow,bcol,i,j,k,m; - MAT t; + int arow,bcol,i,j,k,m, h, arowh, bcolh; + MAT t, a11, a12, a21, a22; + MAT p, b11, b12, b21, b22; + MAT ans1, ans2, ans3, c11, c12, c21, c22; + MAT s1, s2, t1, t2, u1, v1, w1, aa, bb; pointer s,u,v; pointer *ab,*tb; - + int a1row,a2row, a3row,a4row, a1col, a2col, a3col, a4col; + int b1row,b2row, b3row,b4row, b1col, b2col, b3col, b4col; + int pflag1, pflag2, pflag3; + /* mismach col and row */ if ( a->col != b->row ) { - *c = 0; error("mulmat : size mismatch"); - } else { + *c = 0; error("mulmat : size mismatch"); + } + else { + pflag1 = 0; pflag2 = 0; pflag3 = 0; arow = a->row; m = a->col; bcol = b->col; MKMAT(t,arow,bcol); - for ( i = 0; i < arow; i++ ) - for ( j = 0, ab = BDY(a)[i], tb = BDY(t)[i]; j < bcol; j++ ) { - for ( k = 0, s = 0; k < m; k++ ) { - mulr(vl,(Obj)ab[k],(Obj)BDY(b)[k][j],(Obj *)&u); addr(vl,(Obj)s,(Obj)u,(Obj *)&v); s = v; + /* StrassenSize == 0 or matrix size less then StrassenSize, + then calc cannonical algorithm. */ + if((StrassenSize == 0)||(a->row<=StrassenSize || a->col <= StrassenSize) || (b->row<=StrassenSize || b->col <= StrassenSize)) { + for ( i = 0; i < arow; i++ ) + for ( j = 0, ab = BDY(a)[i], tb = BDY(t)[i]; j < bcol; j++ ) { + for ( k = 0, s = 0; k < m; k++ ) { + arf_mul(vl,(Obj)ab[k],(Obj)BDY(b)[k][j],(Obj *)&u); + arf_add(vl,(Obj)s,(Obj)u,(Obj *)&v); + s = v; + } + tb[j] = s; } - tb[j] = s; + *c = t; + return; + } + /* padding odd col and row to even number for zero */ + i = arow/2; + j = arow - i; + if (i != j) { + arow++; + pflag1 = 1; + } + i = m/2; + j = m - i; + if (i != j) { + m++; + pflag2 = 1; + } + + i = bcol/2; + j = bcol - i; + if (i != j) { + bcol++; + pflag3 = 1; + } + + /* split matrix A and B */ + a1row = arow/2; a1col = m/2; + MKMAT(a11,a1row,a1col); + MKMAT(a21,a1row,a1col); + MKMAT(a12,a1row,a1col); + MKMAT(a22,a1row,a1col); + + b1row = m/2; b1col = bcol/2; + MKMAT(b11,b1row,b1col); + MKMAT(b21,b1row,b1col); + MKMAT(b12,b1row,b1col); + MKMAT(b22,b1row,b1col); + + /* make a11 matrix */ + for (i = 0; i < a1row; i++) { + for (j = 0; j < a1col; j++) { + a11->body[i][j] = a->body[i][j]; } + } + + /* make a21 matrix */ + for (i = a1row; i < a->row; i++) { + for (j = 0; j < a1col; j++) { + a21->body[i-a1row][j] = a->body[i][j]; + } + } + + /* create a12 matrix */ + for (i = 0; i < a1row; i++) { + for (j = a1col; j < a->col; j++) { + a12->body[i][j-a1col] = a->body[i][j]; + } + } + + /* create a22 matrix */ + for (i = a1row; i < a->row; i++) { + for (j = a1col; j < a->col; j++) { + a22->body[i-a1row][j-a1col] = a->body[i][j]; + } + } + + + /* create b11 submatrix */ + for (i = 0; i < b1row; i++) { + for (j = 0; j < b1col; j++) { + b11->body[i][j] = b->body[i][j]; + } + } + + /* create b21 submatrix */ + for (i = b1row; i < b->row; i++) { + for (j = 0; j < b1col; j++) { + b21->body[i-b1row][j] = b->body[i][j]; + } + } + + /* create b12 submatrix */ + for (i = 0; i < b1row; i++) { + for (j = b1col; j < b->col; j++) { + b12->body[i][j-b1col] = b->body[i][j]; + } + } + + /* create b22 submatrix */ + for (i = b1row; i < b->row; i++) { + for (j = b1col; j < b->col; j++) { + b22->body[i-b1row][j-b1col] = b->body[i][j]; + } + } + + /* extension by zero */ + if (pflag1) { + for (j = 0; j < a1col; j++) { + a21->body[a1row-1][j] = 0; /* null */ + } + for (j = a1col; j < a->col; j++) { + a22->body[a1row-1][j-a1col] = 0; + } + } + if (pflag2) { + for (i = 0; i < a1row; i++) { + a12->body[i][a1col-1] = 0; + } + for (i = a1row; i < a->row; i++) { + a22->body[i-a1row][a1col-1] = 0; + } + for (j = 0; j < b1col; j++) { + b21->body[b1row-1][j] = 0; + } + for (j = b1col; j < b->col; j++) { + b22->body[b1row-1][j-b1col] = 0; + } + } + if (pflag3) { + for (i = 0; i < b1row; i++) { + b12->body[i][b1col-1] = 0; + } + for (i = b1row; i < b->row; i++) { + b22->body[i-b1row][b1col-1] = 0; + } + } + + /* expand matrix by Strassen-Winograd algorithm */ + /* s1=A21+A22 */ + addmat(vl,a21,a22,&s1); + + /* s2=s1-A11 */ + submat(vl,s1,a11,&s2); + + /* t1=B12-B11 */ + submat(vl, b12, b11, &t1); + + /* t2=B22-t1 */ + submat(vl, b22, t1, &t2); + + /* u=(A11-A21)*(B22-B12) */ + submat(vl, a11, a21, &ans1); + submat(vl, b22, b12, &ans2); + mulmatmat(vl, ans1, ans2, &u1); + + /* v=s1*t1 */ + mulmatmat(vl, s1, t1, &v1); + + /* w=A11*B11+s2*t2 */ + mulmatmat(vl, a11, b11, &ans1); + mulmatmat(vl, s2, t2, &ans2); + addmat(vl, ans1, ans2, &w1); + + /* C11 = A11*B11+A12*B21 */ + mulmatmat(vl, a12, b21, &ans2); + addmat(vl, ans1, ans2, &c11); + + /* C12 = w1+v1+(A12-s2)*B22 */ + submat(vl, a12, s2, &ans1); + mulmatmat(vl, ans1, b22, &ans2); + addmat(vl, w1, v1, &ans1); + addmat(vl, ans1, ans2, &c12); + + /* C21 = w1+u1+A22*(B21-t2) */ + submat(vl, b21, t2, &ans1); + mulmatmat(vl, a22, ans1, &ans2); + addmat(vl, w1, u1, &ans1); + addmat(vl, ans1, ans2, &c21); + + /* C22 = w1 + u1 + v1 */ + addmat(vl, ans1, v1, &c22); + } + + for(i =0; irow; i++) { + for ( j=0; j < c11->col; j++) { + t->body[i][j] = c11->body[i][j]; + } + } + if (pflag1 == 0) { + k = c21->row; + } else { + k = c21->row - 1; + } + for(i =0; icol; j++) { + t->body[i+c11->row][j] = c21->body[i][j]; + } + } + if (pflag2 == 0) { + h = c12->col; + } else { + h = c12->col -1; + } + for(i =0; irow; i++) { + for ( j=0; j < k; j++) { + t->body[i][j+c11->col] = c12->body[i][j]; + } + } + if (pflag1 == 0) { + k = c22->row; + } else { + k = c22->row -1; + } + if (pflag2 == 0) { + h = c22->col; + } else { + h = c22->col - 1; + } + for(i =0; ibody[i+c11->row][j+c11->col] = c22->body[i][j]; + } + } + *c = t; +} + +#if 0 +/* remove miser type */ +void mulmatmat_miser(vl,a,b,c,ar0,ac0,ar1,ac1,br0,bc0,br1,bc1) +VL vl; +MAT a,b,*c; +int ar0, ac0, ar1, ac1, br0, bc0, br1, bc1; +{ + int arow,bcol,i,j,k,m, h; + MAT t, a11, a12, a21, a22; + MAT p, b11, b12, b21, b22; + MAT ans1, ans2, c11, c12, c21, c22; + MAT s1, s2, t1, t2, u1, v1, w1; + pointer s,u,v; + pointer *ab,*tb, *bb; + int a1row, a1col; + int b1row, b1col; + int pflag1, pflag2; + + arow = ar1-ar0 + 1; m = ac1-ac0 + 1; bcol = bc1 - bc0 + 1; + /* mismach col and row */ + if ( m != br1-br0 + 1 ) { + *c = 0; error("mulmat : size mismatch"); + } + else { + pflag1 = 0; pflag2 = 0; + MKMAT(t,arow,bcol); + /* StrassenSize == 0 or matrix size less then StrassenSize, + then calc cannonical algorithm. */ + if((StrassenSize == 0)||(arow<=StrassenSize || m <= StrassenSize) || (m<=StrassenSize || bcol <= StrassenSize)) { + for ( i = 0; i < arow; i++ ) { + if (i+ar0 > a->row-1) { + ab = NULL; + } else { + ab = BDY(a)[i+ar0]; + } + tb = BDY(t)[i]; + for ( j = 0; j < bcol; j++ ) { + for ( k = 0, s = 0; k < m; k++ ) { + if (k+br0 > b->row-1) { + bb = NULL; + } else { + bb = BDY(b)[k+br0]; + } + if ((ab == NULL || k+ac0 > a->col-1) && (bb == NULL || j+bc0 > b->col-1)) { + arf_mul(vl,NULL,NULL,(Obj *)&u); + } else if ((ab != NULL && k+ac0 <= a->col-1) && (bb == NULL || j+bc0 > b->col-1)){ + arf_mul(vl,(Obj)ab[k+ac0],NULL,(Obj *)&u); + } else if ((ab == NULL || k+ac0 > a->col-1) && (bb != NULL && j+bc0 <= b->col-1)) { + arf_mul(vl,NULL,(Obj)bb[j+bc0],(Obj *)&u); + } else { + arf_mul(vl,(Obj)ab[k+ac0],(Obj)bb[j+bc0],(Obj *)&u); + } + arf_add(vl,(Obj)s,(Obj)u,(Obj *)&v); + s = v; + } + tb[j] = s; + } + } *c = t; + return; + + } + /* padding odd col and row to even number for zero */ + i = arow/2; + j = arow - i; + if (i != j) { + arow++; + pflag1 = 1; + } + i = m/2; + j = m - i; + if (i != j) { + m++; + pflag2 = 1; + } + + i = bcol/2; + j = bcol - i; + if (i != j) { + bcol++; + } + + /* split matrix A and B */ + a1row = arow/2; a1col = m/2; + b1row = m/2; b1col = bcol/2; + + /* expand matrix by Strassen-Winograd algorithm */ + /* s1=A21+A22 */ + addmat_miser(vl,a,a,&s1, ar0 + a1row, ac0, ar0 + arow -1, ac0 + a1col-1, ar0 + a1row, ac0 + a1col, ar0 + arow -1, ac0 + m-1); + + /* s2=s1-A11 */ + submat_miser(vl,s1,a,&s2, 0,0, s1->row-1, s1->col-1, ar0, ac0, ar0 + a1row-1, ac0 + a1col-1); + + /* t1=B12-B11 */ + submat_miser(vl, b, b, &t1, br0, bc0 + b1col, br0 + b1row-1, bc0 + bcol - 1, br0,bc0,br0 + b1row-1, bc0 + b1col-1); + + /* t2=B22-t1 */ + submat_miser(vl, b, t1, &t2, br0 + b1row, bc0 + b1col, br0 + m-1, bc0 + bcol-1, 0,0,t1->row-1, t1->col-1); + + /* u=(A11-A21)*(B22-B12) */ + submat_miser(vl, a, a, &ans1, ar0, ac0, ar0 + a1row-1,ac0 + a1col-1, ar0 + a1row, ac0, ar0 + arow-1, ac0 + a1col-1); + submat_miser(vl, b, b, &ans2, br0 + b1row, bc0 + b1col, br0 + m-1, bc0 + bcol-1, br0, bc0 + b1col, br0 + b1row-1, bc0 + bcol-1); + mulmatmat_miser(vl, ans1, ans2, &u1, 0, 0, ans1->row -1, ans1->col-1, 0, 0, ans2->row -1, ans2->col-1); + + /* v=s1*t1 */ + mulmatmat_miser(vl, s1, t1, &v1, 0, 0, s1->row -1, s1->col-1, 0, 0, t1->row -1, t1->col-1); + + /* w=A11*B11+s2*t2 */ + mulmatmat_miser(vl, a, b, &ans1, ar0, ac0, ar0 + a1row-1,ac0 + a1col-1, br0, bc0, br0 + b1row-1,bc0 + b1col-1); + mulmatmat_miser(vl, s2, t2, &ans2, 0, 0, s2->row -1, s2->col-1, 0, 0, t2->row -1, t2->col-1); + addmat_miser(vl, ans1, ans2, &w1, 0, 0, ans1->row -1, ans1->col-1, 0, 0, ans2->row -1, ans2->col-1); + + /* C11 = A11*B11+A12*B21 */ + mulmatmat_miser(vl, a, b, &ans2, ar0, ac0 + a1col, ar0 + a1row-1, ac0 + m-1, br0 + b1row, bc0 + 0, br0 + m-1, bc0 + b1col-1); + addmat_miser(vl, ans1, ans2, &c11, 0, 0, ans1->row -1, ans1->col -1, 0, 0, ans2->row -1, ans2->col-1); + + /* C12 = w1+v1+(A12-s2)*B22 */ + submat_miser(vl, a, s2, &ans1, ar0, ac0 + a1col, ar0 + a1row-1, ac0 + m-1, 0, 0, s2->row -1, s2->col -1); + mulmatmat_miser(vl, ans1, b, &ans2, 0, 0, ans1->row -1, ans1->col -1, br0 + b1row, bc0 + b1col, br0 + m-1, bc0 + bcol-1); + addmat_miser(vl, w1, v1, &ans1, 0, 0, w1->row -1, w1->col -1, 0,0, v1->row-1, v1->col -1); + addmat_miser(vl, ans1, ans2, &c12, 0, 0, ans1->row -1, ans1->col -1, 0, 0, ans2->row -1, ans2->col-1); + + /* C21 = w1+u1+A22*(B21-t2) */ + submat_miser(vl, b, t2, &ans1, br0 + b1row, bc0 + 0, br0 + m-1, bc0 + b1col-1, 0,0, t2->row-1, t2->col-1); + mulmatmat_miser(vl, a, ans1, &ans2, ar0 + a1row, ac0 + a1col, ar0 + arow-1, ac0 + m-1, 0, 0, ans1->row -1, ans1->col -1); + addmat_miser(vl, w1, u1, &ans1, 0,0,w1->row -1, w1->col-1, 0,0,u1->row -1, u1->col-1); + addmat_miser(vl, ans1, ans2, &c21, 0, 0, ans1->row -1, ans1->col -1, 0, 0, ans2->row -1, ans2->col-1); + + /* C22 = w1 + u1 + v1 */ + addmat_miser(vl, ans1, v1, &c22, 0, 0, ans1->row -1, ans1->col -1, 0, 0, v1->row-1, v1->col-1); } + + for(i =0; irow; i++) { + for ( j=0; j < c11->col; j++) { + t->body[i][j] = c11->body[i][j]; + } + } + if (pflag1 == 0) { + k = c21->row; + } else { + k = c21->row - 1; + } + for(i =0; icol; j++) { + t->body[i+c11->row][j] = c21->body[i][j]; + } + } + if (pflag2 == 0) { + h = c12->col; + } else { + h = c12->col -1; + } + for(i =0; irow; i++) { + for ( j=0; j < k; j++) { + t->body[i][j+c11->col] = c12->body[i][j]; + } + } + if (pflag1 == 0) { + k = c22->row; + } else { + k = c22->row -1; + } + if (pflag2 == 0) { + h = c22->col; + } else { + h = c22->col - 1; + } + for(i =0; ibody[i+c11->row][j+c11->col] = c22->body[i][j]; + } + } + *c = t; } +#endif void mulmatvect(vl,a,b,c) VL vl; @@ -224,11 +810,16 @@ VECT *c; else if ( a->col != b->len ) { *c = 0; error("mulmatvect : size mismatch"); } else { +#if 0 + for ( i = 0; i < b->len; i++ ) + if ( BDY(b)[i] && OID((Obj)BDY(b)[i]) > O_R ) + error("mulmatvect : invalid argument"); +#endif arow = a->row; m = a->col; MKVECT(t,arow); for ( i = 0; i < arow; i++ ) { for ( j = 0, s = 0, ab = BDY(a)[i]; j < m; j++ ) { - mulr(vl,(Obj)ab[j],(Obj)BDY(b)[j],(Obj *)&u); addr(vl,(Obj)s,(Obj)u,(Obj *)&v); s = v; + arf_mul(vl,(Obj)ab[j],(Obj)BDY(b)[j],(Obj *)&u); arf_add(vl,(Obj)s,(Obj)u,(Obj *)&v); s = v; } BDY(t)[i] = s; } @@ -251,11 +842,14 @@ VECT *c; else if ( a->len != b->row ) { *c = 0; error("mulvectmat : size mismatch"); } else { + for ( i = 0; i < a->len; i++ ) + if ( BDY(a)[i] && OID((Obj)BDY(a)[i]) > O_R ) + error("mulvectmat : invalid argument"); bcol = b->col; m = a->len; MKVECT(t,bcol); for ( j = 0; j < bcol; j++ ) { for ( i = 0, s = 0; i < m; i++ ) { - mulr(vl,(Obj)BDY(a)[i],(Obj)BDY(b)[i][j],(Obj *)&u); addr(vl,(Obj)s,(Obj)u,(Obj *)&v); s = v; + arf_mul(vl,(Obj)BDY(a)[i],(Obj)BDY(b)[i][j],(Obj *)&u); arf_add(vl,(Obj)s,(Obj)u,(Obj *)&v); s = v; } BDY(t)[j] = s; } @@ -281,7 +875,7 @@ MAT a,b; row = a->row; col = a->col; for ( i = 0; i < row; i++ ) for ( j = 0; j < col; j++ ) - if ( t = compr(vl,(Obj)BDY(a)[i][j],(Obj)BDY(b)[i][j]) ) + if ( t = arf_comp(vl,(Obj)BDY(a)[i][j],(Obj)BDY(b)[i][j]) ) return t; return 0; }