From a7d5e99475de7268056a19fc2138639edc952969 Mon Sep 17 00:00:00 2001 From: Lev Date: Mon, 24 May 2021 14:35:12 -0500 Subject: [PATCH] Edit cleaned up code --- .../Topic 3/3.4.11/main.cpp | 46 +---------- .../Topic 3/3.4.11/merklerex | Bin 24756 -> 0 bytes .../Topic 3/3.4.11/test.cpp | 72 ------------------ 3 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 CM2005 Object Oriented Programming/Topic 3/3.4.11/merklerex delete mode 100644 CM2005 Object Oriented Programming/Topic 3/3.4.11/test.cpp diff --git a/CM2005 Object Oriented Programming/Topic 3/3.4.11/main.cpp b/CM2005 Object Oriented Programming/Topic 3/3.4.11/main.cpp index 8d3ac0c..364c0b4 100644 --- a/CM2005 Object Oriented Programming/Topic 3/3.4.11/main.cpp +++ b/CM2005 Object Oriented Programming/Topic 3/3.4.11/main.cpp @@ -9,48 +9,4 @@ int main() { MerkelMain app{}; app.init(); - - //CSVReader reader; - //CSVReader::readCSV("20200317.csv"); -} - - - - - - -// std::vector orders; - -// orders.push_back( OrderBookEntry{1000, -// 0.02, -// "2020/03/17 17:01:24.884492", -// "BTC/USDT", -// OrderBookType::bid} ); - -// orders.push_back( OrderBookEntry{2000, -// 0.02, -// "2020/03/17 17:01:24.884492", -// "BTC/USDT", -// OrderBookType::bid} ); - - -// // std::cout << "The price is " << orders[1].price << std::endl; - -// for (OrderBookEntry& order : orders) -// { -// std::cout << "The price is " << order.price << std::endl; -// } - -// for (unsigned int i = 0; i < orders.size() ; ++i) -// { -// std::cout << "The price is " << orders[i].price << std::endl; -// } - -// for (unsigned int i = 0; i < orders.size() ; ++i) -// { -// std::cout << "The price is " << orders.at(i).price << std::endl; -// } - - - - +} \ No newline at end of file diff --git a/CM2005 Object Oriented Programming/Topic 3/3.4.11/merklerex b/CM2005 Object Oriented Programming/Topic 3/3.4.11/merklerex deleted file mode 100644 index ec291e0d27ebb224df8e1c2a12353539b068f5aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24756 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 dmsF8ou&N@Ds;U}| -#include -#include -#include - -std::vector Tokenise(std::string csvLine, char separator) -{ - std::vector tokens; - signed int start, end; - std::string token; - start = csvLine.find_first_not_of(separator, 0); - do - { - end = csvLine.find_first_of(separator, start); - if(start == csvLine.length() || start == end) break; - if(end >= 0) - token = csvLine.substr(start, end - start); - else - token = csvLine.substr(start, csvLine.length() - start); - - tokens.push_back(token); - start = end + 1; - } while (end > 0); - return tokens; -} - -int main() -{ - std::string filename = "20200317.csv"; - std::string line; - std::ifstream csvFile{filename}; - - std::vector tokens; - - if(csvFile.is_open()) - { - std::cout << "File open" << std::endl; - while(std::getline(csvFile, line)) - { - std::cout << "Read line: " << line << std::endl; - tokens = Tokenise(line, ','); - if(tokens.size() != 5) //bad - { - std::cout << "Bad line" << std::endl; - continue; - } - double price{}; - double amount{}; - // We checked and we have 5 tokens - try - { - price = std::stod(tokens[3]); - amount = std::stod(tokens[4]); - std::cout << price << std::endl; - std::cout << amount << std::endl; - } - catch(std::exception& e) - { - //error reading file - std::cout << "ERROR" << std::endl; - } - break; // can be removed to read all lines in the csv - } - csvFile.close(); - } - else - { - std::cout << "Could not open file" << std::endl; - } - - return 0; -} \ No newline at end of file