Skip to content

Commit

Permalink
fix log
Browse files Browse the repository at this point in the history
  • Loading branch information
TilmanNeumann committed Jan 29, 2025
1 parent b764b6b commit d48d40e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ private void logResults(BigInteger N, int k, BigInteger kN, BigInteger factor, i
int pMaxBits = 32 - Integer.numberOfLeadingZeros(sieveParams.pMax);
LOG.info(" multiplier k = " + k + ", kN%8 = " + kN.mod(I_8) + ", primeBaseSize = " + primeBaseSize + ", pMin = " + sieveParams.pMin + " (" + pMinBits + " bits), pMax = " + sieveParams.pMax + " (" + pMaxBits + " bits), sieveArraySize = " + sieveParams.sieveArraySize);
LOG.info(" polyGenerator: " + polyReport.getOperationDetails());
LOG.info(" sieve: Found " + sieveReport.getOperationDetails());
LOG.info(" sieve: " + sieveReport.getOperationDetails());
LOG.info(" tDiv: " + tdivReport.getOperationDetails());
LOG.info(" cc: " + ccReport.getOperationDetails());
if (ccReport.getMaxRelatedPartialsCount() > 0) LOG.info(" cc: maxRelatedPartialsCount = " + ccReport.getMaxRelatedPartialsCount() + ", maxPartialMatrixSize = " + ccReport.getMaxMatrixSize() + " rows");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/tilman_neumann/jml/factor/siqs/SIQS.java
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ private void logResults(BigInteger N, int k, BigInteger kN, BigInteger factor, i
int pMaxBits = 32 - Integer.numberOfLeadingZeros(sieveParams.pMax);
LOG.info(" multiplier k = " + k + ", kN%8 = " + kN.mod(I_8) + ", primeBaseSize = " + primeBaseSize + ", pMin = " + sieveParams.pMin + " (" + pMinBits + " bits), pMax = " + sieveParams.pMax + " (" + pMaxBits + " bits), sieveArraySize = " + sieveParams.sieveArraySize);
LOG.info(" polyGenerator: " + polyReport.getOperationDetails());
LOG.info(" sieve: Found " + sieveReport.getOperationDetails());
LOG.info(" sieve: " + sieveReport.getOperationDetails());
LOG.info(" tDiv: " + tdivReport.getOperationDetails());
LOG.info(" cc: " + ccReport.getOperationDetails());
if (ccReport.getMaxRelatedPartialsCount() > 0) LOG.info(" cc: maxRelatedPartialsCount = " + ccReport.getMaxRelatedPartialsCount() + ", maxPartialMatrixSize = " + ccReport.getMaxMatrixSize() + " rows");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ private void logResults(BigInteger N, int k, BigInteger kN, BigInteger factor, i
int pMaxBits = 32 - Integer.numberOfLeadingZeros(sieveParams.pMax);
LOG.info(" multiplier k = " + k + ", kN%8 = " + kN.mod(I_8) + ", primeBaseSize = " + primeBaseSize + ", pMin = " + sieveParams.pMin + " (" + pMinBits + " bits), pMax = " + sieveParams.pMax + " (" + pMaxBits + " bits), sieveArraySize = " + sieveParams.sieveArraySize);
LOG.info(" polyGenerator: " + polyReport.getOperationDetails());
LOG.info(" sieve: Found " + sieveReport.getOperationDetails());
LOG.info(" sieve: " + sieveReport.getOperationDetails());
LOG.info(" tDiv: " + tdivReport.getOperationDetails());
LOG.info(" cc: " + ccReport.getOperationDetails());
if (ccReport.getMaxRelatedPartialsCount() > 0) LOG.info(" cc: maxRelatedPartialsCount = " + ccReport.getMaxRelatedPartialsCount() + ", maxPartialMatrixSize = " + ccReport.getMaxMatrixSize() + " rows");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public long getTotalDuration(int numberOfThreads) {
}

public String getOperationDetails() {
return "found " + sieveHitCount + " sieve hits";
return "Found " + sieveHitCount + " sieve hits";
}

public String getPhaseTimings(int numberOfThreads) {
Expand Down

0 comments on commit d48d40e

Please sign in to comment.