Add changed the main.cpp and the Merkel.cpp to finilize integration

CM2005 Object Oriented Programming/Topic 3/3.4.11/OrderBookEntry.cpp

@@ -0,0 +1,31 @@
+#include "OrderBookEntry.h"
+
+OrderBookEntry::OrderBookEntry( double _price, 
+                        double _amount, 
+                        std::string _timestamp, 
+                        std::string _product, 
+                        OrderBookType _orderType)
+: price(_price), 
+  amount(_amount), 
+  timestamp(_timestamp),
+  product(_product), 
+  orderType(_orderType)
+{
+    
+}
+
+OrderBookType OrderBookEntry::stringToOrderBookType(std::string s)
+{
+  if(s == "ask")
+  {
+    return OrderBookType::ask;
+  }
+  else if(s == "bid")
+  {
+    return OrderBookType::bid;
+  }
+  else
+  {
+    return OrderBookType::unknown;
+  }
+}