Merge pull request #26 from mlemanczyk/codex/add-parameters-p-min-and-p-max-to-resultsparser

Add inclusive exponent filtering to results parser
This commit is contained in:
Marek Lemańczyk authored and GitHub committed 2025-09-19 13:48:22 +02:00
commit e3f2cf1f2c
1 file changed
+87 -11
+87 -11
View File
@@ -35,14 +35,12 @@ internal static class Program
return 0; return 0;
} }
if (args.Length != 1)
{
Console.Error.WriteLine("Only a single CSV file path is supported.");
PrintHelp();
return 1;
}
string inputPath = args[0]; string inputPath = args[0];
if (IsHelpOption(inputPath))
{
PrintHelp();
return 0;
}
if (!File.Exists(inputPath)) if (!File.Exists(inputPath))
{ {
@@ -50,9 +48,20 @@ internal static class Program
return 1; return 1;
} }
if (!TryParseRangeArguments(args.AsSpan(1), out ulong pMin, out ulong pMax))
{
return 1;
}
if (pMin > pMax)
{
Console.Error.WriteLine("The --p-min value cannot be greater than --p-max.");
return 1;
}
try try
{ {
ProcessFile(inputPath); ProcessFile(inputPath, pMin, pMax);
return 0; return 0;
} }
catch (Exception exception) catch (Exception exception)
@@ -64,17 +73,79 @@ internal static class Program
private static bool IsHelpOption(string value) => HelpOptions.Contains(value); private static bool IsHelpOption(string value) => HelpOptions.Contains(value);
private static bool TryParseRangeArguments(ReadOnlySpan<string> arguments, out ulong pMin, out ulong pMax)
{
pMin = 0UL;
pMax = ulong.MaxValue;
if (arguments.Length == 0)
{
return true;
}
if ((arguments.Length & 1) == 1)
{
Console.Error.WriteLine("Each range option must be followed by a numeric value.");
PrintHelp();
return false;
}
for (int i = 0; i < arguments.Length; i += 2)
{
string option = arguments[i];
string value = arguments[i + 1];
try
{
switch (option)
{
case "--p-min":
pMin = ParseRangeValue(option, value);
break;
case "--p-max":
pMax = ParseRangeValue(option, value);
break;
default:
Console.Error.WriteLine($"Unsupported option '{option}'.");
PrintHelp();
return false;
}
}
catch (FormatException exception)
{
Console.Error.WriteLine(exception.Message);
PrintHelp();
return false;
}
}
return true;
}
private static ulong ParseRangeValue(string option, string value)
{
if (!ulong.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out ulong parsed))
{
throw new FormatException($"Value '{value}' for option '{option}' is not a valid non-negative integer.");
}
return parsed;
}
private static void PrintHelp() private static void PrintHelp()
{ {
Console.WriteLine("EvenPerfectBitScanner.ResultsParser"); Console.WriteLine("EvenPerfectBitScanner.ResultsParser");
Console.WriteLine("Parses CSV results produced by the candidate scanner."); Console.WriteLine("Parses CSV results produced by the candidate scanner.");
Console.WriteLine(); Console.WriteLine();
Console.WriteLine("Usage:"); Console.WriteLine("Usage:");
Console.WriteLine(" EvenPerfectBitScanner.ResultsParser <results.csv>"); Console.WriteLine(" EvenPerfectBitScanner.ResultsParser <results.csv> [--p-min <value>] [--p-max <value>]");
Console.WriteLine(); Console.WriteLine();
Console.WriteLine("The program accepts the following help switches:"); Console.WriteLine("The program accepts the following help switches:");
Console.WriteLine(" --?, -?, /?, -help, --help, --h, -h, /h, /help"); Console.WriteLine(" --?, -?, /?, -help, --help, --h, -h, /h, /help");
Console.WriteLine(); Console.WriteLine();
Console.WriteLine("Optional range arguments allow filtering primes by exponent:");
Console.WriteLine(" --p-min <value> - include entries with p >= value");
Console.WriteLine(" --p-max <value> - include entries with p <= value");
Console.WriteLine();
Console.WriteLine("Outputs prime results into four files placed next to the source file:"); Console.WriteLine("Outputs prime results into four files placed next to the source file:");
Console.WriteLine(" raw-primes-<name> - prime entries in the original order"); Console.WriteLine(" raw-primes-<name> - prime entries in the original order");
Console.WriteLine(" sorted-primes-<name> - prime entries sorted by p"); Console.WriteLine(" sorted-primes-<name> - prime entries sorted by p");
@@ -82,10 +153,10 @@ internal static class Program
Console.WriteLine(" sorted-primes-rejected-<name> - sorted prime entries with isPerfect = false"); Console.WriteLine(" sorted-primes-rejected-<name> - sorted prime entries with isPerfect = false");
Console.WriteLine(); Console.WriteLine();
Console.WriteLine("Example:"); Console.WriteLine("Example:");
Console.WriteLine(" EvenPerfectBitScanner.ResultsParser results.csv"); Console.WriteLine(" EvenPerfectBitScanner.ResultsParser results.csv --p-min 89 --p-max 107");
} }
private static void ProcessFile(string inputPath) private static void ProcessFile(string inputPath, ulong pMin, ulong pMax)
{ {
using IEnumerator<string> enumerator = File.ReadLines(inputPath).GetEnumerator(); using IEnumerator<string> enumerator = File.ReadLines(inputPath).GetEnumerator();
if (!enumerator.MoveNext()) if (!enumerator.MoveNext())
@@ -120,6 +191,11 @@ internal static class Program
} }
CandidateResult result = ParseLine(currentLine); CandidateResult result = ParseLine(currentLine);
if (result.P < pMin || result.P > pMax)
{
continue;
}
InsertPendingResult(pendingResults, result); InsertPendingResult(pendingResults, result);
DrainPrimeMatches(pendingResults, primeResults, ref currentPrime, primeEnumerator, false); DrainPrimeMatches(pendingResults, primeResults, ref currentPrime, primeEnumerator, false);
if (++consoleProgress == 10_000) if (++consoleProgress == 10_000)