From 706b0549ad2d6f160f9260cd9840ba4245800f49 Mon Sep 17 00:00:00 2001 From: Julia McCauley Date: Fri, 16 Apr 2021 11:17:45 -0400 Subject: intermediate commit to pull new changes --- data/empty.sqlite3 | Bin 8192 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 data/empty.sqlite3 (limited to 'data/empty.sqlite3') diff --git a/data/empty.sqlite3 b/data/empty.sqlite3 deleted file mode 100644 index 3d10907..0000000 Binary files a/data/empty.sqlite3 and /dev/null differ -- cgit v1.2.3-70-g09d2 From ccacfbf0a288f6aa69c10ec17d96151cfba77c70 Mon Sep 17 00:00:00 2001 From: Julia McCauley Date: Fri, 16 Apr 2021 14:01:46 -0400 Subject: fixed error with empty hub map in suspicion rank --- data/empty.sqlite3 | 0 frontend/src/SECAPIData.js | 2 +- src/main/java/edu/brown/cs/student/term/Main.java | 2 +- src/main/java/edu/brown/cs/student/term/hub/SuspicionRanker.java | 6 ++++++ 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 data/empty.sqlite3 (limited to 'data/empty.sqlite3') diff --git a/data/empty.sqlite3 b/data/empty.sqlite3 new file mode 100644 index 0000000..e69de29 diff --git a/frontend/src/SECAPIData.js b/frontend/src/SECAPIData.js index d14ee1f..8d0611f 100644 --- a/frontend/src/SECAPIData.js +++ b/frontend/src/SECAPIData.js @@ -13,7 +13,7 @@ function SECAPIData() { const toEpochMilli = date => Date.parse(date); const getLinks = () => { - fetch("http://localhost:4567/susrank", { + fetch("http://localhost:4567/data", { method: "POST", body: JSON.stringify( { diff --git a/src/main/java/edu/brown/cs/student/term/Main.java b/src/main/java/edu/brown/cs/student/term/Main.java index 4b910f7..5c7497f 100644 --- a/src/main/java/edu/brown/cs/student/term/Main.java +++ b/src/main/java/edu/brown/cs/student/term/Main.java @@ -162,7 +162,7 @@ public final class Main { Map variables = ImmutableMap.of("holders", suspiciousHolders); return GSON.toJson(variables); } catch (Exception e) { - System.out.println("DBQuerier Test, couldn't connect to db???"); + System.out.println("Error retrieving the suspicion ranks for GUI"); return "Error"; } } diff --git a/src/main/java/edu/brown/cs/student/term/hub/SuspicionRanker.java b/src/main/java/edu/brown/cs/student/term/hub/SuspicionRanker.java index 564ba28..2b567c2 100644 --- a/src/main/java/edu/brown/cs/student/term/hub/SuspicionRanker.java +++ b/src/main/java/edu/brown/cs/student/term/hub/SuspicionRanker.java @@ -31,6 +31,7 @@ public class SuspicionRanker { LinkMapper lm = new LinkMapper(querier); HubSearch hub = new HubSearch(lm); Map holderToHubScore = hub.runHubSearch(start, end); + System.out.println(holderToHubScore); ProfitCalculation pc = new ProfitCalculation(DatabaseQuerier.getConn(), "", new Date(start.toEpochMilli()), @@ -38,6 +39,11 @@ public class SuspicionRanker { Map profitMap = pc.getProfitMap(); + //if the maps are empty, we abort because we have entirely incomplete data + if(profitMap.isEmpty() || holderToHubScore.isEmpty()){ + return new ArrayList<>(); + } + double profitMax = getMaxOfMap(profitMap); /*if all of our values are negative, we need to flip sides so that the * biggest loser doesn't end up being the most suspicious person*/ -- cgit v1.2.3-70-g09d2