Use unique_ptr

Author: msoos

src/approxmc.cpp

@@ -61,20 +61,16 @@ using namespace ApproxMC;
 
 DLL_PUBLIC AppMC::AppMC(const std::unique_ptr<CMSat::FieldGen>& _fg)
 {
-    data = new AppMCPrivateData(_fg);
-    data->counter.solver = new SATSolver();
+    data = std::make_unique<AppMCPrivateData>(_fg);
+    data->counter.solver = std::make_unique<SATSolver>();
     data->counter.solver->set_up_for_scalmc();
     data->counter.solver->set_allow_otf_gauss();
 }
 
-DLL_PUBLIC AppMC::~AppMC()
-{
-    delete data->counter.solver;
-    delete data;
-}
+DLL_PUBLIC AppMC::~AppMC() = default;
 
 // Helper function, used only in this unit
-void setup_sampling_vars(AppMCPrivateData* data)
+void setup_sampling_vars(unique_ptr<AppMCPrivateData>& data)
 {
     if (data->conf.verb) {
         cout << "c o [appmc] Sampling set size: " << data->conf.sampl_vars.size() << endl;
@@ -279,11 +275,6 @@ DLL_PUBLIC bool AppMC::add_xor_clause(const vector<uint32_t>& vars, bool rhs)
     return data->counter.solver_add_xor_clause(vars, rhs);
 }
 
-DLL_PUBLIC CMSat::SATSolver* AppMC::get_solver()
-{
-    return data->counter.solver;
-}
-
 DLL_PUBLIC const std::vector<uint32_t>& AppMC::get_sampling_set() const
 {
     return data->conf.sampl_vars;

src/approxmc.h

@@ -33,6 +33,7 @@
 #include <memory>
 #include <string>
 #include <vector>
+#include <memory>
 #include <cryptominisat5/cryptominisat.h>
 namespace ApproxMC {
 
@@ -122,7 +123,7 @@ class AppMC
     ////////////////////////////
     // Do not bother with this, it's private
     ////////////////////////////
-    AppMCPrivateData* data;
+    std::unique_ptr<AppMCPrivateData> data;
 };
 
 }

src/counter.h

@@ -41,6 +41,7 @@ using std::vector;
 using std::map;
 using std::pair;
 using namespace CMSat;
+using std::unique_ptr;
 
 namespace AppMCInt {
 
@@ -93,23 +94,23 @@ struct SparseData {
 
 class Counter {
 public:
-    Counter(Config& _conf, const std::unique_ptr<FieldGen>& _fg) : fg(_fg->dup()), conf(_conf) {}
+    Counter(Config& _conf, const unique_ptr<FieldGen>& _fg) : fg(_fg->dup()), conf(_conf) {}
     ApproxMC::SolCount solve();
     string gen_rnd_bits(const uint32_t size,
                         const uint32_t numhashes, SparseData& sparse_data);
     string binary(const uint32_t x, const uint32_t length);
     bool find_one_solution();
     bool gen_rhs();
     uint32_t threshold_appmcgen;
-    SATSolver* solver = nullptr;
+    unique_ptr<SATSolver> solver = nullptr;
     ApproxMC::SolCount calc_est_count();
     const Constants constants;
     bool solver_add_clause(const vector<Lit>& cl);
     bool solver_add_xor_clause(const vector<uint32_t>& vars, const bool rhs);
     bool solver_add_xor_clause(const vector<Lit>& lits, const bool rhs);
 
 private:
-    std::unique_ptr<FieldGen> fg;
+    unique_ptr<FieldGen> fg;
     Config& conf;
     ApproxMC::SolCount count();
     void add_appmc_options();