diff options
author | Julia McCauley <skurvyj@gmail.com> | 2021-04-16 14:01:46 -0400 |
---|---|---|
committer | Julia McCauley <skurvyj@gmail.com> | 2021-04-16 14:01:46 -0400 |
commit | ccacfbf0a288f6aa69c10ec17d96151cfba77c70 (patch) | |
tree | 261608c8b07c3fc6f67e5e1541547401817b9e62 | |
parent | b8279f5498ac7189690b4b85d1d68edb63df3185 (diff) |
fixed error with empty hub map in suspicion rank
-rw-r--r-- | data/empty.sqlite3 | 0 | ||||
-rw-r--r-- | frontend/src/SECAPIData.js | 2 | ||||
-rw-r--r-- | src/main/java/edu/brown/cs/student/term/Main.java | 2 | ||||
-rw-r--r-- | src/main/java/edu/brown/cs/student/term/hub/SuspicionRanker.java | 6 |
4 files changed, 8 insertions, 2 deletions
diff --git a/data/empty.sqlite3 b/data/empty.sqlite3 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/data/empty.sqlite3 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<String, Object> 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<Holder, Double> 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<Integer, Double> 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*/ |