mlemanczyk/even-perfect-numbers-scanner
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switched back to PrimeTester.IsPrimeInternal for teseting

Browse Source
This commit is contained in:
mlemanczyk committed 2025-10-21 04:07:49 +02:00
1 parent 1b3a89ca53
commit 8dc7751084
1 file changed
+13 -7
Download Patch File Download Diff File Expand all files Collapse all files
PerfectNumbers.Core/PrimeOrderCalculator.Cpu.cs
+13 -7
View File
@@ -747,7 +747,7 @@ internal static partial class PrimeOrderCalculator
// if (!gpuPopulated) // if (!gpuPopulated)
// { // {
// throw new InvalidOperationException($"GPU didn't populate factors for {value}"); // throw new InvalidOperationException($"GPU didn't populate factors for {value}");
// counts.Clear(); // counts.Clear();
remaining = PopulateSmallPrimeFactorsCpu(value, limit, counts); remaining = PopulateSmallPrimeFactorsCpu(value, limit, counts);
// } // }
@@ -798,7 +798,8 @@ internal static partial class PrimeOrderCalculator
// continue; // continue;
// } // }
bool isPrime = Open.Numeric.Primes.Prime.Numbers.IsPrime(composite); bool isPrime = PrimeTester.IsPrimeInternal(composite, CancellationToken.None);
// bool isPrime = Open.Numeric.Primes.Prime.Numbers.IsPrime(composite);
if (isPrime) if (isPrime)
{ {
@@ -858,7 +859,8 @@ internal static partial class PrimeOrderCalculator
if (!entry.HasKnownPrimality) if (!entry.HasKnownPrimality)
{ {
bool isPrime = Open.Numeric.Primes.Prime.Numbers.IsPrime(composite); bool isPrime = PrimeTester.IsPrimeInternal(composite, CancellationToken.None);
// bool isPrime = Open.Numeric.Primes.Prime.Numbers.IsPrime(composite);
entry = entry.WithPrimality(isPrime); entry = entry.WithPrimality(isPrime);
pending[index] = entry; pending[index] = entry;
} }
@@ -887,7 +889,8 @@ internal static partial class PrimeOrderCalculator
} }
else else
{ {
cofactorIsPrime = Open.Numeric.Primes.Prime.Numbers.IsPrime(cofactor); cofactorIsPrime = PrimeTester.IsPrimeInternal(cofactor, CancellationToken.None);
// cofactorIsPrime = Open.Numeric.Primes.Prime.Numbers.IsPrime(cofactor);
} }
ArrayPool<FactorEntry> pool = ThreadStaticPools.FactorEntryPool; ArrayPool<FactorEntry> pool = ThreadStaticPools.FactorEntryPool;
@@ -1414,7 +1417,8 @@ internal static partial class PrimeOrderCalculator
return; return;
} }
bool isPrime = Open.Numeric.Primes.Prime.Numbers.IsPrime(value); bool isPrime = PrimeTester.IsPrimeInternal(value, CancellationToken.None);
// bool isPrime = Open.Numeric.Primes.Prime.Numbers.IsPrime(value);
if (!knownComposite && isPrime) if (!knownComposite && isPrime)
{ {
AddFactor(counts, value, 1); AddFactor(counts, value, 1);
@@ -1424,7 +1428,8 @@ internal static partial class PrimeOrderCalculator
ulong factor = PollardRhoStrict(value); ulong factor = PollardRhoStrict(value);
ulong quotient = value / factor; ulong quotient = value / factor;
isPrime = Open.Numeric.Primes.Prime.Numbers.IsPrime(factor); isPrime = PrimeTester.IsPrimeInternal(factor, CancellationToken.None);
// isPrime = Open.Numeric.Primes.Prime.Numbers.IsPrime(factor);
if (isPrime) if (isPrime)
{ {
int exponent = 1; int exponent = 1;
@@ -1453,7 +1458,8 @@ internal static partial class PrimeOrderCalculator
} }
else else
{ {
isPrime = Open.Numeric.Primes.Prime.Numbers.IsPrime(quotient); isPrime = PrimeTester.IsPrimeInternal(quotient, CancellationToken.None);
// isPrime = Open.Numeric.Primes.Prime.Numbers.IsPrime(quotient);
} }
if (isPrime) if (isPrime)