Update exposed gotoNextTimeframe and overloaded enterAsk and enterBid

CM2005 Object Oriented Programming/Midterm/Merkelrex-TradingBot/MerkelMain.h

@@ -22,22 +22,26 @@ public:
     /** returns a vector of all bids orders for the current time */
     std::vector<OrderBookEntry> getCurrentBids();
 
-    void enterAsk();
+    /** matches bids and asks, proceeds to the next time frame */
+    void gotoNextTimeframe(bool silent);
+    void enterAsk(OrderBookEntry newAsk);
+    void enterBid(OrderBookEntry newBid);
 private:
     void printMenu();
     void printHelp();
     void printMarketStats();
-
+    void enterAsk();
     void enterBid();
     void printWallet();
-    void gotoNextTimeframe();
+    
     int getUserOption();
     void init(); // initialization function for user interaction
     void processUserOption(int userOption);
 
     std::string currentTime;
 
-    OrderBook orderBook{"20200317.csv"};
+    OrderBook orderBook{"../../../../111.csv"};
+    //OrderBook orderBook{"20200317.csv"};
     //OrderBook orderBook{"20200601.csv"};
     Wallet wallet;
 };