part 2 of day 1 solved 😀

Author: zayzou

com/zayzou/day00/Day01.java

@@ -13,7 +13,7 @@
 public class Day01 {
 
     final static HashMap<String, String> digitsMap = new HashMap<>();
-    final static String FILE = "com/zayzou/day00/part2.txt";
+    final static String FILE = "com/zayzou/day00/input.txt";
 
     static {
         digitsMap.put("one", "1");
@@ -37,6 +37,7 @@ public static void main(String[] args) {
             String last = "";
             while ((line = br.readLine()) != null) {
                 final String l = line;
+                last="";
                 for (int i = 0; i < line.length(); i++) {
                     final int index = i;
                     if (Character.isDigit(line.charAt(i))) {
@@ -53,25 +54,30 @@ public static void main(String[] args) {
                     }
                 }
                 for (int i = line.length() - 1; i >= 0; i--) {
-                    final int index = i;
                     if (Character.isDigit(line.charAt(i))) {
                         last = String.valueOf(line.charAt(i));
                         break;
                     }
-                }
 
-                if (last.isBlank()) {
-                    int maxIndex = -1;
                     for (Map.Entry<String, String> entry : digitsMap.entrySet()) {
-                        var number = entry.getKey();
-                        int index = line.lastIndexOf(number);
-                        if (maxIndex < index) {
-                            last = entry.getValue();
-                            maxIndex = index;
+                        //                                two1nine      i=7-
+                        if ((i - entry.getKey().length() + 1) >= 0) {
+                            String substring = line.substring(i - entry.getKey().length() + 1, i + 1);
+                            if (substring.compareTo(entry.getKey()) == 0) {
+                                last = entry.getValue();
+                                break;
+                            }
                         }
+
+                    }
+                    if (!last.isBlank()) {
+                        break;
                     }
+
                 }
-                System.out.println(line + " -> " + first + "" + last);
+
+
+                System.out.println("calibration values : for "+line + " are " + first + "" + last);
                 sum += Integer.valueOf(first + "" + last);
             }
             System.out.println(sum);

com/zayzou/day00/part2.txt

@@ -1,6 +1,7 @@
-six1mpffbnbnnlxthree
-4eight3one
-9nine2xnhvjtjlzj
-jxrbrt4jmnmlonesznvbjrsn
-nsvkljgpfn77pvfour5j
-fourlkgmnnzncht75
+two1nine
+eightwothree
+abcone2threexyz
+xtwone3four
+4nineeightseven2
+zoneight234
+7pqrstsixteen