Inherit constructor of satcheck_minisat2_baset

This avoids having definitions of the constructors of
`satcheck_minisat_simplifiert` and `satcheck_minisat_no_simplifiert`
which were implemented the same way, by having a single template
constructor instead. This will simplify subsequent changes to the
constructor, because they will only need to be made in one place.

Author: thomasspriggs

src/solvers/sat/satcheck_minisat2.cpp

@@ -308,9 +308,8 @@ void satcheck_minisat2_baset<T>::set_assignment(literalt a, bool value)
 
 template <typename T>
 satcheck_minisat2_baset<T>::satcheck_minisat2_baset(
-  T *_solver,
   message_handlert &message_handler)
-  : cnf_solvert(message_handler), solver(_solver), time_limit_seconds(0)
+  : cnf_solvert(message_handler), solver(new T), time_limit_seconds(0)
 {
 }
 
@@ -353,21 +352,8 @@ void satcheck_minisat2_baset<T>::set_assumptions(const bvt &bv)
   }
 }
 
-satcheck_minisat_no_simplifiert::satcheck_minisat_no_simplifiert(
-  message_handlert &message_handler)
-  : satcheck_minisat2_baset<Minisat::Solver>(
-      new Minisat::Solver,
-      message_handler)
-{
-}
-
-satcheck_minisat_simplifiert::satcheck_minisat_simplifiert(
-  message_handlert &message_handler)
-  : satcheck_minisat2_baset<Minisat::SimpSolver>(
-      new Minisat::SimpSolver,
-      message_handler)
-{
-}
+template class satcheck_minisat2_baset<Minisat::Solver>;
+template class satcheck_minisat2_baset<Minisat::SimpSolver>;
 
 void satcheck_minisat_simplifiert::set_frozen(literalt a)
 {

src/solvers/sat/satcheck_minisat2.h

@@ -29,7 +29,7 @@ template <typename T>
 class satcheck_minisat2_baset : public cnf_solvert, public hardness_collectort
 {
 public:
-  satcheck_minisat2_baset(T *, message_handlert &message_handler);
+  explicit satcheck_minisat2_baset(message_handlert &message_handler);
   virtual ~satcheck_minisat2_baset();
 
   tvt l_get(literalt a) const override final;
@@ -94,15 +94,15 @@ class satcheck_minisat_no_simplifiert:
   public satcheck_minisat2_baset<Minisat::Solver>
 {
 public:
-  explicit satcheck_minisat_no_simplifiert(message_handlert &message_handler);
+  using satcheck_minisat2_baset<Minisat::Solver>::satcheck_minisat2_baset;
   const std::string solver_text() override;
 };
 
 class satcheck_minisat_simplifiert:
   public satcheck_minisat2_baset<Minisat::SimpSolver>
 {
 public:
-  explicit satcheck_minisat_simplifiert(message_handlert &message_handler);
+  using satcheck_minisat2_baset<Minisat::SimpSolver>::satcheck_minisat2_baset;
   const std::string solver_text() override final;
   void set_frozen(literalt a) override final;
   bool is_eliminated(literalt a) const;