Remove <adiar/file.h>

The entire public API does not make use of Adiar's files (with the exception
of 'domain_get()' and one overload of 'domain_set(...)', both of which are
really only intended for an internal use-case anyway).

src/adiar/CMakeLists.txt

@@ -12,7 +12,6 @@ set(HEADERS
   domain.h
   exception.h
   exec_policy.h
-  file.h
   functional.h
   statistics.h
   types.h

src/adiar/adiar.h

@@ -14,7 +14,6 @@
 #include <adiar/exception.h>
 #include <adiar/exec_policy.h>
 #include <adiar/functional.h>
-#include <adiar/file.h> // <-- TODO: Remove!
 
 ////////////////////////////////////////////////////////////////////////////////
 /// Global Domain

src/adiar/bdd.h

@@ -22,8 +22,6 @@
 #include <adiar/functional.h>
 #include <adiar/types.h>
 
-#include <adiar/file.h> // <-- TODO: remove!
-
 #include <adiar/bdd/bdd.h>
 #include <adiar/zdd/zdd.h>
 

src/adiar/bdd/bdd.cpp

@@ -186,7 +186,7 @@ namespace adiar
 
   __bdd bdd_from(const exec_policy &ep, const zdd &A)
   {
-    const shared_file<bdd::label_type> dom = domain_get();
+    const internal::shared_file<bdd::label_type> dom = domain_get();
     internal::file_stream<domain_var> ds(dom);
 
     return bdd_from(ep, A, make_generator(ds));

src/adiar/domain.cpp

@@ -1,8 +1,7 @@
 #include "domain.h"
 
 #include <adiar/internal/data_types/node.h>
-#include <adiar/internal/io/file.h>
-#include <adiar/internal/io/shared_file_ptr.h>
+#include <adiar/internal/io/file_writer.h>
 
 namespace adiar
 {
@@ -13,7 +12,7 @@ namespace adiar
 
   void domain_set(const domain_var varcount)
   {
-    shared_file<domain_var> dom;
+    internal::shared_file<domain_var> dom;
     { // Garbage collect writer to free write-lock
       internal::file_writer<domain_var> lw(dom);
       for (domain_var v = 0; v < varcount; v++) { lw << v; }
@@ -23,7 +22,7 @@ namespace adiar
 
   void domain_set(const generator<domain_var> &gen)
   {
-    shared_file<domain_var> dom;
+    internal::shared_file<domain_var> dom;
     { // Garbage collect writer to free write-lock
       internal::file_writer<domain_var> lw(dom);
 
@@ -34,7 +33,7 @@ namespace adiar
     domain_set(dom);
   }
 
-  void domain_set(const shared_file<domain_var> &dom)
+  void domain_set(const internal::shared_file<domain_var> &dom)
   {
     domain_ptr = dom;
   }
@@ -49,7 +48,7 @@ namespace adiar
     return domain_ptr ? true : false;
   }
 
-  shared_file<domain_var> domain_get()
+  internal::shared_file<domain_var> domain_get()
   {
     if(!domain_isset()) {
       throw domain_error("Domain must be set before it can be used");

src/adiar/domain.h

@@ -12,9 +12,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <adiar/exception.h>
-#include <adiar/file.h> // <-- TODO: Replace with <adiar/internal/io/file.h>
 #include <adiar/functional.h>
 
+#include <adiar/internal/io/file.h>
+#include <adiar/internal/io/shared_file_ptr.h>
+
 // TODO: Make 'domain_var' independent of node type. Then remove this include.
 #include <adiar/internal/data_types/node.h>
 
@@ -75,7 +77,7 @@ namespace adiar
   ///
   /// \see domain_get()
   //////////////////////////////////////////////////////////////////////////////
-  void domain_set(const shared_file<domain_var> &dom);
+  void domain_set(const internal::shared_file<domain_var> &dom);
 
   //////////////////////////////////////////////////////////////////////////////
   /// \brief     Removes any globally shared domain variables (if any).
@@ -102,7 +104,7 @@ namespace adiar
   ///
   /// \see domain_set(const shared_file<domain_var> &dom)
   //////////////////////////////////////////////////////////////////////////////
-  shared_file<domain_var> domain_get();
+  internal::shared_file<domain_var> domain_get();
 
   //////////////////////////////////////////////////////////////////////////////
   /// \brief The size of the domain.

src/adiar/zdd/build.cpp

@@ -65,7 +65,7 @@ namespace adiar
 
   zdd zdd_ithvar(const zdd::label_type var)
   {
-    const shared_file<domain_var> dom = domain_get();
+    const internal::shared_file<domain_var> dom = domain_get();
     internal::file_stream<domain_var, true> ds(dom);
 
     return zdd_ithvar(var, make_generator(ds));
@@ -101,7 +101,7 @@ namespace adiar
 
   zdd zdd_nithvar(const zdd::label_type var)
   {
-    const shared_file<domain_var> dom = domain_get();
+    const internal::shared_file<domain_var> dom = domain_get();
     internal::file_stream<domain_var, true> ds(dom);
 
     return zdd_nithvar(var, make_generator(ds));
@@ -156,7 +156,7 @@ namespace adiar
       return zdd_null();
     }
 
-    const shared_file<domain_var> dom = domain_get();
+    const internal::shared_file<domain_var> dom = domain_get();
     internal::file_stream<domain_var, true> ds(dom);
 
     return zdd_powerset(make_generator(ds));

src/adiar/zdd/complement.cpp

@@ -54,7 +54,7 @@ namespace adiar
     }
 
     static zdd on_terminal_input(const bool terminal_value, const zdd& /*dd*/,
-                                 const shared_file<zdd::label_type> &universe)
+                                 const internal::shared_file<zdd::label_type> &universe)
     {
       // TODO: remove
       internal::file_stream<zdd::label_type, true> ls(universe);
@@ -118,7 +118,7 @@ namespace adiar
 
   __zdd zdd_complement(const exec_policy &ep, const zdd &A)
   {
-    const shared_file<zdd::label_type> dom = domain_get();
+    const internal::shared_file<zdd::label_type> dom = domain_get();
     internal::file_stream<domain_var> ds(dom);
 
     return zdd_complement(ep, A, make_generator(ds));

src/adiar/zdd/zdd.cpp

@@ -225,7 +225,7 @@ namespace adiar
 
   __zdd zdd_from(const exec_policy &ep, const bdd &f)
   {
-    const shared_file<zdd::label_type> dom = domain_get();
+    const internal::shared_file<zdd::label_type> dom = domain_get();
     internal::file_stream<domain_var> ds(dom);
 
     return zdd_from(ep, f, make_generator(ds));

test/adiar/bdd/test_count.cpp

@@ -126,7 +126,7 @@ go_bandit([]() {
     }
 
     // Set domain to be empty
-    adiar::shared_file<bdd::label_type> empty_dom;
+    shared_file<bdd::label_type> empty_dom;
     domain_set(empty_dom);
 
     describe("bdd_nodecount", [&]() {
@@ -292,7 +292,7 @@ go_bandit([]() {
     });
 
     describe("bdd_satcount(f) [non-empty dom]", [&]() {
-      adiar::shared_file<bdd::label_type> dom;
+      shared_file<bdd::label_type> dom;
       {
         label_writer lw(dom);
         lw << 0 << 1 << 2 << 3 << 4 << 5 << 6;

test/adiar/internal/data_structures/test_level_merger.cpp

@@ -292,14 +292,14 @@ go_bandit([]() {
 
     describe("level_merger<shared_file<label_type>, ...>", [&]() {
       it("can use a single label_file", [&]() {
-        adiar::shared_file<ptr_uint64::label_type> f;
+        shared_file<ptr_uint64::label_type> f;
 
         { // Garbage collect the writers
           label_writer w(f);
           w << 0 << 2 << 3;
         }
 
-        level_merger<adiar::shared_file<ptr_uint64::label_type>, std::less<>, 1> merger;
+        level_merger<shared_file<ptr_uint64::label_type>, std::less<>, 1> merger;
 
         merger.hook({f});
 
@@ -316,8 +316,8 @@ go_bandit([]() {
       });
 
       it("can merge two label_files", [&]() {
-        adiar::shared_file<ptr_uint64::label_type> f1;
-        adiar::shared_file<ptr_uint64::label_type> f2;
+        shared_file<ptr_uint64::label_type> f1;
+        shared_file<ptr_uint64::label_type> f2;
 
         { // Garbage collect the writers
           label_writer w1(f1);
@@ -327,7 +327,7 @@ go_bandit([]() {
           w2 << 0 << 1 << 3;
         }
 
-        level_merger<adiar::shared_file<ptr_uint64::label_type>, std::less<>, 2> merger;
+        level_merger<shared_file<ptr_uint64::label_type>, std::less<>, 2> merger;
 
         merger.hook({f1, f2});