1 files changed, 35 insertions, 34 deletions

diff --git a/src/main/java/edu/brown/cs/student/term/profit/ProfitCalculation.java b/src/main/java/edu/brown/cs/student/term/profit/ProfitCalculation.java
index 0fe35d9..b4bf708 100644
--- a/src/main/java/edu/brown/cs/student/term/profit/ProfitCalculation.java
+++ b/src/main/java/edu/brown/cs/student/term/profit/ProfitCalculation.java
@@ -110,13 +110,12 @@ public class ProfitCalculation {
           }
         } else {
           //ignore sell orders for which we do not have buys for
-          if (buyHistoryMap.containsKey(ticker)) {
-            if (sellHistoryMap.containsKey(ticker)) {
-              sellHistoryMap.get(ticker).addLast(order);
-            } else {
-              sellHistoryMap.put(ticker, oneElement);
-            }
+          if (sellHistoryMap.containsKey(ticker)) {
+            sellHistoryMap.get(ticker).addLast(order);
+          } else {
+            sellHistoryMap.put(ticker, oneElement);
           }
+
         }
 
       }
@@ -135,39 +134,41 @@ public class ProfitCalculation {
       LinkedList<OrderTuple> sells = sellHistoryMap.get(ticker);
       LinkedList<OrderTuple> buys = buyHistoryMap.get(ticker);
       double realizedGain = 0;
+      if (sells != null && buys != null) {
+        //process each sell order (unless all buy orders are "drained"
+        for (OrderTuple sell : sells) {
+          //stop if buys are empty, stop if buy happened after sell
+          if (buys.isEmpty()) {
+            break;
+          }
 
-      //process each sell order (unless all buy orders are "drained"
-      for (OrderTuple sell : sells) {
-        //stop if buys are empty, stop if buy happened after sell
-        if (buys.isEmpty()) {
-          break;
-        }
-
-        int sharesToSell = sell.getShares();
-
-        //sell off through list of buys
-        while (sharesToSell > 0 && !buys.isEmpty()) {
-          //dont sell from buys which didn't exist at the time.
-          if (sell.getDate().after(buys.getFirst().getDate())) {
-            OrderTuple buyBundle = buys.removeFirst();
-            int sharesAtBundlePrice;
-            //the buy has more shares than we want to sell
-            if (buyBundle.getShares() > sharesToSell) {
-              sharesAtBundlePrice = sharesToSell;
-              sharesToSell = 0;
-              //add back the holdings that were not sold
-              buyBundle.setShares(buyBundle.getShares() - sharesAtBundlePrice);
-              buys.addFirst(buyBundle);
+          int sharesToSell = sell.getShares();
+
+          //sell off through list of buys
+          while (sharesToSell > 0 && !buys.isEmpty()) {
+            //dont sell from buys which didn't exist at the time.
+            if (sell.getDate().after(buys.getFirst().getDate())
+                || sell.getDate().equals(buys.getFirst().getDate())) {
+              OrderTuple buyBundle = buys.removeFirst();
+              int sharesAtBundlePrice;
+              //the buy has more shares than we want to sell
+              if (buyBundle.getShares() > sharesToSell) {
+                sharesAtBundlePrice = sharesToSell;
+                sharesToSell = 0;
+                //add back the holdings that were not sold
+                buyBundle.setShares(buyBundle.getShares() - sharesAtBundlePrice);
+                buys.addFirst(buyBundle);
+              } else {
+                sharesToSell -= buyBundle.getShares();
+                sharesAtBundlePrice = buyBundle.getShares();
+              }
+              realizedGain += sharesAtBundlePrice * (sell.getCost() - buyBundle.getCost());
             } else {
-              sharesToSell -= buyBundle.getShares();
-              sharesAtBundlePrice = buyBundle.getShares();
+              break;
             }
-            realizedGain += sharesAtBundlePrice * (sell.getCost() - buyBundle.getCost());
-          } else {
-            break;
-          }
 
 
+          }
         }
       }