move table writing functions into Table

Author: epezent

examples/CMakeLists.txt

@@ -4,7 +4,7 @@ mel_example(tcp)
 mel_example(udp)
 mel_example(melnet)
 mel_example(ctrl_c_handling)
-mel_example(datalog)
+mel_example(table)
 mel_example(filter)
 mel_example(options)
 mel_example(pid)

examples/ex_datalog.cpp renamed to examples/ex_table.cpp

@@ -26,49 +26,23 @@ using namespace mel;
 
 int main() {
 
-    //=========================================================================
-    // Basic data logging
-   //=========================================================================
-
-    // instantiate logger
-    DataLogger logger;
-    // set headers
-    logger.set_header({"ColumnA", "ColumnB", "ColumnC", "ColumnD"});
-    // generate data
-    for (std::size_t i = 0; i < 100; ++i) {
-       std::vector<double> row{1.0*i, 2.0*i, 3.0*i, 4.0*i};
-       logger.buffer(row);
-    }
-    // save data to C:\data
-    logger.save_data("datalogger_data.csv", ".", false);
-    // wait for file to be saved
-    sleep(seconds(1));
-    // read back data with row and column offsets
-    std::vector<std::vector<double>> data_read;
-    DataLogger::read_from_csv(data_read, 1, 2, "datalogger_data.csv", ".");
-    for (auto& row : data_read)
-        print(row);
-
-    //=========================================================================
-    // Advanced data logging with Tables
-    //=========================================================================
-
-    std::string filename = "table_data.csv";
+    std::string filename = "table_data.tbl";
     Table tab("my_table", { "col 0", "col 1", "col 2" });
     tab.push_back_row({ 1.01, 2.02, 3.03 });
     tab.push_back_row({ 4.04, 5.05, 6.06 });
 
     std::vector<Table> tabs(3);
     tabs[0] = tab;
     tabs[1] = tab;
-    tabs[2].set_col_names({ "col A", "col B" });
+    tabs[2].rename("my_table2");
+    tabs[2].set_col_names({ "COL A", "COL B" });
     tabs[2].set_values({ {0.03256, -0.23535}, {8, 9}, {-1000, -5000} });
 
-    DataLogger::write_to_csv(tabs, filename, ".", false);
+    Table::write(filename, tabs);
 
     Table new_tab;
     std::vector<Table> new_tabs;
-    if (DataLogger::read_from_csv(new_tabs, filename, ".")) {
+    if (Table::read(filename, new_tabs)) {
         //std::cout << new_tab << std::endl;
         for (std::size_t i = 0; i < new_tabs.size(); ++i) {
             std::cout << new_tabs[i];

include/MEL/Logging/DataLogger.hpp

@@ -42,37 +42,6 @@ enum class DataFormat {
 //==============================================================================
 
 class DataLogger {
-public:
-
-	/// Write a vector of strings to a file
-	static bool write_to_csv(const std::vector<std::string> &header, const std::string &filename, const std::string& directory = ".", bool timestamp = true);
-
-	/// Write a vector of vectors to a file
-	static bool write_to_csv(const std::vector<std::vector<double>> &data, const std::string &filename, const std::string& directory = ".", bool timestamp = true);
-
-	/// Write a Table to a file
-	static bool write_to_csv(const Table &data, const std::string &filename = "", const std::string& directory = ".", bool timestamp = true);
-
-	/// Write a vector of Tables to a file
-	static bool write_to_csv(const std::vector<Table> &data, const std::string &filename = "", const std::string& directory = ".", bool timestamp = true);
-
-	/// Read a vector of vectors from a file
-	static bool read_from_csv(std::vector<std::vector<double>> &data_out, const std::string &filename, const std::string& directory = ".");
-
-    /// Read a vector of vectors from a file with a row and column offset
-    static bool read_from_csv(std::vector<std::vector<double>>& data_out, std::size_t row_offset, std::size_t col_offset, const std::string &filename, const std::string& directory = ".");
-
-	/// Read a Table from a file
-	static bool read_from_csv(Table &data, const std::string &filename, const std::string& directory = ".");
-
-	/// Read a vector of Tables from a file
-	static bool read_from_csv(std::vector<Table> &data, const std::string &filename, const std::string& directory = ".");
-
-	static std::string make_csv_header(const Table &table);
-
-	static bool parse_csv_header(Table &table, const std::string &header);
-
-
 public:
     /// Constructor.
     DataLogger(WriterType writer_type = WriterType::Buffered,

include/MEL/Logging/Table.hpp

@@ -100,10 +100,30 @@ class Table {
 	/// Overload the << stream operator with a Table as the rhs argument
 	friend std::ostream& operator<<(std::ostream& os, const Table& table);
 
+public:
+
+	/// Write a Table to a file
+	static bool write(const std::string &filepath, const Table &data_in);
+
+	/// Write a vector of Tables to a file
+	static bool write(const std::string &filepath, const std::vector<Table> &data_in);
+
+	/// Read a Table from a file
+	static bool read(const std::string &filepath, Table &data_out);
+
+	/// Read a vector of Tables from a file
+	static bool read(const std::string &filepath, std::vector<Table> &data_out);
+
 private:
 
 	bool check_inner_dim(const std::vector<std::vector<double>> &values, std::size_t row_size) const;
 
+private:
+
+	static std::string make_header(const Table &table);
+
+	static bool parse_header(Table &table, const std::string &header);
+
 private:
 	std::string name_;
 

src/MEL/Logging/Csv.cpp

@@ -3,9 +3,7 @@
 #include <thread>
 
 namespace mel
-{
-
-    
+{    
 
 Csv::Csv() : File() {}