Add default constructors for Fst and Diversity Processors

lib/genesis/population/function/diversity_pool_processor.hpp

@@ -70,6 +70,16 @@ class DiversityPoolProcessor
     //     Constructors and Rule of Five
     // -------------------------------------------------------------------------
 
+    /**
+     * @brief Default constructor.
+     *
+     * We always want to make sure that the user provides a WindowAveragePolicy, so using this
+     * default constructor leads to an unusable instance. We provide it so that dummy processors
+     * can be constructed, but they have to be replaced by non-default-constructed instances
+     * befor usage.
+     */
+    FstPoolProcessor() = default;
+
     /**
      * @brief Construct a processor.
      *
@@ -86,6 +96,7 @@ class DiversityPoolProcessor
         : avg_policy_( window_average_policy )
         , thread_pool_( thread_pool )
         , threading_threshold_( threading_threshold )
+        , is_default_constructed_( false )
     {
         thread_pool_ = thread_pool ? thread_pool : utils::Options::get().global_thread_pool();
     }
@@ -185,6 +196,11 @@ class DiversityPoolProcessor
 
     void process( Variant const& variant )
     {
+        // Check correct usage
+        if( is_default_constructed_ ) {
+            throw std::domain_error( "Cannot use a default constructed FstPoolProcessor" );
+        }
+
         // Boundary error check. We do this before any other processing of the Variant,
         // as this indicates a serious error or issue with the data somewhere,
         // which we want to catch in any case.
@@ -281,6 +297,10 @@ class DiversityPoolProcessor
     // at which we start using the thread pool.
     std::shared_ptr<utils::ThreadPool> thread_pool_;
     size_t threading_threshold_ = 0;
+
+    // We want to make sure to disallow default constructed instances.
+    // Bit ugly to do it this way, but works for now.
+    bool is_default_constructed_ = true;
 };
 
 // =================================================================================================

lib/genesis/population/function/fst_pool_processor.hpp

@@ -67,6 +67,16 @@ class FstPoolProcessor
     //     Constructors and Rule of Five
     // -------------------------------------------------------------------------
 
+    /**
+     * @brief Default constructor.
+     *
+     * We always want to make sure that the user provides a WindowAveragePolicy, so using this
+     * default constructor leads to an unusable instance. We provide it so that dummy processors
+     * can be constructed, but they have to be replaced by non-default-constructed instances
+     * befor usage.
+     */
+    FstPoolProcessor() = default;
+
     /**
      * @brief Construct a processor.
      *
@@ -82,6 +92,7 @@ class FstPoolProcessor
         : avg_policy_( window_average_policy )
         , thread_pool_( thread_pool )
         , threading_threshold_( threading_threshold )
+        , is_default_constructed_( false )
     {
         thread_pool_ = thread_pool ? thread_pool : utils::Options::get().global_thread_pool();
     }
@@ -179,7 +190,11 @@ class FstPoolProcessor
 
     void process( Variant const& variant )
     {
+        // Check correct usage
         assert( sample_pairs_.size() == calculators_.size() );
+        if( is_default_constructed_ ) {
+            throw std::domain_error( "Cannot use a default constructed FstPoolProcessor" );
+        }
 
         // Only process Variants that are passing, but keep track of the ones that did not.
         ++filter_stats_[variant.status.get()];
@@ -287,6 +302,10 @@ class FstPoolProcessor
     // (number of sample pairs) at which we start using the thread pool.
     std::shared_ptr<utils::ThreadPool> thread_pool_;
     size_t threading_threshold_ = 0;
+
+    // We want to make sure to disallow default constructed instances.
+    // Bit ugly to do it this way, but works for now.
+    bool is_default_constructed_ = true;
 };
 
 // =================================================================================================