tatus


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52

[1mdiff --git a/data/mock_tradeClarks.sqlite3 b/data/mock_tradeClarks.sqlite3[m
[1mindex 980c539..e816ee8 100644[m
Binary files a/data/mock_tradeClarks.sqlite3 and b/data/mock_tradeClarks.sqlite3 differ
[1mdiff --git a/src/main/java/edu/brown/cs/student/term/Main.java b/src/main/java/edu/brown/cs/student/term/Main.java[m
[1mindex 31bf7a3..c4a7814 100644[m
[1m--- a/src/main/java/edu/brown/cs/student/term/Main.java[m
[1m+++ b/src/main/java/edu/brown/cs/student/term/Main.java[m
[36m@@ -47,12 +47,21 @@[m [mpublic final class Main {[m
       //do a gui type thing[m
       //runSparkServer((int) options.valueOf("port"));[m
     }[m
[31m-    [m
[31m-    HashMap<String, Command> commandHashMap = new HashMap<>();[m
[31m-    commandHashMap.put("setup", new SetupCommand());[m
[31m-    /** add commands to map here! */[m
[31m-    REPL repl = new REPL(commandHashMap);[m
[31m-    repl.runREPL();[m
[32m+[m
[32m+[m[32m    ProfitCalculation person = new ProfitCalculation(null, "Vincent", new Date(1515629591000L), new Date(1715507898000L));[m
[32m+[m[32m    try {[m
[32m+[m[32m      person.setConnection("./data/mock_tradeClarks.sqlite3");[m
[32m+[m[32m    } catch(Exception e) {[m
[32m+[m[32m      e.printStackTrace();[m
[32m+[m[32m    }[m
[32m+[m
[32m+[m[32m    person.calculateGains();[m
[32m+[m
[32m+[m[32m//    HashMap<String, Command> commandHashMap = new HashMap<>();[m
[32m+[m[32m//    commandHashMap.put("setup", new SetupCommand());[m
[32m+[m[32m//    /** add commands to map here! */[m
[32m+[m[32m//    REPL repl = new REPL(commandHashMap);[m
[32m+[m[32m//    repl.runREPL();[m
   }[m
 [m
 [m
[1mdiff --git a/src/main/java/edu/brown/cs/student/term/ProfitCalculation.java b/src/main/java/edu/brown/cs/student/term/ProfitCalculation.java[m
[1mindex aa1bc09..94f87f7 100644[m
[1m--- a/src/main/java/edu/brown/cs/student/term/ProfitCalculation.java[m
[1m+++ b/src/main/java/edu/brown/cs/student/term/ProfitCalculation.java[m
[36m@@ -265,10 +265,10 @@[m [mpublic class ProfitCalculation {[m
     double totalGains = unrealizedGains + realizedGains;[m
 [m
     System.out.println("Money In: " + moneyInput);[m
[32m+[m[32m    System.out.println("SP500 on money In: " + (moneyInput * compareToSP500()));[m
     System.out.println("Money Out: " + (moneyInput + totalGains));[m
[31m-    System.out.println("NASDAQ on money In: " + (moneyInput * compareToSP500()));[m
     System.out.println([m
[31m-        "Total: " + totalGains + "| unrealized: " + unrealizedGains + " | realized: " +[m
[32m+[m[32m        "Total gain: " + totalGains + "| unrealized: " + unrealizedGains + " | realized: " +[m
             realizedGains);[m
   }[m
 [m