next parts and refactorization

Author: lizewskik

CMakeLists.txt

@@ -29,9 +29,11 @@ find_package(Boost 1.85 REQUIRED COMPONENTS
 
 set(SOURCES 
     src/main.cpp
+    src/application.cpp
     src/graphio.cpp
     src/graphfilebase.cpp
     src/graphfile.cpp
+    src/graphdata.cpp
     src/fileio.cpp
     src/filereader.cpp
     src/filewriter.cpp

include/application.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#ifndef APPLICATION_H
+#define APPLICATION_H
+
+#include "graphio.hpp"
+
+class Application {
+
+public:
+    static void run();
+};
+
+#endif //APPLICATION_H

include/filewriter.hpp

@@ -10,8 +10,10 @@ class FileWriter : public FileIO {
 private:
 
 public:
-    void create_directory(const std::string &parent_path, const std::string &directory_name);
-    void create_required_directories(const std::string& target_path);
+    void create_required_directories(const std::string& target_path) const;
+
+private:
+    void create_directory(const std::string &parent_path, const std::string &directory_name) const;
 };
 
 #endif //FILE_WRITER_H

include/graphdata.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#ifndef GRAPH_DATA_H
+#define GRAPH_DATA_H
+
+#include <armadillo>
+#include <string>
+
+class GraphData {
+
+private:
+    int nodes;
+    arma::umat amatrix;
+
+public:
+    GraphData() {};
+    GraphData(int nodes, arma::umat amatrix) : nodes(nodes), amatrix(amatrix) {};
+    void save_adjacency_matrix(const std::string target_path) const;
+
+    // getters
+    const int get_nodes() const;
+    const arma::umat get_amatrix() const;
+
+};
+
+#endif //GRAPH_DATA_H

include/graphio.hpp

@@ -1,12 +1,15 @@
 #pragma once
+#pragma warning(disable:4996)
 
 #ifndef GRAPH_IO_H
 #define GRAPH_IO_H
 
 #include <armadillo>
+#include <exception>
 #include "filereader.hpp"
 #include "filewriter.hpp"
 #include "graphfile.hpp"
+#include "graphdata.hpp"
 
 class GraphIO {
 
@@ -15,7 +18,13 @@ class GraphIO {
     FileWriter writer;
 
 public:
+    void do_preactions() const;
     void convert() const;
+
+private:
+	unsigned short read_word(FILE* in) const;
+    GraphData read_graph(FILE* in) const;
+    GraphData read_graph_file(FILE** in, std::string absolute_path) const;
 };
 
 #endif //GRAPH_IO_H

src/application.cpp

@@ -0,0 +1,8 @@
+#include "application.hpp"
+
+void Application::run()
+{
+    GraphIO graphio;
+    graphio.do_preactions();
+    graphio.convert();
+}

src/filewriter.cpp

@@ -1,6 +1,6 @@
 #include "filewriter.hpp"
 
-void FileWriter::create_directory(const std::string &parent_path, const std::string &directory_name)
+void FileWriter::create_directory(const std::string &parent_path, const std::string &directory_name) const
 {
         std::filesystem::path target_path(
         parent_path
@@ -15,7 +15,7 @@ void FileWriter::create_directory(const std::string &parent_path, const std::str
     std::filesystem::create_directories(target_path);
 }
 
-void FileWriter::create_required_directories(const std::string &target_path)
+void FileWriter::create_required_directories(const std::string &target_path) const
 {
     std::vector<std::string> bvg_vec {
 		"b03", "b03m", "b06", "b06m", "b09", "b09m"

src/graphdata.cpp

@@ -0,0 +1,16 @@
+#include "graphdata.hpp"
+
+void GraphData::save_adjacency_matrix(const std::string target_path) const
+{
+    this->amatrix.save(arma::csv_name(target_path));
+}
+
+const int GraphData::get_nodes() const
+{
+    return this->nodes;
+}
+
+const arma::umat GraphData::get_amatrix() const
+{
+    return this->amatrix;
+}

src/graphio.cpp

@@ -1,16 +1,82 @@
 #include "graphio.hpp"
 
+void GraphIO::do_preactions() const
+{
+    std::string target_path = this->reader.read_property(FileIO::CONFIG_DB_TARGET);
+    this->writer.create_required_directories(target_path);
+}
+
 void GraphIO::convert() const
 {
     std::string source_path = this->reader.read_property(FileIO::CONFIG_DB_SOURCE);
 
+    FILE* file_ptr;
+    GraphData graph;
+
     for (const auto& entry : std::filesystem::recursive_directory_iterator(source_path)) {
         if (std::filesystem::is_regular_file(entry.path())) {
 
             std::filesystem::path path = entry.path();
-            GraphFile gf(path);
+            GraphFile ginfo = GraphFile(path);
+
+            // read graph file
+            graph = read_graph_file(&file_ptr, ginfo.get_source_absolute());
+
+            // save graph adjacency matrix file
+            graph.save_adjacency_matrix(ginfo.get_target_absolute());
+
+            // TODO to implement
+            // log the success of the operation on console
+        }
+    }
+}
+
+unsigned short GraphIO::read_word(FILE *in) const
+{
+    unsigned char b1, b2;
+    b1 = getc(in);
+    b2 = getc(in);
+    return b1 | (b2 << 8);
+}
 
-            // rest of procedure
+GraphData GraphIO::read_graph(FILE *in) const
+{
+    int nodes;
+    int edges;
+    int target;
+    int i, j;
+
+    nodes = read_word(in);
+
+    arma::umat matrix(nodes, nodes, arma::fill::zeros);
+
+    for (i = 0; i < nodes; i++)
+    {
+        edges = read_word(in);
+
+        for (j = 0; j < edges; j++)
+        {
+            target = read_word(in);
+            matrix.at(i, target) = 1;
         }
     }
+
+    return GraphData(nodes, matrix);
+}
+
+GraphData GraphIO::read_graph_file(FILE **in, std::string absolute_path) const
+{
+    try {
+	    *in = fopen(absolute_path.c_str(), "rb"); // file is opening in read binary mode
+        if (in == NULL) {
+            throw std::runtime_error("file cannot be opened");
+        }
+        else {
+            return read_graph(*in);
+        }
+    }
+    catch (std::ifstream::failure e) {
+        std::cerr << "error during reading the file under path: " << absolute_path << std::endl;
+        throw std::runtime_error(e.what());
+    }
 }

src/main.cpp

@@ -1,10 +1,7 @@
-#include "graphio.hpp"
-
-#include <boost/algorithm/string.hpp>
+#include "application.hpp"
 
 int main() {
 
-    // temporary playground
-    GraphIO graphio;
-    graphio.convert();
+    Application::run();
+    return 0;
 }