- Timestamp:
- Oct 4, 2010, 7:28:36 PM (14 years ago)
- Branches:
- (u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')
- Children:
- 3112fe486f6ef925872fb0f70c02d25ff6328060
- Parents:
- 4326e5b680361011d38f1ddc9d4295b9176cb475
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/misc_ip.cc
r4326e5 r8c2051 219 219 220 220 unsigned long p_ui=5; add = 2; 221 BOOLEAN b_is_0=(mpz_cmp_ui(b, 0) == 0); 221 222 mpz_sqrt(sr, nn); 222 223 // there are 3 possible limits, we take the minimum: … … 224 225 // - sr = sqrt(nn) 225 226 // - 1<<31 226 unsigned long limit= 1<<31;227 if ( (mpz_cmp_ui(b, 0) == 0)|| (mpz_cmp(pb, sr) > 0))227 unsigned long limit=~(0L); 228 if (b_is_0 || (mpz_cmp(pb, sr) > 0)) 228 229 { 229 230 mpz_set(pb, sr); 230 231 } 231 if (mpz_cmp_ui( b, limit)<0)232 if (mpz_cmp_ui(pb, limit)<0) 232 233 { 233 234 limit=mpz_get_ui(pb); … … 278 279 mpz_set_ui(p, p_ui); 279 280 mpz_sqrt(sr, nn); 280 if ( (mpz_cmp_ui(b, 0) == 0)|| (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);281 if (b_is_0 || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr); 281 282 while (mpz_cmp(pb, p) >= 0) 282 283 { … … 287 288 multiplicities[index++] = tt; 288 289 mpz_sqrt(sr, nn); 289 if ( (mpz_cmp_ui(b, 0) == 0)|| (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);290 if (b_is_0 || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr); 290 291 if (mpz_cmp_ui(nn,1)==0) break; 291 292 } … … 294 295 } 295 296 if ((mpz_cmp_ui(nn, 1) > 0) && 296 ( (mpz_cmp_ui(b, 0) == 0)|| (mpz_cmp(nn, pb) <= 0)))297 (b_is_0 || (mpz_cmp(nn, pb) <= 0))) 297 298 { 298 299 setListEntry(primes, index, nn);
Note: See TracChangeset
for help on using the changeset viewer.