Changeset 1c3aa7 in git for kernel/longalg.cc
- Timestamp:
- Aug 21, 2009, 3:24:56 PM (15 years ago)
- Branches:
- (u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')
- Children:
- 05a2f65abea7460479e32eb18200563024d57dd2
- Parents:
- f73e9cd899821185b921674a392103bfa336b941
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/longalg.cc
rf73e9cd r1c3aa7 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: longalg.cc,v 1. 49 2009-08-21 10:58:50Singular Exp $ */4 /* $Id: longalg.cc,v 1.50 2009-08-21 13:24:56 Singular Exp $ */ 5 5 /* 6 6 * ABSTRACT: algebraic numbers … … 66 66 static int napExpi(int i, napoly a, napoly b); 67 67 ring nacRing; 68 static inline void naNormalize0(number &pp)69 {70 lnumber p = (lnumber)pp;71 if ((p!=NULL) && (p->z!=NULL))72 {73 naNormalize(pp);74 }75 }76 68 77 69 #define napCopy(p) (napoly)p_Copy((poly)p,nacRing) … … 988 980 if (p==NULL) return NULL; 989 981 naTest(p); 990 naNormalize(p);982 //naNormalize(p); 991 983 lnumber erg; 992 984 lnumber src = (lnumber)p; … … 1066 1058 { 1067 1059 number luu=(number)lu; 1068 naNormalize 0(luu);1060 naNormalize(luu); 1069 1061 lu=(lnumber)luu; 1070 1062 } … … 1131 1123 { 1132 1124 number luu=(number)lu; 1133 naNormalize 0(luu);1125 naNormalize(luu); 1134 1126 lu=(lnumber)luu; 1135 1127 } … … 1209 1201 lo->s = 0; 1210 1202 number luu=(number)lo; 1211 naNormalize 0(luu);1203 naNormalize(luu); 1212 1204 lo=(lnumber)luu; 1213 1205 } … … 1376 1368 { 1377 1369 number luu=(number)lo; 1378 naNormalize 0(luu);1370 naNormalize(luu); 1379 1371 lo=(lnumber)luu; 1380 1372 } … … 1543 1535 { 1544 1536 phn->s = 0; 1545 naNormalize(phn);1537 //naNormalize(phn); 1546 1538 BOOLEAN has_denom=(ph->n!=NULL); 1547 1539 napWrite(ph->z,has_denom/*(ph->n!=NULL)*/); … … 1579 1571 else return FALSE; 1580 1572 } 1573 #if 0 1581 1574 x = a->z; 1582 1575 y = a->n; … … 1607 1600 a->s = 2; 1608 1601 return TRUE; 1602 #else 1603 return FALSE; 1604 #endif 1609 1605 } 1610 1606 … … 1979 1975 // return (number)result; 1980 1976 //} 1981 naNormalize(lb);1977 //naNormalize(lb); 1982 1978 naTest(la); 1983 1979 naTest(lb); … … 2425 2421 number naGetDenom(number &n, const ring r) 2426 2422 { 2427 if (r==currRing) naNormalize(n);2423 //if (r==currRing) naNormalize(n); 2428 2424 lnumber x=(lnumber)n; 2429 2425 if (x->n!=NULL) … … 2439 2435 number naGetNumerator(number &n, const ring r) 2440 2436 { 2441 if (r==currRing) naNormalize(n);2437 //if (r==currRing) naNormalize(n); 2442 2438 lnumber x=(lnumber)n; 2443 2439 lnumber rr=(lnumber)omAlloc0Bin(rnumber_bin);
Note: See TracChangeset
for help on using the changeset viewer.