From 8e76bf15c53c540a72a273ec560a624dfb7e11df Mon Sep 17 00:00:00 2001 From: clarkohw Date: Mon, 19 Apr 2021 02:59:57 -0400 Subject: efficiency for profit calc + tests --- tatus | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 tatus (limited to 'tatus') diff --git a/tatus b/tatus new file mode 100644 index 0000000..29e3798 --- /dev/null +++ b/tatus @@ -0,0 +1,52 @@ +diff --git a/data/mock_tradeClarks.sqlite3 b/data/mock_tradeClarks.sqlite3 +index 980c539..e816ee8 100644 +Binary files a/data/mock_tradeClarks.sqlite3 and b/data/mock_tradeClarks.sqlite3 differ +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 31bf7a3..c4a7814 100644 +--- a/src/main/java/edu/brown/cs/student/term/Main.java ++++ b/src/main/java/edu/brown/cs/student/term/Main.java +@@ -47,12 +47,21 @@ public final class Main { + //do a gui type thing + //runSparkServer((int) options.valueOf("port")); + } +-  +- HashMap commandHashMap = new HashMap<>(); +- commandHashMap.put("setup", new SetupCommand()); +- /** add commands to map here! */ +- REPL repl = new REPL(commandHashMap); +- repl.runREPL(); ++ ++ ProfitCalculation person = new ProfitCalculation(null, "Vincent", new Date(1515629591000L), new Date(1715507898000L)); ++ try { ++ person.setConnection("./data/mock_tradeClarks.sqlite3"); ++ } catch(Exception e) { ++ e.printStackTrace(); ++ } ++ ++ person.calculateGains(); ++ ++// HashMap commandHashMap = new HashMap<>(); ++// commandHashMap.put("setup", new SetupCommand()); ++// /** add commands to map here! */ ++// REPL repl = new REPL(commandHashMap); ++// repl.runREPL(); + } +  +  +diff --git a/src/main/java/edu/brown/cs/student/term/ProfitCalculation.java b/src/main/java/edu/brown/cs/student/term/ProfitCalculation.java +index aa1bc09..94f87f7 100644 +--- a/src/main/java/edu/brown/cs/student/term/ProfitCalculation.java ++++ b/src/main/java/edu/brown/cs/student/term/ProfitCalculation.java +@@ -265,10 +265,10 @@ public class ProfitCalculation { + double totalGains = unrealizedGains + realizedGains; +  + System.out.println("Money In: " + moneyInput); ++ System.out.println("SP500 on money In: " + (moneyInput * compareToSP500())); + System.out.println("Money Out: " + (moneyInput + totalGains)); +- System.out.println("NASDAQ on money In: " + (moneyInput * compareToSP500())); + System.out.println( +- "Total: " + totalGains + "| unrealized: " + unrealizedGains + " | realized: " + ++ "Total gain: " + totalGains + "| unrealized: " + unrealizedGains + " | realized: " + + realizedGains); + } +  -- cgit v1.2.3-70-g09d2