From 6e0fe0e37db2cc7e1972356ae6a5a7791efe5623 Mon Sep 17 00:00:00 2001
From: jenno-verdonck <42772246+jenno-verdonck@users.noreply.github.com>
Date: Wed, 1 Feb 2023 14:07:54 +0100
Subject: [PATCH] Format fixes in HierarchyBuilderDate

---
 .../deidentifier/arx/aggregates/HierarchyBuilderDate.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/org/deidentifier/arx/aggregates/HierarchyBuilderDate.java b/src/main/org/deidentifier/arx/aggregates/HierarchyBuilderDate.java
index 424631a6fc..52b52a1654 100644
--- a/src/main/org/deidentifier/arx/aggregates/HierarchyBuilderDate.java
+++ b/src/main/org/deidentifier/arx/aggregates/HierarchyBuilderDate.java
@@ -68,7 +68,7 @@ public Format() {
             map.put(Granularity.HOUR_DAY_MONTH_YEAR, "dd.MM.yyyy-HH:00");
             map.put(Granularity.DAY_MONTH_YEAR, "dd.MM.yyyy");
             map.put(Granularity.WEEK_MONTH_YEAR, "W/MM.yyyy");
-            map.put(Granularity.WEEK_YEAR, "ww/yyyy");
+            map.put(Granularity.WEEK_YEAR, "ww/YYYY");
             map.put(Granularity.MONTH_YEAR, "MM/yyyy");
             map.put(Granularity.QUARTER_YEAR, "QQQ yyyy");
         }
@@ -183,7 +183,7 @@ public static enum Granularity {
         /**  Granularity */
         WEEK_MONTH_YEAR("W/MM.yyyy"),
         /**  Granularity */
-        WEEK_YEAR("ww/yyyy"),
+        WEEK_YEAR("ww/YYYY"),
         /**  Granularity */
         MONTH_YEAR("MM/yyyy"),
         /**  Granularity */
@@ -542,10 +542,10 @@ private String generalize(String input, Granularity granularity) {
         if (_range == null) {
             return formatter.format(dateTime);
         } else {
-            int dateUnit = Integer.valueOf(formatter.format(dateTime));
+            int dateUnit = Integer.valueOf(formatter.format(dateTime)) - 1;
             int lower    = Integer.valueOf((dateUnit) / (_range))  * (_range);
             int upper    = lower + _range;
-            String outputDate = "[" + lower + ", " + upper + "[";
+            String outputDate = "[" + (lower+1) + ", " + (upper+1) + "[";
             return outputDate;
         }
     }