refactorization work part 3

Author: lizewskik

include/graphconverter.hpp

@@ -24,7 +24,6 @@ class GraphConverter
     GReader reader;
     GWriter writer;
     FileReader config;
-    // FilesystemUtils fs_utils;
     ResourceLocation resource;
 
 public:

include/graphreader.hpp

@@ -11,7 +11,7 @@
 class GraphReader : public IReadable
 {
 public:
-    virtual GFile* read(GFile &file);
+    virtual GFile* read(GFile &file) const;
 private:
     unsigned short read_word(FILE* in) const;
     void read_graph(FILE* in, VGraphFile &file) const;

include/greader.hpp

@@ -7,14 +7,24 @@
 #include <cassert>
 #include <memory>
 
+/*
+
+explicit Context(std::unique_ptr<Strategy> &&strategy = {}) : strategy_(std::move(strategy))
+void set_strategy(std::unique_ptr<Strategy> &&strategy)
+
+*/
+
 class GReader
 {
 private:
-    IReadable* gcontext;
+    std::unique_ptr<IReadable> context;
+    // IReadable* gcontext;
 public:
-    GReader(){};
-    GReader(IReadable &gcontext);
-    void set_context(IReadable &gcontext);
+    // GReader(){};
+    // explicit GReader(std::unique_ptr<IReadable> &&context = {}) : context(std::move(context)){};
+    void set_context(std::unique_ptr<IReadable> &&context);
+    // GReader(IReadable &gcontext);
+    // void set_context(IReadable &gcontext);
     GFile* read(GFile &file) const;
 };
 

include/groundreader.hpp

@@ -9,7 +9,7 @@
 class GroundReader : public IReadable
 {
 public:
-    virtual GFile* read(GFile &file);
+    virtual GFile* read(GFile &file) const;
 private:
 };
 

include/gwriter.hpp

@@ -11,11 +11,9 @@
 class GWriter
 {
 private:
-    std::unique_ptr<IWriteable> gcontext;
+    std::unique_ptr<IWriteable> context;
 public:
-    GWriter(){};
-    GWriter(std::unique_ptr<IWriteable> &gcontext);
-    void set_context(std::unique_ptr<IWriteable> &gcontext);
+    void set_context(std::unique_ptr<IWriteable> &&context);
     bool write(GFile &file) const;
 };
 

include/ireadable.hpp

@@ -9,7 +9,7 @@ class IReadable
 {
 public:
     virtual ~IReadable() = default;
-    virtual GFile* read(GFile &file) = 0;
+    virtual GFile* read(GFile &file) const = 0;
 };
 
 

src/graphconverter.cpp

@@ -15,8 +15,8 @@ void GraphConverter::preactions() const
 
 void GraphConverter::postactions()
 {
-    // reader.set_context(std::make_unique<GroundReader>());
-    // writer.set_context(std::make_unique<GroundWriter>());
+    reader.set_context(std::make_unique<GroundReader>());
+    writer.set_context(std::make_unique<GroundWriter>());
 
     GroundFile* ground;
 
@@ -46,10 +46,10 @@ void GraphConverter::postactions()
 
 void GraphConverter::convert()
 {
-    // reader.set_context(std::make_unique<GraphReader>());
-    // writer.set_context(std::make_unique<GraphWriter>());
-    GraphReader* greader = new GraphReader();
-    GraphWriter* gwriter = new GraphWriter();
+    reader.set_context(std::make_unique<GraphReader>());
+    writer.set_context(std::make_unique<GraphWriter>());
+    // GraphReader* greader = new GraphReader();
+    // GraphWriter* gwriter = new GraphWriter();
     // reader.set_context(greader);
     // writer.set_context(gwriter);
 
@@ -60,7 +60,7 @@ void GraphConverter::convert()
         if (std::filesystem::is_regular_file(entry.path())) {
             graph = new VGraphFile(entry.path());
             try {
-                graph = dynamic_cast<VGraphFile*>(greader->read(*graph));
+                graph = dynamic_cast<VGraphFile*>(reader.read(*graph));
                 graph->build_target_absolute(this->resource);
             } catch (std::exception ex) {
                 BOOST_LOG_TRIVIAL(error) << "An error occured during reading graph file";
@@ -69,7 +69,7 @@ void GraphConverter::convert()
 
             try {
                 // this->writer.write(*graph);
-                gwriter->write(*graph);
+                writer.write(*graph);
                 BOOST_LOG_TRIVIAL(info) << "Graph was processed (" << processed << "/" << 145600 << ")";
             } catch (std::exception ex) {
                 BOOST_LOG_TRIVIAL(error) << "An error occured during writing graph file";
@@ -80,8 +80,8 @@ void GraphConverter::convert()
         }
     }
     delete graph;
-    delete greader;
-    delete gwriter;
+    // delete greader;
+    // delete gwriter;
     BOOST_LOG_TRIVIAL(info) << "Database was processed";
 }
 

src/graphreader.cpp

@@ -1,6 +1,6 @@
 #include "graphreader.hpp"
 
-GFile* GraphReader::read(GFile &file)
+GFile* GraphReader::read(GFile &file) const
 {
     FILE* in = fopen(file.absolute().string().c_str(), "rb");
 

src/greader.cpp

@@ -1,16 +1,22 @@
 #include "greader.hpp"
 
-GReader::GReader(IReadable &gcontext)
-{
-    this->gcontext = &gcontext;
-}
+// GReader::GReader(IReadable &gcontext)
+// {
+//     this->gcontext = &gcontext;
+// }
+
+// void GReader::set_context(IReadable &gcontext)
+// {
+//     this->gcontext = &gcontext;
+// }
 
-void GReader::set_context(IReadable &gcontext)
+void GReader::set_context(std::unique_ptr<IReadable> &&context)
 {
-    this->gcontext = &gcontext;
+    this->context = std::move(context);
 }
 
-GFile* GReader::read(GFile &file) const
+GFile *GReader::read(GFile &file) const
 {
-    return gcontext->read(file);
+    assert(context);
+    return context->read(file);
 }

src/groundreader.cpp

@@ -1,6 +1,6 @@
 #include "groundreader.hpp"
 
-GFile* GroundReader::read(GFile &file)
+GFile* GroundReader::read(GFile &file) const
 {
     return new GroundFile();
 }