From 4d08009e3214cc3c3f19c047edd83855857ba003 Mon Sep 17 00:00:00 2001 From: Gonzalo Diaz Date: Wed, 4 Sep 2024 15:14:40 -0400 Subject: [PATCH 1/3] [REFACTOR] Custom Logger: Class refactor, singleton encapsulated in a new class with new static (shorcut) methods. Preserve the interface. --- algorithm-exercises-java/build.gradle | 2 +- .../src/main/java/util/CustomLogger.java | 136 +++++++++++------- sonar-project.properties | 4 +- 3 files changed, 84 insertions(+), 58 deletions(-) diff --git a/algorithm-exercises-java/build.gradle b/algorithm-exercises-java/build.gradle index bfbabc6..e397d2d 100644 --- a/algorithm-exercises-java/build.gradle +++ b/algorithm-exercises-java/build.gradle @@ -63,7 +63,7 @@ configurations.checkstyle { def jacocoExclusions = [ '**/*App.class', - '**/CustomLogger.class' + '**/util/*' ]; test { diff --git a/algorithm-exercises-java/src/main/java/util/CustomLogger.java b/algorithm-exercises-java/src/main/java/util/CustomLogger.java index 5fcdda7..af37bf2 100644 --- a/algorithm-exercises-java/src/main/java/util/CustomLogger.java +++ b/algorithm-exercises-java/src/main/java/util/CustomLogger.java @@ -1,74 +1,100 @@ package util; /** - * CustomLogger. - * - * @link https://www.logicbig.com/tutorials/core-java-tutorial/logging/levels.html + * Log. */ public class CustomLogger { - private CustomLogger() {} - - public static final String LOGGER_NAME = "projecteuler"; - private static java.util.logging.Logger log; - /** - * Common logger singleton. + * LoggerSingleton. + * + * @link https://www.logicbig.com/tutorials/core-java-tutorial/logging/levels.html */ - @SuppressWarnings({"java:S106", "java:S4792"}) - public static java.util.logging.Logger getLogger() { + private class LoggerSingleton { - // default log level - String logLevel = System.getenv("LOG_LEVEL"); + private LoggerSingleton() {} - if (logLevel == null) { - logLevel = "INFO"; - } + public static final String LOGGER_NAME = "projecteuler"; + private static java.util.logging.Logger log; + + /** + * Common logger singleton. + */ + @SuppressWarnings({"java:S106", "java:S4792"}) + public static java.util.logging.Logger getLogger() { + + // default log level + String logLevel = System.getenv("LOG_LEVEL"); - logLevel = logLevel.toUpperCase(); - - // Singleton initalization - if (log == null) { - log = java.util.logging.Logger.getLogger(CustomLogger.LOGGER_NAME); - - java.util.logging.Level level; - - switch (logLevel) { - case "INFO": - level = java.util.logging.Level.INFO; - break; - case "DEBUG": - level = java.util.logging.Level.FINE; - break; - case "FINE": - level = java.util.logging.Level.FINE; - break; - case "WARN": - level = java.util.logging.Level.WARNING; - break; - case "WARNING": - level = java.util.logging.Level.WARNING; - break; - case "ERROR": - level = java.util.logging.Level.SEVERE; - break; - case "SEVERE": - level = java.util.logging.Level.SEVERE; - break; - default: - level = java.util.logging.Level.INFO; + if (logLevel == null) { + logLevel = "INFO"; } - System.out.println("Setting LOG_LEVEL: " + level.getName()); + logLevel = logLevel.toUpperCase(); + + // Singleton initalization + if (log == null) { + log = java.util.logging.Logger.getLogger(LoggerSingleton.LOGGER_NAME); + + java.util.logging.Level level; + + switch (logLevel) { + case "INFO": + level = java.util.logging.Level.INFO; + break; + case "DEBUG": + level = java.util.logging.Level.FINE; + break; + case "FINE": + level = java.util.logging.Level.FINE; + break; + case "WARN": + level = java.util.logging.Level.WARNING; + break; + case "WARNING": + level = java.util.logging.Level.WARNING; + break; + case "ERROR": + level = java.util.logging.Level.SEVERE; + break; + case "SEVERE": + level = java.util.logging.Level.SEVERE; + break; + default: + level = java.util.logging.Level.INFO; + } + + System.out.println("Setting LOG_LEVEL: " + level.getName()); + + log.setLevel(level); - log.setLevel(level); + log.info("INFO LEVEL ENABLED"); + log.warning("WARNING LEVEL ENABLED"); + log.fine("FINE LEVEL ENABLED"); + log.finest("FINEST LEVEL ENABLED"); + } - log.info("INFO LEVEL ENABLED"); - log.warning("WARNING LEVEL ENABLED"); - log.fine("FINE LEVEL ENABLED"); - log.finest("FINEST LEVEL ENABLED"); + return log; } + } + + public static java.util.logging.Logger getLogger() { + return LoggerSingleton.getLogger(); + } + + public static void info(String message) { + LoggerSingleton.getLogger().log(java.util.logging.Level.INFO, message); + } + + public static void warning(String message) { + LoggerSingleton.getLogger().log(java.util.logging.Level.WARNING, message); + } + + public static void error(String message) { + LoggerSingleton.getLogger().log(java.util.logging.Level.SEVERE, message); + } - return log; + public static void debug(String message) { + LoggerSingleton.getLogger().log(java.util.logging.Level.FINE, message); } } diff --git a/sonar-project.properties b/sonar-project.properties index 485195a..9feee93 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,6 +1,6 @@ # Must be unique in a given SonarQube instance sonar.projectKey=sir-gon_algorithm-exercises-java -sonar.organization", "sir-gon" +sonar.organization="sir-gon" # This is the name and version displayed in the SonarQube UI. # Was mandatory prior to SonarQube 6.1. @@ -11,7 +11,7 @@ sonar.projectVersion=1.0 # Replace "\" by "/" on Windows. # This property is optional if sonar.modules is set. sonar.sources=algorithm-exercises-java/src/main/java/ae -sonar.exclusions=**/App.java,**/CustomLogger.java +sonar.coverage.exclusions=**/App.java,**/util/*.java sonar.coverageReportPaths=algorithm-exercises-java/build/jacoco.xml From 99a2fa8bb71110c76588882e9d601f1f2c3e1bb3 Mon Sep 17 00:00:00 2001 From: Gonzalo Diaz Date: Wed, 4 Sep 2024 16:40:10 -0400 Subject: [PATCH 2/3] =?UTF-8?q?[BREAKING]=20=E2=9A=A0=EF=B8=8F=20[REFACTOR?= =?UTF-8?q?]=20Custom=20Logger:=20using=20static=20call=20instead=20of=20a?= =?UTF-8?q?n=20instance.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/ae/Problem0000.java | 6 +++--- .../arrays/ArraysLeftRotation.java | 4 +--- .../arrays/CrushBruteForce.java | 5 +---- .../arrays/CrushOptimized.java | 5 +---- .../ae/hackerrank/projecteuler/Euler001.java | 6 +++--- .../ae/hackerrank/projecteuler/Euler002.java | 6 +++--- .../hackerrank/warmup/BirthdayCakeCandles.java | 5 +---- .../ae/hackerrank/warmup/CompareTriplets.java | 2 -- .../hackerrank/warmup/DiagonalDifference.java | 2 -- .../java/ae/hackerrank/warmup/MiniMaxSum.java | 2 -- .../java/ae/hackerrank/warmup/PlusMinus.java | 5 +---- .../ae/hackerrank/warmup/SimpleArraySum.java | 5 ++--- .../java/ae/hackerrank/warmup/SolveMeFirst.java | 2 -- .../java/ae/hackerrank/warmup/Staircase.java | 5 +---- .../ae/hackerrank/warmup/TimeConversion.java | 5 +---- .../java/ae/hackerrank/warmup/VeryBigSum.java | 5 +---- .../main/java/ae/projecteuler/Problem0001.java | 8 +++----- .../main/java/ae/projecteuler/Problem0002.java | 8 +++----- .../main/java/ae/projecteuler/Problem0003.java | 8 ++++---- .../main/java/ae/projecteuler/Problem0004.java | 6 +++--- .../main/java/ae/projecteuler/Problem0005.java | 7 +++---- .../java/ae/projecteuler/Problem0005Simple.java | 9 +++++---- .../main/java/ae/projecteuler/Problem0006.java | 13 +++++++------ .../main/java/ae/projecteuler/Problem0007.java | 9 ++++----- .../main/java/ae/projecteuler/Problem0008.java | 7 +++---- .../main/java/ae/projecteuler/Problem0009.java | 10 +++++----- .../main/java/ae/projecteuler/Problem0010.java | 8 ++++---- .../main/java/ae/projecteuler/Problem0011.java | 14 +++++++------- .../main/java/ae/projecteuler/Problem0012.java | 6 +++--- .../main/java/ae/projecteuler/Problem0013.java | 7 +++---- .../main/java/ae/projecteuler/Problem0014.java | 9 ++++----- .../main/java/ae/projecteuler/Problem0015.java | 5 +++-- .../main/java/ae/projecteuler/Problem0016.java | 7 ++++--- .../main/java/ae/projecteuler/Problem0017.java | 6 +++--- .../main/java/ae/projecteuler/Problem0018.java | 8 ++++---- .../main/java/ae/projecteuler/Problem0019.java | 6 +++--- .../main/java/ae/projecteuler/Problem0020.java | 6 +++--- .../main/java/ae/projecteuler/Problem0021.java | 6 +++--- .../main/java/ae/projecteuler/Problem0022.java | 5 ++--- .../main/java/ae/projecteuler/Problem0023.java | 17 ++++++++--------- .../main/java/ae/projecteuler/Problem0024.java | 1 - .../java/ae/projecteuler/helper/BigNum.java | 2 -- .../ae/projecteuler/Problem0005SimpleTest.java | 10 +++++----- .../java/ae/projecteuler/Problem0005Test.java | 6 +++--- 44 files changed, 121 insertions(+), 163 deletions(-) diff --git a/algorithm-exercises-java/src/main/java/ae/Problem0000.java b/algorithm-exercises-java/src/main/java/ae/Problem0000.java index 96c78fb..d512e6a 100644 --- a/algorithm-exercises-java/src/main/java/ae/Problem0000.java +++ b/algorithm-exercises-java/src/main/java/ae/Problem0000.java @@ -4,6 +4,8 @@ package ae; +import util.CustomLogger; + /** * {TITLE}. * @@ -13,8 +15,6 @@ public class Problem0000 { private Problem0000() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); - /** * Problem template method. */ @@ -22,7 +22,7 @@ public static Integer problem0000() { Integer result = null; String log = String.format("Problem 00XX solved: %d", result); - logger.info(log); + CustomLogger.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/interview_preparation_kit/arrays/ArraysLeftRotation.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/interview_preparation_kit/arrays/ArraysLeftRotation.java index 868bf97..3ec1eb8 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/interview_preparation_kit/arrays/ArraysLeftRotation.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/interview_preparation_kit/arrays/ArraysLeftRotation.java @@ -11,10 +11,8 @@ */ public class ArraysLeftRotation { - private ArraysLeftRotation() { - } + private ArraysLeftRotation() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); static final int FIRST_POSITION = 0; /** diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/interview_preparation_kit/arrays/CrushBruteForce.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/interview_preparation_kit/arrays/CrushBruteForce.java index eaf5f9f..20599fa 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/interview_preparation_kit/arrays/CrushBruteForce.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/interview_preparation_kit/arrays/CrushBruteForce.java @@ -12,10 +12,7 @@ */ public class CrushBruteForce { - private CrushBruteForce() { - } - - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); + private CrushBruteForce() {} private static final int INITIALIZER = 0; diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/interview_preparation_kit/arrays/CrushOptimized.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/interview_preparation_kit/arrays/CrushOptimized.java index fe75cac..e50f182 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/interview_preparation_kit/arrays/CrushOptimized.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/interview_preparation_kit/arrays/CrushOptimized.java @@ -12,10 +12,7 @@ */ public class CrushOptimized { - private CrushOptimized() { - } - - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); + private CrushOptimized() {} /** * arrayManipulation. diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler001.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler001.java index 69ce119..42d6d6b 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler001.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler001.java @@ -1,5 +1,7 @@ package ae.hackerrank.projecteuler; +import util.CustomLogger; + /** * Multiples of 3 and 5. * @@ -9,8 +11,6 @@ public class Euler001 { private Euler001() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); - /** * Greatest common divisor. */ @@ -45,7 +45,7 @@ public static Long euler001(Integer a, Integer b, Integer n) { - sumOfArithmeticProgression((long) n, lcm); String log = String.format("Problem 001 solved: %d", result); - logger.info(log); + CustomLogger.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler002.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler002.java index 22312bc..9424f93 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler002.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler002.java @@ -1,5 +1,7 @@ package ae.hackerrank.projecteuler; +import util.CustomLogger; + /** * Even Fibonacci numbers. * @@ -9,8 +11,6 @@ public class Euler002 { private Euler002() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); - private static Long fibbo(Integer n) { Long total = 0L; Long fibo; @@ -37,7 +37,7 @@ public static Long euler002(Integer n) { Long result = fibbo(n); String log = String.format("Problem 002 solved: %d", result); - logger.info(log); + CustomLogger.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/BirthdayCakeCandles.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/BirthdayCakeCandles.java index 980408a..ce98a3c 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/BirthdayCakeCandles.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/BirthdayCakeCandles.java @@ -9,10 +9,7 @@ */ public class BirthdayCakeCandles { - private BirthdayCakeCandles() { - } - - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); + private BirthdayCakeCandles() {} /** * birthdayCakeCandles. diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/CompareTriplets.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/CompareTriplets.java index 32c6b0f..7ddfc3d 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/CompareTriplets.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/CompareTriplets.java @@ -12,8 +12,6 @@ public class CompareTriplets { private CompareTriplets() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); - /** * compareTriplets. */ diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/DiagonalDifference.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/DiagonalDifference.java index a461aba..1284429 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/DiagonalDifference.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/DiagonalDifference.java @@ -11,8 +11,6 @@ public class DiagonalDifference { private DiagonalDifference() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); - /** * diagonalDifference. */ diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/MiniMaxSum.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/MiniMaxSum.java index 3b41398..b927b22 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/MiniMaxSum.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/MiniMaxSum.java @@ -11,8 +11,6 @@ public class MiniMaxSum { private MiniMaxSum() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); - /** * miniMaxSum. * diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/PlusMinus.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/PlusMinus.java index 8db199b..30db4f4 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/PlusMinus.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/PlusMinus.java @@ -11,10 +11,7 @@ */ public class PlusMinus { - private PlusMinus() { - } - - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); + private PlusMinus() {} /** * plusMinus. diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/SimpleArraySum.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/SimpleArraySum.java index b91d611..83e211c 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/SimpleArraySum.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/SimpleArraySum.java @@ -1,6 +1,7 @@ package ae.hackerrank.warmup; import java.util.List; +import util.CustomLogger; /** * Simple Array Sum. @@ -11,8 +12,6 @@ public class SimpleArraySum { private SimpleArraySum() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); - /** * simpleArraySum. */ @@ -24,7 +23,7 @@ public static int simpleArraySum(List ar) { } String log = String.format("simpleArraySum solved: %d", total); - logger.info(log); + CustomLogger.info(log); return total; } diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/SolveMeFirst.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/SolveMeFirst.java index b62d9d3..18ac6d6 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/SolveMeFirst.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/SolveMeFirst.java @@ -9,8 +9,6 @@ public class SolveMeFirst { private SolveMeFirst() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); - /** * solveMeFirst. */ diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/Staircase.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/Staircase.java index 2cfc755..8c81337 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/Staircase.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/Staircase.java @@ -10,10 +10,7 @@ */ public class Staircase { - private Staircase() { - } - - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); + private Staircase() {} /** * staircase. diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/TimeConversion.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/TimeConversion.java index e93b2e7..b508855 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/TimeConversion.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/TimeConversion.java @@ -8,10 +8,7 @@ */ public class TimeConversion { - private TimeConversion() { - } - - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); + private TimeConversion() {} /** * timeConversion. diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/VeryBigSum.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/VeryBigSum.java index a09c2ab..34bfad6 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/VeryBigSum.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/VeryBigSum.java @@ -9,10 +9,7 @@ */ public class VeryBigSum { - private VeryBigSum() { - } - - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); + private VeryBigSum() {} /** * aVeryBigSum. diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0001.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0001.java index 86e38b2..8404450 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0001.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0001.java @@ -1,6 +1,6 @@ package ae.projecteuler; -import java.util.logging.Logger; +import util.CustomLogger; /** * Multiples of 3 and 5. @@ -11,8 +11,6 @@ public class Problem0001 { private Problem0001() {} - static Logger logger = util.CustomLogger.getLogger(); - /** * Problem0001. */ @@ -23,14 +21,14 @@ public static Integer problem0001(Integer top) { for (i = 0; i < top; i++) { if (i % 3 == 0 || i % 5 == 0) { String log = String.format("Line result: %d", i); - logger.fine(log); + CustomLogger.debug(log); result += i; } } String log = String.format("Problem 0001 solved: %d", result); - logger.info(log); + CustomLogger.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0002.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0002.java index ca2b7c9..947810b 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0002.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0002.java @@ -1,6 +1,6 @@ package ae.projecteuler; -import java.util.logging.Logger; +import util.CustomLogger; /** * Even Fibonacci numbers. @@ -11,8 +11,6 @@ public class Problem0002 { private Problem0002() {} - static Logger logger = util.CustomLogger.getLogger(); - /** * Problem template method. */ @@ -28,7 +26,7 @@ public static Integer problem0002(int top) { fibo = last2 + last1; String log = String.format("Fibonacci(%d) = %d", i, fibo); - logger.fine(log); + CustomLogger.debug(log); if (fibo % 2 == 0) { evenSum += fibo; @@ -41,7 +39,7 @@ public static Integer problem0002(int top) { } while (fibo < top); String log = String.format("Problem 0002 result: %d", evenSum); - logger.info(log); + CustomLogger.info(log); return evenSum; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0003.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0003.java index 3760257..94b0265 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0003.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0003.java @@ -3,6 +3,7 @@ import ae.projecteuler.helper.Divisors; import ae.projecteuler.helper.NaturalNumber; import java.util.Arrays; +import util.CustomLogger; /** @@ -14,7 +15,6 @@ public class Problem0003 { private Problem0003() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0003. @@ -28,7 +28,7 @@ public static Long problem0003(Long top) { String log; log = String.format("Divisors of %d: %s", top, Arrays.toString(divs)); - logger.info(log); + CustomLogger.info(log); Long maxPrimeFactor = null; Integer i = middle; @@ -38,13 +38,13 @@ public static Long problem0003(Long top) { boolean prime = NaturalNumber.isPrime(divs[i]); log = String.format("%d is Prime?: %b", i, prime); - logger.fine(log); + CustomLogger.debug(log); if (prime) { maxPrimeFactor = divs[i]; log = String.format("Problem 0003 solved: %d", maxPrimeFactor); - logger.info(log); + CustomLogger.info(log); return maxPrimeFactor; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0004.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0004.java index 15e7419..2ee48de 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0004.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0004.java @@ -10,6 +10,7 @@ package ae.projecteuler; import ae.projecteuler.helper.Palindrome; +import util.CustomLogger; /** * Largest palindrome product. @@ -20,7 +21,6 @@ public class Problem0004 { private Problem0004() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem template method. @@ -42,7 +42,7 @@ public static Integer problem0004(int bottom, int top) { if (Palindrome.isPalindrome(Long.valueOf((long) j * (long) i))) { String log = String.format("FOUND: %d x %d = %d is Palindrome", i, j, i * j); - logger.fine(log); + CustomLogger.debug(log); if (foundPalindrome == null || i * j > foundPalindrome) { foundi = i; @@ -64,7 +64,7 @@ public static Integer problem0004(int bottom, int top) { foundPalindrome, cycles); - logger.info(log); + CustomLogger.info(log); return foundPalindrome; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005.java index cf6a32d..d61d786 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - +import util.CustomLogger; /** * Smallest multiple. @@ -16,7 +16,6 @@ public class Problem0005 { private Problem0005() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * countOccurrences. @@ -76,7 +75,7 @@ public static Integer problem0005(Integer bottom, Integer top) { ); log = String.format("%s", minimumPrimeFactorsCollector.toString()); - logger.info(log); + CustomLogger.info(log); } result = 1; @@ -88,7 +87,7 @@ public static Integer problem0005(Integer bottom, Integer top) { } log = String.format("Problem 0005 solved: %d", result); - logger.info(log); + CustomLogger.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005Simple.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005Simple.java index 100da97..a22848a 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005Simple.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005Simple.java @@ -2,6 +2,8 @@ package ae.projecteuler; +import util.CustomLogger; + /** * Smallest multiple. * @@ -11,7 +13,6 @@ public class Problem0005Simple { private Problem0005Simple() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0005. @@ -30,10 +31,10 @@ public static Integer problem0005(Integer bottom, Integer top, Integer startFrom if (fail) { log = String.format("Fail %d not divisible by %d", test, i); - logger.fine(log); + CustomLogger.debug(log); } else { log = String.format("Testing: %d divisible by %d", test, i); - logger.fine(log); + CustomLogger.debug(log); } i += 1; @@ -47,7 +48,7 @@ public static Integer problem0005(Integer bottom, Integer top, Integer startFrom } while (found == null); log = String.format("Problem 00005 solved: %d", found); - logger.info(log); + CustomLogger.info(log); return found; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0006.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0006.java index 52ff119..8bad6ff 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0006.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0006.java @@ -8,6 +8,8 @@ package ae.projecteuler; +import util.CustomLogger; + /** * Sum square difference. * @@ -17,7 +19,6 @@ class Problem0006 { private Problem0006() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0006. @@ -39,20 +40,20 @@ public static Integer problem0006(Integer bottom, Integer top) { String log; log = String.format("Sum of first %d squares = %d", top, sumOfSquares); - logger.fine(log); + CustomLogger.debug(log); log = String.format("Base for Square Of Sum of first %d = %d", top, baseForSquareOfSum); - logger.fine(log); + CustomLogger.debug(log); log = String.format("Square Of Sum of first %d = %d", top, squareOfSum); - logger.fine(log); + CustomLogger.debug(log); log = String.format("Difference found %d - %d = %d", squareOfSum, sumOfSquares, squareOfSum - sumOfSquares); - logger.fine(log); + CustomLogger.debug(log); log = String.format("Problem 00006 solved: %d", answer); - logger.info(log); + CustomLogger.info(log); return answer; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0007.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0007.java index 57cb597..dae717e 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0007.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0007.java @@ -2,7 +2,7 @@ import ae.projecteuler.helper.NaturalNumber; import java.util.ArrayList; - +import util.CustomLogger; /** * 10001st prime. @@ -13,7 +13,6 @@ public class Problem0007 { private Problem0007() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0007. @@ -31,20 +30,20 @@ public static Integer problem0007(Integer top) { primes.add(j); log = String.format("Prime found %d put in position: %d", j, primes.size()); - logger.fine(log); + CustomLogger.debug(log); } j = 2 * i + 1; } log = String.format("primes count: %d", primes.size()); - logger.info(log); + CustomLogger.info(log); Integer answer = primes.get(primes.size() - 1); Integer cycles = i; log = String.format("%d prime number is: %d in %d cycles", top, answer, cycles); - logger.info(log); + CustomLogger.info(log); return answer; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0008.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0008.java index fbafd29..5140956 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0008.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0008.java @@ -2,7 +2,7 @@ import ae.projecteuler.helper.Product; import java.util.ArrayList; - +import util.CustomLogger; /** * Largest product in a series. @@ -13,7 +13,6 @@ public class Problem0008 { private Problem0008() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem template method. @@ -34,7 +33,7 @@ public static Long problem0008(String number, Integer interval) { Long currentProduct = Product.product(digitsSet.toArray(Long[]::new)); log = String.format("Product beetwen %d and %d is: %d", i, i + interval, currentProduct); - logger.fine(log); + CustomLogger.debug(log); if (currentProduct > max) { max = currentProduct; @@ -42,7 +41,7 @@ public static Long problem0008(String number, Integer interval) { } log = String.format("Problem 0008 solved: %d", max); - logger.info(log); + CustomLogger.info(log); return max; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0009.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0009.java index 45ea1c0..f471e26 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0009.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0009.java @@ -1,5 +1,6 @@ package ae.projecteuler; +import util.CustomLogger; /** * Special Pythagorean triplet. @@ -10,7 +11,6 @@ public class Problem0009 { private Problem0009() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); private class Triplet { @@ -46,13 +46,13 @@ public static Integer problem0009(Integer limit) { while (b < c && found == null) { // TESTING log = String.format("TESTING: a = %d b = %d c = %d", a, b, c); - logger.fine(log); + CustomLogger.debug(log); Triplet test = new Problem0009().new Triplet(a, b, c); if (test.isPythagoreanTriplet()) { found = test; log = String.format("FOUND: a = %d b = %d c = %d", a, b, c); - logger.fine(log); + CustomLogger.debug(log); } // INCREASE @@ -68,9 +68,9 @@ public static Integer problem0009(Integer limit) { } log = String.format("FOUND: a = %d, b = %d, c = %d", found.ta, found.tb, found.tc); - logger.info(log); + CustomLogger.info(log); log = String.format("PRODUCT: a * b * c = %d", found.ta * found.tb * found.tc); - logger.info(log); + CustomLogger.info(log); return found.ta * found.tb * found.tc; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0010.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0010.java index 91406a8..575cfac 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0010.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0010.java @@ -3,6 +3,7 @@ import ae.projecteuler.helper.NaturalNumber; import ae.projecteuler.helper.Sum; import java.util.ArrayList; +import util.CustomLogger; /** * Summation of primes. @@ -13,7 +14,6 @@ public class Problem0010 { private Problem0010() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0010. @@ -30,16 +30,16 @@ public static Long problem0010(Long bottom, Long top) { if (new NaturalNumber(i).isPrime()) { primes.add(i); log = String.format("Prime found %d put in position: %d", i, primes.size()); - logger.fine(log); + CustomLogger.debug(log); } } while (i < top); Long result = Sum.sum(primes.toArray(Long[]::new)); log = String.format("primes count: %d", primes.size()); - logger.info(log); + CustomLogger.info(log); log = String.format("Sum of primes below %d is: %d", top, result); - logger.info(log); + CustomLogger.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0011.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0011.java index 6184647..e3c59c4 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0011.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0011.java @@ -1,5 +1,6 @@ package ae.projecteuler; +import util.CustomLogger; /** * Largest product in a grid. @@ -10,7 +11,6 @@ public class Problem0011 { private Problem0011() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0011. @@ -33,7 +33,7 @@ public static Integer problem0011(Integer[][] squareMatrix, Integer interval) for (int j = 0; j < matrixLimit; j++) { log = String.format("start point => i: %d, j: %d", i, j); - logger.fine(log); + CustomLogger.debug(log); // reset diagonals int diag1Acum = 1; @@ -44,13 +44,13 @@ public static Integer problem0011(Integer[][] squareMatrix, Integer interval) i + k, j + k ); - logger.fine(log); + CustomLogger.debug(log); log = String.format( "diag2 coordinate: (i, j) = (%d, %d)", i + k, j + (quadrantSize - 1) - k ); - logger.fine(log); + CustomLogger.debug(log); diag1Acum *= squareMatrix[i + k][j + k]; diag2Acum *= squareMatrix[i + k][j + (quadrantSize - 1) - k]; @@ -68,13 +68,13 @@ public static Integer problem0011(Integer[][] squareMatrix, Integer interval) i + k, j + l ); - logger.fine(log); + CustomLogger.debug(log); log = String.format( "horizontal coordinate: (i, j) = (%d, %d)", i + l, j + k ); - logger.fine(log); + CustomLogger.debug(log); verticalAcum *= squareMatrix[i + k][j + l]; horizontalAcum *= squareMatrix[i + l][j + k]; @@ -87,7 +87,7 @@ public static Integer problem0011(Integer[][] squareMatrix, Integer interval) } log = String.format("Problem 0011 solved: %d", result); - logger.info(log); + CustomLogger.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0012.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0012.java index 19d7b98..27cc9c7 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0012.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0012.java @@ -1,6 +1,7 @@ package ae.projecteuler; import ae.projecteuler.helper.Divisors; +import util.CustomLogger; /** * Problem 0012. @@ -11,7 +12,6 @@ public class Problem0012 { private Problem0012() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0012. @@ -29,7 +29,7 @@ public static Long problem0012(Long top) { d = Divisors.divisors(triangular); log = String.format("Triangular number: %d has %d divisors", triangular, d.length); - logger.fine(log); + CustomLogger.debug(log); if (d.length > count) { count = (long) d.length; @@ -39,7 +39,7 @@ public static Long problem0012(Long top) { } log = String.format("Problem 00012 solved: %d", count); - logger.info(log); + CustomLogger.info(log); return count; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0013.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0013.java index eeca408..c988ecd 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0013.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0013.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; - +import util.CustomLogger; /** * Large sum. @@ -15,7 +15,6 @@ public class Problem0013 { private Problem0013() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0013. @@ -33,9 +32,9 @@ public static String problem0013(String[] arrayOfNumbers, Integer firtsDigits) { String log; log = String.format("First %d digits of huge sume are %s", firtsDigits, first); - logger.info(log); + CustomLogger.info(log); log = String.format("Problem 00013 solved: %s", numberString); - logger.info(log); + CustomLogger.info(log); return numberString; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0014.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0014.java index 4db5097..00577f3 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0014.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0014.java @@ -2,7 +2,7 @@ import ae.projecteuler.helper.Collatz; import java.util.ArrayList; - +import util.CustomLogger; /** * Longest Collatz sequence. @@ -12,7 +12,6 @@ public class Problem0014 { private Problem0014() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0013. @@ -38,7 +37,7 @@ public static Long problem0014(Integer bottom, Integer top) throws IllegalArgume } while (c != 1); log = String.format("sequense of %d: %s", i, sequence); - logger.fine(log); + CustomLogger.debug(log); if (sequence.size() > maxSequence.size()) { maxSequence = sequence; @@ -49,12 +48,12 @@ public static Long problem0014(Integer bottom, Integer top) throws IllegalArgume "Large sequence found: %s has %d elements", maxSequence, maxSequence.size()); - logger.fine(log); + CustomLogger.debug(log); // return firt element long result = maxSequence.get(0); - logger.info(() -> String.format("Problem 00014 solved: %d", result)); + CustomLogger.info("Problem 00014 solved: %d".formatted(result)); return result; } } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0015.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0015.java index 721b22b..21fd746 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0015.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0015.java @@ -1,5 +1,7 @@ package ae.projecteuler; +import util.CustomLogger; + /** * Lattice paths. * @@ -9,7 +11,6 @@ public class Problem0015 { private Problem0015() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0015. @@ -51,7 +52,7 @@ public static Long problem0015(Integer gridSide) { String log; log = String.format("Problem 00015 solved: %d", result); - logger.info(log); + CustomLogger.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0016.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0016.java index 0fd228b..bf3a6bd 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0016.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0016.java @@ -1,6 +1,8 @@ package ae.projecteuler; import ae.projecteuler.helper.BigNum; +import util.CustomLogger; + /** * Problem 0016. @@ -11,7 +13,6 @@ public class Problem0016 { private Problem0016() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0016. @@ -22,7 +23,7 @@ public static String problem0016(int base, int exponent) { String log; log = String.format("Digits of power found: %s", power.toString()); - logger.info(log); + CustomLogger.info(log); String[] digits = power.toString().split(""); @@ -30,7 +31,7 @@ public static String problem0016(int base, int exponent) { result.bigSumMany(digits); log = String.format("Problem 00016 solved: %s", result.toString()); - logger.info(log); + CustomLogger.info(log); return result.toString(); } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0017.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0017.java index ad318d4..f37a8fd 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0017.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0017.java @@ -1,6 +1,7 @@ package ae.projecteuler; import ae.projecteuler.helper.NumberToWord; +import util.CustomLogger; /** * Number letter counts. @@ -11,7 +12,6 @@ public class Problem0017 { private Problem0017() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0017. @@ -29,11 +29,11 @@ public static Integer problem0017(int init, int last) throws Exception { acum += replaced.length(); log = String.format("acum: %d => word: %s", acum, word); - logger.fine(log); + CustomLogger.debug(log); } log = String.format("Problem 00017 solved: %d", acum); - logger.info(log); + CustomLogger.info(log); return acum; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0018.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0018.java index fda261f..038e9dc 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0018.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0018.java @@ -3,6 +3,7 @@ import ae.projecteuler.lib.BinaryNode; import ae.projecteuler.lib.BinaryNodeWeightBuilder; import java.util.Arrays; +import util.CustomLogger; /** @@ -14,7 +15,6 @@ public class Problem0018 { private Problem0018() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem template method. @@ -27,16 +27,16 @@ public static Integer problem0018(Integer[][] triangle) { Integer[] leaves = builder.getLeaves(); log = String.format("Triangle: %s", tree); - logger.fine(log); + CustomLogger.debug(log); log = String.format("Leaves count: %d, %s", leaves.length, leaves); - logger.fine(log); + CustomLogger.debug(log); Arrays.sort(leaves); Integer result = leaves[leaves.length - 1]; // maximum is last element log = String.format("Problem 00018 solved: %d", result); - logger.fine(log); + CustomLogger.debug(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0019.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0019.java index da7d026..a28277d 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0019.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0019.java @@ -4,6 +4,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import util.CustomLogger; /** * Counting Sundays. @@ -14,7 +15,6 @@ public class Problem0019 { private Problem0019() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); private static final String FEBRUARY_KEY = "FEBRUARY"; private static Map copyDaysInMonth() { @@ -55,7 +55,7 @@ public static Integer problem0019( Integer days = mapEntry.getValue(); log = String.format("Year: %d | Month: %s | days: %d", year, month, days); - logger.fine(log); + CustomLogger.debug(log); accumulatedRemainder += days % 7; if (accumulatedRemainder % 7 == dayOfWeek) { @@ -71,7 +71,7 @@ public static Integer problem0019( Integer result = resultCount - excess; log = String.format("Problem 00019 solved: %d", result); - logger.info(log); + CustomLogger.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0020.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0020.java index c799248..94b8f14 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0020.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0020.java @@ -1,6 +1,7 @@ package ae.projecteuler; import ae.projecteuler.helper.BigNum; +import util.CustomLogger; /** * Problem 0020. @@ -11,7 +12,6 @@ public class Problem0020 { private Problem0020() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0020. @@ -21,12 +21,12 @@ public static BigNum problem0020(int limit) { BigNum factorial = BigNum.bigFactorial(limit); log = String.format("Factorial of %d!: %s", limit, factorial.toString()); - logger.info(log); + CustomLogger.info(log); BigNum result = new BigNum(0).bigSumMany(factorial.toArray()); log = String.format("Problem 00020 solved: %s", result.toString()); - logger.info(log); + CustomLogger.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0021.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0021.java index b363799..cbbabeb 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0021.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0021.java @@ -9,6 +9,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import util.CustomLogger; /** @@ -20,7 +21,6 @@ public class Problem0021 { private Problem0021() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0021. @@ -57,12 +57,12 @@ public static String problem0021(int start, int limit) { String log; log = String.format("Amicable numbers: %s", amicableNumbers); - logger.info(log); + CustomLogger.info(log); BigNum result = new BigNum(0).bigSumMany(amicableNumbers.toArray(String[]::new)); log = String.format("Problem 00021 solved: %s", result); - logger.info(log); + CustomLogger.info(log); return result.toString(); } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0022.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0022.java index 29c0ef4..9ba19c2 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0022.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0022.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; - +import util.CustomLogger; /** * Names scores. @@ -15,7 +15,6 @@ public class Problem0022 { private Problem0022() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0022. @@ -33,7 +32,7 @@ public static Integer problem0022(String[] listOfNames) { String log; log = String.format("Problem 00022 solved: %d", result); - logger.info(log); + CustomLogger.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0023.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0023.java index a345b44..2fb6922 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0023.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0023.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.Set; - +import util.CustomLogger; /** * Non-abundant sums. @@ -17,7 +17,6 @@ public class Problem0023 { private Problem0023() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); /** * Problem 0023. @@ -39,11 +38,11 @@ public static Integer problem0023(int underLimit, int superLimit) { log = String.format( "abundant nums list size => %d", abundantNumberList.size() ); - logger.info(log); + CustomLogger.info(log); log = String.format( "abundant nums list result: => %s", abundantNumberList ); - logger.fine(log); + CustomLogger.debug(log); ArrayList sumsAbundantNums = new ArrayList<>(); @@ -62,12 +61,12 @@ public static Integer problem0023(int underLimit, int superLimit) { log = String.format( "sumsAbundantNums size => %d", abundantNumberList.size() ); - logger.info(log); + CustomLogger.info(log); log = String.format( "sumsAbundantNums => %s", abundantNumberList ); - logger.fine(log); + CustomLogger.debug(log); //////////////////// // filter duplicates @@ -90,7 +89,7 @@ public static Integer problem0023(int underLimit, int superLimit) { "sumsAbundantNums size: %d. result => %s", sumsAbundantNums.size(), sumsAbundantNums); - logger.fine(log); + CustomLogger.debug(log); // All numbers below limit that not present in list of sums of pair of abundant numbers ArrayList found = new ArrayList<>(); @@ -102,13 +101,13 @@ public static Integer problem0023(int underLimit, int superLimit) { } log = String.format("found: %d, found => %s", found.size(), found); - logger.fine(log); + CustomLogger.debug(log); Integer[] foundArr = found.toArray(Integer[]::new); Integer result = Sum.sum(foundArr); log = String.format("Problem 0023 result: %d", result); - logger.info(log); + CustomLogger.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0024.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0024.java index ea972dc..3bcf177 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0024.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0024.java @@ -12,7 +12,6 @@ public class Problem0024 { private Problem0024() {} - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); static Long factorial(long n) { long out = 1L; diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/helper/BigNum.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/helper/BigNum.java index 61c6aa0..9675fb5 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/helper/BigNum.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/helper/BigNum.java @@ -10,8 +10,6 @@ */ public class BigNum { - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); - int cycles = 0; List value = new ArrayList<>(); diff --git a/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005SimpleTest.java b/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005SimpleTest.java index 30806c4..051c4bc 100644 --- a/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005SimpleTest.java +++ b/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005SimpleTest.java @@ -4,11 +4,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import util.CustomLogger; class Problem0005SimpleTest { - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); @Test void problem0005SmallTest() { @@ -29,7 +29,7 @@ class Problem0005SimpleTest { String log; log = "Problem 00005 BRUTE FORCE stars..."; - logger.info(log); + CustomLogger.info(log); Integer answer = 232792560; Integer bottom = 1; @@ -42,7 +42,7 @@ class Problem0005SimpleTest { ); log = "Problem 00005 BRUTE FORCE ends."; - logger.info(log); + CustomLogger.info(log); } @EnabledIfEnvironmentVariable(named = "BRUTEFORCE", matches = "TRUE") @@ -50,7 +50,7 @@ class Problem0005SimpleTest { String log; log = "Problem 00005 BRUTE FORCE stars..."; - logger.info(log); + CustomLogger.info(log); Integer answer = 232792560; Integer bottom = 1; @@ -63,6 +63,6 @@ class Problem0005SimpleTest { ); log = "Problem 00005 BRUTE FORCE ends."; - logger.info(log); + CustomLogger.info(log); } } diff --git a/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005Test.java b/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005Test.java index 078f053..ae43d6c 100644 --- a/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005Test.java +++ b/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005Test.java @@ -4,11 +4,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import util.CustomLogger; class Problem0005Test { - static java.util.logging.Logger logger = util.CustomLogger.getLogger(); @Test void problem0005() { @@ -28,7 +28,7 @@ class Problem0005Test { String log; log = "Problem 00005 BRUTE FORCE stars..."; - logger.info(log); + CustomLogger.info(log); Integer answer = 232792560; Integer bottom = 1; @@ -41,6 +41,6 @@ class Problem0005Test { ); log = "Problem 0005 BRUTE FORCE ends."; - logger.info(log); + CustomLogger.info(log); } } From 670557d2c357e66a0ca39f878244e9a76f93e32c Mon Sep 17 00:00:00 2001 From: Gonzalo Diaz Date: Wed, 4 Sep 2024 16:45:24 -0400 Subject: [PATCH 3/3] =?UTF-8?q?[BREAKING]=20=E2=9A=A0=EF=B8=8F=20[REFACTOR?= =?UTF-8?q?]=20Custom=20Logger=20renamed=20as=20"Log".?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/ae/Problem0000.java | 4 ++-- .../ae/hackerrank/projecteuler/Euler001.java | 4 ++-- .../ae/hackerrank/projecteuler/Euler002.java | 4 ++-- .../ae/hackerrank/warmup/SimpleArraySum.java | 4 ++-- .../main/java/ae/projecteuler/Problem0001.java | 6 +++--- .../main/java/ae/projecteuler/Problem0002.java | 6 +++--- .../main/java/ae/projecteuler/Problem0003.java | 8 ++++---- .../main/java/ae/projecteuler/Problem0004.java | 6 +++--- .../main/java/ae/projecteuler/Problem0005.java | 6 +++--- .../java/ae/projecteuler/Problem0005Simple.java | 8 ++++---- .../main/java/ae/projecteuler/Problem0006.java | 12 ++++++------ .../main/java/ae/projecteuler/Problem0007.java | 8 ++++---- .../main/java/ae/projecteuler/Problem0008.java | 6 +++--- .../main/java/ae/projecteuler/Problem0009.java | 10 +++++----- .../main/java/ae/projecteuler/Problem0010.java | 8 ++++---- .../main/java/ae/projecteuler/Problem0011.java | 14 +++++++------- .../main/java/ae/projecteuler/Problem0012.java | 6 +++--- .../main/java/ae/projecteuler/Problem0013.java | 6 +++--- .../main/java/ae/projecteuler/Problem0014.java | 8 ++++---- .../main/java/ae/projecteuler/Problem0015.java | 4 ++-- .../main/java/ae/projecteuler/Problem0016.java | 6 +++--- .../main/java/ae/projecteuler/Problem0017.java | 6 +++--- .../main/java/ae/projecteuler/Problem0018.java | 8 ++++---- .../main/java/ae/projecteuler/Problem0019.java | 6 +++--- .../main/java/ae/projecteuler/Problem0020.java | 6 +++--- .../main/java/ae/projecteuler/Problem0021.java | 6 +++--- .../main/java/ae/projecteuler/Problem0022.java | 4 ++-- .../main/java/ae/projecteuler/Problem0023.java | 16 ++++++++-------- .../java/util/{CustomLogger.java => Log.java} | 2 +- .../ae/projecteuler/Problem0005SimpleTest.java | 10 +++++----- .../java/ae/projecteuler/Problem0005Test.java | 6 +++--- 31 files changed, 107 insertions(+), 107 deletions(-) rename algorithm-exercises-java/src/main/java/util/{CustomLogger.java => Log.java} (98%) diff --git a/algorithm-exercises-java/src/main/java/ae/Problem0000.java b/algorithm-exercises-java/src/main/java/ae/Problem0000.java index d512e6a..0a4142e 100644 --- a/algorithm-exercises-java/src/main/java/ae/Problem0000.java +++ b/algorithm-exercises-java/src/main/java/ae/Problem0000.java @@ -4,7 +4,7 @@ package ae; -import util.CustomLogger; +import util.Log; /** * {TITLE}. @@ -22,7 +22,7 @@ public static Integer problem0000() { Integer result = null; String log = String.format("Problem 00XX solved: %d", result); - CustomLogger.info(log); + Log.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler001.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler001.java index 42d6d6b..c520f41 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler001.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler001.java @@ -1,6 +1,6 @@ package ae.hackerrank.projecteuler; -import util.CustomLogger; +import util.Log; /** * Multiples of 3 and 5. @@ -45,7 +45,7 @@ public static Long euler001(Integer a, Integer b, Integer n) { - sumOfArithmeticProgression((long) n, lcm); String log = String.format("Problem 001 solved: %d", result); - CustomLogger.info(log); + Log.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler002.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler002.java index 9424f93..22417ed 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler002.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/projecteuler/Euler002.java @@ -1,6 +1,6 @@ package ae.hackerrank.projecteuler; -import util.CustomLogger; +import util.Log; /** * Even Fibonacci numbers. @@ -37,7 +37,7 @@ public static Long euler002(Integer n) { Long result = fibbo(n); String log = String.format("Problem 002 solved: %d", result); - CustomLogger.info(log); + Log.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/SimpleArraySum.java b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/SimpleArraySum.java index 83e211c..2551e03 100644 --- a/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/SimpleArraySum.java +++ b/algorithm-exercises-java/src/main/java/ae/hackerrank/warmup/SimpleArraySum.java @@ -1,7 +1,7 @@ package ae.hackerrank.warmup; import java.util.List; -import util.CustomLogger; +import util.Log; /** * Simple Array Sum. @@ -23,7 +23,7 @@ public static int simpleArraySum(List ar) { } String log = String.format("simpleArraySum solved: %d", total); - CustomLogger.info(log); + Log.info(log); return total; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0001.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0001.java index 8404450..2d701ac 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0001.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0001.java @@ -1,6 +1,6 @@ package ae.projecteuler; -import util.CustomLogger; +import util.Log; /** * Multiples of 3 and 5. @@ -21,14 +21,14 @@ public static Integer problem0001(Integer top) { for (i = 0; i < top; i++) { if (i % 3 == 0 || i % 5 == 0) { String log = String.format("Line result: %d", i); - CustomLogger.debug(log); + Log.debug(log); result += i; } } String log = String.format("Problem 0001 solved: %d", result); - CustomLogger.info(log); + Log.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0002.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0002.java index 947810b..a92faf9 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0002.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0002.java @@ -1,6 +1,6 @@ package ae.projecteuler; -import util.CustomLogger; +import util.Log; /** * Even Fibonacci numbers. @@ -26,7 +26,7 @@ public static Integer problem0002(int top) { fibo = last2 + last1; String log = String.format("Fibonacci(%d) = %d", i, fibo); - CustomLogger.debug(log); + Log.debug(log); if (fibo % 2 == 0) { evenSum += fibo; @@ -39,7 +39,7 @@ public static Integer problem0002(int top) { } while (fibo < top); String log = String.format("Problem 0002 result: %d", evenSum); - CustomLogger.info(log); + Log.info(log); return evenSum; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0003.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0003.java index 94b0265..745961d 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0003.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0003.java @@ -3,7 +3,7 @@ import ae.projecteuler.helper.Divisors; import ae.projecteuler.helper.NaturalNumber; import java.util.Arrays; -import util.CustomLogger; +import util.Log; /** @@ -28,7 +28,7 @@ public static Long problem0003(Long top) { String log; log = String.format("Divisors of %d: %s", top, Arrays.toString(divs)); - CustomLogger.info(log); + Log.info(log); Long maxPrimeFactor = null; Integer i = middle; @@ -38,13 +38,13 @@ public static Long problem0003(Long top) { boolean prime = NaturalNumber.isPrime(divs[i]); log = String.format("%d is Prime?: %b", i, prime); - CustomLogger.debug(log); + Log.debug(log); if (prime) { maxPrimeFactor = divs[i]; log = String.format("Problem 0003 solved: %d", maxPrimeFactor); - CustomLogger.info(log); + Log.info(log); return maxPrimeFactor; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0004.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0004.java index 2ee48de..57b8f3f 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0004.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0004.java @@ -10,7 +10,7 @@ package ae.projecteuler; import ae.projecteuler.helper.Palindrome; -import util.CustomLogger; +import util.Log; /** * Largest palindrome product. @@ -42,7 +42,7 @@ public static Integer problem0004(int bottom, int top) { if (Palindrome.isPalindrome(Long.valueOf((long) j * (long) i))) { String log = String.format("FOUND: %d x %d = %d is Palindrome", i, j, i * j); - CustomLogger.debug(log); + Log.debug(log); if (foundPalindrome == null || i * j > foundPalindrome) { foundi = i; @@ -64,7 +64,7 @@ public static Integer problem0004(int bottom, int top) { foundPalindrome, cycles); - CustomLogger.info(log); + Log.info(log); return foundPalindrome; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005.java index d61d786..800d2bf 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import util.CustomLogger; +import util.Log; /** * Smallest multiple. @@ -75,7 +75,7 @@ public static Integer problem0005(Integer bottom, Integer top) { ); log = String.format("%s", minimumPrimeFactorsCollector.toString()); - CustomLogger.info(log); + Log.info(log); } result = 1; @@ -87,7 +87,7 @@ public static Integer problem0005(Integer bottom, Integer top) { } log = String.format("Problem 0005 solved: %d", result); - CustomLogger.info(log); + Log.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005Simple.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005Simple.java index a22848a..49070e9 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005Simple.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0005Simple.java @@ -2,7 +2,7 @@ package ae.projecteuler; -import util.CustomLogger; +import util.Log; /** * Smallest multiple. @@ -31,10 +31,10 @@ public static Integer problem0005(Integer bottom, Integer top, Integer startFrom if (fail) { log = String.format("Fail %d not divisible by %d", test, i); - CustomLogger.debug(log); + Log.debug(log); } else { log = String.format("Testing: %d divisible by %d", test, i); - CustomLogger.debug(log); + Log.debug(log); } i += 1; @@ -48,7 +48,7 @@ public static Integer problem0005(Integer bottom, Integer top, Integer startFrom } while (found == null); log = String.format("Problem 00005 solved: %d", found); - CustomLogger.info(log); + Log.info(log); return found; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0006.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0006.java index 8bad6ff..f670dc3 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0006.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0006.java @@ -8,7 +8,7 @@ package ae.projecteuler; -import util.CustomLogger; +import util.Log; /** * Sum square difference. @@ -40,20 +40,20 @@ public static Integer problem0006(Integer bottom, Integer top) { String log; log = String.format("Sum of first %d squares = %d", top, sumOfSquares); - CustomLogger.debug(log); + Log.debug(log); log = String.format("Base for Square Of Sum of first %d = %d", top, baseForSquareOfSum); - CustomLogger.debug(log); + Log.debug(log); log = String.format("Square Of Sum of first %d = %d", top, squareOfSum); - CustomLogger.debug(log); + Log.debug(log); log = String.format("Difference found %d - %d = %d", squareOfSum, sumOfSquares, squareOfSum - sumOfSquares); - CustomLogger.debug(log); + Log.debug(log); log = String.format("Problem 00006 solved: %d", answer); - CustomLogger.info(log); + Log.info(log); return answer; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0007.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0007.java index dae717e..1af9137 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0007.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0007.java @@ -2,7 +2,7 @@ import ae.projecteuler.helper.NaturalNumber; import java.util.ArrayList; -import util.CustomLogger; +import util.Log; /** * 10001st prime. @@ -30,20 +30,20 @@ public static Integer problem0007(Integer top) { primes.add(j); log = String.format("Prime found %d put in position: %d", j, primes.size()); - CustomLogger.debug(log); + Log.debug(log); } j = 2 * i + 1; } log = String.format("primes count: %d", primes.size()); - CustomLogger.info(log); + Log.info(log); Integer answer = primes.get(primes.size() - 1); Integer cycles = i; log = String.format("%d prime number is: %d in %d cycles", top, answer, cycles); - CustomLogger.info(log); + Log.info(log); return answer; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0008.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0008.java index 5140956..ba5bbed 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0008.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0008.java @@ -2,7 +2,7 @@ import ae.projecteuler.helper.Product; import java.util.ArrayList; -import util.CustomLogger; +import util.Log; /** * Largest product in a series. @@ -33,7 +33,7 @@ public static Long problem0008(String number, Integer interval) { Long currentProduct = Product.product(digitsSet.toArray(Long[]::new)); log = String.format("Product beetwen %d and %d is: %d", i, i + interval, currentProduct); - CustomLogger.debug(log); + Log.debug(log); if (currentProduct > max) { max = currentProduct; @@ -41,7 +41,7 @@ public static Long problem0008(String number, Integer interval) { } log = String.format("Problem 0008 solved: %d", max); - CustomLogger.info(log); + Log.info(log); return max; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0009.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0009.java index f471e26..f5edea1 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0009.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0009.java @@ -1,6 +1,6 @@ package ae.projecteuler; -import util.CustomLogger; +import util.Log; /** * Special Pythagorean triplet. @@ -46,13 +46,13 @@ public static Integer problem0009(Integer limit) { while (b < c && found == null) { // TESTING log = String.format("TESTING: a = %d b = %d c = %d", a, b, c); - CustomLogger.debug(log); + Log.debug(log); Triplet test = new Problem0009().new Triplet(a, b, c); if (test.isPythagoreanTriplet()) { found = test; log = String.format("FOUND: a = %d b = %d c = %d", a, b, c); - CustomLogger.debug(log); + Log.debug(log); } // INCREASE @@ -68,9 +68,9 @@ public static Integer problem0009(Integer limit) { } log = String.format("FOUND: a = %d, b = %d, c = %d", found.ta, found.tb, found.tc); - CustomLogger.info(log); + Log.info(log); log = String.format("PRODUCT: a * b * c = %d", found.ta * found.tb * found.tc); - CustomLogger.info(log); + Log.info(log); return found.ta * found.tb * found.tc; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0010.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0010.java index 575cfac..d0a36a2 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0010.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0010.java @@ -3,7 +3,7 @@ import ae.projecteuler.helper.NaturalNumber; import ae.projecteuler.helper.Sum; import java.util.ArrayList; -import util.CustomLogger; +import util.Log; /** * Summation of primes. @@ -30,16 +30,16 @@ public static Long problem0010(Long bottom, Long top) { if (new NaturalNumber(i).isPrime()) { primes.add(i); log = String.format("Prime found %d put in position: %d", i, primes.size()); - CustomLogger.debug(log); + Log.debug(log); } } while (i < top); Long result = Sum.sum(primes.toArray(Long[]::new)); log = String.format("primes count: %d", primes.size()); - CustomLogger.info(log); + Log.info(log); log = String.format("Sum of primes below %d is: %d", top, result); - CustomLogger.info(log); + Log.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0011.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0011.java index e3c59c4..6d3476f 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0011.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0011.java @@ -1,6 +1,6 @@ package ae.projecteuler; -import util.CustomLogger; +import util.Log; /** * Largest product in a grid. @@ -33,7 +33,7 @@ public static Integer problem0011(Integer[][] squareMatrix, Integer interval) for (int j = 0; j < matrixLimit; j++) { log = String.format("start point => i: %d, j: %d", i, j); - CustomLogger.debug(log); + Log.debug(log); // reset diagonals int diag1Acum = 1; @@ -44,13 +44,13 @@ public static Integer problem0011(Integer[][] squareMatrix, Integer interval) i + k, j + k ); - CustomLogger.debug(log); + Log.debug(log); log = String.format( "diag2 coordinate: (i, j) = (%d, %d)", i + k, j + (quadrantSize - 1) - k ); - CustomLogger.debug(log); + Log.debug(log); diag1Acum *= squareMatrix[i + k][j + k]; diag2Acum *= squareMatrix[i + k][j + (quadrantSize - 1) - k]; @@ -68,13 +68,13 @@ public static Integer problem0011(Integer[][] squareMatrix, Integer interval) i + k, j + l ); - CustomLogger.debug(log); + Log.debug(log); log = String.format( "horizontal coordinate: (i, j) = (%d, %d)", i + l, j + k ); - CustomLogger.debug(log); + Log.debug(log); verticalAcum *= squareMatrix[i + k][j + l]; horizontalAcum *= squareMatrix[i + l][j + k]; @@ -87,7 +87,7 @@ public static Integer problem0011(Integer[][] squareMatrix, Integer interval) } log = String.format("Problem 0011 solved: %d", result); - CustomLogger.info(log); + Log.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0012.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0012.java index 27cc9c7..377bc79 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0012.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0012.java @@ -1,7 +1,7 @@ package ae.projecteuler; import ae.projecteuler.helper.Divisors; -import util.CustomLogger; +import util.Log; /** * Problem 0012. @@ -29,7 +29,7 @@ public static Long problem0012(Long top) { d = Divisors.divisors(triangular); log = String.format("Triangular number: %d has %d divisors", triangular, d.length); - CustomLogger.debug(log); + Log.debug(log); if (d.length > count) { count = (long) d.length; @@ -39,7 +39,7 @@ public static Long problem0012(Long top) { } log = String.format("Problem 00012 solved: %d", count); - CustomLogger.info(log); + Log.info(log); return count; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0013.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0013.java index c988ecd..0e4e87e 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0013.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0013.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import util.CustomLogger; +import util.Log; /** * Large sum. @@ -32,9 +32,9 @@ public static String problem0013(String[] arrayOfNumbers, Integer firtsDigits) { String log; log = String.format("First %d digits of huge sume are %s", firtsDigits, first); - CustomLogger.info(log); + Log.info(log); log = String.format("Problem 00013 solved: %s", numberString); - CustomLogger.info(log); + Log.info(log); return numberString; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0014.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0014.java index 00577f3..4de711d 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0014.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0014.java @@ -2,7 +2,7 @@ import ae.projecteuler.helper.Collatz; import java.util.ArrayList; -import util.CustomLogger; +import util.Log; /** * Longest Collatz sequence. @@ -37,7 +37,7 @@ public static Long problem0014(Integer bottom, Integer top) throws IllegalArgume } while (c != 1); log = String.format("sequense of %d: %s", i, sequence); - CustomLogger.debug(log); + Log.debug(log); if (sequence.size() > maxSequence.size()) { maxSequence = sequence; @@ -48,12 +48,12 @@ public static Long problem0014(Integer bottom, Integer top) throws IllegalArgume "Large sequence found: %s has %d elements", maxSequence, maxSequence.size()); - CustomLogger.debug(log); + Log.debug(log); // return firt element long result = maxSequence.get(0); - CustomLogger.info("Problem 00014 solved: %d".formatted(result)); + Log.info("Problem 00014 solved: %d".formatted(result)); return result; } } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0015.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0015.java index 21fd746..786e77d 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0015.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0015.java @@ -1,6 +1,6 @@ package ae.projecteuler; -import util.CustomLogger; +import util.Log; /** * Lattice paths. @@ -52,7 +52,7 @@ public static Long problem0015(Integer gridSide) { String log; log = String.format("Problem 00015 solved: %d", result); - CustomLogger.info(log); + Log.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0016.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0016.java index bf3a6bd..de35abe 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0016.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0016.java @@ -1,7 +1,7 @@ package ae.projecteuler; import ae.projecteuler.helper.BigNum; -import util.CustomLogger; +import util.Log; /** @@ -23,7 +23,7 @@ public static String problem0016(int base, int exponent) { String log; log = String.format("Digits of power found: %s", power.toString()); - CustomLogger.info(log); + Log.info(log); String[] digits = power.toString().split(""); @@ -31,7 +31,7 @@ public static String problem0016(int base, int exponent) { result.bigSumMany(digits); log = String.format("Problem 00016 solved: %s", result.toString()); - CustomLogger.info(log); + Log.info(log); return result.toString(); } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0017.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0017.java index f37a8fd..b77c013 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0017.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0017.java @@ -1,7 +1,7 @@ package ae.projecteuler; import ae.projecteuler.helper.NumberToWord; -import util.CustomLogger; +import util.Log; /** * Number letter counts. @@ -29,11 +29,11 @@ public static Integer problem0017(int init, int last) throws Exception { acum += replaced.length(); log = String.format("acum: %d => word: %s", acum, word); - CustomLogger.debug(log); + Log.debug(log); } log = String.format("Problem 00017 solved: %d", acum); - CustomLogger.info(log); + Log.info(log); return acum; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0018.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0018.java index 038e9dc..4cebb0f 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0018.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0018.java @@ -3,7 +3,7 @@ import ae.projecteuler.lib.BinaryNode; import ae.projecteuler.lib.BinaryNodeWeightBuilder; import java.util.Arrays; -import util.CustomLogger; +import util.Log; /** @@ -27,16 +27,16 @@ public static Integer problem0018(Integer[][] triangle) { Integer[] leaves = builder.getLeaves(); log = String.format("Triangle: %s", tree); - CustomLogger.debug(log); + Log.debug(log); log = String.format("Leaves count: %d, %s", leaves.length, leaves); - CustomLogger.debug(log); + Log.debug(log); Arrays.sort(leaves); Integer result = leaves[leaves.length - 1]; // maximum is last element log = String.format("Problem 00018 solved: %d", result); - CustomLogger.debug(log); + Log.debug(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0019.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0019.java index a28277d..6082518 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0019.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0019.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import util.CustomLogger; +import util.Log; /** * Counting Sundays. @@ -55,7 +55,7 @@ public static Integer problem0019( Integer days = mapEntry.getValue(); log = String.format("Year: %d | Month: %s | days: %d", year, month, days); - CustomLogger.debug(log); + Log.debug(log); accumulatedRemainder += days % 7; if (accumulatedRemainder % 7 == dayOfWeek) { @@ -71,7 +71,7 @@ public static Integer problem0019( Integer result = resultCount - excess; log = String.format("Problem 00019 solved: %d", result); - CustomLogger.info(log); + Log.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0020.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0020.java index 94b8f14..39ec048 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0020.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0020.java @@ -1,7 +1,7 @@ package ae.projecteuler; import ae.projecteuler.helper.BigNum; -import util.CustomLogger; +import util.Log; /** * Problem 0020. @@ -21,12 +21,12 @@ public static BigNum problem0020(int limit) { BigNum factorial = BigNum.bigFactorial(limit); log = String.format("Factorial of %d!: %s", limit, factorial.toString()); - CustomLogger.info(log); + Log.info(log); BigNum result = new BigNum(0).bigSumMany(factorial.toArray()); log = String.format("Problem 00020 solved: %s", result.toString()); - CustomLogger.info(log); + Log.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0021.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0021.java index cbbabeb..2a7624c 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0021.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0021.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import util.CustomLogger; +import util.Log; /** @@ -57,12 +57,12 @@ public static String problem0021(int start, int limit) { String log; log = String.format("Amicable numbers: %s", amicableNumbers); - CustomLogger.info(log); + Log.info(log); BigNum result = new BigNum(0).bigSumMany(amicableNumbers.toArray(String[]::new)); log = String.format("Problem 00021 solved: %s", result); - CustomLogger.info(log); + Log.info(log); return result.toString(); } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0022.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0022.java index 9ba19c2..9960903 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0022.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0022.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import util.CustomLogger; +import util.Log; /** * Names scores. @@ -32,7 +32,7 @@ public static Integer problem0022(String[] listOfNames) { String log; log = String.format("Problem 00022 solved: %d", result); - CustomLogger.info(log); + Log.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0023.java b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0023.java index 2fb6922..579d1ff 100644 --- a/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0023.java +++ b/algorithm-exercises-java/src/main/java/ae/projecteuler/Problem0023.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.Set; -import util.CustomLogger; +import util.Log; /** * Non-abundant sums. @@ -38,11 +38,11 @@ public static Integer problem0023(int underLimit, int superLimit) { log = String.format( "abundant nums list size => %d", abundantNumberList.size() ); - CustomLogger.info(log); + Log.info(log); log = String.format( "abundant nums list result: => %s", abundantNumberList ); - CustomLogger.debug(log); + Log.debug(log); ArrayList sumsAbundantNums = new ArrayList<>(); @@ -61,12 +61,12 @@ public static Integer problem0023(int underLimit, int superLimit) { log = String.format( "sumsAbundantNums size => %d", abundantNumberList.size() ); - CustomLogger.info(log); + Log.info(log); log = String.format( "sumsAbundantNums => %s", abundantNumberList ); - CustomLogger.debug(log); + Log.debug(log); //////////////////// // filter duplicates @@ -89,7 +89,7 @@ public static Integer problem0023(int underLimit, int superLimit) { "sumsAbundantNums size: %d. result => %s", sumsAbundantNums.size(), sumsAbundantNums); - CustomLogger.debug(log); + Log.debug(log); // All numbers below limit that not present in list of sums of pair of abundant numbers ArrayList found = new ArrayList<>(); @@ -101,13 +101,13 @@ public static Integer problem0023(int underLimit, int superLimit) { } log = String.format("found: %d, found => %s", found.size(), found); - CustomLogger.debug(log); + Log.debug(log); Integer[] foundArr = found.toArray(Integer[]::new); Integer result = Sum.sum(foundArr); log = String.format("Problem 0023 result: %d", result); - CustomLogger.info(log); + Log.info(log); return result; } diff --git a/algorithm-exercises-java/src/main/java/util/CustomLogger.java b/algorithm-exercises-java/src/main/java/util/Log.java similarity index 98% rename from algorithm-exercises-java/src/main/java/util/CustomLogger.java rename to algorithm-exercises-java/src/main/java/util/Log.java index af37bf2..190aa1c 100644 --- a/algorithm-exercises-java/src/main/java/util/CustomLogger.java +++ b/algorithm-exercises-java/src/main/java/util/Log.java @@ -3,7 +3,7 @@ /** * Log. */ -public class CustomLogger { +public class Log { /** * LoggerSingleton. diff --git a/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005SimpleTest.java b/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005SimpleTest.java index 051c4bc..8bd8fd2 100644 --- a/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005SimpleTest.java +++ b/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005SimpleTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; -import util.CustomLogger; +import util.Log; class Problem0005SimpleTest { @@ -29,7 +29,7 @@ class Problem0005SimpleTest { String log; log = "Problem 00005 BRUTE FORCE stars..."; - CustomLogger.info(log); + Log.info(log); Integer answer = 232792560; Integer bottom = 1; @@ -42,7 +42,7 @@ class Problem0005SimpleTest { ); log = "Problem 00005 BRUTE FORCE ends."; - CustomLogger.info(log); + Log.info(log); } @EnabledIfEnvironmentVariable(named = "BRUTEFORCE", matches = "TRUE") @@ -50,7 +50,7 @@ class Problem0005SimpleTest { String log; log = "Problem 00005 BRUTE FORCE stars..."; - CustomLogger.info(log); + Log.info(log); Integer answer = 232792560; Integer bottom = 1; @@ -63,6 +63,6 @@ class Problem0005SimpleTest { ); log = "Problem 00005 BRUTE FORCE ends."; - CustomLogger.info(log); + Log.info(log); } } diff --git a/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005Test.java b/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005Test.java index ae43d6c..25236b1 100644 --- a/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005Test.java +++ b/algorithm-exercises-java/src/test/java/ae/projecteuler/Problem0005Test.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; -import util.CustomLogger; +import util.Log; class Problem0005Test { @@ -28,7 +28,7 @@ class Problem0005Test { String log; log = "Problem 00005 BRUTE FORCE stars..."; - CustomLogger.info(log); + Log.info(log); Integer answer = 232792560; Integer bottom = 1; @@ -41,6 +41,6 @@ class Problem0005Test { ); log = "Problem 0005 BRUTE FORCE ends."; - CustomLogger.info(log); + Log.info(log); } }