Changeset 74757f8 in git
- Timestamp:
- Oct 1, 2015, 6:11:45 PM (8 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- 6d2299707fab11d66d5c8c8cbbac1da05a9d8fba
- Parents:
- bfc0a2c96a339a71d9850d33f5afc5b725262f6b
- Files:
-
- 3 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/iparith.cc
rbfc0a2 r74757f8 3786 3786 n_Delete(&n,coeffs_BIGINT); 3787 3787 return bo; 3788 } 3789 static BOOLEAN jjBI2IM(leftv res, leftv u) 3790 { 3791 bigintmat *b=(bigintmat*)u->Data(); 3792 res->data=(void *)bim2iv(b); 3793 return FALSE; 3788 3794 } 3789 3795 static BOOLEAN jjBI2P(leftv res, leftv u) -
Singular/ipconv.cc
rbfc0a2 r74757f8 211 211 void *r=(void *)iv2bim(iv,coeffs_BIGINT); 212 212 delete iv; 213 return r;214 }215 216 static void * iiBim2Im(void *data)217 {218 bigintmat *b=(bigintmat*)data;219 void *r=(void *)bim2iv(b);220 delete b;221 213 return r; 222 214 } -
Singular/table.h
rbfc0a2 r74757f8 126 126 ,{D(jjINTERRED), INTERRED_CMD, IDEAL_CMD, IDEAL_CMD , ALLOW_PLURAL |NO_RING} 127 127 ,{D(jjINTERRED), INTERRED_CMD, MODUL_CMD, MODUL_CMD , ALLOW_PLURAL |NO_RING} 128 ,{D(jjBI2IM), INTMAT_CMD, INTMAT_CMD, BIGINTMAT_CMD , ALLOW_PLURAL |ALLOW_RING} 128 129 ,{D(jjDUMMY), INTMAT_CMD, INTMAT_CMD, INTMAT_CMD , ALLOW_PLURAL |ALLOW_RING} 129 130 ,{D(jjIm2Iv), INTVEC_CMD, INTVEC_CMD, INTMAT_CMD , ALLOW_PLURAL |ALLOW_RING} … … 294 295 ,{D(jjPLUS_MA), '+', MATRIX_CMD, MATRIX_CMD, MATRIX_CMD, ALLOW_PLURAL | ALLOW_RING} 295 296 ,{D(jjPLUS_S), '+', STRING_CMD, STRING_CMD, STRING_CMD, ALLOW_PLURAL | ALLOW_RING} 297 ,{D(jjPLUS_BIM), '+', BIGINTMAT_CMD, BIGINTMAT_CMD, BIGINTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 298 ,{D(jjOP_BIM_I), '+', BIGINTMAT_CMD, BIGINTMAT_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING} 299 ,{D(jjOP_I_BIM), '+', BIGINTMAT_CMD, INT_CMD, BIGINTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 300 ,{D(jjOP_BIM_BI), '+', BIGINTMAT_CMD, BIGINTMAT_CMD, BIGINT_CMD, ALLOW_PLURAL | ALLOW_RING} 301 ,{D(jjOP_BI_BIM), '+', BIGINTMAT_CMD, BIGINT_CMD, BIGINTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 296 302 ,{D(jjOP_IV_I), '+', INTVEC_CMD, INTVEC_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING} 297 303 ,{D(jjOP_I_IV), '+', INTVEC_CMD, INT_CMD, INTVEC_CMD, ALLOW_PLURAL | ALLOW_RING} … … 300 306 ,{D(jjPLUS_IV), '+', INTVEC_CMD, INTVEC_CMD, INTVEC_CMD, ALLOW_PLURAL | ALLOW_RING} 301 307 ,{D(jjPLUS_IV), '+', INTMAT_CMD, INTMAT_CMD, INTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 302 ,{D(jjPLUS_BIM), '+', BIGINTMAT_CMD, BIGINTMAT_CMD, BIGINTMAT_CMD, ALLOW_PLURAL | ALLOW_RING}303 ,{D(jjOP_BIM_I), '+', BIGINTMAT_CMD, BIGINTMAT_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING}304 ,{D(jjOP_I_BIM), '+', BIGINTMAT_CMD, INT_CMD, BIGINTMAT_CMD, ALLOW_PLURAL | ALLOW_RING}305 ,{D(jjOP_BIM_BI), '+', BIGINTMAT_CMD, BIGINTMAT_CMD, BIGINT_CMD, ALLOW_PLURAL | ALLOW_RING}306 ,{D(jjOP_BI_BIM), '+', BIGINTMAT_CMD, BIGINT_CMD, BIGINTMAT_CMD, ALLOW_PLURAL | ALLOW_RING}307 308 #ifdef SINGULAR_4_1 308 309 ,{D(jjPLUS_BIM), '+', CMATRIX_CMD, CMATRIX_CMD, CMATRIX_CMD, ALLOW_PLURAL | ALLOW_RING} … … 320 321 ,{D(jjPLUS_MA_P), '-', MATRIX_CMD, MATRIX_CMD, POLY_CMD, ALLOW_PLURAL | ALLOW_RING} 321 322 ,{D(jjMINUS_MA), '-', MATRIX_CMD, MATRIX_CMD, MATRIX_CMD, ALLOW_PLURAL | ALLOW_RING} 322 ,{D(jjOP_IV_I), '-', INTVEC_CMD, INTVEC_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING}323 ,{D(jjOP_IM_I), '-', INTMAT_CMD, INTMAT_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING}324 ,{D(jjMINUS_IV), '-', INTVEC_CMD, INTVEC_CMD, INTVEC_CMD, ALLOW_PLURAL | ALLOW_RING}325 ,{D(jjMINUS_IV), '-', INTMAT_CMD, INTMAT_CMD, INTMAT_CMD, ALLOW_PLURAL | ALLOW_RING}326 323 ,{D(jjMINUS_BIM), '-', BIGINTMAT_CMD, BIGINTMAT_CMD, BIGINTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 327 324 ,{D(jjOP_BIM_I), '-', BIGINTMAT_CMD, BIGINTMAT_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING} … … 329 326 ,{D(jjOP_BIM_BI), '-', BIGINTMAT_CMD, BIGINTMAT_CMD, BIGINT_CMD, ALLOW_PLURAL | ALLOW_RING} 330 327 ,{D(jjOP_BI_BIM), '-', BIGINTMAT_CMD, BIGINT_CMD, BIGINTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 328 ,{D(jjOP_IV_I), '-', INTVEC_CMD, INTVEC_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING} 329 ,{D(jjOP_IM_I), '-', INTMAT_CMD, INTMAT_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING} 330 ,{D(jjMINUS_IV), '-', INTVEC_CMD, INTVEC_CMD, INTVEC_CMD, ALLOW_PLURAL | ALLOW_RING} 331 ,{D(jjMINUS_IV), '-', INTMAT_CMD, INTMAT_CMD, INTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 331 332 #ifdef SINGULAR_4_1 332 333 ,{D(jjMINUS_BIM), '-', CMATRIX_CMD, CMATRIX_CMD,CMATRIX_CMD, ALLOW_PLURAL | ALLOW_RING} … … 361 362 ,{D(jjTIMES_MA_BI1),'*', MATRIX_CMD, MATRIX_CMD, BIGINT_CMD, ALLOW_PLURAL | ALLOW_RING} 362 363 ,{D(jjTIMES_MA_BI2),'*', MATRIX_CMD, BIGINT_CMD, MATRIX_CMD, ALLOW_PLURAL | ALLOW_RING} 364 ,{D(jjTIMES_BIM), '*', BIGINTMAT_CMD, BIGINTMAT_CMD, BIGINTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 365 ,{D(jjOP_BIM_I), '*', BIGINTMAT_CMD, BIGINTMAT_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING} 366 ,{D(jjOP_I_BIM), '*', BIGINTMAT_CMD, INT_CMD, BIGINTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 367 ,{D(jjOP_BIM_BI), '*', BIGINTMAT_CMD, BIGINTMAT_CMD, BIGINT_CMD, ALLOW_PLURAL | ALLOW_RING} 368 ,{D(jjOP_BI_BIM), '*', BIGINTMAT_CMD, BIGINT_CMD, BIGINTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 363 369 ,{D(jjOP_IV_I), '*', INTVEC_CMD, INTVEC_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING} 364 370 ,{D(jjOP_I_IV), '*', INTVEC_CMD, INT_CMD, INTVEC_CMD, ALLOW_PLURAL | ALLOW_RING} … … 368 374 ,{D(jjTIMES_IV), '*', INTMAT_CMD, INTMAT_CMD, INTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 369 375 ,{D(jjTIMES_IV), '*', INTMAT_CMD, INTVEC_CMD, INTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 370 ,{D(jjTIMES_BIM), '*', BIGINTMAT_CMD, BIGINTMAT_CMD, BIGINTMAT_CMD, ALLOW_PLURAL | ALLOW_RING}371 ,{D(jjOP_BIM_I), '*', BIGINTMAT_CMD, BIGINTMAT_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING}372 ,{D(jjOP_I_BIM), '*', BIGINTMAT_CMD, INT_CMD, BIGINTMAT_CMD, ALLOW_PLURAL | ALLOW_RING}373 ,{D(jjOP_BIM_BI), '*', BIGINTMAT_CMD, BIGINTMAT_CMD, BIGINT_CMD, ALLOW_PLURAL | ALLOW_RING}374 ,{D(jjOP_BI_BIM), '*', BIGINTMAT_CMD, BIGINT_CMD, BIGINTMAT_CMD, ALLOW_PLURAL | ALLOW_RING}375 376 #ifdef SINGULAR_4_1 376 377 ,{D(jjTIMES_BIM), '*', CMATRIX_CMD, CMATRIX_CMD, CMATRIX_CMD, ALLOW_PLURAL | ALLOW_RING} … … 1142 1143 // intmat -> bigintmat 1143 1144 { INTMAT_CMD, BIGINTMAT_CMD, D(iiIm2Bim) , NULL_VAL }, 1144 // bigintmat -> intmat1145 { BIGINTMAT_CMD, INTMAT_CMD, D(iiBim2Im) , NULL_VAL },1146 1145 // intmat -> matrix 1147 1146 { INTMAT_CMD, MATRIX_CMD, D(iiIm2Ma) , NULL_VAL }, -
Tst/Short/ok_s.lst
rbfc0a2 r74757f8 52 52 bug_tr738 53 53 bug_tr739 54 bug_tr745 54 55 bug_genus_etc 55 56 conv_bi
Note: See TracChangeset
for help on using the changeset viewer.