diff --git a/src/Main.java b/src/Main.java index e5571ea..58e997e 100644 --- a/src/Main.java +++ b/src/Main.java @@ -6,34 +6,25 @@ public class Main { public static void main(String[] args) { + // Initializing scanner, taking input on the filename Scanner s = new Scanner(System.in); System.out.print("Enter the CSV filename: "); String f = s.nextLine(); - List> dta = new ArrayList<>(); - try (Scanner fs = new Scanner(new File(f))) { - fs.nextLine(); - - while (fs.hasNextLine()) { - String[] v = fs.nextLine().split(","); - - int chg = Integer.parseInt(v[2]); + // call parseCSV method to get all data + List> allData = parseCSV(f); - Map mp1 = new HashMap<>(); - mp1.put("id", v[0]); - mp1.put("tm", v[1]); - mp1.put("chg", String.valueOf(chg)); - dta.add(mp1); - } - } catch (FileNotFoundException e) { - System.out.println("Error reading the file: " + e.getMessage()); + // if allData empty then the file was not found or had problem + if (allData.isEmpty()) { + System.out.println("No data found or error reading the file."); s.close(); return; } + // grouping data by id Map>> mp2 = new HashMap<>(); - for (Map d : dta) { + for (Map d : allData) { String id = d.get("id"); List> lst = mp2.get(id); if (lst == null) { @@ -50,18 +41,19 @@ public static void main(String[] args) { List> sel; if (inp.equalsIgnoreCase("all")) { - sel = dta; + sel = allData; } else { - String id = "fork" + inp; + String id = "fork" + inp; sel = mp2.get(id); } int sz = sel.size(); + // format timestamp DateTimeFormatter f1 = DateTimeFormatter.ISO_DATE_TIME; LocalDateTime lat = null; for (Map d : sel) { - LocalDateTime t = LocalDateTime.parse(d.get("tm"), f1); + LocalDateTime t = LocalDateTime.parse(d.get("tm"), f1); if (lat == null || t.isAfter(lat)) { lat = t; } @@ -69,6 +61,7 @@ public static void main(String[] args) { DateTimeFormatter f2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss", Locale.getDefault()); String latT = lat.format(f2); + // manipulating chg data double tot = 0.0; int tlc = 0; for (Map d : sel) { @@ -90,6 +83,7 @@ public static void main(String[] args) { } } + // printing out report of requested forks System.out.println("\nStatistics:"); System.out.println("Number of commits: " + sz); System.out.println("Most recent commit timestamp: " + latT); @@ -100,4 +94,30 @@ public static void main(String[] args) { s.close(); } -} + + public static List> parseCSV(String f) { + List> allData = new ArrayList<>(); + try (Scanner fs = new Scanner(new File(f))) { + // Opens file in scanner, iterates across, initializes ArrayList, coalescses + // stats into a hashmap, then places in an array list + fs.nextLine(); + + while (fs.hasNextLine()) { + String[] v = fs.nextLine().split(","); + + int chg = Integer.parseInt(v[2]); + // one HashMap = one commit + Map valueMap = new HashMap<>(); + valueMap.put("id", v[0]); + valueMap.put("tm", v[1]); + valueMap.put("chg", String.valueOf(chg)); + allData.add(valueMap); + } + } + + catch (FileNotFoundException e) { + System.out.println("Error reading the file: " + e.getMessage()); + } + return allData; + } +} \ No newline at end of file diff --git a/src/MainTest.java b/src/MainTest.java index 1141d9e..1c4e436 100644 --- a/src/MainTest.java +++ b/src/MainTest.java @@ -12,7 +12,7 @@ public class MainTest { void testParseCSV() { // You will finish implementing this method in Wave 3 // TODO: Call Main.parseCSV("data/small_commit_data.csv") here and set it to an actual variable - + List> parsed = Main.parseCSV("data/small_commit_data.csv"); // Sets up the expected value for you. You do not need to edit this part List> expectedCommits = new ArrayList<>();