Revert "Merge pull request #24 from mlemanczyk/codex/modify-evenperfectbitscanner-for-residue-mode"

This reverts commit 2d024cc708, reversing
changes made to b1c29ad16e.

EvenPerfectBitScanner/Program.cs

@@ -451,17 +451,16 @@ internal static class Program
 			MersenneTesters = new ThreadLocal<MersenneNumberTester>(() =>
 			{
 				var tester = new MersenneNumberTester(
-																	useIncremental: !useLucas,
-																	useOrderCache: false,
-																	kernelType: kernelType,
-																	useModuloWorkaround: useModuloWorkaround,
-																	useOrder: useOrder,
-																	useGpuLucas: mersenneOnGpu,
-																	useGpuScan: mersenneOnGpu,
-																	useGpuOrder: orderOnGpu,
-																	useResidue: useResidue,
-																														   maxK: residueKMax,
-																														   residueDivisorSets: divisorCyclesSearchLimit128);
+									useIncremental: !useLucas,
+									useOrderCache: false,
+									kernelType: kernelType,
+									useModuloWorkaround: useModuloWorkaround,
+									useOrder: useOrder,
+									useGpuLucas: mersenneOnGpu,
+									useGpuScan: mersenneOnGpu,
+									useGpuOrder: orderOnGpu,
+									useResidue: useResidue,
+									maxK: residueKMax);
 				if (!useLucas)
 				{
 					tester.WarmUpOrders(currentP, _orderWarmupLimitOverride ?? 5_000_000UL);
@@ -767,7 +766,7 @@ internal static class Program
 		Console.WriteLine("  --divisor-cycles-device=cpu|gpu  device for cycles generation (default gpu)");
 		Console.WriteLine("  --divisor-cycles-batch-size=<value> batch size for cycles generation (default 512)");
 		Console.WriteLine("  --divisor-cycles-continue  continue divisor cycles generation");
-		Console.WriteLine("  --divisor-cycles-limit=<value> cycle search iterations when --mersenne=divisor or residue (UInt128 supported; residue path honors full range)");
+		Console.WriteLine("  --divisor-cycles-limit=<value> cycle search iterations when --mersenne=divisor");
 
 		Console.WriteLine("  --use-order            test primality via q order");
 		Console.WriteLine("  --workaround-mod       avoid '%' operator on the GPU");
@@ -1127,30 +1126,8 @@ internal static class Program
 			return _divisorTester!.IsPrime(p, _divisor, divisorCyclesSearchLimit, out detailedCheck);
 		}
 
-		bool mersennePrime = MersenneTesters.Value!.IsMersennePrime(p, out bool residueExhausted);
-		detailedCheck = residueExhausted;
-		return mersennePrime;
-	}
-
-	[MethodImpl(MethodImplOptions.AggressiveInlining)]
-	internal static UInt128 ResolveResidueMaxK(
-			bool useResidue,
-			bool residueMaxExplicit,
-			bool divisorLimitExplicit,
-			UInt128 residueMaxK,
-			UInt128 divisorLimit)
-	{
-		if (!useResidue)
-		{
-			return residueMaxK;
-		}
-
-		if (residueMaxExplicit || !divisorLimitExplicit)
-		{
-			return residueMaxK;
-		}
-
-		return divisorLimit;
+		detailedCheck = MersenneTesters.Value!.IsMersennePrime(p);
+		return detailedCheck;
 	}
 
 	// Use ModResidueTracker with a small set of primes to pre-filter composite p.