aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Foiani <sotech117@michaels-mbp-3.lan>2021-04-16 11:28:17 -0400
committerMichael Foiani <sotech117@michaels-mbp-3.lan>2021-04-16 11:28:17 -0400
commit250f5edc1ed502c74c398b5850a0bb7a7b01848c (patch)
tree56e41c692f5d1380eda69bc931e0d01feda0721b /src
parent939f748b5f0914fe1558d571fdf13962c46b4537 (diff)
parentb75b23ff59a71c9a54be43525189b678124ae3a3 (diff)
Big merge to supress the printstram and update the frontend server.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/edu/brown/cs/student/term/DatabaseQuerier.java25
-rw-r--r--src/main/java/edu/brown/cs/student/term/Main.java174
-rw-r--r--src/main/java/edu/brown/cs/student/term/hub/Holder.java7
-rw-r--r--src/main/java/edu/brown/cs/student/term/hub/HubSearch.java68
-rw-r--r--src/main/java/edu/brown/cs/student/term/hub/LinkMapper.java15
-rw-r--r--src/main/java/edu/brown/cs/student/term/hub/SuspicionRanker.java50
-rw-r--r--src/main/java/edu/brown/cs/student/term/profit/ProfitCalculation.java (renamed from src/main/java/edu/brown/cs/student/term/ProfitCalculation.java)170
-rw-r--r--src/main/java/edu/brown/cs/student/term/profit/StockHolding.java16
-rw-r--r--src/main/java/edu/brown/cs/student/term/repl/Command.java8
-rw-r--r--src/main/java/edu/brown/cs/student/term/repl/REPL.java1
-rw-r--r--src/main/java/edu/brown/cs/student/term/repl/commands/SetupCommand.java28
-rw-r--r--src/test/java/edu/brown/cs/student/DBQuerierTest.java167
-rw-r--r--src/test/java/edu/brown/cs/student/HubRankTest.java66
-rw-r--r--src/test/java/edu/brown/cs/student/LinkMapperTest.java59
-rw-r--r--src/test/java/edu/brown/cs/student/SuspicionRankerTest.java52
15 files changed, 613 insertions, 293 deletions
diff --git a/src/main/java/edu/brown/cs/student/term/DatabaseQuerier.java b/src/main/java/edu/brown/cs/student/term/DatabaseQuerier.java
index f4be9b3..688270f 100644
--- a/src/main/java/edu/brown/cs/student/term/DatabaseQuerier.java
+++ b/src/main/java/edu/brown/cs/student/term/DatabaseQuerier.java
@@ -7,7 +7,7 @@ import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
-public class DatabaseQuerier{
+public class DatabaseQuerier {
private static Connection conn = null;
//TODO: Be prepared to overhaul this to account for IDs
@@ -49,10 +49,19 @@ public class DatabaseQuerier{
while(rs.next()){
stocks.add(rs.getString(1));
}
+
+ rs.close();
+ prep.close();
return stocks;
}
- //TODO: Fill these in
+ /**
+ * Gets all the trades in by stock and buy type, ordered by time
+ * @param startDate - the start date of these trades
+ * @param endDate - the end date of these trades
+ * @return a list of list of trades as specified above
+ * @throws SQLException - if something goes wrong with connection
+ */
public List<List<Trade>> getAllTradesByStock(Instant startDate, Instant endDate) throws SQLException {
List<List<Trade>> allTrades = new ArrayList<>();
List<String> stocks = getRecentStocks(startDate, endDate);
@@ -64,6 +73,15 @@ public class DatabaseQuerier{
return allTrades;
}
+ /**
+ * Gets a single stock's list of trades for that time period (either buy or sell)
+ * @param stock - string name of the stock to get the trades for
+ * @param isBuy - integer whether it's a buy or sell
+ * @param startDate - an Instant representing the start of the time period
+ * @param endDate - an Instant representing the end of the time period
+ * @return - a list of trades for that stock
+ * @throws SQLException - if issue getting connection
+ */
public List<Trade> getTradeByStock(String stock, int isBuy, Instant startDate, Instant endDate) throws SQLException{
List<Trade> trades = new ArrayList<>();
@@ -84,6 +102,9 @@ public class DatabaseQuerier{
rs.getDouble(8)));
}
+ rs.close();
+ prep.close();
+
return trades;
}
}
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 fd4352c..008c411 100644
--- a/src/main/java/edu/brown/cs/student/term/Main.java
+++ b/src/main/java/edu/brown/cs/student/term/Main.java
@@ -1,8 +1,10 @@
package edu.brown.cs.student.term;
+import com.google.common.collect.ImmutableMap;
import edu.brown.cs.student.term.hub.Holder;
-import edu.brown.cs.student.term.hub.HubSearch;
-import edu.brown.cs.student.term.hub.LinkMapper;
+import edu.brown.cs.student.term.profit.ProfitCalculation;
+import edu.brown.cs.student.term.profit.StockHolding;
+import edu.brown.cs.student.term.hub.SuspicionRanker;
import edu.brown.cs.student.term.repl.Command;
import edu.brown.cs.student.term.repl.REPL;
import edu.brown.cs.student.term.repl.commands.LoadCommand;
@@ -10,30 +12,15 @@ import edu.brown.cs.student.term.repl.commands.SetupCommand;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
-import java.sql.Connection;
-import java.sql.Date;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.io.OutputStream;
+import java.io.PrintStream;
import java.time.Instant;
+import java.sql.Date;
import java.util.HashMap;
-import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import joptsimple.OptionParser;
-import joptsimple.OptionSet;
import spark.*;
import spark.template.freemarker.FreeMarkerEngine;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-import com.google.common.collect.ImmutableMap;
-
import freemarker.template.Configuration;
//fix
@@ -41,44 +28,20 @@ import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.sql.ResultSet;
-import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.*;
-import com.google.common.collect.ImmutableMap;
-import com.google.gson.Gson;
-import joptsimple.OptionParser;
-import joptsimple.OptionSet;
-import spark.ExceptionHandler;
-import spark.ModelAndView;
-import spark.QueryParamsMap;
-import spark.Request;
-import spark.Response;
-import spark.Route;
-import spark.Filter;
-import spark.Spark;
-import spark.TemplateViewRoute;
-import spark.template.freemarker.FreeMarkerEngine;
-
-import freemarker.template.Configuration;
+import com.google.gson.Gson;
import org.json.JSONObject;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
/**
* The Main class of our project. This is where execution begins.
*/
public final class Main {
- // TODO: fix temproary solution
public static JSONObject xmlLinks = null;
-
-
private static final Gson GSON = new Gson();
private static final int DEFAULT_PORT = 4567;
@@ -108,6 +71,9 @@ public final class Main {
if (options.has("gui")) {
runSparkServer((int) options.valueOf("port"));
+ //will auto connect to correct db when running gui!
+ SetupCommand setConnection = new SetupCommand();
+ setConnection.run(new String[]{"data/trades.sqlite3"});
}
if (!options.has("debug")) {
@@ -139,7 +105,7 @@ public final class Main {
return new FreeMarkerEngine(config);
}
- public void runSparkServer(int port) {
+ public void runSparkServer(int port) {
Spark.port(port);
Spark.externalStaticFileLocation("src/main/resources/static");
Spark.exception(Exception.class, new ExceptionPrinter());
@@ -147,56 +113,100 @@ public final class Main {
Spark.options("/*",
(request, response) -> {
- String accessControlRequestHeaders = request
- .headers("Access-Control-Request-Headers");
- if (accessControlRequestHeaders != null) {
- response.header("Access-Control-Allow-Headers",
- accessControlRequestHeaders);
- }
-
- String accessControlRequestMethod = request
- .headers("Access-Control-Request-Method");
- if (accessControlRequestMethod != null) {
- response.header("Access-Control-Allow-Methods",
- accessControlRequestMethod);
- }
-
- return "OK";
+ String accessControlRequestHeaders = request
+ .headers("Access-Control-Request-Headers");
+ if (accessControlRequestHeaders != null) {
+ response.header("Access-Control-Allow-Headers",
+ accessControlRequestHeaders);
+ }
+
+ String accessControlRequestMethod = request
+ .headers("Access-Control-Request-Method");
+ if (accessControlRequestMethod != null) {
+ response.header("Access-Control-Allow-Methods",
+ accessControlRequestMethod);
+ }
+
+ return "OK";
});
-
-
Spark.before((request, response) -> response.header("Access-Control-Allow-Origin", "*"));
- Spark.post("/data", new DataHandler());
+ Spark.post("/data", new SuspicionRankHandler());
+ Spark.post("/profit", new ProfitQueryHandler());
}
-
- private static class DataHandler implements Route {
+ /**
+ * Gets the list of holders with id, name, and suspicion rank.
+ */
+ private static class SuspicionRankHandler implements Route {
@Override
+ /**
+ * Expects that the request will contain two longs that are the start/end
+ * dates for the suspicion rank to run on as epoch time in milliseconds
+ */
public Object handle(Request request, Response response) throws Exception {
- String str = request.body();
- xmlLinks = new JSONObject(str); //this is all the filedAt times and xml files
+ //String str = request.body();
+ //xmlLinks = new JSONObject(str); //this is all the filedAt times and xml files
+ try {
+ DatabaseQuerier db = SetupCommand.getDq();
+ SuspicionRanker ranker = new SuspicionRanker(db);
+
+ JSONObject data = new JSONObject(request.body());
+
+ long startMilli = data.getLong("start");
+ long endMilli = data.getLong("end");
+ Instant start = Instant.ofEpochMilli(startMilli);
+ Instant end = Instant.ofEpochMilli(endMilli);
+ List<Holder> suspiciousHolders = ranker.getSuspicionScoreList(start, end);
+ 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???");
+ return "Error";
+ }
+ }
+ }
- try{
+ private static class ProfitQueryHandler implements Route {
+ @Override
+ public Object handle(Request request, Response response) throws Exception {
+ JSONObject req = new JSONObject(request.body());
+ String person = req.getString("person");
+ Date startPeriod = new Date(req.getLong("startTime"));
+ Date endPeriod = new Date(req.getLong("endTime"));
+
+ List<StockHolding> holdings = new LinkedList<>();
+ ProfitCalculation profit;
+ double gains = 0.0;
+ double sp500PercentGain = 0.0;
+ double sp500Gain = 0.0;
+ try {
DatabaseQuerier db = new DatabaseQuerier("data/trades.sqlite3");
- LinkMapper lm = new LinkMapper(db);
-
- Instant start = Instant.parse("2021-03-30T05:00:00.00Z");
- //12 am on 3/28 in UTC
- Instant end = Instant.parse("2021-04-12T05:00:00.00Z");
- lm.makeFollowerLinks(start, end);
- HubSearch hub = new HubSearch(lm);
- Map<Holder, Double> him = hub.runHubSearch(start, end);
- return GSON.toJson(him);
- } catch(Exception e) {
+ profit =
+ new ProfitCalculation(DatabaseQuerier.getConn(), person, startPeriod, endPeriod);
+ holdings = profit.getHoldingsList();
+ gains = profit.calculateGains();
+ sp500PercentGain = profit.compareToSP500();
+ } catch (Exception e) {
System.out.println("DBQuerier Test, couldn't connect to db???");
return "Error";
}
+
+ Map<String, Object> res = new HashMap<>();
+ res.put("person", person);
+ res.put("moneyIn", profit.getMoneyInput());
+ res.put("moneyOut", profit.getMoneyInput() + gains);
+ res.put("holdings", holdings);
+ res.put("percentGain", 100 * gains / profit.getMoneyInput());
+ res.put("SP500", (1 + sp500PercentGain) * profit.getMoneyInput());
+ res.put("percentSP500", 100 * sp500PercentGain);
+ return GSON.toJson(res);
+
}
+
}
/**
* Display an error page when an exception occurs in the server.
- *
*/
private static class ExceptionPrinter implements ExceptionHandler {
@Override
@@ -211,6 +221,4 @@ public final class Main {
res.body(stacktrace.toString());
}
}
-
-
} \ No newline at end of file
diff --git a/src/main/java/edu/brown/cs/student/term/hub/Holder.java b/src/main/java/edu/brown/cs/student/term/hub/Holder.java
index 683eb01..1151e74 100644
--- a/src/main/java/edu/brown/cs/student/term/hub/Holder.java
+++ b/src/main/java/edu/brown/cs/student/term/hub/Holder.java
@@ -5,6 +5,7 @@ import java.util.Objects;
public class Holder {
private int id;
private String name;
+ private double suspicionScore;
public Holder(int id, String name) {
this.id = id;
@@ -15,6 +16,12 @@ public class Holder {
return id;
}
+ public void setSuspicionScore(double sus){
+ this.suspicionScore = sus;
+ }
+
+ public double getSuspicionScore(){return suspicionScore;}
+
public String getName() {
return name;
}
diff --git a/src/main/java/edu/brown/cs/student/term/hub/HubSearch.java b/src/main/java/edu/brown/cs/student/term/hub/HubSearch.java
index 4d5755c..ccefeef 100644
--- a/src/main/java/edu/brown/cs/student/term/hub/HubSearch.java
+++ b/src/main/java/edu/brown/cs/student/term/hub/HubSearch.java
@@ -11,12 +11,10 @@ public class HubSearch {
LinkMapper mapper;
Map<Holder, Set<Holder>> followerToLeaderMap = new HashMap<>();
- //TODO: Make this just take in a map from holder -> set of holder
public HubSearch(LinkMapper mapper){
this.mapper = mapper;
}
- //TODO: reevaluate this basic version and tweak to customize
public Map<Holder, Double> runHubSearch(Instant start, Instant end){
followerToLeaderMap = mapper.makeFollowerLinks(start, end);
int numHolders = followerToLeaderMap.size();
@@ -54,15 +52,9 @@ public class HubSearch {
//dampening factor
double damp = 0.15;
/*
- In normal page rank:
- links is the pages that k links to, if k links to j, then
- we want to add some weight to j from k, but that
- weight is diluted by the number of links that k has
- in general because we don't want to count a bunch of links
- from a page as highly as one targeted link from one page to another
In Hub Search
- leader = j, follower = k, if follower links to (follows) leader,
+ we have the leader and follower if follower links to (follows) leader,
then we want to add some weight from follower to leader,
but should that weight be diluted by the number of people
who followed leader or the number of people who follower followed
@@ -87,62 +79,4 @@ public class HubSearch {
return sum <= 0.001;
}
-
-
-
-
-
-
-
-
-
- /*
- def pageRank(pList: List[Page]): mutable.HashMap[Int, Double] = {
- val n = pList.length
- val weights = new Array[Double](n)
- val r = new Array[Double](n)
- val rPrime = Array.fill[Double](n)(1.0 / n)
-
- while (!distance(r, rPrime)) {
- Array.copy(rPrime, 0, r, 0, n)
- for (j <- 0 to n - 1) {
- rPrime(j) = 0
- for (k <- 0 to n - 1) {
- val wjk = getWeight(pList(j), pList(k), n)
- rPrime(j) = (rPrime(j) + (wjk * r(k)))
- }
- }
- }
-
- val pageRank = new mutable.HashMap[Int, Double]()
-
- for (i <- 0 to rPrime.length - 1) {
- pageRank.put(pList(i).getID, rPrime(i))
- }
- pageRank
- }
-
- def getWeight(j: Page, k: Page, n: Int): Double = {
-
- val links = k.getLinks
- val nk = links.size
-
- if (links.contains(j.getTitle.toLowerCase)) {
- ((0.15 / n) + ((1 - 0.15) * (1.0 / nk)))
- } else if (nk == 0) {
- ((0.15 / n) + ((1 - 0.15) * (1.0 / n)))
- } else {
- (0.15 / n)
- }
- }
-
- def distance(r1: Array[Double], r2: Array[Double]): Boolean = {
- var sum = 0.0
- for (i <- 0 to r1.length - 1) {
- sum = sum + Math.pow((r1(i) - r2(i)), 2)
- }
- sum <= .001
-
- }
- */
}
diff --git a/src/main/java/edu/brown/cs/student/term/hub/LinkMapper.java b/src/main/java/edu/brown/cs/student/term/hub/LinkMapper.java
index 8bc8cf9..b490ea1 100644
--- a/src/main/java/edu/brown/cs/student/term/hub/LinkMapper.java
+++ b/src/main/java/edu/brown/cs/student/term/hub/LinkMapper.java
@@ -21,7 +21,7 @@ public class LinkMapper {
/**
- * Returns the follower => leaders map as is, does not update it
+ * Returns the follower to leaders map as is, does not update it
* @return person to follower map
*/
public Map<Holder, Set<Holder>> getFollowerToLeaders() {
@@ -29,9 +29,11 @@ public class LinkMapper {
}
/**
- * The links between people and their followers who made the same trade
+ * This links a person and the set of people whose trades they followed
* in the same time period
- * @return the newly updated link map
+ * @param start - instant representing start of time period to look at
+ * @param end - instant representing end of time period to look at
+ * @return - the newly updated link map
*/
public Map<Holder, Set<Holder>> makeFollowerLinks(Instant start, Instant end){
if(databaseQuerier != null){
@@ -54,9 +56,10 @@ public class LinkMapper {
return followerToLeaders;
}
-
- //TODO: Try to create both leader => follower and follower => leader map at once
- //only if necessary tho!
+ /**
+ * Converts a single trade list into entries in the follower to leader map
+ * @param tradeList - a list of trades for a single stock (either buy or sell)
+ */
private void convertTradeListToFollowerMap(List<Trade> tradeList){
List<Holder> holderList = new ArrayList<>();
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 a1196d8..9f5f9c1 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
@@ -1,4 +1,54 @@
package edu.brown.cs.student.term.hub;
+import edu.brown.cs.student.term.DatabaseQuerier;
+import edu.brown.cs.student.term.profit.ProfitCalculation;
+
+import java.time.Instant;
+import java.sql.Date;
+import java.util.*;
+
public class SuspicionRanker {
+
+ DatabaseQuerier querier;
+
+ public SuspicionRanker(DatabaseQuerier db) {
+ this.querier = db;
+ }
+
+ public <K, V extends Comparable<V>> V getMaxOfMap(Map<K, V> map) {
+ Map.Entry<K, V> maxEntry = Collections.max(map.entrySet(), Map.Entry.comparingByValue());
+ System.out.println(maxEntry);
+ System.out.println(maxEntry.getValue());
+ return maxEntry.getValue();
+ }
+
+ public List<Holder> getSuspicionScoreList(Instant start, Instant end) {
+ List<Holder> suspicionList = new ArrayList<>();
+ try {
+ LinkMapper lm = new LinkMapper(querier);
+ HubSearch hub = new HubSearch(lm);
+ Map<Holder, Double> holderToHubScore = hub.runHubSearch(start, end);
+
+ ProfitCalculation pc = new ProfitCalculation(DatabaseQuerier.getConn(), "",
+ new Date(start.toEpochMilli()),
+ new Date(end.toEpochMilli()));
+
+ Map<Integer, Double> profitMap = pc.getProfitMap();
+
+ double profitMax = getMaxOfMap(profitMap);
+
+ double hubMax = getMaxOfMap(holderToHubScore);
+
+ for (Holder guy : holderToHubScore.keySet()) {
+ double normalizedProfitScore = profitMap.get(guy.getId()) / profitMax;
+ double normalizedHubScore = holderToHubScore.get(guy) / hubMax;
+ double suspicionScore = normalizedHubScore * 0.6 + normalizedProfitScore * 0.4;
+ guy.setSuspicionScore(suspicionScore);
+ suspicionList.add(guy);
+ }
+ } catch (Exception e) {
+ System.out.println("ERROR: Could not connect to database querier");
+ }
+ return suspicionList;
+ }
}
diff --git a/src/main/java/edu/brown/cs/student/term/ProfitCalculation.java b/src/main/java/edu/brown/cs/student/term/profit/ProfitCalculation.java
index aa1bc09..85b2a9a 100644
--- a/src/main/java/edu/brown/cs/student/term/ProfitCalculation.java
+++ b/src/main/java/edu/brown/cs/student/term/profit/ProfitCalculation.java
@@ -1,18 +1,14 @@
-package edu.brown.cs.student.term;
+package edu.brown.cs.student.term.profit;
+import edu.brown.cs.student.term.profit.StockHolding;
import org.json.JSONArray;
+import org.json.JSONException;
import org.json.JSONObject;
-import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
import java.net.URI;
-import java.net.URL;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
@@ -24,8 +20,8 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.LinkedList;
-import java.util.List;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
public class ProfitCalculation {
@@ -33,6 +29,7 @@ public class ProfitCalculation {
private String person;
private Date startTime;
private Date endTime;
+ private boolean tablesFilled;
private String BASE_URL = "https://data.alpaca.markets/v1";
@@ -51,6 +48,9 @@ public class ProfitCalculation {
//map of stock to gains from increases in value of holdings
private Map<String, Double> unrealizedGainsMap;
+ //map to store current prices of stocks -- to avoid repeated api calls
+ private Map<String, Double> currentStockPrices;
+
private double moneyInput;
/**
@@ -70,16 +70,17 @@ public class ProfitCalculation {
sellHistoryMap = new HashMap<>();
realizedGainsMap = new HashMap<>();
unrealizedGainsMap = new HashMap<>();
+ currentStockPrices = new HashMap<>();
+ tablesFilled = false;
}
/**
- * This method fills the maps of sell and buy orders with lists of oldest - new trades
+ * This method fills the maps of sell and buy orders with lists of oldest - new trades.
*/
private void organizeOrders() {
//get a list of trades for a person to consider
try {
PreparedStatement prep;
- // TODO: add start and end time
prep =
conn.prepareStatement("SELECT * FROM \'trades\' WHERE holder_name= ? "
+ " AND trade_timestamp BETWEEN ? AND ?"
@@ -92,7 +93,7 @@ public class ProfitCalculation {
while (rs.next()) {
String ticker = rs.getString("stock_name");
int shares = rs.getInt("number_of_shares");
- double price = rs.getDouble("price");
+ double price = rs.getDouble("share_price");
OrderTuple order = new OrderTuple(shares, price, rs.getDate("trade_timestamp"));
//one element list for first time ticker is seen.
@@ -107,9 +108,7 @@ public class ProfitCalculation {
} else {
buyHistoryMap.put(ticker, oneElement);
}
- }
- //for sell orders build up sell history
- else {
+ } else {
//ignore sell orders for which we do not have buys for
if (buyHistoryMap.containsKey(ticker)) {
if (sellHistoryMap.containsKey(ticker)) {
@@ -128,7 +127,7 @@ public class ProfitCalculation {
}
/**
- * This method processes the sell orders in the sellHistoryMap to get realized gains
+ * This method processes the sell orders in the sellHistoryMap to get realized gains.
*/
private void getRealizedGains() {
for (String ticker : sellHistoryMap.keySet()) {
@@ -177,7 +176,7 @@ public class ProfitCalculation {
}
/**
- * get the change in value of stocks which are still held
+ * get the change in value of stocks which are still held.
*/
private void getUnrealizedGains() {
@@ -186,16 +185,17 @@ public class ProfitCalculation {
double unrealizedGains = 0;
double currentPrice = getCurrentPrice(ticker);
- LinkedList<OrderTuple> stockHistory = buyHistoryMap.get(ticker);
- for (OrderTuple order : stockHistory) {
- unrealizedGains += order.getShares() * (currentPrice - order.getCost());
+ if (currentPrice != -1) {
+ LinkedList<OrderTuple> stockHistory = buyHistoryMap.get(ticker);
+ for (OrderTuple order : stockHistory) {
+ unrealizedGains += order.getShares() * (currentPrice - order.getCost());
+ }
}
-
unrealizedGainsMap.put(ticker, unrealizedGains);
}
}
- private class OrderTuple {
+ private final class OrderTuple {
private int shares;
private double cost;
private Date date;
@@ -224,33 +224,49 @@ public class ProfitCalculation {
}
private double getCurrentPrice(String ticker) {
- String PRICE_URL = BASE_URL + "/last/stocks/" + ticker;
+ if (currentStockPrices.containsKey(ticker)) {
+ return currentStockPrices.get(ticker);
+ } else {
+ String PRICE_URL = BASE_URL + "/last/stocks/" + ticker;
+
+ HttpClient client = HttpClient.newHttpClient();
+ HttpRequest request = HttpRequest.newBuilder()
+ .uri(URI.create(PRICE_URL)).setHeader("APCA-API-KEY-ID", API_KEY)
+ .setHeader("APCA-API-SECRET-KEY", SECRET_KEY)
+ .build();
+
+ HttpResponse<String> response = null;
+ try {
+ response = client.send(request,
+ HttpResponse.BodyHandlers.ofString());
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
- HttpClient client = HttpClient.newHttpClient();
- HttpRequest request = HttpRequest.newBuilder()
- .uri(URI.create(PRICE_URL)).setHeader("APCA-API-KEY-ID", API_KEY)
- .setHeader("APCA-API-SECRET-KEY", SECRET_KEY)
- .build();
- HttpResponse<String> response = null;
- try {
- response = client.send(request,
- HttpResponse.BodyHandlers.ofString());
- } catch (IOException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
+ JSONObject object = new JSONObject(response.body());
+ try {
+ double price = object.getJSONObject("last").getDouble("price");
+ currentStockPrices.put(ticker, price);
+ return price;
+ } catch (JSONException e) {
+ currentStockPrices.put(ticker, -1.0);
+ return -1.0;
+ }
}
- JSONObject object = new JSONObject(response.body());
- return object.getJSONObject("last").getDouble("price");
}
- public void calculateGains() {
- organizeOrders();
- getRealizedGains();
- getUnrealizedGains();
+ public double calculateGains() {
+ if (!tablesFilled) {
+ organizeOrders();
+ getRealizedGains();
+ getUnrealizedGains();
+ tablesFilled = true;
+ }
double realizedGains = 0;
double unrealizedGains = 0;
@@ -261,21 +277,42 @@ public class ProfitCalculation {
for (double value : unrealizedGainsMap.values()) {
unrealizedGains += value;
}
+ return unrealizedGains + realizedGains;
+ }
+
+ public List<StockHolding> getHoldingsList() {
+ if (!tablesFilled) {
+ organizeOrders();
+ getRealizedGains();
+ getUnrealizedGains();
+ tablesFilled = true;
+ }
+
+ List<StockHolding> holdings = new LinkedList<>();
- double totalGains = unrealizedGains + realizedGains;
+ for (String key : buyHistoryMap.keySet()) {
+ double realizedGains = 0;
+ double unrealizedGains = 0;
+ if (unrealizedGainsMap.containsKey(key)) {
+ unrealizedGains = unrealizedGainsMap.get(key);
+ }
+ if (realizedGainsMap.containsKey(key)) {
+ realizedGains = realizedGainsMap.get(key);
+ }
- System.out.println("Money In: " + moneyInput);
- System.out.println("Money Out: " + (moneyInput + totalGains));
- System.out.println("NASDAQ on money In: " + (moneyInput * compareToSP500()));
- System.out.println(
- "Total: " + totalGains + "| unrealized: " + unrealizedGains + " | realized: " +
- realizedGains);
+ int shares = 0;
+ for (OrderTuple order : buyHistoryMap.get(key)) {
+ shares += order.getShares();
+ }
+ holdings.add(new StockHolding(key, realizedGains, unrealizedGains, shares));
+ }
+ return holdings;
}
/**
* return percent change in SPY (SP 500) over the time period.
*/
- private double compareToSP500() {
+ public double compareToSP500() {
String url = "https://data.alpaca.markets/v1/bars/"
+ "day?"
+ "symbols=SPY"
@@ -305,8 +342,41 @@ public class ProfitCalculation {
double endPrice = object.getJSONObject(object.length() - 1).getDouble("c");
//get percent change
//end - start /start
- return 1 + ((endPrice - startPrice) /startPrice);
+ return ((endPrice - startPrice) / startPrice);
+
+ }
+
+ /**
+ * get a map for all people in the timeframe of holder_id to percent gain.
+ *
+ * @return a map of holder_id to percent gain
+ */
+ public Map<Integer, Double> getProfitMap() {
+ Map<Integer, Double> profitMap = new HashMap<>();
+ try {
+ PreparedStatement prep;
+ prep =
+ conn.prepareStatement("SELECT * from trades group by holder_name;");
+ ResultSet rs = prep.executeQuery();
+ while (rs.next()) {
+ int id = rs.getInt("holder_id");
+ this.person = rs.getString("holder_name");
+ if (moneyInput == 0) {
+ profitMap.put(id, 0.0);
+ } else {
+ profitMap.put(id, this.calculateGains() / moneyInput);
+ }
+
+ }
+ } catch (SQLException throwables) {
+ System.out.println("ERROR: SQl error in profit calculation");
+ }
+ System.out.println(profitMap.toString());
+ return profitMap;
+ }
+ public double getMoneyInput() {
+ return this.moneyInput;
}
public void setConnection(String filename) throws SQLException, ClassNotFoundException {
diff --git a/src/main/java/edu/brown/cs/student/term/profit/StockHolding.java b/src/main/java/edu/brown/cs/student/term/profit/StockHolding.java
new file mode 100644
index 0000000..e2b174c
--- /dev/null
+++ b/src/main/java/edu/brown/cs/student/term/profit/StockHolding.java
@@ -0,0 +1,16 @@
+package edu.brown.cs.student.term.profit;
+
+public class StockHolding {
+ private String ticker;
+ private Double realizedGain;
+ private Double unrealizedGain;
+ private int shares;
+
+ public StockHolding(String ticker, Double realizedGain, Double unrealizedGain, int shares) {
+ this.ticker = ticker;
+ this.realizedGain = realizedGain;
+ this.unrealizedGain = unrealizedGain;
+ this.shares = shares;
+ }
+
+} \ No newline at end of file
diff --git a/src/main/java/edu/brown/cs/student/term/repl/Command.java b/src/main/java/edu/brown/cs/student/term/repl/Command.java
index 056c7df..b110644 100644
--- a/src/main/java/edu/brown/cs/student/term/repl/Command.java
+++ b/src/main/java/edu/brown/cs/student/term/repl/Command.java
@@ -1,13 +1,13 @@
package edu.brown.cs.student.term.repl;
/**
- * Interface implemented by all five StarsCommand commands.
- * Implemented by StarsCommand, NaiveNeighbors, NaiveRadiusCommand, RadiusCommand, NeighborsCommand
+ * Interface implemented by all the commands that the REPL is responsible for
*/
public interface Command {
/**
- * Main run method for every command.
- * @param args arguments for the command
+ * The function that the command calls when run from the REPL
+ * @param args - the arguments for the command
+ * @return a string representation of the output, or error message
*/
String run(String[] args);
}
diff --git a/src/main/java/edu/brown/cs/student/term/repl/REPL.java b/src/main/java/edu/brown/cs/student/term/repl/REPL.java
index a1d5c23..5381d45 100644
--- a/src/main/java/edu/brown/cs/student/term/repl/REPL.java
+++ b/src/main/java/edu/brown/cs/student/term/repl/REPL.java
@@ -16,6 +16,7 @@ public class REPL {
/**
* Constructor for a REPL object.
+ * @param userCommands - map of string to Command object for REPL to run
*/
public REPL(HashMap<String, Command> userCommands) {
commands = userCommands;
diff --git a/src/main/java/edu/brown/cs/student/term/repl/commands/SetupCommand.java b/src/main/java/edu/brown/cs/student/term/repl/commands/SetupCommand.java
index e19117c..a6ef1f0 100644
--- a/src/main/java/edu/brown/cs/student/term/repl/commands/SetupCommand.java
+++ b/src/main/java/edu/brown/cs/student/term/repl/commands/SetupCommand.java
@@ -34,34 +34,6 @@ public class SetupCommand implements Command {
System.out.println(error);
return error;
}
-
- try{
- /** Just for testing purposes **/
- //12 am on 3/12 in UTC
- Instant start = Instant.parse("2021-03-12T05:00:00.00Z");
- //12 am on 3/27 in UTC
- Instant end = Instant.parse("2021-03-27T05:00:00.00Z");
-
- System.out.println(end.toEpochMilli());
- System.out.println(start.getEpochSecond());
-
- ZonedDateTime zdt = ZonedDateTime.ofInstant(start, ZoneId.of("America/New_York"));
- System.out.println(zdt.toString());
- List<List<Trade>> trades = dq.getAllTradesByStock(start, end);
-
- int sum = 0;
- for(List<Trade> t: trades){
- System.out.println(t);
- sum += t.size();
- }
-
- System.out.println("num of trades: " + sum);
-
-
- } catch(Exception e){
- e.printStackTrace();
- }
-
return error;
}
diff --git a/src/test/java/edu/brown/cs/student/DBQuerierTest.java b/src/test/java/edu/brown/cs/student/DBQuerierTest.java
index d813969..b3ea140 100644
--- a/src/test/java/edu/brown/cs/student/DBQuerierTest.java
+++ b/src/test/java/edu/brown/cs/student/DBQuerierTest.java
@@ -1,21 +1,18 @@
package edu.brown.cs.student;
-import java.io.PrintStream;
-import java.sql.SQLException;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
import edu.brown.cs.student.term.DatabaseQuerier;
-import edu.brown.cs.student.term.repl.commands.SetupCommand;
import edu.brown.cs.student.term.trade.Trade;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
-//TODO: Write more tests for methods besides stock by name
public class DBQuerierTest {
/** these should span the entire mock dataset */
@@ -35,12 +32,6 @@ public class DBQuerierTest {
}
}
- /*
- * try{
-
- } catch(Exception e) {
- System.out.println("Error in test");
- }*/
@After
public void tearDown() {
@@ -50,34 +41,114 @@ public class DBQuerierTest {
@Test
public void testNonExistentStock(){
setUp();
+ List<Trade> fakeStockList = new ArrayList<>();
+ try{
+ fakeStockList = db.getTradeByStock("NONO", 1, start, end);
+ } catch(Exception e) {
+ System.out.println("Error in test");
+ }
+ assertTrue(fakeStockList.isEmpty());
+ tearDown();
+ }
+
+ @Test
+ public void testEmptyDatabase(){
try{
- List<Trade> fakeStockList = db.getTradeByStock("NONO", 1, start, end);
- assertTrue(fakeStockList.isEmpty());
+ db = new DatabaseQuerier("data/empty.sqlite3");
+ } catch(Exception e){
+ System.out.println("DBQuerier Test, couldn't connect to db???");
+ }
+
+ List<Trade> gmeBadDatesList = new ArrayList<>();
+ List<String> noStocks = new ArrayList<>();
+ List<List<Trade>> noTrades = new ArrayList<>();
+ try {
+ gmeBadDatesList = db.getTradeByStock("GME", 1, start, end);
+ noStocks = db.getRecentStocks(start, end);
+ noTrades = db.getAllTradesByStock(start, end);
+ } catch (Exception e){
+ System.out.println("ERROR: in test");
+ }
+ assertTrue(gmeBadDatesList.isEmpty());
+ assertTrue(noStocks.isEmpty());
+ assertTrue(noTrades.isEmpty());
+ tearDown();
+ }
+
+ @Test
+ public void testEmptyStringStock(){
+ setUp();
+ List<Trade> fakeStockList = new ArrayList<>();
+ try{
+ fakeStockList = db.getTradeByStock("", 1, start, end);
} catch(Exception e) {
System.out.println("Error in test");
}
+ assertTrue(fakeStockList.isEmpty());
tearDown();
}
@Test
- public void testFlippedDates(){
+ public void testNeitherIsBuyOrSell(){
setUp();
+ List<Trade> fakeStockList = new ArrayList<>();
try{
- List<Trade> gmeBadDatesList = db.getTradeByStock("GME", 1, end, start);
- assertTrue(gmeBadDatesList.isEmpty());
+ fakeStockList = db.getTradeByStock("GME", 3, start, end);
+ } catch(Exception e) {
+ System.out.println("Error in test");
+ }
+ assertTrue(fakeStockList.isEmpty());
+ tearDown();
+ }
+ @Test
+ public void testIsSell(){
+ setUp();
+ List<Trade> sellGMEList = new ArrayList<>();
+ try{
+ sellGMEList = db.getTradeByStock("GME", 0, start, end);
} catch(Exception e) {
System.out.println("Error in test");
}
+ assertEquals(7, sellGMEList.size());
+ for(Trade t: sellGMEList){
+ assertFalse(t.isBuy());
+ }
+ tearDown();
+ }
+
+
+ @Test
+ public void testFlippedDates(){
+ setUp();
+ List<Trade> gmeBadDatesList = new ArrayList<>();
+ List<String> noStocks = new ArrayList<>();
+ List<List<Trade>> noTrades = new ArrayList<>();
+ try{
+ gmeBadDatesList = db.getTradeByStock("GME", 1, end, start);
+ noStocks = db.getRecentStocks(end, start);
+ noTrades = db.getAllTradesByStock(end, start);
+ } catch(Exception e) {
+ System.out.println("Error in test");
+ }
+ assertTrue(gmeBadDatesList.isEmpty());
+ assertTrue(noStocks.isEmpty());
+ assertTrue(noTrades.isEmpty());
tearDown();
}
@Test
public void testTradeByStockNameBuy(){
setUp();
+ List<Trade> gmeBuyList = new ArrayList<>();
+ List<Trade> teslaBuyList = new ArrayList<>();
try{
- List<Trade> gmeBuyList = db.getTradeByStock("GME", 1, start, end);
+ gmeBuyList = db.getTradeByStock("GME", 1, start, end);
+ teslaBuyList = db.getTradeByStock("TSLA", 1, start, end);
+ } catch(Exception e) {
+ System.out.println("Error in testTradeByStockName");
+ }
System.out.println(gmeBuyList);
assertEquals(gmeBuyList.size(), 6);
assertEquals(gmeBuyList.get(0).getId(), 482);
@@ -85,16 +156,12 @@ public class DBQuerierTest {
assertEquals(gmeBuyList.get(4).getId(), 275);
assertEquals(gmeBuyList.get(5).getId(), 30);
-
- List<Trade> teslaBuyList = db.getTradeByStock("TSLA", 1, start, end);
assertEquals(teslaBuyList.size(), 16);
assertEquals(teslaBuyList.get(0).getId(), 328);
assertEquals(teslaBuyList.get(7).getId(), 241);
assertEquals(teslaBuyList.get(15).getId(), 774);
- } catch(Exception e) {
- System.out.println("Error in testTradeByStockName");
- }
+
tearDown();
}
@@ -103,20 +170,60 @@ public class DBQuerierTest {
public void testTradeByNameOrdering(){
setUp();
+ List<Trade> gmeSellList = new ArrayList<>();
+ List<Trade> amznBuyList = new ArrayList<>();
try{
- List<Trade> gmeSellList = db.getTradeByStock("GME", 0, start, end);
- for(int i = 1; i < gmeSellList.size(); i++){
- assertTrue(gmeSellList.get(i-1).getTimestamp() < gmeSellList.get(i).getTimestamp());
- }
+ gmeSellList = db.getTradeByStock("GME", 0, start, end);
+ amznBuyList = db.getTradeByStock("AMZN", 1, start, end);
+ } catch(Exception e) {
+ System.out.println("Error in test");
+ }
- List<Trade> amznBuyList = db.getTradeByStock("AMZN", 1, start, end);
- for(int i = 1; i < amznBuyList.size(); i++){
- assertTrue(amznBuyList.get(i-1).getTimestamp() < amznBuyList.get(i).getTimestamp());
- }
+ for(int i = 1; i < gmeSellList.size(); i++){
+ assertTrue(gmeSellList.get(i-1).getTimestamp() < gmeSellList.get(i).getTimestamp());
+ }
- } catch(Exception e) {
+
+ for(int i = 1; i < amznBuyList.size(); i++){
+ assertTrue(amznBuyList.get(i-1).getTimestamp() < amznBuyList.get(i).getTimestamp());
+ }
+ tearDown();
+ }
+
+ @Test
+ public void testGetRecentStocks(){
+ setUp();
+ List<String> stockNames = new ArrayList<>();
+ try {
+ stockNames = db.getRecentStocks(start, end);
+ }catch(Exception e){
System.out.println("Error in test");
}
+ assertEquals(50, stockNames.size());
tearDown();
}
+
+ @Test
+ public void testGetAllTradesByStock(){
+ setUp();
+ List<List<Trade>> trades = new ArrayList<>();
+ try {
+ trades = db.getAllTradesByStock(start, end);
+ }catch(Exception e){
+ System.out.println("Error in test");
+ }
+
+ assertEquals(100, trades.size());
+
+ for(List<Trade> tList: trades){
+ Trade first = tList.get(0);
+ for(Trade t: tList){
+ //all things in each list should be for the same stock and same isBuy type
+ assertEquals(first.isBuy(), t.isBuy());
+ assertEquals(first.getStock(), t.getStock());
+ }
+ }
+ tearDown();
+ }
+
}
diff --git a/src/test/java/edu/brown/cs/student/HubRankTest.java b/src/test/java/edu/brown/cs/student/HubRankTest.java
index 9ba0987..cbe6112 100644
--- a/src/test/java/edu/brown/cs/student/HubRankTest.java
+++ b/src/test/java/edu/brown/cs/student/HubRankTest.java
@@ -7,9 +7,12 @@ import edu.brown.cs.student.term.hub.LinkMapper;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.time.Instant;
import java.util.Map;
+import java.util.Set;
public class HubRankTest {
@@ -30,25 +33,66 @@ public class HubRankTest {
}
}
- /*
- * try{
-
- } catch(Exception e) {
- System.out.println("Error in test");
- }*/
-
@After
public void tearDown() {
db = null;
}
@Test
- public void testMapper(){
+ public void testEmptyDB(){
+ try{
+ db = new DatabaseQuerier("data/empty.sqlite3");
+ } catch(Exception e){
+ System.out.println("DBQuerier Test, couldn't connect to db???");
+ }
+ LinkMapper lm = new LinkMapper(db);
+ HubSearch hub = new HubSearch(lm);
+ Map<Holder, Double> hubRanks = hub.runHubSearch(start, end);
+ assertTrue(hubRanks.isEmpty());
+ tearDown();
+ }
+
+ @Test
+ public void flippedDates(){
+ setUp();
+ LinkMapper lm = new LinkMapper(db);
+ HubSearch hub = new HubSearch(lm);
+ Map<Holder, Double> hubRanks = hub.runHubSearch(end, start);
+ assertTrue(hubRanks.isEmpty());
+ tearDown();
+
+ }
+
+ @Test
+ public void testHubRankSmall(){
setUp();
LinkMapper lm = new LinkMapper(db);
- lm.makeFollowerLinks(start, end);
HubSearch hub = new HubSearch(lm);
- Map<Holder, Double> him = hub.runHubSearch(start, end);
- System.out.println(him);
+ Map<Holder, Double> hubRanks = hub.runHubSearch(start, end);
+ assertEquals(6, hubRanks.size());
+ tearDown();
+ }
+
+ @Test
+ public void testCheckRightValues(){
+ setUp();
+ LinkMapper lm = new LinkMapper(db);
+ HubSearch hub = new HubSearch(lm);
+ Map<Holder, Double> hubRanks = hub.runHubSearch(start, end);
+ Holder don = new Holder(1, "Don");
+ Holder mitch = new Holder(2, "Mitch");
+ Holder nancy = new Holder(3, "Nancy");
+ Holder midge = new Holder(4, "Midge");
+ Holder bob = new Holder(5, "Bob");
+ Holder jane = new Holder(6, "Jane");
+
+ System.out.println(hubRanks);
+ assertTrue(hubRanks.get(mitch) > hubRanks.get(don));
+ assertTrue(hubRanks.get(don) > hubRanks.get(bob));
+ assertTrue(hubRanks.get(bob) > hubRanks.get(nancy));
+ assertTrue(hubRanks.get(nancy)> hubRanks.get(jane));
+ assertTrue(hubRanks.get(nancy) > hubRanks.get(midge));
+
+ tearDown();
}
}
diff --git a/src/test/java/edu/brown/cs/student/LinkMapperTest.java b/src/test/java/edu/brown/cs/student/LinkMapperTest.java
index 2683b90..3d4bedc 100644
--- a/src/test/java/edu/brown/cs/student/LinkMapperTest.java
+++ b/src/test/java/edu/brown/cs/student/LinkMapperTest.java
@@ -10,6 +10,10 @@ import org.junit.Test;
import java.time.Instant;
import java.util.Map;
+import java.util.Set;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class LinkMapperTest {
@@ -30,26 +34,57 @@ public class LinkMapperTest {
}
}
- /*
- * try{
-
- } catch(Exception e) {
- System.out.println("Error in test");
- }*/
-
@After
public void tearDown() {
db = null;
}
@Test
- public void testMapper(){
+ public void testBasicMapper(){
+ setUp();
+ LinkMapper lm = new LinkMapper(db);
+ Map<Holder, Set<Holder>> linkMap = lm.makeFollowerLinks(start, end);
+ //should be one for each person in little mock (6)
+ assertEquals(6, linkMap.keySet().size());
+
+ for(Holder h: linkMap.keySet()){
+ //didn't follow anyone elses trades
+ if(h.getName().equals("Don") || h.getName().equals("Jane")){
+ assertTrue(linkMap.get(h).isEmpty());
+ //biggest follower
+ } else if(h.getName().equals("Midge")){
+ assertEquals(4, linkMap.get(h).size());
+ } else if(h.getName().equals("Nancy") || h.getName().equals("Mitch")){
+ assertEquals(2, linkMap.get(h).size());
+ } else {
+ //should be Bob, only followed Mitch
+ assertEquals(1, linkMap.get(h).size());
+ }
+ }
+ tearDown();
+ }
+
+ @Test
+ public void testBadDate(){
setUp();
LinkMapper lm = new LinkMapper(db);
- lm.makeFollowerLinks(start, end);
- HubSearch hub = new HubSearch(lm);
- Map<Holder, Double> him = hub.runHubSearch(start, end);
- System.out.println(him);
+ Map<Holder, Set<Holder>> linkMap = lm.makeFollowerLinks(end, start);
+ assertTrue(linkMap.isEmpty());
+ tearDown();
+ }
+
+ @Test
+ public void testEmptyDB(){
+ try{
+ db = new DatabaseQuerier("data/empty.sqlite3");
+ } catch(Exception e){
+ System.out.println("DBQuerier Test, couldn't connect to db???");
+ }
+ LinkMapper lm = new LinkMapper(db);
+ Map<Holder, Set<Holder>> linkMap = lm.makeFollowerLinks(start, end);
+ //should be one for each person in little mock (6)
+ assertTrue(linkMap.isEmpty());
+
}
}
diff --git a/src/test/java/edu/brown/cs/student/SuspicionRankerTest.java b/src/test/java/edu/brown/cs/student/SuspicionRankerTest.java
new file mode 100644
index 0000000..d641507
--- /dev/null
+++ b/src/test/java/edu/brown/cs/student/SuspicionRankerTest.java
@@ -0,0 +1,52 @@
+package edu.brown.cs.student;
+
+import edu.brown.cs.student.term.DatabaseQuerier;
+import edu.brown.cs.student.term.hub.Holder;
+import edu.brown.cs.student.term.hub.HubSearch;
+import edu.brown.cs.student.term.hub.LinkMapper;
+import edu.brown.cs.student.term.hub.SuspicionRanker;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+
+public class SuspicionRankerTest {
+
+ //12 am on 3/11 in UTC
+ //private Instant start = Instant.parse("2021-03-11T05:00:00.00Z");
+ private Instant start = Instant.ofEpochMilli(161800418000L);
+ //12 am on 3/28 in UTC
+ //private Instant end = Instant.parse("2021-03-28T05:00:00.00Z");
+ private Instant end = Instant.ofEpochMilli(1618019436000L);
+
+ private DatabaseQuerier db;
+
+ @Before
+ public void setUp() {
+ try{
+ db = new DatabaseQuerier("data/trades.sqlite3");
+ } catch(Exception e){
+ System.out.println("DBQuerier Test, couldn't connect to db???");
+ }
+ }
+
+ @After
+ public void tearDown() {
+ db = null;
+ }
+
+ @Test
+ public void testMapper(){
+ setUp();
+ SuspicionRanker r = new SuspicionRanker(db);
+ List<Holder> him = r.getSuspicionScoreList(start, end);
+ //System.out.println(him);
+ for(Holder guy: him){
+ System.out.println(guy.getName() + " " + guy.getSuspicionScore());
+ }
+ tearDown();
+ }
+}