fixed build script: don't exit the terminal if there are compile errors

- consistent spelling

Darlehenberechner.java

@@ -69,6 +69,12 @@ class Darlehenberechner {
       }
 
 
+      public Konfiguration setLaufzeitJahre(Integer jahre) {
+         this.laufzeitMonate = (jahre * 12);
+         return this;
+      }
+
+
       public Konfiguration setLaufzeit(Integer jahre, Integer monate) {
          this.laufzeitMonate = (jahre * 12) + monate;
          return this;
@@ -172,7 +178,7 @@ class Darlehenberechner {
    }
 
 
-   private static void askParametersAndRun() throws IOException {
+   private static void askParametersAndRun() throws ParseException, IOException {
       DECIMAL_FORMAT.setParseBigDecimal(true);
 
       var konfig = new Konfiguration();
@@ -211,7 +217,7 @@ class Darlehenberechner {
    }
 
 
-   private static void parseParametersAndRun(String[] args) {
+   private static void parseParametersAndRun(String[] args) throws ParseException {
       var konfig = new Konfiguration();
       int count = 0;
       DECIMAL_FORMAT.setParseBigDecimal(true);

DrinkingBar.java

@@ -18,59 +18,148 @@ public class DrinkingBar {
    private static final int MINS_PER_HALF_HOUR = MINS_PER_HOUR / 2;
    private static final int MINUTES_BEFORE_PAUSE = 4 * MINS_PER_HOUR + MINS_PER_HALF_HOUR;
    private static final int MINUTES_WITH_PAUSE = 6 * MINS_PER_HOUR;
-   private static final DecimalFormat LITER_FORMAT = new DecimalFormat("0.00");
+   private static final int DEFAULT_TOTAL_TIME = 8 * MINS_PER_HOUR + MINS_PER_HALF_HOUR;
+   private static final BigDecimal DEFAULT_TOTAL_TIME_BD = BigDecimal.valueOf(DEFAULT_TOTAL_TIME);
+   private static final BigDecimal DEFAULT_TOTAL_LITRES = BigDecimal.valueOf(2.0);
+   private static final BigDecimal QUARTER_LITRE = BigDecimal.valueOf(0.25);
+   private static final DecimalFormat LITRE_FORMAT = new DecimalFormat("0.00");
    private static final DecimalFormat PERCENTAGE_FORMAT = new DecimalFormat("00.00");
    private static final BigDecimal MINS_PER_HOUR_BD = BigDecimal.valueOf(MINS_PER_HOUR);
    private static final MathContext MC_INTEGER = new MathContext(1, RoundingMode.HALF_EVEN);
 
+   private final LocalTime startTime;
+   private LocalTime endTime;
+   private long totalMinutes;
+   private BigDecimal totalMinutesBD;
+   private BigDecimal totalLitres;
+
+
+   private DrinkingBar(LocalTime startTime) {
+      this.startTime = startTime;
+      this.totalMinutes = DEFAULT_TOTAL_TIME;
+      this.totalMinutesBD = BigDecimal.valueOf(totalMinutes);
+      this.endTime = startTime.plusMinutes(totalMinutes);
+      this.totalLitres = DEFAULT_TOTAL_LITRES;
+   }
+
 
    public static void main(String[] args) throws IOException {
       var br = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
-      System.out.print("Ankunftszeit: ");
+      print("Ankunftszeit: ");
       var startTime = LocalTime.parse(br.readLine(), TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
+      var db = new DrinkingBar(startTime);
+      db.showLoadingBar();
+   }
 
-      long totalMinutes = 8 * MINS_PER_HOUR + MINS_PER_HALF_HOUR;
-      long passedMinutes = startTime.until(LocalTime.now().truncatedTo(ChronoUnit.MINUTES), ChronoUnit.MINUTES);
+
+   private static void println(Object o) {
+      System.out.println(o);
+   }
+
+
+   private static void print(Object o) {
+      System.out.print(o);
+   }
+
+
+   protected long getPassedMinutes() {
+      return startTime.until(LocalTime.now().truncatedTo(ChronoUnit.MINUTES), ChronoUnit.MINUTES);
+   }
+
+
+   private void setEndTime(LocalTime endTime) {
+      this.endTime = endTime;
+      this.totalMinutes = startTime.until(endTime, ChronoUnit.MINUTES);
+      this.totalMinutesBD = BigDecimal.valueOf(totalMinutes);
+      extraInitEndTimeTotalMinutes();
+   }
+
+
+   protected void extraInitEndTimeTotalMinutes() {
+      // correct necessary litres to drink based on the end time.
+      // lower the volume in quarter litre steps
+      BigDecimal calcTotalLitres = DEFAULT_TOTAL_LITRES;
+      BigDecimal totalLitresFromMinutes = DEFAULT_TOTAL_LITRES
+         .multiply(totalMinutesBD) // reverse dreisatz
+         .divide(DEFAULT_TOTAL_TIME_BD, MathContext.DECIMAL64);
+      do {
+         calcTotalLitres = calcTotalLitres.subtract(QUARTER_LITRE);
+      } while (calcTotalLitres.compareTo(totalLitresFromMinutes) >= 0);
+      // add quarter since we always did a step "too many", due to the do ... while loop
+      this.totalLitres = calcTotalLitres.add(QUARTER_LITRE);
+   }
+
+
+   private void showLoadingBar() {
+      long passedMinutes = getPassedMinutes();
       // long passedMinutes = 0; // DEBUG
-      double prevPrintedLitres = 0.0;
+      if (passedMinutes > totalMinutes) {
+         passedMinutes = totalMinutes;
+      } else if (passedMinutes < 0) {
+         var now = LocalTime.now().truncatedTo(ChronoUnit.SECONDS);
+         println("!ACHTUNG! Startzeit \"" + startTime + ":00\" liegt in der Zukunft von jetzt an (" + now + ") gesehen.");
+      }
+      println(minutesToTimeString(totalMinutesBD) + " gesamt; Endzeit: " + TIME_FORMATTER.format(endTime));
       while (passedMinutes < totalMinutes) {
-         if (passedMinutes <= MINUTES_BEFORE_PAUSE || passedMinutes > MINUTES_WITH_PAUSE) {
-            double currentLitres = 2.0 / totalMinutes * passedMinutes + 0.25;
-            double printedLitres = currentLitres - (currentLitres % 0.25);
-            double currentProgressToNextStep = 100 / 0.25 * (currentLitres - printedLitres);
-            long minutesToNextStep = getMinutesToNextStep(currentLitres, totalMinutes);
-            System.out.print("\rAktuelles Volumen: " + LITER_FORMAT.format(printedLitres) + "L - "
-               + PERCENTAGE_FORMAT.format(currentProgressToNextStep) + "% - " + minutesToTimeString(minutesToNextStep));
-            prevPrintedLitres = printedLitres;
-         }
-         try {
-            var now = LocalTime.now();
-            var oneMinuteLater = now.plusMinutes(1).truncatedTo(ChronoUnit.MINUTES);
-            // +1 second to adjust for ignored milliseconds as it is better to switch between 00 and 01 as between 59 and 00
-            TimeUnit.SECONDS.sleep(now.until(oneMinuteLater, ChronoUnit.SECONDS) + 1);
-            // TimeUnit.MILLISECONDS.sleep(100L); // DEBUG
-         } catch (InterruptedException ie) {
-            throw new RuntimeException(ie);
-         }
+         print(fillLoadingBar(passedMinutes, true));
+         waitUntilNextMinute();
          passedMinutes++;
       }
-      System.out.println("");
+      println(fillLoadingBar(passedMinutes, false));
    }
 
 
-   private static long getMinutesToNextStep(double currentLitres, long totalMinutes) {
+   private String fillLoadingBar(long passedMinutes, boolean progressive) {
+      long effectivePassedMinutes = passedMinutes < 0 ? 0 : passedMinutes;
+      if (totalMinutes > MINUTES_WITH_PAUSE && passedMinutes > MINUTES_BEFORE_PAUSE && passedMinutes <= MINUTES_WITH_PAUSE) {
+         effectivePassedMinutes = MINUTES_BEFORE_PAUSE;
+      }
+      var effectivePassedMinutesBD = BigDecimal.valueOf(effectivePassedMinutes);
+      BigDecimal currentLitres = totalLitres
+         .multiply(effectivePassedMinutesBD) // reverse dreisatz
+         .divide(totalMinutesBD, MathContext.DECIMAL64)
+         .add(QUARTER_LITRE);
+      BigDecimal printedLitres = currentLitres.subtract(currentLitres.remainder(QUARTER_LITRE, MathContext.DECIMAL64));
+      /* BigDecimal currentProgressToNextStep = ONE_HUNDRED_PERCENT
+         .multiply(currentLitres.subtract(printedLitres)) // reverse dreisatz
+         .divide(QUARTER_LITRE, MathContext.DECIMAL64); */
+      BigDecimal minutesToNextStep = getMinutesToNextStep(currentLitres);
+      String progressivePart = progressive ? "\r" : "";
+      return progressivePart + "Aktuelles Volumen: " + LITRE_FORMAT.format(printedLitres) + "L - "
+         // + PERCENTAGE_FORMAT.format(currentProgressToNextStep) + "% - "
+         + minutesToTimeString(minutesToNextStep);
+   }
+
+
+   private BigDecimal getMinutesToNextStep(BigDecimal currentLitres) {
       // berechne Liter benötigt bis zum nächsten 0.25er Schritt
-      double litresToNextStep = 0.25 - (currentLitres % 0.25);
+      BigDecimal litresToNextStep = QUARTER_LITRE.subtract(currentLitres.remainder(QUARTER_LITRE));
       // berechne Minuten benötigt für 1 Liter
-      double minutesPerLitre = totalMinutes / 2.0;
+      BigDecimal minutesPerLitre = totalMinutesBD.divide(totalLitres, MathContext.DECIMAL64);
       // berechne Minuten benötigt bis zum nächsten 0.25er Schritt
-      return (long) (minutesPerLitre * litresToNextStep) + 1;
+      // runde auf ganze Zahl, da wir nur ganze Minuten anzeigen und damit 1.999 = 2 Minuten sind
+      return minutesPerLitre.multiply(litresToNextStep).setScale(0, RoundingMode.HALF_EVEN);
    }
 
 
-   private static String minutesToTimeString(long minutes) { // DEBUG
-      var minutesBD = BigDecimal.valueOf(minutes);
-      BigDecimal[] hoursAndMinutes = minutesBD.divideAndRemainder(MINS_PER_HOUR_BD, MC_INTEGER);
+   private String minutesToTimeString(BigDecimal minutes) {
+      BigDecimal[] hoursAndMinutes = minutes.divideAndRemainder(MINS_PER_HOUR_BD, MC_INTEGER);
       return LocalTime.of(hoursAndMinutes[0].intValue(), hoursAndMinutes[1].intValue()).format(TIME_FORMATTER);
    }
+
+
+   private void waitUntilNextMinute() {
+      try {
+         var now = LocalTime.now();
+         var oneMinuteLater = now.plusMinutes(1).truncatedTo(ChronoUnit.MINUTES);
+         /* We wait whole seconds to not make it overly complicated.
+            That results in cut milliseconds: if we would have to wait 1 second and 526 milliseconds, we wait only 1 second.
+            So, adjust for ignored milliseconds, add +1 second as it is better to switch between 00 and 01 as between 59 and 00 */
+         TimeUnit.SECONDS.sleep(now.until(oneMinuteLater, ChronoUnit.SECONDS) + 1);
+         // TimeUnit.MILLISECONDS.sleep(100L); // DEBUG
+      } catch (InterruptedException ie) {
+         Thread.currentThread().interrupt();
+         throw new RuntimeException(ie);
+      }
+   }
 }

Java11.java

@@ -12,6 +12,8 @@ import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 class Java11 {
+
+
    public static void main(String[] args) {
       ////////
       // 1. //
@@ -159,4 +161,4 @@ interface InterfaceWithPrivateMethods {
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.PARAMETER)
-public @interface Nonnull {}
+@interface Nonnull {}

LoadingBar.java

@@ -33,6 +33,7 @@ public class LoadingBar {
    private static final long MAX_NUMBER_WORK_MINS = 8L * MINS_PER_HOUR;
    private static final int LINE_LENGTH = 100;
    private static final MathContext MC_INTEGER = new MathContext(1, RoundingMode.HALF_EVEN);
+   private static final BigDecimal ONE_HUNDRED_PERCENT = BigDecimal.valueOf(100);
 
 
    private enum DaySection {
@@ -65,6 +66,17 @@ public class LoadingBar {
    }
 
 
+   private final LocalTime startTime;
+   private LocalTime endTime;
+   private long totalMinutes;
+   private BigDecimal totalMinutesBD;
+
+
+   private LoadingBar(LocalTime startTime) {
+      this.startTime = startTime;
+   }
+
+
    public static void main(String[] args) throws IOException {
       if (args.length == 0) {
          askParametersAndRun();
@@ -78,10 +90,13 @@ public class LoadingBar {
       var br = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
       print("Ankunftszeit: ");
       var startTime = LocalTime.parse(br.readLine(), TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
-      if (startTime.until(LocalTime.now(), ChronoUnit.MINUTES) < DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH) {
-         handleMittagspause(br, startTime);
+      var lb = new LoadingBar(startTime);
+      if (lb.hasMittagspauseArrived()) {
+         handleMittagspause(br, lb);
+         lb.showLoadingBar();
       }
-      handleZapfenstreich(br, startTime);
+      handleZapfenstreich(br, lb);
+      lb.showLoadingBar();
    }
 
 
@@ -95,33 +110,33 @@ public class LoadingBar {
    }
 
 
-   private static void handleMittagspause(BufferedReader br, LocalTime startTime) throws IOException {
+   private static void handleMittagspause(BufferedReader br, LoadingBar lb) throws IOException {
       print("Mittagspause verschieben um (optional): ");
       String mittagspauseOffsetRaw = br.readLine();
       if (mittagspauseOffsetRaw != null && !mittagspauseOffsetRaw.isBlank()) {
          var mittagspauseOffset = Integer.parseInt(mittagspauseOffsetRaw);
-         showLoadingBarMittagspause(startTime, mittagspauseOffset);
+         lb.initMittagspause(mittagspauseOffset);
          return;
       }
       print("Mittagspause um (optional): ");
       String manualMittagspauseRaw = br.readLine();
       if (manualMittagspauseRaw != null && !manualMittagspauseRaw.isBlank()) {
          var manualMittagspause = LocalTime.parse(manualMittagspauseRaw, TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
-         showLoadingBarMittagspause(startTime, manualMittagspause);
+         lb.initMittagspause(manualMittagspause);
       } else {
-         showLoadingBarMittagspause(startTime);
+         lb.initMittagspause();
       }
    }
 
 
-   private static void handleZapfenstreich(BufferedReader br, LocalTime startTime) throws IOException {
+   private static void handleZapfenstreich(BufferedReader br, LoadingBar lb) throws IOException {
       print("Mittagspause hat gedauert (optional): ");
       String mittagspauseDurationRaw = br.readLine();
       Integer mittagspauseDuration = null;
       if (mittagspauseDurationRaw != null && !mittagspauseDurationRaw.isBlank()) {
          mittagspauseDuration = Integer.valueOf(mittagspauseDurationRaw);
       }
-      LocalTime vorlaeufigeEndzeit = startTime.plusMinutes(MAX_NUMBER_WORK_MINS)
+      LocalTime vorlaeufigeEndzeit = lb.startTime.plusMinutes(MAX_NUMBER_WORK_MINS)
          .plusMinutes(mittagspauseDuration != null ? mittagspauseDuration : MIN_LUNCH_DURATION);
       println("Endzeit: " + TIME_FORMATTER.format(vorlaeufigeEndzeit));
       print("Feierabend verschieben um (optional): ");
@@ -129,7 +144,7 @@ public class LoadingBar {
       Integer zapfenstreichOffset = null;
       if (zapfenstreichOffsetRaw != null && !zapfenstreichOffsetRaw.isBlank()) {
          zapfenstreichOffset = Integer.valueOf(zapfenstreichOffsetRaw);
-         showLoadingBarZapfenstreich(startTime, mittagspauseDuration, zapfenstreichOffset);
+         lb.initZapfenstreich(mittagspauseDuration, zapfenstreichOffset);
          return;
       }
       print("Manuelle Uhrzeit Feierabend (optional): ");
@@ -137,18 +152,24 @@ public class LoadingBar {
       LocalTime manualZapfenstreich = null;
       if (manualZapfenstreichRaw != null && !manualZapfenstreichRaw.isBlank()) {
          manualZapfenstreich = LocalTime.parse(manualZapfenstreichRaw, TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
-         showLoadingBarZapfenstreich(startTime, mittagspauseDuration, manualZapfenstreich);
-         return;
+         lb.initZapfenstreich(mittagspauseDuration, manualZapfenstreich);
+      } else {
+         lb.initZapfenstreich(mittagspauseDuration);
       }
-      showLoadingBarZapfenstreich(startTime, mittagspauseDuration);
    }
 
 
    private static void parseParametersAndRun(String[] args) {
+      LoadingBar lb = getLoadingBarFromCLI(args);
+      lb.showLoadingBar();
+   }
+
+
+   private static LoadingBar getLoadingBarFromCLI(String[] args) {
       String nextArg = args[0];
       if ("--help".equals(nextArg)) {
          printHelp();
-         return;
+         System.exit(1);
       }
       verifyMinimumNumberOfArgs(args);
       verifyTimeFormat(nextArg, "Erstes Argument");
@@ -156,34 +177,33 @@ public class LoadingBar {
       nextArg = args[1];
       var section = DaySection.byParam(nextArg);
       verifyDaySection(section, nextArg);
-      if (section == DaySection.MITTAG) {
-         handleMittagspause(args, startTime);
-      } else {
-         handleZapfenstreich(args, startTime);
-      }
+      return section == DaySection.MITTAG ? getLoadingBarMittagspause(args, startTime) : getLoadingBarZapfenstreich(args, startTime);
    }
 
 
-   private static void handleMittagspause(String[] args, LocalTime startTime) {
+   private static LoadingBar getLoadingBarMittagspause(String[] args, LocalTime startTime) {
+      var lb = new LoadingBar(startTime);
       if (args.length == 2) {
-         showLoadingBarMittagspause(startTime);
-         return;
+         lb.initMittagspause();
+         return lb;
       }
       String nextArg = args[2];
       if (OFFSET_PATTERN.matcher(nextArg).matches()) {
-         showLoadingBarMittagspause(startTime, Integer.parseInt(nextArg));
-         return;
+         lb.initMittagspause(Integer.parseInt(nextArg));
+         return lb;
       }
       verifyTimeFormat(nextArg, "Argument nach " + DaySection.MITTAG.getParam());
       var manualMittagspause = LocalTime.parse(nextArg, TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
-      showLoadingBarMittagspause(startTime, manualMittagspause);
+      lb.initMittagspause(manualMittagspause);
+      return lb;
    }
 
 
-   private static void handleZapfenstreich(String[] args, LocalTime startTime) {
+   private static LoadingBar getLoadingBarZapfenstreich(String[] args, LocalTime startTime) {
+      var lb = new LoadingBar(startTime);
       if (args.length == 2) {
-         showLoadingBarZapfenstreich(startTime);
-         return;
+         lb.initZapfenstreich();
+         return lb;
       }
       String nextArg = args[2];
       LocalTime maxZapfenstreich = null;
@@ -199,13 +219,13 @@ public class LoadingBar {
       }
       if (args.length == 3) {
          if (maxZapfenstreich == null && endTimeOffset == 0) {
-            showLoadingBarZapfenstreich(startTime, lunchDuration);
+            lb.initZapfenstreich(lunchDuration);
          } else if (maxZapfenstreich == null) {
-            showLoadingBarZapfenstreich(startTime, lunchDuration, endTimeOffset);
+            lb.initZapfenstreich(lunchDuration, endTimeOffset);
          } else {
-            showLoadingBarZapfenstreich(startTime, lunchDuration, maxZapfenstreich);
+            lb.initZapfenstreich(lunchDuration, maxZapfenstreich);
          }
-         return;
+         return lb;
       }
       nextArg = args[3];
       if (lunchDuration == null) {
@@ -215,12 +235,13 @@ public class LoadingBar {
       if (maxZapfenstreich == null && !OFFSET_PATTERN.matcher(nextArg).matches()) {
          verifyTimeFormat(nextArg, "Letztes Argument nach " + DaySection.ZAPFENSTREICH.getParam() + " und Mittagspausendauer");
          maxZapfenstreich = LocalTime.parse(nextArg, TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
-         showLoadingBarZapfenstreich(startTime, lunchDuration, maxZapfenstreich);
-         return;
+         lb.initZapfenstreich(lunchDuration, maxZapfenstreich);
+         return lb;
       }
       verifyOffsetFormat(nextArg, "Letztes Argument nach " + DaySection.ZAPFENSTREICH.getParam() + " und Enduhrzeit");
       endTimeOffset = Integer.parseInt(nextArg);
-      showLoadingBarZapfenstreich(startTime, lunchDuration, endTimeOffset);
+      lb.initZapfenstreich(lunchDuration, endTimeOffset);
+      return lb;
    }
 
 
@@ -302,75 +323,97 @@ public class LoadingBar {
    }
 
 
-   private static void showLoadingBarMittagspause(LocalTime startTime) {
-      showLoadingBarMittagspause(startTime, null);
+   protected long getPassedMinutes() {
+      return startTime.until(LocalTime.now().truncatedTo(ChronoUnit.MINUTES), ChronoUnit.MINUTES);
    }
 
 
-   private static void showLoadingBarMittagspause(LocalTime startTime, int endTimeOffset) {
-      LocalTime endTime = startTime.plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH + endTimeOffset);
-      LocalTime trueEndTime = endTime.isAfter(LATEST_LUNCH_TIME) ? LATEST_LUNCH_TIME : endTime;
-      showLoadingBar(startTime, trueEndTime);
+   private void setEndTime(LocalTime endTime) {
+      this.endTime = endTime;
+      this.totalMinutes = startTime.until(endTime, ChronoUnit.MINUTES);
+      this.totalMinutesBD = BigDecimal.valueOf(totalMinutes);
    }
 
 
-   private static void showLoadingBarMittagspause(LocalTime startTime, LocalTime manualEndTime) {
-      LocalTime endTime = manualEndTime != null ? manualEndTime : startTime.plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH);
-      LocalTime trueEndTime = endTime.isAfter(LATEST_LUNCH_TIME) ? LATEST_LUNCH_TIME : endTime;
-      showLoadingBar(startTime, trueEndTime);
+
+   private boolean hasMittagspauseArrived() {
+      return startTime.until(LocalTime.now(), ChronoUnit.MINUTES) < DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH;
    }
 
 
-   private static void showLoadingBarZapfenstreich(LocalTime startTime) {
-      showLoadingBarZapfenstreich(startTime, -1, 0);
+   private void initMittagspause() {
+      LocalTime defaultEndTime = startTime.plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH);
+      realInitMittagspause(defaultEndTime);
    }
 
 
-   private static void showLoadingBarZapfenstreich(LocalTime startTime, Integer manualLunchDuration) {
-      showLoadingBarZapfenstreich(startTime, manualLunchDuration, 0);
+   private void initMittagspause(int endTimeOffset) {
+      LocalTime offsetEndTime = startTime.plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH + endTimeOffset);
+      realInitMittagspause(offsetEndTime);
    }
 
 
-   private static void showLoadingBarZapfenstreich(LocalTime startTime, Integer manualLunchDuration, int endTimeOffset) {
+   private void initMittagspause(LocalTime manualEndTime) {
+      LocalTime effectiveEndTime = manualEndTime != null ? manualEndTime : startTime.plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH);
+      realInitMittagspause(effectiveEndTime);
+   }
+
+
+   private void realInitMittagspause(LocalTime theoreticalEndTime) {
+      setEndTime(theoreticalEndTime.isAfter(LATEST_LUNCH_TIME) ? LATEST_LUNCH_TIME : theoreticalEndTime);
+   }
+
+
+   private void initZapfenstreich() {
+      LocalTime trueEndTime = startTime.plusMinutes(MAX_NUMBER_WORK_MINS + MIN_LUNCH_DURATION);
+      realInitZapfenstreich(MIN_LUNCH_DURATION, trueEndTime);
+   }
+
+
+   private void initZapfenstreich(Integer manualLunchDuration) {
+      initZapfenstreich(manualLunchDuration, 0);
+   }
+
+
+   private void initZapfenstreich(Integer manualLunchDuration, int endTimeOffset) {
       long minLunchDuration = getMinLunchDuration(endTimeOffset);
       long realLunchDuration = getRealLunchDuration(manualLunchDuration, minLunchDuration);
       LocalTime trueEndTime = startTime.plusMinutes(MAX_NUMBER_WORK_MINS + realLunchDuration + endTimeOffset);
-      realShowLoadingBarZapfenstreich(startTime, realLunchDuration, trueEndTime);
+      realInitZapfenstreich(realLunchDuration, trueEndTime);
    }
 
 
-   private static void showLoadingBarZapfenstreich(LocalTime startTime, Integer manualLunchDuration, LocalTime manualEndTime) {
+   private void initZapfenstreich(Integer manualLunchDuration, LocalTime manualEndTime) {
       LocalTime trueEndTime = manualEndTime;
-      long minLunchDuration = getMinLunchDuration(startTime, trueEndTime);
+      long minLunchDuration = getMinLunchDuration(trueEndTime);
       long realLunchDuration = getRealLunchDuration(manualLunchDuration, minLunchDuration);
       if (trueEndTime == null) {
          trueEndTime = startTime.plusMinutes(MAX_NUMBER_WORK_MINS + realLunchDuration);
       }
-      realShowLoadingBarZapfenstreich(startTime, realLunchDuration, trueEndTime);
+      realInitZapfenstreich(realLunchDuration, trueEndTime);
    }
 
 
-   private static long getMinLunchDuration(int endTimeOffset) {
+   private long getMinLunchDuration(int endTimeOffset) {
       if (endTimeOffset == 0) {
          return MIN_LUNCH_DURATION;
       }
       long totalDuration = MAX_NUMBER_WORK_MINS + endTimeOffset;
-      long effectiveLunchDuration = totalDuration - MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH;
-      return getMinLunchDuration(effectiveLunchDuration);
+      return getMinLunchDuration(totalDuration);
    }
 
 
-   private static long getMinLunchDuration(LocalTime startTime, LocalTime endTime) {
-      if (endTime == null) {
+   private long getMinLunchDuration(LocalTime manualEndTime) {
+      if (manualEndTime == null) {
          return MIN_LUNCH_DURATION;
       }
-      long totalDuration = startTime.until(endTime, ChronoUnit.MINUTES);
-      long effectiveLunchDuration = totalDuration - MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH;
-      return getMinLunchDuration(effectiveLunchDuration);
+      long totalDuration = startTime.until(manualEndTime, ChronoUnit.MINUTES);
+      return getMinLunchDuration(totalDuration);
    }
 
 
-   private static long getMinLunchDuration(long effectiveLunchDuration) {
+   private long getMinLunchDuration(long precalculatedTotalDuration) {
+      long effectiveLunchDuration = precalculatedTotalDuration - MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH;
       if (effectiveLunchDuration < 0) {
          effectiveLunchDuration = 0;
       }
@@ -378,53 +421,61 @@ public class LoadingBar {
    }
 
 
-   private static long getRealLunchDuration(Integer manualLunchDuration, long minLunchDuration) {
+   private long getRealLunchDuration(Integer manualLunchDuration, long minLunchDuration) {
       return manualLunchDuration != null && manualLunchDuration >= minLunchDuration ? manualLunchDuration : minLunchDuration;
    }
 
 
-   private static void realShowLoadingBarZapfenstreich(LocalTime startTime, long manualLunchDuration, LocalTime endTime) {
-      if (manualLunchDuration > 0) {
-         var totalWorkTime = LocalTime.MIDNIGHT.plusMinutes(startTime.until(endTime, ChronoUnit.MINUTES) - manualLunchDuration);
+   private void realInitZapfenstreich(long effectiveLunchDuration, LocalTime effectiveEndTime) {
+      if (effectiveLunchDuration > 0) {
+         var totalWorkTime = LocalTime.MIDNIGHT.plusMinutes(startTime.until(effectiveEndTime, ChronoUnit.MINUTES) - effectiveLunchDuration);
          print("Arbeitszeit: " + TIME_FORMATTER.format(totalWorkTime) + "; ");
       }
-      showLoadingBar(startTime, endTime);
+      setEndTime(effectiveEndTime);
    }
 
 
-   private static void showLoadingBar(LocalTime startTime, LocalTime endTime) {
-      long totalMinutes = startTime.until(endTime, ChronoUnit.MINUTES);
-      long passedMinutes = startTime.until(LocalTime.now().truncatedTo(ChronoUnit.MINUTES), ChronoUnit.MINUTES);
+   private void showLoadingBar() {
+      long passedMinutes = getPassedMinutes();
+      // long passedMinutes = 0; // DEBUG
       if (passedMinutes > totalMinutes) {
          passedMinutes = totalMinutes;
       } else if (passedMinutes < 0) {
          var now = LocalTime.now().truncatedTo(ChronoUnit.SECONDS);
          println("!ACHTUNG! Startzeit \"" + startTime + ":00\" liegt in der Zukunft von jetzt an (" + now + ") gesehen.");
       }
-      println(minutesToTimeString(totalMinutes) + " gesamt; Endzeit: " + TIME_FORMATTER.format(endTime));
+      println(minutesToTimeString(totalMinutesBD) + " gesamt; Endzeit: " + TIME_FORMATTER.format(endTime));
       while (passedMinutes < totalMinutes) {
-         print(fillLoadingBar(totalMinutes, passedMinutes, true));
-         try {
-            var now = LocalTime.now();
-            var oneMinuteLater = now.plusMinutes(1).truncatedTo(ChronoUnit.MINUTES);
-            // +1 second to adjust for ignored milliseconds as it is better to switch between 00 and 01 as between 59 and 00
-            TimeUnit.SECONDS.sleep(now.until(oneMinuteLater, ChronoUnit.SECONDS) + 1);
-            // TimeUnit.SECONDS.sleep(1L); // DEBUG
-         } catch (InterruptedException ie) {
-            throw new RuntimeException(ie);
-         }
+         print(fillLoadingBar(passedMinutes, true));
+         waitUntilNextMinute();
          passedMinutes++;
       }
-      println(fillLoadingBar(totalMinutes, passedMinutes, false));
+      println(fillLoadingBar(passedMinutes, false));
    }
 
 
-   private static String fillLoadingBar(long totalMinutes, long passedMinutes, boolean progressive) {
-      var nonNegativePassedMinutes = passedMinutes < 0 ? 0 : passedMinutes;
-      BigDecimal wholePercentage = BigDecimal.valueOf(100)
+   private void waitUntilNextMinute() {
+      try {
+         var now = LocalTime.now();
+         var oneMinuteLater = now.plusMinutes(1).truncatedTo(ChronoUnit.MINUTES);
+         /* We wait whole seconds to not make it overly complicated.
+            That results in cut milliseconds: if we would have to wait 1 second and 526 milliseconds, we wait only 1 second.
+            So, adjust for ignored milliseconds, add +1 second as it is better to switch between 00 and 01 as between 59 and 00 */
+         TimeUnit.SECONDS.sleep(now.until(oneMinuteLater, ChronoUnit.SECONDS) + 1);
+         // TimeUnit.MILLISECONDS.sleep(100L); // DEBUG
+      } catch (InterruptedException ie) {
+         Thread.currentThread().interrupt();
+         throw new RuntimeException(ie);
+      }
+   }
+
+
+   private String fillLoadingBar(long passedMinutes, boolean progressive) {
+      var nonNegativePassedMinutes = BigDecimal.valueOf(passedMinutes < 0 ? 0 : passedMinutes);
+      BigDecimal wholePercentage = ONE_HUNDRED_PERCENT
          // kind of reverse dreisatz to avoid having e.g. 99.9999 instead of 100 %
-         .multiply(BigDecimal.valueOf(nonNegativePassedMinutes))
-         .divide(BigDecimal.valueOf(totalMinutes), MathContext.DECIMAL64);
+         .multiply(nonNegativePassedMinutes)
+         .divide(totalMinutesBD, MathContext.DECIMAL64);
       int numberOfEquals = wholePercentage.intValue();
       var sb = new StringBuilder("[");
       for (int i = 0; i < LINE_LENGTH; i++) {
@@ -434,7 +485,7 @@ public class LoadingBar {
             sb.append("-");
          }
       }
-      long remainingMinutes = totalMinutes - nonNegativePassedMinutes;
+      BigDecimal remainingMinutes = totalMinutesBD.subtract(nonNegativePassedMinutes);
       sb.append("] ").append(PERCENTAGE_FORMAT.format(wholePercentage)).append("% ")
           .append(minutesToTimeString(nonNegativePassedMinutes)).append(" - ").append(minutesToTimeString(remainingMinutes));
       if (progressive) {
@@ -444,9 +495,8 @@ public class LoadingBar {
    }
 
 
-   private static String minutesToTimeString(long minutes) {
-      var minutesBD = BigDecimal.valueOf(minutes);
-      BigDecimal[] hoursAndMinutes = minutesBD.divideAndRemainder(MINS_PER_HOUR_BD, MC_INTEGER);
+   private String minutesToTimeString(BigDecimal minutes) {
+      BigDecimal[] hoursAndMinutes = minutes.divideAndRemainder(MINS_PER_HOUR_BD, MC_INTEGER);
       return LocalTime.of(hoursAndMinutes[0].intValue(), hoursAndMinutes[1].intValue()).format(TIME_FORMATTER);
    }
 }

SimpleLoadingBar.java

@@ -19,6 +19,20 @@ public class SimpleLoadingBar {
    private static final BigDecimal MINS_PER_HOUR_BD = BigDecimal.valueOf(MINS_PER_HOUR);
    private static final int LINE_LENGTH = 100;
    private static final MathContext MC_INTEGER = new MathContext(1, RoundingMode.HALF_EVEN);
+   private static final BigDecimal ONE_HUNDRED_PERCENT = BigDecimal.valueOf(100);
+
+   private final String title;
+   private final LocalTime startTime;
+   private LocalTime endTime;
+   private long totalMinutes;
+   private BigDecimal totalMinutesBD;
+
+
+   private SimpleLoadingBar(LocalTime startTime, LocalTime endTime, String title) {
+      this.startTime = startTime;
+      setEndTime(endTime);
+      this.title = initTitle(title);
+   }
 
 
    public static void main(String[] args) {
@@ -28,13 +42,12 @@ public class SimpleLoadingBar {
       }
       verifyMinimumNumberOfArgs(args);
       String nextArg = args[0];
-      verifyTimeFormat(nextArg, "Erstes Argument"); // FSFIXME package
-      var firstTime = LocalTime.parse(nextArg, TIME_FORMATTER); // FSFIXME package
+      verifyTimeFormat(nextArg, "Erstes Argument");
+      var firstTime = LocalTime.parse(nextArg, TIME_FORMATTER);
       LocalTime startTime = null;
       String title = "";
       LocalTime endTime = null;
       if (args.length > 1) {
-         startTime = firstTime;
          nextArg = args[1];
          if ("-msg".equals(nextArg)) {
             title = args.length > 2 ? args[2] : title;
@@ -46,23 +59,32 @@ public class SimpleLoadingBar {
       if (endTime == null) {
          startTime = LocalTime.now();
          endTime = firstTime;
+      } else {
+         startTime = firstTime;
       }
-      String fallbackTitle = "Ende! Endzeit " + TIME_FORMATTER.format(endTime) + " erreicht.";
       if (args.length == 2 || !title.isBlank()) {
-         title = title.isBlank() ? fallbackTitle : title;
-         showLoadingBar(startTime, endTime, title);
+         new SimpleLoadingBar(startTime, endTime, title).showLoadingBar();
          return;
       }
       // if there are 3 arguments, the third will be discarded.
       boolean hasTitleArg = args.length > 3 && "-msg".equals(args[2]);
       title = hasTitleArg ? args[3] : title;
-      title = title.isBlank() ? fallbackTitle : title;
-      showLoadingBar(startTime, endTime, title);
+      new SimpleLoadingBar(startTime, endTime, title).showLoadingBar();
+   }
+
+
+   private static void println(Object o) {
+      System.out.println(o);
+   }
+
+
+   private static void print(Object o) {
+      System.out.print(o);
    }
 
 
    private static void printHelp() {
-      System.out.println("Mögliche Argumente für LoadingBar:\n"
+      println("Mögliche Argumente für LoadingBar:\n"
           + "Startzeit, Endzeit, Endnachricht (Optional)\n"
           + TIME_FORMAT + " " + TIME_FORMAT + " -msg <Nachricht>\n"
           + "Endzeit (Startzeit = jetzt), Endnachricht (Optional)\n"
@@ -75,7 +97,7 @@ public class SimpleLoadingBar {
       if (args.length >= 1) {
          return;
       }
-      System.out.println("Mindestens 1 Argument muss gegeben sein.");
+      println("Mindestens 1 Argument muss gegeben sein.");
       printHelp();
       System.exit(1);
    }
@@ -85,44 +107,57 @@ public class SimpleLoadingBar {
       if (TIME_PATTERN.matcher(param).matches()) {
          return;
       }
-      System.out.println(errMsgPrefix + " \"" + param + "\" muss Uhrzeitformat (" + TIME_FORMAT + ") entsprechen.");
+      println(errMsgPrefix + " \"" + param + "\" muss Uhrzeitformat (" + TIME_FORMAT + ") entsprechen.");
       System.exit(1);
    }
 
 
-   public static void showLoadingBar(LocalTime startTime, LocalTime endTime, String title) {
-      long initialMinutes = startTime.until(endTime, ChronoUnit.MINUTES);
-      System.out.print(minutesToTimeString(initialMinutes) + " gesamt; Endzeit: " + TIME_FORMATTER.format(endTime) + "\n");
-      long passedMinutes = startTime.until(LocalTime.now(), ChronoUnit.MINUTES);
-      if (passedMinutes > initialMinutes) {
-         passedMinutes = initialMinutes;
-      } else if (passedMinutes < 0) {
-         System.out.println(fillLoadingBar(initialMinutes, 0, false));
-         return;
-      }
-      while (passedMinutes < initialMinutes) {
-         System.out.print(fillLoadingBar(initialMinutes, passedMinutes, true));
-         try {
-            var now = LocalTime.now();
-            var oneMinuteLater = now.plusMinutes(1).truncatedTo(ChronoUnit.MINUTES);
-            // +1 second to adjust for ignored milliseconds as it is better to switch between 00 and 01 as between 59 and 00
-            TimeUnit.SECONDS.sleep(now.until(oneMinuteLater, ChronoUnit.SECONDS) + 1);
-            // TimeUnit.SECONDS.sleep(1L); // DEBUG
-         } catch (InterruptedException ie) {
-            throw new RuntimeException(ie);
-         }
-         passedMinutes++;
-      }
-      System.out.println(fillLoadingBar(initialMinutes, passedMinutes, false));
-      System.out.println(formatTitle(title));
+   protected long getPassedMinutes() {
+      return startTime.until(LocalTime.now().truncatedTo(ChronoUnit.MINUTES), ChronoUnit.MINUTES);
    }
 
 
-   private static String fillLoadingBar(long initialMinutes, long passedMinutes, boolean progressive) {
-      BigDecimal wholePercentage = BigDecimal.valueOf(100)
-         .multiply(BigDecimal.valueOf(passedMinutes) // kind of reverse dreisatz to avoid to have e.g. 99.9999 instead of 100 %
-         .divide(BigDecimal.valueOf(initialMinutes), MathContext.DECIMAL64));
-      long remainingMinutes = initialMinutes - passedMinutes;
+   private void setEndTime(LocalTime endTime) {
+      this.endTime = endTime;
+      this.totalMinutes = startTime.until(endTime, ChronoUnit.MINUTES);
+      this.totalMinutesBD = BigDecimal.valueOf(totalMinutes);
+   }
+
+
+   private String initTitle(String inputTitle) {
+      String fallbackTitle = "Ende! Endzeit " + TIME_FORMATTER.format(endTime) + " erreicht.";
+      String effectiveTitle = inputTitle == null || inputTitle.isBlank() ? fallbackTitle : inputTitle;
+      String separator = "*".repeat(effectiveTitle.length());
+      return separator + "\n" + effectiveTitle + "\n" + separator;
+   }
+
+
+   private void showLoadingBar() {
+      long passedMinutes = getPassedMinutes();
+      // long passedMinutes = 0; // DEBUG
+      if (passedMinutes > totalMinutes) {
+         passedMinutes = totalMinutes;
+      } else if (passedMinutes < 0) {
+         var now = LocalTime.now().truncatedTo(ChronoUnit.SECONDS);
+         println("!ACHTUNG! Startzeit \"" + startTime + ":00\" liegt in der Zukunft von jetzt an (" + now + ") gesehen.");
+      }
+      println(minutesToTimeString(totalMinutesBD) + " gesamt; Endzeit: " + TIME_FORMATTER.format(endTime));
+      while (passedMinutes < totalMinutes) {
+         print(fillLoadingBar(passedMinutes, true));
+         waitUntilNextMinute();
+         passedMinutes++;
+      }
+      println(fillLoadingBar(passedMinutes, false));
+      println(title);
+   }
+
+
+   private String fillLoadingBar(long passedMinutes, boolean progressive) {
+      var nonNegativePassedMinutes = BigDecimal.valueOf(passedMinutes < 0 ? 0 : passedMinutes);
+      BigDecimal wholePercentage = ONE_HUNDRED_PERCENT
+         // kind of reverse dreisatz to avoid having e.g. 99.9999 instead of 100 %
+         .multiply(nonNegativePassedMinutes)
+         .divide(totalMinutesBD, MathContext.DECIMAL64);
       int numberOfEquals = wholePercentage.intValue();
       var sb = new StringBuilder("[");
       for (int i = 0; i < LINE_LENGTH; i++) {
@@ -132,8 +167,9 @@ public class SimpleLoadingBar {
             sb.append("-");
          }
       }
+      BigDecimal remainingMinutes = totalMinutesBD.subtract(nonNegativePassedMinutes);
       sb.append("] ").append(PERCENTAGE_FORMAT.format(wholePercentage)).append("% ")
-          .append(minutesToTimeString(passedMinutes)).append(" - ").append(minutesToTimeString(remainingMinutes));
+          .append(minutesToTimeString(nonNegativePassedMinutes)).append(" - ").append(minutesToTimeString(remainingMinutes));
       if (progressive) {
          sb.append("\r");
       }
@@ -141,15 +177,24 @@ public class SimpleLoadingBar {
    }
 
 
-   private static String minutesToTimeString(long minutes) {
-      var minutesBD = BigDecimal.valueOf(minutes);
-      BigDecimal[] hoursAndMinutes = minutesBD.divideAndRemainder(MINS_PER_HOUR_BD, MC_INTEGER);
+   private String minutesToTimeString(BigDecimal minutes) {
+      BigDecimal[] hoursAndMinutes = minutes.divideAndRemainder(MINS_PER_HOUR_BD, MC_INTEGER);
       return LocalTime.of(hoursAndMinutes[0].intValue(), hoursAndMinutes[1].intValue()).format(TIME_FORMATTER);
    }
 
 
-   private static String formatTitle(String title) {
-      String separator = "*".repeat(title.length());
-      return separator + "\n" + title + "\n" + separator;
+   private void waitUntilNextMinute() {
+      try {
+         var now = LocalTime.now();
+         var oneMinuteLater = now.plusMinutes(1).truncatedTo(ChronoUnit.MINUTES);
+         /* We wait whole seconds to not make it overly complicated.
+            That results in cut milliseconds: if we would have to wait 1 second and 526 milliseconds, we wait only 1 second.
+            So, adjust for ignored milliseconds, add +1 second as it is better to switch between 00 and 01 as between 59 and 00 */
+         TimeUnit.SECONDS.sleep(now.until(oneMinuteLater, ChronoUnit.SECONDS) + 1);
+         // TimeUnit.MILLISECONDS.sleep(100L); // DEBUG
+      } catch (InterruptedException ie) {
+         Thread.currentThread().interrupt();
+         throw new RuntimeException(ie);
+      }
    }
 }

zeitlaeufer/compileProject.sh

@@ -0,0 +1,4 @@
+#/usr/bin/env bash
+set -uo pipefail
+
+javac -d target/ src/**/*.java

zeitlaeufer/src/main/java/de/szimnau/AbstractLoadingBar.java

@@ -31,69 +31,91 @@ public abstract class AbstractLoadingBar {
 
    protected AbstractLoadingBar(LocalTime startTime, long totalMinutes) {
       this.startTime = startTime;
-      this.endTime = startTime.plusMinutes(totalMinutes);
-      this.totalMinutes = totalMinutes;
-      this.totalMinutesBD = BigDecimal.valueOf(totalMinutes);
+      setTotalMinutes(totalMinutes);
    }
 
 
-   protected LocalTime getStartTime() {
+   public LocalTime getStartTime() {
       return startTime;
    }
 
 
-   protected LocalTime getEndTime() {
+   public LocalTime getEndTime() {
       return endTime;
    }
 
 
-   protected void setEndTime(LocalTime endTime) {
+   protected final void setEndTime(LocalTime endTime) {
       this.endTime = endTime;
       this.totalMinutes = startTime.until(endTime, ChronoUnit.MINUTES);
       this.totalMinutesBD = BigDecimal.valueOf(totalMinutes);
+      extraInitEndTimeTotalMinutes();
    }
 
 
+   protected void extraInitEndTimeTotalMinutes() {}
+
+
    protected long getTotalMinutes() {
       return totalMinutes;
    }
 
 
+   protected final void setTotalMinutes(long totalMinutes) {
+      this.totalMinutes = totalMinutes;
+      this.totalMinutesBD = BigDecimal.valueOf(totalMinutes);
+      this.endTime = startTime.plusMinutes(totalMinutes);
+      extraInitEndTimeTotalMinutes();
+   }
+
+
    protected BigDecimal getTotalMinutesBD() {
       return totalMinutesBD;
    }
 
 
-   protected void showLoadingBar() {
+   protected long getPassedMinutes() {
+      return getPassedMinutes(false);
+   }
+
+
+   protected long getPassedMinutes(boolean passedMinutesZero) {
+      return passedMinutesZero ? 0 : startTime.until(LocalTime.now().truncatedTo(ChronoUnit.MINUTES), ChronoUnit.MINUTES);
+   }
+
+
+   public void showLoadingBar() {
       showLoadingBar(false, false, 0);
    }
 
 
-   protected void showLoadingBarDebug() {
+   public void showLoadingBar(boolean debug, boolean passedMinutesZero) {
+      showLoadingBar(debug, passedMinutesZero, 100L);
+   }
+
+
+   public void showLoadingBarDebug() {
       showLoadingBar(true, true, 100L);
    }
 
 
-   protected void showLoadingBarDebug(long millisWaiting) {
+   public void showLoadingBarDebug(long millisWaiting) {
       showLoadingBar(true, true, millisWaiting);
    }
 
 
-   protected void showLoadingBarDebug(boolean passedMinutesZero) {
+   public void showLoadingBarDebug(boolean passedMinutesZero) {
       showLoadingBar(true, passedMinutesZero, 100L);
    }
 
 
-   protected void showLoadingBarDebug(boolean passedMinutesZero, long millisWaiting) {
+   public void showLoadingBarDebug(boolean passedMinutesZero, long millisWaiting) {
       showLoadingBar(true, passedMinutesZero, millisWaiting);
    }
 
 
    private void showLoadingBar(boolean debug, boolean passedMinutesZero, long millisWaiting) {
-      long passedMinutes = startTime.until(LocalTime.now().truncatedTo(ChronoUnit.MINUTES), ChronoUnit.MINUTES);
-      if (debug && passedMinutesZero) {
-         passedMinutes = 0;
-      }
+      long passedMinutes = getPassedMinutes(debug && passedMinutesZero);
       if (passedMinutes > totalMinutes) {
          passedMinutes = totalMinutes;
       } else if (passedMinutes < 0) {

zeitlaeufer/src/main/java/de/szimnau/DrinkingBar.java

@@ -6,6 +6,8 @@ import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
 import java.nio.charset.StandardCharsets;
 import java.text.DecimalFormat;
 import java.time.LocalTime;
@@ -19,47 +21,76 @@ public class DrinkingBar extends AbstractLoadingBar {
    private static final int MINS_PER_HALF_HOUR = CommonTools.MINS_PER_HOUR / 2;
    private static final int MINUTES_BEFORE_PAUSE = 4 * CommonTools.MINS_PER_HOUR + MINS_PER_HALF_HOUR;
    private static final int MINUTES_WITH_PAUSE = 6 * CommonTools.MINS_PER_HOUR;
-   private static final DecimalFormat LITER_FORMAT = new DecimalFormat("0.00");
+   private static final int DEFAULT_TOTAL_TIME = 8 * CommonTools.MINS_PER_HOUR + MINS_PER_HALF_HOUR;
+   private static final BigDecimal DEFAULT_TOTAL_TIME_BD = BigDecimal.valueOf(DEFAULT_TOTAL_TIME);
+   private static final BigDecimal DEFAULT_TOTAL_LITRES = BigDecimal.valueOf(2.0);
+   private static final BigDecimal QUARTER_LITRE = BigDecimal.valueOf(0.25);
+   private static final DecimalFormat LITRE_FORMAT = new DecimalFormat("0.00");
 
-
-   protected DrinkingBar(LocalTime startTime) {
-      super(startTime, 8 * CommonTools.MINS_PER_HOUR + MINS_PER_HALF_HOUR);
-   }
+   private BigDecimal totalLitres;
 
 
    public static void main(String[] args) throws IOException {
       var br = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
       print("Ankunftszeit: ");
       var startTime = LocalTime.parse(br.readLine(), FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
-      long totalMinutes = 8 * CommonTools.MINS_PER_HOUR + MINS_PER_HALF_HOUR;
       var db = new DrinkingBar(startTime);
       db.showLoadingBar();
    }
 
 
+   protected DrinkingBar(LocalTime startTime) {
+      super(startTime, DEFAULT_TOTAL_TIME);
+      this.totalLitres = DEFAULT_TOTAL_LITRES;
+   }
+
+
+   @Override
+   protected void extraInitEndTimeTotalMinutes() {
+      // correct necessary litres to drink based on the end time.
+      // lower the volume in quarter litre steps
+      BigDecimal calcTotalLitres = DEFAULT_TOTAL_LITRES;
+      BigDecimal totalLitresFromMinutes = DEFAULT_TOTAL_LITRES
+         .multiply(getTotalMinutesBD()) // reverse dreisatz
+         .divide(DEFAULT_TOTAL_TIME_BD, MathContext.DECIMAL64);
+      do {
+         calcTotalLitres = calcTotalLitres.subtract(QUARTER_LITRE);
+      } while (calcTotalLitres.compareTo(totalLitresFromMinutes) >= 0);
+      // add quarter since we always did a step "too many", due to the do ... while loop
+      this.totalLitres = calcTotalLitres.add(QUARTER_LITRE);
+   }
+
+
    @Override
    protected String fillLoadingBar(long passedMinutes, boolean progressive) {
-      long effectivePassedMinutes = passedMinutes;
-      if (passedMinutes > MINUTES_BEFORE_PAUSE && passedMinutes <= MINUTES_WITH_PAUSE) {
+      long effectivePassedMinutes = passedMinutes < 0 ? 0 : passedMinutes;
+      if (getTotalMinutes() > MINUTES_WITH_PAUSE && passedMinutes > MINUTES_BEFORE_PAUSE && passedMinutes <= MINUTES_WITH_PAUSE) {
          effectivePassedMinutes = MINUTES_BEFORE_PAUSE;
       }
-      double currentLitres = 2.0 / getTotalMinutes() * effectivePassedMinutes + 0.25;
-      double printedLitres = currentLitres - (currentLitres % 0.25);
-      double currentProgressToNextStep = 100 / 0.25 * (currentLitres - printedLitres);
+      var effectivePassedMinutesBD = BigDecimal.valueOf(effectivePassedMinutes);
+      BigDecimal currentLitres = totalLitres
+         .multiply(effectivePassedMinutesBD) // reverse dreisatz
+         .divide(getTotalMinutesBD(), MathContext.DECIMAL64)
+         .add(QUARTER_LITRE);
+      BigDecimal printedLitres = currentLitres.subtract(currentLitres.remainder(QUARTER_LITRE, MathContext.DECIMAL64));
+      /* BigDecimal currentProgressToNextStep = ONE_HUNDRED_PERCENT
+         .multiply(currentLitres.subtract(printedLitres)) // reverse dreisatz
+         .divide(QUARTER_LITRE, MathContext.DECIMAL64); */
       BigDecimal minutesToNextStep = getMinutesToNextStep(currentLitres);
       String progressivePart = progressive ? "\r" : "";
-      return progressivePart + "Aktuelles Volumen: " + LITER_FORMAT.format(printedLitres) + "L - "
-         + FormatTools.PERCENTAGE_FORMAT.format(currentProgressToNextStep) + "% - "
+      return progressivePart + "Aktuelles Volumen: " + LITRE_FORMAT.format(printedLitres) + "L - "
+         // + FormatTools.PERCENTAGE_FORMAT.format(currentProgressToNextStep) + "% - "
          + FormatTools.minutesToTimeString(minutesToNextStep);
    }
 
 
-   private BigDecimal getMinutesToNextStep(double currentLitres) {
+   private BigDecimal getMinutesToNextStep(BigDecimal currentLitres) {
       // berechne Liter benötigt bis zum nächsten 0.25er Schritt
-      double litresToNextStep = 0.25 - (currentLitres % 0.25);
+      BigDecimal litresToNextStep = QUARTER_LITRE.subtract(currentLitres.remainder(QUARTER_LITRE));
       // berechne Minuten benötigt für 1 Liter
-      double minutesPerLitre = getTotalMinutes() / 2.0;
+      BigDecimal minutesPerLitre = getTotalMinutesBD().divide(totalLitres, MathContext.DECIMAL64);
       // berechne Minuten benötigt bis zum nächsten 0.25er Schritt
-      return BigDecimal.valueOf((minutesPerLitre * litresToNextStep) + 1);
+      // runde auf ganze Zahl, da wir nur ganze Minuten anzeigen und damit 1.999 = 2 Minuten sind
+      return minutesPerLitre.multiply(litresToNextStep).setScale(0, RoundingMode.HALF_EVEN);
    }
 }

zeitlaeufer/src/main/java/de/szimnau/LoadingBar.java

@@ -2,59 +2,22 @@ package de.szimnau;
 
 import de.szimnau.tools.CommonTools;
 import de.szimnau.tools.FormatTools;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
+import de.szimnau.tools.LoadingBarCliTools;
 
 import static de.szimnau.tools.CommonTools.print;
-import static de.szimnau.tools.CommonTools.println;
 
 
 public class LoadingBar extends AbstractProgressBar {
 
-   private static final Pattern LUNCH_DURATION_PATTERN = Pattern.compile("\\d+");
-   private static final Pattern OFFSET_PATTERN = Pattern.compile("[+-]\\d+");
-   private static final int MIN_LUNCH_DURATION = 30;
-   private static final LocalTime LATEST_LUNCH_TIME = LocalTime.of(13, 30);
-   private static final long DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH = 5L * CommonTools.MINS_PER_HOUR;
-   private static final int MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH = 6 * CommonTools.MINS_PER_HOUR;
-   private static final long MAX_NUMBER_WORK_MINS = 8L * CommonTools.MINS_PER_HOUR;
-
-
-   private enum DaySection {
-      MITTAG("-m", "Mittag"),
-      ZAPFENSTREICH("-z", "Zapfenstreich");
-
-      private final String param;
-      private final String description;
-
-
-      DaySection(String param, String description) {
-         this.param = param;
-         this.description = description;
-      }
-
-
-      public static DaySection byParam(String param) {
-         return Arrays.stream(DaySection.values()).filter((DaySection section) -> section.getParam().equals(param)).findFirst().orElse(null);
-      }
-
-
-      public String getParam() {
-         return param;
-      }
-
-
-      public String getDescription() {
-         return description;
-      }
-   }
+   public static final long MAX_NUMBER_WORK_MINS = 8L * CommonTools.MINS_PER_HOUR;
+   public static final int MIN_LUNCH_DURATION = 30;
+   public static final LocalTime LATEST_LUNCH_TIME = LocalTime.of(13, 30);
+   public static final int MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH = 6 * CommonTools.MINS_PER_HOUR;
+   protected static final long DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH = 5L * CommonTools.MINS_PER_HOUR;
 
 
    protected LoadingBar(LocalTime startTime) {
@@ -64,262 +27,36 @@ public class LoadingBar extends AbstractProgressBar {
 
    public static void main(String[] args) throws IOException {
       if (args.length == 0) {
-         askParametersAndRun();
+         LoadingBarCliTools.askParametersAndRun(LoadingBar::new);
       } else {
-         parseParametersAndRun(args);
+         LoadingBarCliTools.parseParametersAndRun(args, LoadingBar::new);
       }
    }
 
 
-   private static void askParametersAndRun() throws IOException {
-      var br = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
-      print("Ankunftszeit: ");
-      var startTime = LocalTime.parse(br.readLine(), FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
-      var lb = new LoadingBar(startTime);
-      if (lb.hasMittagspauseArrived()) {
-         handleMittagspause(br, lb);
-         lb.showLoadingBar();
-         // lb.showLoadingBarDebug(); // DEBUG
-      }
-      handleZapfenstreich(br, lb);
-      lb.showLoadingBar();
-      // lb.showLoadingBarDebug(); // DEBUG
+   public boolean hasMittagspauseArrived() {
+      return hasMittagspauseArrived(false);
    }
 
 
-   protected static void handleMittagspause(BufferedReader br, LoadingBar lb) throws IOException {
-      print("Mittagspause verschieben um (optional): ");
-      String mittagspauseOffsetRaw = br.readLine();
-      if (mittagspauseOffsetRaw != null && !mittagspauseOffsetRaw.isBlank()) {
-         var mittagspauseOffset = Integer.parseInt(mittagspauseOffsetRaw);
-         lb.initMittagspause(mittagspauseOffset);
-         return;
-      }
-      print("Mittagspause um (optional): ");
-      String manualMittagspauseRaw = br.readLine();
-      if (manualMittagspauseRaw != null && !manualMittagspauseRaw.isBlank()) {
-         var manualMittagspause = LocalTime.parse(manualMittagspauseRaw, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
-         lb.initMittagspause(manualMittagspause);
-      } else {
-         lb.initMittagspause();
-      }
+   public boolean hasMittagspauseArrived(boolean debugWithPassedMinutesZero) {
+      return getPassedMinutes(debugWithPassedMinutesZero) < DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH;
    }
 
 
-   protected static void handleZapfenstreich(BufferedReader br, LoadingBar lb) throws IOException {
-      print("Mittagspause hat gedauert (optional): ");
-      String mittagspauseDurationRaw = br.readLine();
-      Integer mittagspauseDuration = null;
-      if (mittagspauseDurationRaw != null && !mittagspauseDurationRaw.isBlank()) {
-         mittagspauseDuration = Integer.valueOf(mittagspauseDurationRaw);
-      }
-      LocalTime vorlaeufigeEndzeit = lb.getStartTime().plusMinutes(MAX_NUMBER_WORK_MINS)
-         .plusMinutes(mittagspauseDuration != null ? mittagspauseDuration : MIN_LUNCH_DURATION);
-      println("Endzeit: " + FormatTools.TIME_FORMATTER.format(vorlaeufigeEndzeit));
-      print("Feierabend verschieben um (optional): ");
-      String zapfenstreichOffsetRaw = br.readLine();
-      Integer zapfenstreichOffset = null;
-      if (zapfenstreichOffsetRaw != null && !zapfenstreichOffsetRaw.isBlank()) {
-         zapfenstreichOffset = Integer.valueOf(zapfenstreichOffsetRaw);
-         lb.initZapfenstreich(mittagspauseDuration, zapfenstreichOffset);
-         return;
-      }
-      print("Manuelle Uhrzeit Feierabend (optional): ");
-      String manualZapfenstreichRaw = br.readLine();
-      LocalTime manualZapfenstreich = null;
-      if (manualZapfenstreichRaw != null && !manualZapfenstreichRaw.isBlank()) {
-         manualZapfenstreich = LocalTime.parse(manualZapfenstreichRaw, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
-         lb.initZapfenstreich(mittagspauseDuration, manualZapfenstreich);
-      } else {
-         lb.initZapfenstreich(mittagspauseDuration);
-      }
-   }
-
-
-   private static void parseParametersAndRun(String[] args) {
-      LoadingBar lb = getLoadingBarFromCLI(args);
-      lb.showLoadingBar();
-      // lb.showLoadingBarDebug(); // DEBUG
-   }
-
-
-   protected static LoadingBar getLoadingBarFromCLI(String[] args) {
-      String nextArg = args[0];
-      if ("--help".equals(nextArg)) {
-         printHelp();
-         System.exit(1);
-      }
-      verifyMinimumNumberOfArgs(args);
-      verifyTimeFormat(nextArg, "Erstes Argument");
-      var startTime = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
-      nextArg = args[1];
-      var section = DaySection.byParam(nextArg);
-      verifyDaySection(section, nextArg);
-      LoadingBar lb;
-      return section == DaySection.MITTAG ? getLoadingBarMittagspause(args, startTime) : getLoadingBarZapfenstreich(args, startTime);
-   }
-
-
-   private static LoadingBar getLoadingBarMittagspause(String[] args, LocalTime startTime) {
-      var lb = new LoadingBar(startTime);
-      if (args.length == 2) {
-         lb.initMittagspause();
-         return lb;
-      }
-      String nextArg = args[2];
-      if (OFFSET_PATTERN.matcher(nextArg).matches()) {
-         lb.initMittagspause(Integer.parseInt(nextArg));
-         return lb;
-      }
-      verifyTimeFormat(nextArg, "Argument nach " + DaySection.MITTAG.getParam());
-      var manualMittagspause = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
-      lb.initMittagspause(manualMittagspause);
-      return lb;
-   }
-
-
-   private static LoadingBar getLoadingBarZapfenstreich(String[] args, LocalTime startTime) {
-      var lb = new LoadingBar(startTime);
-      if (args.length == 2) {
-         lb.initZapfenstreich();
-         return lb;
-      }
-      String nextArg = args[2];
-      LocalTime maxZapfenstreich = null;
-      int endTimeOffset = 0;
-      Integer lunchDuration = null;
-      if (FormatTools.TIME_PATTERN.matcher(nextArg).matches()) {
-         maxZapfenstreich = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
-      } else if (OFFSET_PATTERN.matcher(nextArg).matches()) {
-         endTimeOffset = Integer.parseInt(nextArg);
-      } else {
-         verifyDurationFormat(nextArg, "Argument nach " + DaySection.ZAPFENSTREICH.getParam());
-         lunchDuration = Integer.parseInt(nextArg);
-      }
-      if (args.length == 3) {
-         if (maxZapfenstreich == null && endTimeOffset == 0) {
-            lb.initZapfenstreich(lunchDuration);
-         } else if (maxZapfenstreich == null) {
-            lb.initZapfenstreich(lunchDuration, endTimeOffset);
-         } else {
-            lb.initZapfenstreich(lunchDuration, maxZapfenstreich);
-         }
-         return lb;
-      }
-      nextArg = args[3];
-      if (lunchDuration == null) {
-         println("Letztes Argument darf nur auf Mittagspausendauer folgen.");
-         System.exit(1);
-      }
-      if (maxZapfenstreich == null && !OFFSET_PATTERN.matcher(nextArg).matches()) {
-         verifyTimeFormat(nextArg, "Letztes Argument nach " + DaySection.ZAPFENSTREICH.getParam() + " und Mittagspausendauer");
-         maxZapfenstreich = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
-         lb.initZapfenstreich(lunchDuration, maxZapfenstreich);
-         return lb;
-      }
-      verifyOffsetFormat(nextArg, "Letztes Argument nach " + DaySection.ZAPFENSTREICH.getParam() + " und Enduhrzeit");
-      endTimeOffset = Integer.parseInt(nextArg);
-      lb.initZapfenstreich(lunchDuration, endTimeOffset);
-      return lb;
-   }
-
-
-   private static void verifyMinimumNumberOfArgs(String[] args) {
-      if (args.length >= 2) {
-         return;
-      }
-      println("Mindestens 2 Argumente müssen gegeben sein.");
-      printHelp();
-      System.exit(1);
-   }
-
-
-   private static void verifyTimeFormat(String param, String errMsgPrefix) {
-      verifyInputFormat(FormatTools.TIME_PATTERN, param, errMsgPrefix, "Uhrzeitformat (" + FormatTools.TIME_FORMAT + ")", false);
-   }
-
-
-   private static void verifyDurationFormat(String param, String errMsgPrefix) {
-      verifyInputFormat(LUNCH_DURATION_PATTERN, param, errMsgPrefix, "Minutenanzahl (ganze Zahl)", true);
-   }
-
-
-   private static void verifyOffsetFormat(String param, String errMsgPrefix) {
-      verifyInputFormat(OFFSET_PATTERN, param, errMsgPrefix, "Minutendifferenz (ganze Zahl mit Vorzeichen)", false);
-   }
-
-
-   private static void verifyInputFormat(Pattern pattern, String param, String errMsgPrefix, String firstInputPart, boolean timeInputPossible) {
-      if (pattern.matcher(param).matches()) {
-         return;
-      }
-      var possibleTimeInputPart = timeInputPossible ? " oder Uhrzeitformat (" + FormatTools.TIME_FORMAT + ")" : "";
-      println(errMsgPrefix + " \"" + param + "\" muss " + firstInputPart + possibleTimeInputPart + " entsprechen.");
-      System.exit(1);
-   }
-
-
-   private static void verifyDaySection(DaySection section, String param) {
-      if (section != null) {
-         return;
-      }
-      List<String> sectionDescs = Arrays.stream(DaySection.values()).map((DaySection ds) -> ds.getDescription() + " (" + ds.getParam() + ")")
-          .collect(Collectors.toList());
-      String sectionDescsJoined = String.join(" oder ", sectionDescs);
-      println("Argument nach Startzeit \"" + param + "\" muss Angabe für " + sectionDescsJoined + " sein.");
-      System.exit(1);
-   }
-
-
-   private static void printHelp() {
-      println("Mögliche Argumente für LoadingBar:\n"
-          + "Normalfall Vormittag (Mittagspause <= " + LATEST_LUNCH_TIME + ")\n"
-          + FormatTools.TIME_FORMAT + " " + DaySection.MITTAG.getParam() + "\n"
-          + "Vormittag mit expliziter Mittagspause (<= " + LATEST_LUNCH_TIME + ")\n"
-          + FormatTools.TIME_FORMAT + " " + DaySection.MITTAG.getParam() + " " + FormatTools.TIME_FORMAT + "\n"
-          + "Vormittag mit abweichender Minutenanzahl Arbeitszeit\n"
-          + FormatTools.TIME_FORMAT + " " + DaySection.MITTAG.getParam() + " -+mm\n"
-          + "Normalfall Nachmittag (Mittagspause " + MIN_LUNCH_DURATION + " min)\n"
-          + FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + "\n"
-          + "Nachmittag mit expliziter Länge Mittagspause (Mittagspause unter " + MIN_LUNCH_DURATION + " min wird auf " + MIN_LUNCH_DURATION + " min korrigiert)\n"
-          + FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " mm\n"
-          + "Nachmittag mit explizitem Feierabend (Mittagspause je nach Minimum (s.u.))\n"
-          + FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " " + FormatTools.TIME_FORMAT + "\n"
-          + "Nachmittag mit abweichender Minutenanzahl Arbeitszeit\n"
-          + FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " -+mm\n"
-          + "Nachmittag mit explizitem Feierabend u. expliziter Länge Mittagspause (Mittagspause unter Minimum (s.u.) wird auf Minimum korrigiert)\n"
-          + FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " mm " + FormatTools.TIME_FORMAT + "\n"
-          + "Nachmittag mit explizitem Feierabend u. abweichender Minutenanzahl Arbeitszeit\n"
-          + FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " " + FormatTools.TIME_FORMAT + " -+mm\n\n"
-          + "Mittagspause minimum in Minuten:\n"
-          + " - bis " + MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min ("
-          + MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH / CommonTools.MINS_PER_HOUR + " std):  0\n"
-          + " - bis " + MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min + "
-          + MIN_LUNCH_DURATION + " min: Arbeitszeit - " + MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min\n"
-          + " - ab  " + MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min + " + MIN_LUNCH_DURATION + " min: "
-          + MIN_LUNCH_DURATION + " min\n"
-      );
-   }
-
-
-   protected boolean hasMittagspauseArrived() {
-      return getStartTime().until(LocalTime.now(), ChronoUnit.MINUTES) < DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH;
-   }
-
-
-   private void initMittagspause() {
+   public void initMittagspause() {
       LocalTime defaultEndTime = getStartTime().plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH);
       realInitMittagspause(defaultEndTime);
    }
 
 
-   private void initMittagspause(int endTimeOffset) {
+   public void initMittagspause(int endTimeOffset) {
       LocalTime offsetEndTime = getStartTime().plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH + endTimeOffset);
       realInitMittagspause(offsetEndTime);
    }
 
 
-   private void initMittagspause(LocalTime manualEndTime) {
+   public void initMittagspause(LocalTime manualEndTime) {
       LocalTime effectiveEndTime = manualEndTime != null ? manualEndTime : getStartTime().plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH);
       realInitMittagspause(effectiveEndTime);
    }
@@ -330,18 +67,18 @@ public class LoadingBar extends AbstractProgressBar {
    }
 
 
-   private void initZapfenstreich() {
+   public void initZapfenstreich() {
       LocalTime trueEndTime = getStartTime().plusMinutes(MAX_NUMBER_WORK_MINS + MIN_LUNCH_DURATION);
       realInitZapfenstreich(MIN_LUNCH_DURATION, trueEndTime);
    }
 
 
-   private void initZapfenstreich(Integer manualLunchDuration) {
+   public void initZapfenstreich(Integer manualLunchDuration) {
       initZapfenstreich(manualLunchDuration, 0);
    }
 
 
-   private void initZapfenstreich(Integer manualLunchDuration, int endTimeOffset) {
+   public void initZapfenstreich(Integer manualLunchDuration, int endTimeOffset) {
       long minLunchDuration = getMinLunchDuration(endTimeOffset);
       long realLunchDuration = getRealLunchDuration(manualLunchDuration, minLunchDuration);
       LocalTime trueEndTime = getStartTime().plusMinutes(MAX_NUMBER_WORK_MINS + realLunchDuration + endTimeOffset);
@@ -349,7 +86,7 @@ public class LoadingBar extends AbstractProgressBar {
    }
 
 
-   private void initZapfenstreich(Integer manualLunchDuration, LocalTime manualEndTime) {
+   public void initZapfenstreich(Integer manualLunchDuration, LocalTime manualEndTime) {
       LocalTime trueEndTime = manualEndTime;
       long minLunchDuration = getMinLunchDuration(trueEndTime);
       long realLunchDuration = getRealLunchDuration(manualLunchDuration, minLunchDuration);
@@ -361,12 +98,11 @@ public class LoadingBar extends AbstractProgressBar {
 
 
    private long getMinLunchDuration(int endTimeOffset) {
-      if (endTimeOffset == 0) {
+      if (endTimeOffset <= 0) {
          return MIN_LUNCH_DURATION;
       }
       long totalDuration = MAX_NUMBER_WORK_MINS + endTimeOffset;
-      long effectiveLunchDuration = totalDuration - MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH;
-      return getMinLunchDuration(effectiveLunchDuration);
+      return getMinLunchDuration(totalDuration);
    }
 
 
@@ -375,12 +111,12 @@ public class LoadingBar extends AbstractProgressBar {
          return MIN_LUNCH_DURATION;
       }
       long totalDuration = getStartTime().until(manualEndTime, ChronoUnit.MINUTES);
-      long effectiveLunchDuration = totalDuration - MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH;
-      return getMinLunchDuration(effectiveLunchDuration);
+      return getMinLunchDuration(totalDuration);
    }
 
 
-   private long getMinLunchDuration(long effectiveLunchDuration) {
+   private long getMinLunchDuration(long precalculatedTotalDuration) {
+      long effectiveLunchDuration = precalculatedTotalDuration - MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH;
       if (effectiveLunchDuration < 0) {
          effectiveLunchDuration = 0;
       }
@@ -393,11 +129,11 @@ public class LoadingBar extends AbstractProgressBar {
    }
 
 
-   private void realInitZapfenstreich(long effectiveLunchDuration, LocalTime endTime) {
+   private void realInitZapfenstreich(long effectiveLunchDuration, LocalTime effectiveEndTime) {
       if (effectiveLunchDuration > 0) {
-         var totalWorkTime = LocalTime.MIDNIGHT.plusMinutes(getStartTime().until(endTime, ChronoUnit.MINUTES) - effectiveLunchDuration);
+         var totalWorkTime = LocalTime.MIDNIGHT.plusMinutes(getStartTime().until(effectiveEndTime, ChronoUnit.MINUTES) - effectiveLunchDuration);
          print("Arbeitszeit: " + FormatTools.TIME_FORMATTER.format(totalWorkTime) + "; ");
       }
-      setEndTime(endTime);
+      setEndTime(effectiveEndTime);
    }
 }

zeitlaeufer/src/main/java/de/szimnau/SimpleLoadingBar.java

@@ -27,7 +27,7 @@ public class SimpleLoadingBar extends AbstractProgressBar {
       String nextArg = args[0];
       verifyTimeFormat(nextArg, "Erstes Argument");
       var firstTime = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER);
-      LocalTime startTime = null;
+      LocalTime startTime;
       String title = "";
       LocalTime endTime = null;
       if (args.length > 1) {
@@ -94,15 +94,9 @@ public class SimpleLoadingBar extends AbstractProgressBar {
 
 
    @Override
-   protected void showLoadingBar() {
-      showLoadingBar();
+   public void showLoadingBar() {
+      super.showLoadingBar();
       // showLoadingBarDebug(); // DEBUG
       println(title);
    }
-
-
-   private String formatTitle(String title) {
-      String separator = "*".repeat(title.length());
-      return separator + "\n" + title + "\n" + separator;
-   }
 }

zeitlaeufer/src/main/java/de/szimnau/WorkLoadingBar.java

@@ -1,84 +1,37 @@
 package de.szimnau;
 
-import de.szimnau.tools.CommonTools;
-import de.szimnau.tools.FormatTools;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
+import de.szimnau.tools.LoadingBarCliTools;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalTime;
-import java.time.temporal.ChronoUnit;
-
-import static de.szimnau.tools.CommonTools.print;
 
 
-public class WorkLoadingBar extends AbstractProgressBar {
+public class WorkLoadingBar extends LoadingBar {
 
    private final LoadingBar loadingBar;
    private final DrinkingBar drinkingBar;
 
 
-   private WorkLoadingBar(LoadingBar loadingBar, DrinkingBar drinkingBar) {
-      super(loadingBar.getStartTime());
-      this.loadingBar = loadingBar;
-      this.drinkingBar = drinkingBar;
+   private WorkLoadingBar(LocalTime startTime) {
+      super(startTime);
+      this.loadingBar = new LoadingBar(startTime);
+      this.drinkingBar = new DrinkingBar(startTime);
    }
 
 
    public static void main(String[] args) throws IOException {
       if (args.length == 0) {
-         askParametersAndRun();
+         LoadingBarCliTools.askParametersAndRun(WorkLoadingBar::new);
       } else {
-         parseParametersAndRun(args);
+         LoadingBarCliTools.parseParametersAndRun(args, WorkLoadingBar::new);
       }
    }
 
 
-   private static void askParametersAndRun() throws IOException {
-      var br = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
-      print("Ankunftszeit: ");
-      var startTime = LocalTime.parse(br.readLine(), FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
-      var lb = new LoadingBar(startTime);
-      var db = new DrinkingBar(startTime);
-      var wlb = new WorkLoadingBar(lb, db);
-      if (lb.hasMittagspauseArrived()) {
-         handleMittagspause(br, wlb);
-         wlb.showLoadingBar();
-         // wlb.showLoadingBarDebug(); // DEBUG
-      }
-      handleZapfenstreich(br, wlb);
-      wlb.showLoadingBar();
-      // wlb.showLoadingBarDebug(); // DEBUG
-   }
-
-
-   private static void handleMittagspause(BufferedReader br, WorkLoadingBar wlb) throws IOException {
-      LoadingBar.handleMittagspause(br, wlb.loadingBar);
-      wlb.setEndTime(wlb.loadingBar.getEndTime(), false);
-   }
-
-
-   private static void handleZapfenstreich(BufferedReader br, WorkLoadingBar wlb) throws IOException {
-      LoadingBar.handleZapfenstreich(br, wlb.loadingBar);
-      wlb.setEndTime(wlb.loadingBar.getEndTime(), true);
-   }
-
-
-   private static void parseParametersAndRun(String[] args) {
-      LoadingBar lb = LoadingBar.getLoadingBarFromCLI(args);
-      var db = new DrinkingBar(lb.getStartTime());
-      var wlb = new WorkLoadingBar(lb, db);
-      wlb.setEndTime(wlb.loadingBar.getEndTime(), true);
-      wlb.showLoadingBar();
-      // wlb.showLoadingBarDebug(); // DEBUG
-   }
-
-
-   protected void setEndTime(LocalTime endTime, boolean finalEndTime) {
-      setEndTime(endTime);
-      if (finalEndTime) {
-         drinkingBar.setEndTime(endTime);
-      }
+   @Override
+   protected void extraInitEndTimeTotalMinutes() {
+      LocalTime endTime = getEndTime();
+      loadingBar.setEndTime(endTime);
+      drinkingBar.setEndTime(endTime);
    }
 
 

zeitlaeufer/src/main/java/de/szimnau/tools/CommonTools.java

@@ -1,10 +1,8 @@
 package de.szimnau.tools;
 
-import java.lang.*;
 import java.math.BigDecimal;
 import java.math.MathContext;
 import java.math.RoundingMode;
-import java.util.*;
 
 
 public class CommonTools {

zeitlaeufer/src/main/java/de/szimnau/tools/FormatTools.java

@@ -1,6 +1,5 @@
 package de.szimnau.tools;
 
-import java.lang.*;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.time.format.DateTimeFormatter;

zeitlaeufer/src/main/java/de/szimnau/tools/LoadingBarCliTools.java

@@ -0,0 +1,281 @@
+package de.szimnau.tools;
+
+import de.szimnau.LoadingBar;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.function.Function;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static de.szimnau.tools.CommonTools.print;
+import static de.szimnau.tools.CommonTools.println;
+
+public class LoadingBarCliTools {
+
+   private static final Pattern OFFSET_PATTERN = Pattern.compile("[+-]\\d+");
+   private static final Pattern LUNCH_DURATION_PATTERN = Pattern.compile("\\d+");
+
+
+   private enum DaySection {
+      MITTAG("-m", "Mittag"),
+      ZAPFENSTREICH("-z", "Zapfenstreich");
+
+      private final String param;
+      private final String description;
+
+
+      DaySection(String param, String description) {
+         this.param = param;
+         this.description = description;
+      }
+
+
+      public static DaySection byParam(String param) {
+         return Arrays.stream(DaySection.values()).filter((DaySection section) -> section.getParam().equals(param)).findFirst().orElse(null);
+      }
+
+
+      public String getParam() {
+         return param;
+      }
+
+
+      public String getDescription() {
+         return description;
+      }
+   }
+
+
+   private LoadingBarCliTools() {}
+
+
+   public static void askParametersAndRun(Function<LocalTime, ? extends LoadingBar> constructor) throws IOException {
+      var br = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
+      print("Ankunftszeit: ");
+      var startTime = LocalTime.parse(br.readLine(), FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
+      LoadingBar lb = constructor.apply(startTime);
+      boolean debug = false;
+      boolean passedMinutesZero = false;
+      if (lb.hasMittagspauseArrived(debug && passedMinutesZero)) {
+         handleMittagspause(br, lb);
+         lb.showLoadingBar(debug, passedMinutesZero);
+      }
+      handleZapfenstreich(br, lb);
+      lb.showLoadingBar(debug, passedMinutesZero);
+   }
+
+
+   private static void handleMittagspause(BufferedReader br, LoadingBar lb) throws IOException {
+      print("Mittagspause verschieben um (optional): ");
+      String mittagspauseOffsetRaw = br.readLine();
+      if (mittagspauseOffsetRaw != null && !mittagspauseOffsetRaw.isBlank()) {
+         var mittagspauseOffset = Integer.parseInt(mittagspauseOffsetRaw);
+         lb.initMittagspause(mittagspauseOffset);
+         return;
+      }
+      print("Mittagspause um (optional): ");
+      String manualMittagspauseRaw = br.readLine();
+      if (manualMittagspauseRaw != null && !manualMittagspauseRaw.isBlank()) {
+         var manualMittagspause = LocalTime.parse(manualMittagspauseRaw, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
+         lb.initMittagspause(manualMittagspause);
+      } else {
+         lb.initMittagspause();
+      }
+   }
+
+
+   private static void handleZapfenstreich(BufferedReader br, LoadingBar lb) throws IOException {
+      print("Mittagspause hat gedauert (optional): ");
+      String mittagspauseDurationRaw = br.readLine();
+      Integer mittagspauseDuration = null;
+      if (mittagspauseDurationRaw != null && !mittagspauseDurationRaw.isBlank()) {
+         mittagspauseDuration = Integer.valueOf(mittagspauseDurationRaw);
+      }
+      LocalTime vorlaeufigeEndzeit = lb.getStartTime().plusMinutes(LoadingBar.MAX_NUMBER_WORK_MINS)
+         .plusMinutes(mittagspauseDuration != null ? mittagspauseDuration : LoadingBar.MIN_LUNCH_DURATION);
+      println("Endzeit: " + FormatTools.TIME_FORMATTER.format(vorlaeufigeEndzeit));
+      print("Feierabend verschieben um (optional): ");
+      String zapfenstreichOffsetRaw = br.readLine();
+      if (zapfenstreichOffsetRaw != null && !zapfenstreichOffsetRaw.isBlank()) {
+         int zapfenstreichOffset = Integer.parseInt(zapfenstreichOffsetRaw);
+         lb.initZapfenstreich(mittagspauseDuration, zapfenstreichOffset);
+         return;
+      }
+      print("Manuelle Uhrzeit Feierabend (optional): ");
+      String manualZapfenstreichRaw = br.readLine();
+      if (manualZapfenstreichRaw != null && !manualZapfenstreichRaw.isBlank()) {
+         LocalTime manualZapfenstreich = LocalTime.parse(manualZapfenstreichRaw, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
+         lb.initZapfenstreich(mittagspauseDuration, manualZapfenstreich);
+      } else {
+         lb.initZapfenstreich(mittagspauseDuration);
+      }
+   }
+
+
+   public static void parseParametersAndRun(String[] args, Function<LocalTime, ? extends LoadingBar> constructor) {
+      String nextArg = args[0];
+      if ("--help".equals(nextArg)) {
+         printHelp();
+         System.exit(1);
+      }
+      verifyMinimumNumberOfArgs(args);
+      verifyTimeFormat(nextArg, "Erstes Argument");
+      var startTime = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
+      nextArg = args[1];
+      var section = DaySection.byParam(nextArg);
+      verifyDaySection(section, nextArg);
+      LoadingBar lb = constructor.apply(startTime);
+      if (section == DaySection.MITTAG) {
+         initLoadingBarMittagspause(args, lb);
+      } else {
+         initLoadingBarZapfenstreich(args, lb);
+      }
+      boolean debug = false;
+      boolean passedMinutesZero = false;
+      lb.showLoadingBar(debug, passedMinutesZero);
+   }
+
+
+   private static void initLoadingBarMittagspause(String[] args, LoadingBar lb) {
+      if (args.length == 2) {
+         lb.initMittagspause();
+         return;
+      }
+      String nextArg = args[2];
+      if (OFFSET_PATTERN.matcher(nextArg).matches()) {
+         lb.initMittagspause(Integer.parseInt(nextArg));
+         return;
+      }
+      verifyTimeFormat(nextArg, "Argument nach " + DaySection.MITTAG.getParam());
+      var manualMittagspause = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
+      lb.initMittagspause(manualMittagspause);
+   }
+
+
+   private static void initLoadingBarZapfenstreich(String[] args, LoadingBar lb) {
+      if (args.length == 2) {
+         lb.initZapfenstreich();
+         return;
+      }
+      String nextArg = args[2];
+      LocalTime maxZapfenstreich = null;
+      int endTimeOffset = 0;
+      Integer lunchDuration = null;
+      if (FormatTools.TIME_PATTERN.matcher(nextArg).matches()) {
+         maxZapfenstreich = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
+      } else if (OFFSET_PATTERN.matcher(nextArg).matches()) {
+         endTimeOffset = Integer.parseInt(nextArg);
+      } else {
+         verifyDurationFormat(nextArg, "Argument nach " + DaySection.ZAPFENSTREICH.getParam());
+         lunchDuration = Integer.parseInt(nextArg);
+      }
+      if (args.length == 3) {
+         if (maxZapfenstreich == null && endTimeOffset == 0) {
+            lb.initZapfenstreich(lunchDuration);
+         } else if (maxZapfenstreich == null) {
+            lb.initZapfenstreich(lunchDuration, endTimeOffset);
+         } else {
+            lb.initZapfenstreich(lunchDuration, maxZapfenstreich);
+         }
+         return;
+      }
+      nextArg = args[3];
+      if (lunchDuration == null) {
+         println("Letztes Argument darf nur auf Mittagspausendauer folgen.");
+         System.exit(1);
+      }
+      if (maxZapfenstreich == null && !OFFSET_PATTERN.matcher(nextArg).matches()) {
+         verifyTimeFormat(nextArg, "Letztes Argument nach " + DaySection.ZAPFENSTREICH.getParam() + " und Mittagspausendauer");
+         maxZapfenstreich = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
+         lb.initZapfenstreich(lunchDuration, maxZapfenstreich);
+         return;
+      }
+      verifyOffsetFormat(nextArg, "Letztes Argument nach " + DaySection.ZAPFENSTREICH.getParam() + " und Enduhrzeit");
+      endTimeOffset = Integer.parseInt(nextArg);
+      lb.initZapfenstreich(lunchDuration, endTimeOffset);
+   }
+
+
+   private static void verifyMinimumNumberOfArgs(String[] args) {
+      if (args.length >= 2) {
+         return;
+      }
+      println("Mindestens 2 Argumente müssen gegeben sein.");
+      printHelp();
+      System.exit(1);
+   }
+
+
+   private static void verifyTimeFormat(String param, String errMsgPrefix) {
+      verifyInputFormat(FormatTools.TIME_PATTERN, param, errMsgPrefix, "Uhrzeitformat (" + FormatTools.TIME_FORMAT + ")", false);
+   }
+
+
+   private static void verifyDurationFormat(String param, String errMsgPrefix) {
+      verifyInputFormat(LUNCH_DURATION_PATTERN, param, errMsgPrefix, "Minutenanzahl (ganze Zahl)", true);
+   }
+
+
+   private static void verifyOffsetFormat(String param, String errMsgPrefix) {
+      verifyInputFormat(OFFSET_PATTERN, param, errMsgPrefix, "Minutendifferenz (ganze Zahl mit Vorzeichen)", false);
+   }
+
+
+   private static void verifyInputFormat(Pattern pattern, String param, String errMsgPrefix, String firstInputPart, boolean timeInputPossible) {
+      if (pattern.matcher(param).matches()) {
+         return;
+      }
+      var possibleTimeInputPart = timeInputPossible ? " oder Uhrzeitformat (" + FormatTools.TIME_FORMAT + ")" : "";
+      println(errMsgPrefix + " \"" + param + "\" muss " + firstInputPart + possibleTimeInputPart + " entsprechen.");
+      System.exit(1);
+   }
+
+
+   private static void verifyDaySection(DaySection section, String param) {
+      if (section != null) {
+         return;
+      }
+      List<String> sectionDescs = Arrays.stream(DaySection.values()).map((DaySection ds) -> ds.getDescription() + " (" + ds.getParam() + ")")
+          .collect(Collectors.toList());
+      String sectionDescsJoined = String.join(" oder ", sectionDescs);
+      println("Argument nach Startzeit \"" + param + "\" muss Angabe für " + sectionDescsJoined + " sein.");
+      System.exit(1);
+   }
+
+
+   private static void printHelp() {
+      println("Mögliche Argumente für LoadingBar:\n"
+          + "Normalfall Vormittag (Mittagspause <= " + LoadingBar.LATEST_LUNCH_TIME + ")\n"
+          + FormatTools.TIME_FORMAT + " " + DaySection.MITTAG.getParam() + "\n"
+          + "Vormittag mit expliziter Mittagspause (<= " + LoadingBar.LATEST_LUNCH_TIME + ")\n"
+          + FormatTools.TIME_FORMAT + " " + DaySection.MITTAG.getParam() + " " + FormatTools.TIME_FORMAT + "\n"
+          + "Vormittag mit abweichender Minutenanzahl Arbeitszeit\n"
+          + FormatTools.TIME_FORMAT + " " + DaySection.MITTAG.getParam() + " -+mm\n"
+          + "Normalfall Nachmittag (Mittagspause " + LoadingBar.MIN_LUNCH_DURATION + " min)\n"
+          + FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + "\n"
+          + "Nachmittag mit expliziter Länge Mittagspause (Mittagspause unter " + LoadingBar.MIN_LUNCH_DURATION + " min wird auf "
+          + LoadingBar.MIN_LUNCH_DURATION + " min korrigiert)\n"
+          + FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " mm\n"
+          + "Nachmittag mit explizitem Feierabend (Mittagspause je nach Minimum (s.u.))\n"
+          + FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " " + FormatTools.TIME_FORMAT + "\n"
+          + "Nachmittag mit abweichender Minutenanzahl Arbeitszeit\n"
+          + FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " -+mm\n"
+          + "Nachmittag mit explizitem Feierabend u. expliziter Länge Mittagspause (Mittagspause unter Minimum (s.u.) wird auf Minimum korrigiert)\n"
+          + FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " mm " + FormatTools.TIME_FORMAT + "\n"
+          + "Nachmittag mit explizitem Feierabend u. abweichender Minutenanzahl Arbeitszeit\n"
+          + FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " " + FormatTools.TIME_FORMAT + " -+mm\n\n"
+          + "Mittagspause minimum in Minuten:\n"
+          + " - bis " + LoadingBar.MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min ("
+          + LoadingBar.MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH / CommonTools.MINS_PER_HOUR + " std):  0\n"
+          + " - bis " + LoadingBar.MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min + "
+          + LoadingBar.MIN_LUNCH_DURATION + " min: Arbeitszeit - " + LoadingBar.MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min\n"
+          + " - ab  " + LoadingBar.MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min + " + LoadingBar.MIN_LUNCH_DURATION + " min: "
+          + LoadingBar.MIN_LUNCH_DURATION + " min\n"
+      );
+   }
+}