Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 38 additions & 25 deletions src/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,16 @@ public class Main {
public static void main(String[] args) {
Scanner s = new Scanner(System.in);

System.out.print("Enter the CSV filename: ");
String f = s.nextLine();

List<Map<String, String>> 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]);

Map<String, String> 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());
s.close();
return;
}
System.out.print("Enter the CSV filename: ");
String f = s.nextLine();
//chosen file inputted into parseCVS to parse the file
List<Map<String, String>> forks = parseCSV(f);


Map<String, List<Map<String, String>>> mp2 = new HashMap<>();
for (Map<String, String> d : dta) {
for (Map<String, String> d : forks) {
String id = d.get("id");
List<Map<String, String>> lst = mp2.get(id);
if (lst == null) {
Expand All @@ -50,9 +34,9 @@ public static void main(String[] args) {

List<Map<String, String>> sel;
if (inp.equalsIgnoreCase("all")) {
sel = dta;
sel = forks;
} else {
String id = "fork" + inp;
String id = "fork" + inp;
sel = mp2.get(id);
}

Expand All @@ -61,7 +45,7 @@ public static void main(String[] args) {
DateTimeFormatter f1 = DateTimeFormatter.ISO_DATE_TIME;
LocalDateTime lat = null;
for (Map<String, String> 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;
}
Expand Down Expand Up @@ -100,4 +84,33 @@ public static void main(String[] args) {

s.close();
}

public static List<Map<String, String>> parseCSV(String filename){
/*
* creates new map, with keys of from the data file forkID, time,
* and number of lines changed.
*
*/
List<Map<String, String>> forks = new ArrayList<>();

try (Scanner fs = new Scanner(new File(filename))) {
fs.nextLine();

while (fs.hasNextLine()) {
String[] v = fs.nextLine().split(",");

int chg = Integer.parseInt(v[2]);

Map<String, String> commits = new HashMap<>();
commits.put("id", v[0]);
commits.put("tm", v[1]);
commits.put("chg", String.valueOf(chg));
forks.add(commits);
}
} catch (FileNotFoundException e) {
System.out.println("Error reading the file: " + e.getMessage());
return null;
}
return forks;
}
}
3 changes: 2 additions & 1 deletion src/MainTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<Map<String,String>> actualCommits = Main.parseCSV("data/small_commit_data.csv");

// Sets up the expected value for you. You do not need to edit this part
List<Map<String, String>> expectedCommits = new ArrayList<>();
Expand All @@ -37,5 +37,6 @@ void testParseCSV() {
// Finish expected value setup

// TODO: Assert that the expected equals the actual
assertEquals (expectedCommits, actualCommits);
}
}