final?

include/config.hpp

@@ -4,14 +4,18 @@
 
 class Configuration {
 public:
+    // I/O settings
     std::string input_file = "1.in";
     std::string output_file = "1.out";
-    std::string tmp_dir = "build/run";
-    bool generate_data = false;
-    bool evaluate_file = false;
-    int N = 100000; // number of records in a file
-    int n = 101; // number of buffers
-    int b = 10; // blocking factor
+    std::string tmp_directory = "run";
+
+    // Algorithm settings
+    size_t buffer_rows = 101;
+    size_t buffer_cols = 10;
+
+    // Additional modes
+    size_t generate_data = 0;
+    bool read_file = false;
 
     Configuration(int argc, char** argv);
 };

include/merge_sorter.hpp

@@ -21,9 +21,9 @@ private:
 
 public:
     MergeSorter(size_t buffer_rows, size_t buffer_cols, const std::string& tmp_dir);
-    bool sort_file(const std::string& input_file, const std::string& output_file);
+    void sort_file(const std::string& input_file, const std::string& output_file);
 
-    size_t disk_reads() const;
-    size_t disk_writes() const;
-    size_t phases() const;
+    size_t disk_reads();
+    size_t disk_writes();
+    size_t phases();
 };