Changeset 9bb5457 in git
- Timestamp:
- May 27, 2011, 2:56:51 PM (12 years ago)
- Branches:
- (u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')
- Children:
- 2c7f28850c274452c6d4f324225864e2331412ed
- Parents:
- 7af488ec51790060979537b35a03fb345e053f90
- git-author:
- Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-05-27 14:56:51+02:00
- git-committer:
- Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:39:06+01:00
- Location:
- libpolys
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
libpolys/coeffs/gnumpc.cc
r7af488e r9bb5457 30 30 #ifdef LDEBUG 31 31 // not yet implemented 32 BOOLEAN ngcDBTest(number a, const char *f, const int l, const coeffs r)32 BOOLEAN ngcDBTest(number, const char *, const int, const coeffs r) 33 33 { 34 34 assume( getCoeffType(r) == ID ); … … 54 54 { 55 55 assume( getCoeffType(r) == ID ); 56 56 57 57 gmp_complex* n= new gmp_complex( (long)i, (long)0 ); 58 58 59 59 return (number)n; 60 60 } … … 66 66 { 67 67 assume( getCoeffType(r) == ID ); 68 68 69 69 return (int)((gmp_complex*)i)->real(); 70 70 } … … 105 105 { 106 106 assume( getCoeffType(r) == ID ); 107 107 108 108 gmp_complex* b= new gmp_complex( *(gmp_complex*)a ); 109 109 return (number)b; … … 170 170 { 171 171 assume( getCoeffType(R) == ID ); 172 172 173 173 gmp_complex* r= new gmp_complex( (*(gmp_complex*)a) * (*(gmp_complex*)b) ); 174 174 return (number)r; … … 414 414 415 415 416 417 /* 416 417 /* 418 418 //r->cfInitChar=nlInitChar; 419 419 r->cfKillChar=NULL; … … 484 484 else 485 485 n->complex_parameter = omStrDup( (char*) p ); 486 486 487 487 return FALSE; 488 488 } … … 553 553 554 554 if ( from != NULL ) 555 { 555 { 556 556 b = new gmp_complex( *(gmp_complex*)from ); 557 557 } 558 return (number)b; 558 return (number)b; 559 559 } 560 560 -
libpolys/coeffs/longrat.cc
r7af488e r9bb5457 151 151 assume( getCoeffType(dst) == ID ); 152 152 assume( getCoeffType(src) == n_Zp ); 153 153 154 154 number to; 155 155 to = nlInit(npInt(from,src), dst); … … 164 164 * convert from a GMP integer 165 165 */ 166 number nlMapGMP(number from, const coeffs src, const coeffs dst)166 number nlMapGMP(number from, const coeffs /*src*/, const coeffs /*dst*/) 167 167 { 168 168 number z=ALLOC_RNUMBER(); … … 180 180 * convert from an machine long 181 181 */ 182 number nlMapMachineInt(number from, const coeffs src, const coeffs dst)182 number nlMapMachineInt(number from, const coeffs /*src*/, const coeffs /*dst*/) 183 183 { 184 184 number z=ALLOC_RNUMBER(); … … 195 195 196 196 #ifdef LDEBUG 197 BOOLEAN nlDBTest(number a, const char *f,const int l, const coeffs r)197 BOOLEAN nlDBTest(number a, const char *f,const int l, const coeffs /*r*/) 198 198 { 199 199 if (a==NULL) … … 284 284 285 285 #ifdef HAVE_FACTORY 286 CanonicalForm nlConvSingNFactoryN( number n, BOOLEAN setChar, const coeffs r)286 CanonicalForm nlConvSingNFactoryN( number n, BOOLEAN setChar, const coeffs /*r*/ ) 287 287 { 288 288 if (setChar) setCharacteristic( 0 ); … … 345 345 assume( getCoeffType(dst) == ID ); 346 346 assume( getCoeffType(src) == n_R ); 347 347 348 348 double f=nrFloat(from); 349 349 if (f==0.0) return INT_TO_SR(0); … … 372 372 } 373 373 374 static number nlMapLongR(number from, const coeffs src, const coeffs dst) 374 static number nlMapLongR(number from, const coeffs src, const coeffs dst) 375 375 { 376 376 assume( getCoeffType(dst) == ID ); 377 377 assume( getCoeffType(src) == n_long_R ); 378 378 379 379 gmp_float *ff=(gmp_float*)from; 380 380 mpf_t *f=ff->_mpfp(); … … 522 522 return 1; /* immidiate int */ 523 523 int s=a->z[0]._mp_alloc; 524 // while ((s>0) &&(a->z._mp_d[s]==0L)) s--; 524 // while ((s>0) &&(a->z._mp_d[s]==0L)) s--; 525 525 //#if SIZEOF_LONG == 8 526 526 // if (a->z._mp_d[s] < (unsigned long)0x100000000L) s=s*2-1; … … 531 531 { 532 532 int d=a->n[0]._mp_alloc; 533 // while ((d>0) && (a->n._mp_d[d]==0L)) d--; 533 // while ((d>0) && (a->n._mp_d[d]==0L)) d--; 534 534 //#if SIZEOF_LONG == 8 535 535 // if (a->n._mp_d[d] < (unsigned long)0x100000000L) d=d*2-1; … … 1971 1971 assume( getCoeffType(dst) == ID ); 1972 1972 assume( getCoeffType(src) == ID ); 1973 1973 1974 1974 if ((SR_HDL(a) & SR_INT)||(a==NULL)) 1975 1975 { … … 1983 1983 assume( getCoeffType(dst) == ID ); 1984 1984 // assume( getCoeffType(src) == ID ); 1985 1985 1986 1986 if (nCoeff_is_Q(src)) 1987 1987 { … … 2364 2364 nlTest(u, R); 2365 2365 return u; 2366 2366 2367 2367 } 2368 2368 number u = _nlMult_aNoImm_OR_bNoImm(a, b); 2369 2369 nlTest(u, R); 2370 2370 return u; 2371 2371 2372 2372 } 2373 2373 … … 2391 2391 nlTest(u, r); 2392 2392 return u; 2393 2393 2394 2394 } 2395 2395 … … 2539 2539 } 2540 2540 2541 void nlCoeffWrite (const coeffs r)2541 void nlCoeffWrite (const coeffs) 2542 2542 { 2543 2543 PrintS("// characteristic : 0\n"); 2544 2544 } 2545 2545 2546 BOOLEAN nlInitChar(coeffs r, void* p)2546 BOOLEAN nlInitChar(coeffs r, void*) 2547 2547 { 2548 2548 assume( getCoeffType(r) == ID ); 2549 2549 //const int ch = (int)(long)(p); 2550 2550 2551 2551 r->cfKillChar=NULL; 2552 2552 r->cfSetChar=NULL; … … 2609 2609 r->has_simple_Alloc=FALSE; 2610 2610 r->has_simple_Inverse=FALSE; 2611 2611 2612 2612 // variables for this type of coeffs: 2613 2613 // (none) -
libpolys/coeffs/numbers.cc
r7af488e r9bb5457 52 52 53 53 void nNew(number* d) { *d=NULL; } 54 void ndDelete(number* d, const coeffs r) { *d=NULL; }54 void ndDelete(number* d, const coeffs) { *d=NULL; } 55 55 void ndInpMult(number &a, number b, const coeffs r) 56 56 { … … 67 67 68 68 #ifdef LDEBUG 69 void nDBDummy1(number* d,char * f, int l) { *d=NULL; }70 BOOLEAN ndDBTest(number a, const char *f, const int l, const coeffs r)69 void nDBDummy1(number* d,char *, int) { *d=NULL; } 70 BOOLEAN ndDBTest(number, const char *, const int, const coeffs) 71 71 { 72 72 return TRUE; … … 90 90 } 91 91 92 void ndNormalize(number& d, const coeffs r) { }93 94 char * ndName(number n, const coeffs r) { return NULL; }95 96 number ndPar(int i, const coeffs r) { return n_Init(0,r); }97 98 number ndReturn0(number n, const coeffs r) { return n_Init(0,r); }99 100 int ndParDeg(number n, const coeffs r) { return 0; }92 void ndNormalize(number&, const coeffs) { } 93 94 char * ndName(number, const coeffs) { return NULL; } 95 96 number ndPar(int, const coeffs r) { return n_Init(0,r); } 97 98 number ndReturn0(number, const coeffs r) { return n_Init(0,r); } 99 100 int ndParDeg(number, const coeffs) { return 0; } 101 101 102 102 number ndGcd(number, number, const coeffs r) { return n_Init(1,r); } … … 122 122 123 123 #ifdef HAVE_RINGS 124 BOOLEAN ndDivBy(number a, number b, const coeffs r) { return TRUE; } // assume a,b !=0125 int ndDivComp(number a, number b, const coeffs r) { return 2; }124 BOOLEAN ndDivBy(number, number, const coeffs) { return TRUE; } // assume a,b !=0 125 int ndDivComp(number, number, const coeffs) { return 2; } 126 126 BOOLEAN ndIsUnit(number a, const coeffs r) { return !n_IsZero(a,r); } 127 number ndExtGcd (number a, number b, number *s, number *t, const coeffs r) { return n_Init(1,r); }127 number ndExtGcd (number, number, number *, number *, const coeffs r) { return n_Init(1,r); } 128 128 #endif 129 129 130 130 #ifdef HAVE_FACTORY 131 CanonicalForm ndConvSingNFactoryN( number n, BOOLEAN setChar, const coeffs r)131 CanonicalForm ndConvSingNFactoryN( number, BOOLEAN /*setChar*/, const coeffs) 132 132 { 133 133 CanonicalForm term(0); … … 136 136 } 137 137 138 number ndConvFactoryNSingN( const CanonicalForm n, const coeffs r)138 number ndConvFactoryNSingN( const CanonicalForm, const coeffs) 139 139 { 140 140 Werror("no conversion from factory"); -
libpolys/coeffs/rintegers.cc
r7af488e r9bb5457 30 30 * Multiply two numbers 31 31 */ 32 number nrzMult (number a, number b, const coeffs r)32 number nrzMult (number a, number b, const coeffs) 33 33 { 34 34 int_number erg = (int_number) omAllocBin(gmp_nrz_bin); … … 41 41 * Give the smallest non unit k, such that a * x = k = b * y has a solution 42 42 */ 43 number nrzLcm (number a,number b,const coeffs r)43 number nrzLcm (number a,number b,const coeffs) 44 44 { 45 45 int_number erg = (int_number) omAllocBin(gmp_nrz_bin); … … 53 53 * a solution. 54 54 */ 55 number nrzGcd (number a,number b,const coeffs r)55 number nrzGcd (number a,number b,const coeffs) 56 56 { 57 57 int_number erg = (int_number) omAllocBin(gmp_nrz_bin); … … 65 65 * a solution and r, s, s.t. k = s*a + t*b 66 66 */ 67 number nrzExtGcd (number a, number b, number *s, number *t, const coeffs r)67 number nrzExtGcd (number a, number b, number *s, number *t, const coeffs) 68 68 { 69 69 int_number erg = (int_number) omAllocBin(gmp_nrz_bin); … … 79 79 } 80 80 81 void nrzPower (number a, int i, number * result, const coeffs r)81 void nrzPower (number a, int i, number * result, const coeffs) 82 82 { 83 83 int_number erg = (int_number) omAllocBin(gmp_nrz_bin); … … 90 90 * create a number from int 91 91 */ 92 number nrzInit (int i, const coeffs r)92 number nrzInit (int i, const coeffs) 93 93 { 94 94 int_number erg = (int_number) omAllocBin(gmp_nrz_bin); … … 97 97 } 98 98 99 void nrzDelete(number *a, const coeffs r)99 void nrzDelete(number *a, const coeffs) 100 100 { 101 101 if (*a == NULL) return; … … 105 105 } 106 106 107 number nrzCopy(number a, const coeffs r)107 number nrzCopy(number a, const coeffs) 108 108 { 109 109 int_number erg = (int_number) omAllocBin(gmp_nrz_bin); … … 112 112 } 113 113 114 number nrzCopyMap(number a, const coeffs src, const coeffs dst)114 number nrzCopyMap(number a, const coeffs /*src*/, const coeffs dst) 115 115 { 116 116 return nrzCopy(a,dst); 117 117 } 118 118 119 int nrzSize(number a, const coeffs r)119 int nrzSize(number a, const coeffs) 120 120 { 121 121 if (a == NULL) return 0; … … 126 126 * convert a number to int 127 127 */ 128 int nrzInt(number &n, const coeffs r)128 int nrzInt(number &n, const coeffs) 129 129 { 130 130 return (int) mpz_get_si( (int_number)n); 131 131 } 132 132 133 number nrzAdd (number a, number b, const coeffs r)133 number nrzAdd (number a, number b, const coeffs) 134 134 { 135 135 int_number erg = (int_number) omAllocBin(gmp_nrz_bin); … … 139 139 } 140 140 141 number nrzSub (number a, number b, const coeffs r)141 number nrzSub (number a, number b, const coeffs) 142 142 { 143 143 int_number erg = (int_number) omAllocBin(gmp_nrz_bin); … … 147 147 } 148 148 149 number nrzGetUnit (number a, const coeffs r)149 number nrzGetUnit (number, const coeffs r) 150 150 { 151 151 return nrzInit(1, r); 152 152 } 153 153 154 BOOLEAN nrzIsUnit (number a, const coeffs r)154 BOOLEAN nrzIsUnit (number a, const coeffs) 155 155 { 156 156 return 0 == mpz_cmpabs_ui((int_number) a, 1); 157 157 } 158 158 159 BOOLEAN nrzIsZero (number a, const coeffs r)159 BOOLEAN nrzIsZero (number a, const coeffs) 160 160 { 161 161 return 0 == mpz_cmpabs_ui((int_number) a, 0); 162 162 } 163 163 164 BOOLEAN nrzIsOne (number a, const coeffs r)164 BOOLEAN nrzIsOne (number a, const coeffs) 165 165 { 166 166 return (a!=NULL) && (0 == mpz_cmp_si((int_number) a, 1)); 167 167 } 168 168 169 BOOLEAN nrzIsMOne (number a, const coeffs r)169 BOOLEAN nrzIsMOne (number a, const coeffs) 170 170 { 171 171 return (a!=NULL) && (0 == mpz_cmp_si((int_number) a, -1)); 172 172 } 173 173 174 BOOLEAN nrzEqual (number a,number b, const coeffs r)174 BOOLEAN nrzEqual (number a,number b, const coeffs) 175 175 { 176 176 return 0 == mpz_cmp((int_number) a, (int_number) b); 177 177 } 178 178 179 BOOLEAN nrzGreater (number a,number b, const coeffs r)179 BOOLEAN nrzGreater (number a,number b, const coeffs) 180 180 { 181 181 return 0 < mpz_cmp((int_number) a, (int_number) b); 182 182 } 183 183 184 BOOLEAN nrzGreaterZero (number k, const coeffs r)184 BOOLEAN nrzGreaterZero (number k, const coeffs) 185 185 { 186 186 return 0 < mpz_cmp_si((int_number) k, 0); … … 198 198 } 199 199 200 BOOLEAN nrzDivBy (number a,number b, const coeffs r)200 BOOLEAN nrzDivBy (number a,number b, const coeffs) 201 201 { 202 202 return mpz_divisible_p((int_number) a, (int_number) b) != 0; … … 220 220 } 221 221 222 number nrzIntDiv (number a,number b, const coeffs r)222 number nrzIntDiv (number a,number b, const coeffs) 223 223 { 224 224 int_number erg = (int_number) omAllocBin(gmp_nrz_bin); … … 228 228 } 229 229 230 number nrzIntMod (number a,number b, const coeffs R)230 number nrzIntMod (number a,number b, const coeffs) 231 231 { 232 232 int_number erg = (int_number) omAllocBin(gmp_nrz_bin); … … 249 249 } 250 250 251 number nrzNeg (number c, const coeffs r)251 number nrzNeg (number c, const coeffs) 252 252 { 253 253 // nNeg inplace !!! … … 256 256 } 257 257 258 number nrzMapMachineInt(number from, const coeffs src, const coeffs dst)258 number nrzMapMachineInt(number from, const coeffs /*src*/, const coeffs /*dst*/) 259 259 { 260 260 int_number erg = (int_number) omAllocBin(gmp_nrz_bin); … … 263 263 } 264 264 265 number nrzMapZp(number from, const coeffs src, const coeffs dst)265 number nrzMapZp(number from, const coeffs /*src*/, const coeffs /*dst*/) 266 266 { 267 267 int_number erg = (int_number) omAllocBin(gmp_nrz_bin); … … 270 270 } 271 271 272 number nrzMapQ(number from, const coeffs src, const coeffs dst)272 number nrzMapQ(number from, const coeffs src, const coeffs /*dst*/) 273 273 { 274 274 int_number erg = (int_number) omAllocBin(gmp_nrz_bin); … … 305 305 */ 306 306 307 void nrzSetExp(int m, coeffs r)308 { 309 } 310 311 void nrzInitExp(int m, coeffs r)307 void nrzSetExp(int, coeffs) 308 { 309 } 310 311 void nrzInitExp(int, coeffs) 312 312 { 313 313 } 314 314 315 315 #ifdef LDEBUG 316 BOOLEAN nrzDBTest (number a, const char *f, const int l, const coeffs r)316 BOOLEAN nrzDBTest (number, const char *, const int, const coeffs) 317 317 { 318 318 return TRUE;//TODO … … 320 320 #endif 321 321 322 void nrzWrite (number &a, const coeffs r)322 void nrzWrite (number &a, const coeffs) 323 323 { 324 324 char *s,*z; … … 364 364 } 365 365 366 const char * nrzRead (const char *s, number *a, const coeffs r)366 const char * nrzRead (const char *s, number *a, const coeffs) 367 367 { 368 368 int_number z = (int_number) omAllocBin(gmp_nrz_bin); … … 375 375 } 376 376 377 void nrzCoeffWrite (const coeffs r)377 void nrzCoeffWrite (const coeffs) 378 378 { 379 379 PrintS("// characteristic : 0 (Integers)\n"); … … 381 381 382 382 383 BOOLEAN nrzInitChar(coeffs r, void * parameter)383 BOOLEAN nrzInitChar(coeffs r, void *) 384 384 { 385 385 assume( getCoeffType(r) == ID ); … … 426 426 r->cfDBTest=nrzDBTest; 427 427 #endif 428 428 429 429 r->nNULL = 0; 430 430 r->ch = 0; 431 431 r->ringtype = 4; 432 432 r->has_simple_Alloc=FALSE; 433 r->has_simple_Inverse=FALSE; 433 r->has_simple_Inverse=FALSE; 434 434 return FALSE; 435 435 } -
libpolys/coeffs/rmodulo2m.cc
r7af488e r9bb5457 53 53 54 54 r->ringtype = 1; 55 55 56 56 /* next cast may yield an overflow as mod2mMask is an unsigned long */ 57 57 r->ch = (int)r->mod2mMask + 1; … … 110 110 * Give the smallest k, such that a * x = k = b * y has a solution 111 111 */ 112 number nr2mLcm(number a, number b, const coeffs r)112 number nr2mLcm(number a, number b, const coeffs) 113 113 { 114 114 NATNUMBER res = 0; … … 133 133 * a solution. 134 134 */ 135 number nr2mGcd(number a, number b, const coeffs r)135 number nr2mGcd(number a, number b, const coeffs) 136 136 { 137 137 NATNUMBER res = 0; … … 240 240 } 241 241 242 BOOLEAN nr2mIsUnit(number a, const coeffs r)242 BOOLEAN nr2mIsUnit(number a, const coeffs) 243 243 { 244 244 return ((NATNUMBER)a % 2 == 1); 245 245 } 246 246 247 number nr2mGetUnit(number k, const coeffs r)247 number nr2mGetUnit(number k, const coeffs) 248 248 { 249 249 if (k == NULL) return (number)1; … … 253 253 } 254 254 255 BOOLEAN nr2mIsZero(number a, const coeffs r)255 BOOLEAN nr2mIsZero(number a, const coeffs) 256 256 { 257 257 return 0 == (NATNUMBER)a; 258 258 } 259 259 260 BOOLEAN nr2mIsOne(number a, const coeffs r)260 BOOLEAN nr2mIsOne(number a, const coeffs) 261 261 { 262 262 return 1 == (NATNUMBER)a; … … 268 268 } 269 269 270 BOOLEAN nr2mEqual(number a, number b, const coeffs r)270 BOOLEAN nr2mEqual(number a, number b, const coeffs) 271 271 { 272 272 return (a == b); … … 310 310 } 311 311 312 int nr2mDivComp(number as, number bs, const coeffs r)312 int nr2mDivComp(number as, number bs, const coeffs) 313 313 { 314 314 NATNUMBER a = (NATNUMBER)as; … … 474 474 NATNUMBER g = 1; 475 475 NATNUMBER b_div = (NATNUMBER)b; 476 if (b_div < 0) b_div = -b_div; // b_div now represents |b| 476 if (b_div < 0) b_div = -b_div; // b_div now represents |b|, BUT b_div is unsigned! 477 477 NATNUMBER rr = 0; 478 478 while ((g < r->mod2mMask ) && (b_div > 0) && (b_div % 2 == 0)) … … 532 532 } 533 533 534 number nr2mMapMachineInt(number from, const coeffs src, const coeffs dst)534 number nr2mMapMachineInt(number from, const coeffs /*src*/, const coeffs dst) 535 535 { 536 536 NATNUMBER i = ((NATNUMBER)from) % dst->mod2mMask ; … … 538 538 } 539 539 540 number nr2mMapZp(number from, const coeffs src, const coeffs dst)540 number nr2mMapZp(number from, const coeffs /*src*/, const coeffs dst) 541 541 { 542 542 NATNUMBER j = (NATNUMBER)1; … … 549 549 } 550 550 551 number nr2mMapQ(number from, const coeffs src, const coeffs dst)551 number nr2mMapQ(number from, const coeffs /*src*/, const coeffs dst) 552 552 { 553 553 int_number erg = (int_number)omAllocBin(gmp_nrz_bin); … … 566 566 } 567 567 568 number nr2mMapGMP(number from, const coeffs src, const coeffs dst)568 number nr2mMapGMP(number from, const coeffs /*src*/, const coeffs dst) 569 569 { 570 570 int_number erg = (int_number)omAllocBin(gmp_nrz_bin); … … 659 659 660 660 #ifdef LDEBUG 661 BOOLEAN nr2mDBTest (number a, const char * f, const int l, const coeffs r)662 { 663 if ((NATNUMBER)a < 0) return FALSE;661 BOOLEAN nr2mDBTest (number a, const char *, const int, const coeffs r) 662 { 663 //if ((NATNUMBER)a < 0) return FALSE; // is unsigned! 664 664 if (((NATNUMBER)a & r->mod2mMask) != (NATNUMBER)a) return FALSE; 665 665 return TRUE; -
libpolys/coeffs/rmodulon.cc
r7af488e r9bb5457 51 51 nrnInitExp((int)(long)(p), r); 52 52 r->ringtype = 2; 53 53 54 54 /* next computation may yield wrong characteristic as r->modNumber 55 55 is a GMP number */ … … 108 108 } 109 109 110 void nrnDelete(number *a, const coeffs r)110 void nrnDelete(number *a, const coeffs) 111 111 { 112 112 if (*a == NULL) return; … … 116 116 } 117 117 118 number nrnCopy(number a, const coeffs r)118 number nrnCopy(number a, const coeffs) 119 119 { 120 120 int_number erg = (int_number) omAllocBin(gmp_nrz_bin); … … 123 123 } 124 124 125 int nrnSize(number a, const coeffs r)125 int nrnSize(number a, const coeffs) 126 126 { 127 127 if (a == NULL) return 0; … … 132 132 * convert a number to int 133 133 */ 134 int nrnInt(number &n, const coeffs r)134 int nrnInt(number &n, const coeffs) 135 135 { 136 136 return (int)mpz_get_si((int_number) n); … … 179 179 if( !nrnIsZero(c, r) ) 180 180 // Attention: This method operates in-place. 181 mpz_sub((int_number)c, r->modNumber, (int_number)c); 181 mpz_sub((int_number)c, r->modNumber, (int_number)c); 182 182 return c; 183 183 } … … 253 253 } 254 254 255 BOOLEAN nrnIsZero(number a, const coeffs r)255 BOOLEAN nrnIsZero(number a, const coeffs) 256 256 { 257 257 #ifdef LDEBUG … … 261 261 } 262 262 263 BOOLEAN nrnIsOne(number a, const coeffs r)263 BOOLEAN nrnIsOne(number a, const coeffs) 264 264 { 265 265 #ifdef LDEBUG … … 281 281 } 282 282 283 BOOLEAN nrnEqual(number a, number b, const coeffs r)283 BOOLEAN nrnEqual(number a, number b, const coeffs) 284 284 { 285 285 return 0 == mpz_cmp((int_number)a, (int_number)b); 286 286 } 287 287 288 BOOLEAN nrnGreater(number a, number b, const coeffs r)288 BOOLEAN nrnGreater(number a, number b, const coeffs) 289 289 { 290 290 return 0 < mpz_cmp((int_number)a, (int_number)b); 291 291 } 292 292 293 BOOLEAN nrnGreaterZero(number k, const coeffs r)293 BOOLEAN nrnGreaterZero(number k, const coeffs) 294 294 { 295 295 return 0 < mpz_cmp_si((int_number)k, 0); … … 443 443 int_number nrnMapCoef = NULL; 444 444 445 number nrnMapModN(number from, const coeffs src, const coeffs dst)445 number nrnMapModN(number from, const coeffs /*src*/, const coeffs dst) 446 446 { 447 447 return nrnMult(from, (number) nrnMapCoef, dst); 448 448 } 449 449 450 number nrnMap2toM(number from, const coeffs src, const coeffs dst)450 number nrnMap2toM(number from, const coeffs /*src*/, const coeffs dst) 451 451 { 452 452 int_number erg = (int_number)omAllocBin(gmp_nrz_bin); … … 457 457 } 458 458 459 number nrnMapZp(number from, const coeffs src, const coeffs dst)459 number nrnMapZp(number from, const coeffs /*src*/, const coeffs dst) 460 460 { 461 461 int_number erg = (int_number)omAllocBin(gmp_nrz_bin); … … 467 467 } 468 468 469 number nrnMapGMP(number from, const coeffs src, const coeffs dst)469 number nrnMapGMP(number from, const coeffs /*src*/, const coeffs dst) 470 470 { 471 471 int_number erg = (int_number)omAllocBin(gmp_nrz_bin); … … 475 475 } 476 476 477 number nrnMapQ(number from, const coeffs src, const coeffs dst)477 number nrnMapQ(number from, const coeffs src, const coeffs /*dst*/) 478 478 { 479 479 int_number erg = (int_number)omAllocBin(gmp_nrz_bin); … … 590 590 591 591 #ifdef LDEBUG 592 BOOLEAN nrnDBTest (number a, const char * f, const int l, const coeffs r)592 BOOLEAN nrnDBTest (number a, const char *, const int, const coeffs r) 593 593 { 594 594 if (a==NULL) return TRUE; -
libpolys/polys/monomials/ring.cc
r7af488e r9bb5457 2211 2211 2212 2212 static void rO_ISPrefix(int &place, int &bitplace, int &prev_ord, 2213 long *o, int N, int *v, sro_ord &ord_struct)2213 long *o, int /*N*/, int *v, sro_ord &ord_struct) 2214 2214 { 2215 2215 if ((prev_ord== 1) || (bitplace!=BITS_PER_LONG)) … … 3929 3929 pFDeg_CASE(p_WTotaldegree); else 3930 3930 pFDeg_CASE(p_Deg); else 3931 Print("(%p)", r->pFDeg); // default case3931 Print("(%p)", (void*)(r->pFDeg)); // default case 3932 3932 3933 3933 PrintS("\n"); … … 4898 4898 return size; 4899 4899 } 4900 //static int rReallocM1(ring r, ring src, int size, int pos) 4901 //{ 4902 // r->order=(int*)omReallocSize(r->order, size*sizeof(int), (size-1)*sizeof(int)); 4903 // r->block0=(int*)omReallocSize(r->block0, size*sizeof(int), (size-1)*sizeof(int)); 4904 // r->block1=(int*)omReallocSize(r->block1, size*sizeof(int), (size-1)*sizeof(int)); 4905 // r->wvhdl=(int **)omReallocSize(r->wvhdl,size*sizeof(int *), (size-1)*sizeof(int *)); 4906 // for(int k=pos+1; k<size; k++) r->wvhdl[k]=r->wvhdl[k+1]; 4907 // size--; 4908 // return size; 4909 //} 4900 #if 0 // currently unused 4901 static int rReallocM1(ring r, int size, int pos) 4902 { 4903 r->order=(int*)omReallocSize(r->order, size*sizeof(int), (size-1)*sizeof(int)); 4904 r->block0=(int*)omReallocSize(r->block0, size*sizeof(int), (size-1)*sizeof(int)); 4905 r->block1=(int*)omReallocSize(r->block1, size*sizeof(int), (size-1)*sizeof(int)); 4906 r->wvhdl=(int **)omReallocSize(r->wvhdl,size*sizeof(int *), (size-1)*sizeof(int *)); 4907 for(int k=pos+1; k<size; k++) r->wvhdl[k]=r->wvhdl[k+1]; 4908 size--; 4909 return size; 4910 } 4911 #endif 4910 4912 static void rOppWeight(int *w, int l) 4911 4913 { … … 5123 5125 r->order[j]=ringorder_wp; 5124 5126 i++; 5125 //l=rReallocM1(r, src,l,j);5127 //l=rReallocM1(r,l,j); 5126 5128 } 5127 5129 else
Note: See TracChangeset
for help on using the changeset viewer.