Changeset 896561 in git for kernel/longalg.cc
- Timestamp:
- Jul 4, 2011, 4:48:27 PM (13 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- 0312c51932007766f7474511cc741c2233b62ef9
- Parents:
- 5f36297071b90604201cce58a71b12514e338582
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/longalg.cc
r5f3629 r896561 39 39 omBin snaIdeal_bin = omGetSpecBin(sizeof(snaIdeal)); 40 40 number (*naMap)(number from); 41 //omBin lnumber_bin = omGetSpecBin(sizeof(slnumber)); 42 //omBin rnumber_bin = omGetSpecBin(sizeof(snumber)); 41 43 42 44 void redefineFunctionPointers() … … 200 202 poly z=p_Init(r->algring); 201 203 pSetCoeff0(z,c); 202 lnumber l = (lnumber)omAllocBin(rnumber_bin);204 lnumber l = ALLOC_LNUMBER(); 203 205 l->z = z; 204 206 l->s = 2; … … 213 215 number naPar(int i) 214 216 { 215 lnumber l = (lnumber)omAllocBin(rnumber_bin);217 lnumber l = ALLOC_LNUMBER(); 216 218 l->s = 2; 217 219 l->z = p_ISet(1,nacRing); … … 270 272 p_Delete(&(l->z),r->algring); 271 273 p_Delete(&(l->n),r->algring); 272 omFreeBin((ADDRESS)l, rnumber_bin);274 FREE_LNUMBER(l); 273 275 } 274 276 *p = NULL; … … 284 286 lnumber erg; 285 287 lnumber src = (lnumber)p; 286 erg = (lnumber)omAlloc0Bin(rnumber_bin);288 erg = ALLOC_LNUMBER(); 287 289 erg->z = p_Copy(src->z, nacRing); 288 290 erg->n = p_Copy(src->n, nacRing); … … 295 297 lnumber erg; 296 298 lnumber src = (lnumber)p; 297 erg = (lnumber) omAlloc0Bin(rnumber_bin);299 erg = (lnumber)ALLOC_LNUMBER(); 298 300 erg->z = p_Copy(src->z,r->algring); 299 301 erg->n = p_Copy(src->n,r->algring); … … 315 317 lnumber b = (lnumber)lb; 316 318 #ifdef LDEBUG 317 omCheckAddrSize(a,sizeof(s number));318 omCheckAddrSize(b,sizeof(s number));319 omCheckAddrSize(a,sizeof(slnumber)); 320 omCheckAddrSize(b,sizeof(slnumber)); 319 321 #endif 320 322 if (b->n!=NULL) x = pp_Mult_qq(a->z, b->n,nacRing); … … 327 329 return (number)NULL; 328 330 } 329 lu = (lnumber)omAllocBin(rnumber_bin);331 lu = ALLOC_LNUMBER(); 330 332 lu->z=res; 331 333 if (a->n!=NULL) … … 383 385 384 386 #ifdef LDEBUG 385 omCheckAddrSize(a,sizeof(s number));386 omCheckAddrSize(b,sizeof(s number));387 omCheckAddrSize(a,sizeof(slnumber)); 388 omCheckAddrSize(b,sizeof(slnumber)); 387 389 #endif 388 390 … … 397 399 return (number)NULL; 398 400 } 399 lu = (lnumber)omAllocBin(rnumber_bin);401 lu = ALLOC_LNUMBER(); 400 402 lu->z=res; 401 403 if (a->n!=NULL) … … 439 441 440 442 #ifdef LDEBUG 441 omCheckAddrSize(a,sizeof(s number));442 omCheckAddrSize(b,sizeof(s number));443 omCheckAddrSize(a,sizeof(slnumber)); 444 omCheckAddrSize(b,sizeof(slnumber)); 443 445 #endif 444 446 naTest(la); 445 447 naTest(lb); 446 448 447 lo = (lnumber)omAllocBin(rnumber_bin);449 lo = ALLOC_LNUMBER(); 448 450 lo->z = pp_Mult_qq(a->z, b->z,nacRing); 449 451 … … 493 495 if(lo->z==NULL) 494 496 { 495 omFreeBin((ADDRESS)lo, rnumber_bin);497 FREE_LNUMBER(lo); 496 498 lo=NULL; 497 499 } … … 525 527 assume(a->z!=NULL && b->z!=NULL); 526 528 assume(a->n==NULL && b->n==NULL); 527 res = (lnumber)omAllocBin(rnumber_bin);529 res = ALLOC_LNUMBER(); 528 530 res->z = napCopy(a->z); 529 531 res->n = napCopy(b->z); … … 556 558 } 557 559 #ifdef LDEBUG 558 omCheckAddrSize(a,sizeof(s number));559 omCheckAddrSize(b,sizeof(s number));560 omCheckAddrSize(a,sizeof(slnumber)); 561 omCheckAddrSize(b,sizeof(slnumber)); 560 562 #endif 561 lo = (lnumber)omAllocBin(rnumber_bin);563 lo = ALLOC_LNUMBER(); 562 564 if (b->n!=NULL) 563 565 lo->z = pp_Mult_qq(a->z, b->n,nacRing); … … 633 635 } 634 636 #ifdef LDEBUG 635 omCheckAddrSize(b,sizeof(s number));637 omCheckAddrSize(b,sizeof(slnumber)); 636 638 #endif 637 lo = (lnumber)omAlloc0Bin(rnumber_bin);639 lo = ALLOC0_LNUMBER(); 638 640 lo->s = b->s; 639 641 if (b->n!=NULL) … … 784 786 return s; 785 787 } 786 *p = (number) omAlloc0Bin(rnumber_bin);788 *p = (number)ALLOC0_LNUMBER(); 787 789 a = (lnumber)*p; 788 790 if ((naMinimalPoly!=NULL) … … 799 801 if(a->z==NULL) 800 802 { 801 omFreeBin((ADDRESS)*p, rnumber_bin);803 FREE_LNUMBER(a); 802 804 *p=NULL; 803 805 } … … 879 881 if (a==NULL) return FALSE; 880 882 #ifdef LDEBUG 881 omCheckAddrSize(a,sizeof(s number));883 omCheckAddrSize(a,sizeof(slnumber)); 882 884 if (a->z==NULL) 883 885 { … … 937 939 if (a==NULL) return FALSE; 938 940 #ifdef LDEBUG 939 omCheckAddrSize(a,sizeof(s number));941 omCheckAddrSize(a,sizeof(slnumber)); 940 942 if (a->z==NULL) 941 943 { … … 976 978 977 979 lnumber x, y; 978 lnumber result = (lnumber)omAlloc0Bin(rnumber_bin);980 lnumber result = ALLOC0_LNUMBER(); 979 981 980 982 x = (lnumber)a; … … 1376 1378 lnumber a = (lnumber)la; 1377 1379 lnumber b = (lnumber)lb; 1378 result = (lnumber)omAlloc0Bin(rnumber_bin);1380 result = ALLOC0_LNUMBER(); 1379 1381 naTest(la); 1380 1382 naTest(lb); … … 1462 1464 { 1463 1465 if (npIsZero(c)) return NULL; 1464 lnumber l= (lnumber)omAllocBin(rnumber_bin);1466 lnumber l=ALLOC_LNUMBER(); 1465 1467 l->s=2; 1466 1468 l->z=(napoly)p_Init(nacRing); … … 1478 1480 { 1479 1481 if (nlIsZero(c)) return NULL; 1480 lnumber l= (lnumber)omAllocBin(rnumber_bin);1482 lnumber l=ALLOC_LNUMBER(); 1481 1483 l->s=0; 1482 1484 l->z=(napoly)p_Init(nacRing); … … 1492 1494 { 1493 1495 if (npIsZero(c)) return NULL; 1494 lnumber l= (lnumber)omAllocBin(rnumber_bin);1496 lnumber l=ALLOC_LNUMBER(); 1495 1497 l->s=2; 1496 1498 l->z=(napoly)p_Init(nacRing); … … 1510 1512 number n=npInit(i,ntMapRing); 1511 1513 if (npIsZero(n)) return NULL; 1512 lnumber l= (lnumber)omAllocBin(rnumber_bin);1514 lnumber l=ALLOC_LNUMBER(); 1513 1515 l->s=2; 1514 1516 l->z=(napoly)p_Init(nacRing); … … 1527 1529 if (npIsZero(n)) return NULL; 1528 1530 npTest(n); 1529 lnumber l= (lnumber)omAllocBin(rnumber_bin);1531 lnumber l=ALLOC_LNUMBER(); 1530 1532 l->s=2; 1531 1533 l->z=(napoly)p_Init(nacRing); … … 1541 1543 { 1542 1544 if (c==NULL) return NULL; 1543 lnumber erg= (lnumber)omAlloc0Bin(rnumber_bin);1545 lnumber erg= ALLOC_LNUMBER(); 1544 1546 lnumber src =(lnumber)c; 1545 1547 erg->s=src->s; … … 1652 1654 return TRUE; 1653 1655 #ifdef LDEBUG 1654 omCheckAddrSize(a, sizeof(s number));1656 omCheckAddrSize(a, sizeof(slnumber)); 1655 1657 #endif 1656 1658 napoly p = x->z;
Note: See TracChangeset
for help on using the changeset viewer.