code cleaning

Author: francoisbonneau

include/geode/stochastic/sampling/mcmc/metropolis_hasting_sampler.hpp

@@ -231,9 +231,12 @@ namespace geode
         {
             OPENGEODE_ASSERT( proposal.new_object.has_value(),
                 "[MH] Birth proposal has no new_object" );
-            const auto delta_log_energy = energy_.delta_log_energy_add( state,
+            geode::ObjectRef< Type > new_object{
                 proposal.new_object.value().first,
-                proposal.new_object.value().second );
+                proposal.new_object.value().second
+            };
+            const auto delta_log_energy =
+                energy_.delta_log_energy_add( state, new_object );
             return accept_or_reject( proposal, state, engine, delta_log_energy,
                 []( auto& s, auto& p ) {
                     s.add_object( std::move( p.new_object.value().first ),

include/geode/stochastic/sampling/mcmc/models/components/energy_term.hpp

@@ -125,8 +125,7 @@ namespace geode
         virtual double total_log( const ObjectSet< Type >& state ) const = 0;
 
         virtual double delta_log_add( const ObjectSet< Type >& state,
-            const Type& new_object,
-            const uuid& new_object_subset_id ) const = 0;
+            const ObjectRef< Type >& new_object ) const = 0;
 
         virtual double delta_log_remove(
             const ObjectSet< Type >& state, ObjectId object_id ) const = 0;

include/geode/stochastic/sampling/mcmc/models/components/intensity_term.hpp

@@ -51,10 +51,9 @@ namespace geode
         }
 
         double delta_log_add( const ObjectSet< Type >& /*state*/,
-            const Type& /*new_object*/,
-            const uuid& new_object_subset_id ) const override
+            const ObjectRef< Type >& new_object ) const override
         {
-            if( !this->is_targeted_subset( new_object_subset_id ) )
+            if( !this->is_targeted_subset( new_object.subset ) )
             {
                 return 0.0;
             }

include/geode/stochastic/sampling/mcmc/models/gibbs_energy.hpp

@@ -79,15 +79,13 @@ namespace geode
         }
 
         double delta_log_energy_add( const ObjectSet< Type >& state,
-            const Type& new_object,
-            const uuid& new_object_subset_id ) const
+            const ObjectRef< Type >& new_object ) const
         {
             double log_energy{ 0.0 };
             for( const auto& [id, term] : energy_terms_ )
             {
                 geode_unused( id );
-                log_energy += term->delta_log_add(
-                    state, new_object, new_object_subset_id );
+                log_energy += term->delta_log_add( state, new_object );
             }
             return log_energy;
         }

tests/stochastic/sampling/mcmc/models/components/test-intensity-term.cpp

@@ -52,8 +52,8 @@ void test_normal_positive_intensity( double lambda,
         "[test intensity]- total_log wrong value." );
 
     geode::Point2D p3{ { 2., 2. } };
-
-    double delta_add = term.delta_log_add( pattern, p3, subset_id );
+    geode::ObjectRef< geode::Point2D > p_ref{ p3, subset_id };
+    double delta_add = term.delta_log_add( pattern, p_ref );
     OPENGEODE_EXCEPTION( delta_add == neg_log_lambda * 1.,
         "[test intensity]- delta_log_add wrong value." );
 
@@ -81,8 +81,8 @@ void test_normal_zero_intensity( double lambda,
         std::isinf( total ), "[test zero intensity]- total_log wrong value." );
 
     geode::Point2D p3{ { 2., 2. } };
-
-    double delta_add = term.delta_log_add( pattern, p3, subset_id );
+    geode::ObjectRef< geode::Point2D > p_ref{ p3, subset_id };
+    double delta_add = term.delta_log_add( pattern, p_ref );
     OPENGEODE_EXCEPTION( std::isinf( delta_add ),
         "[test zero intensity]- delta_log_add wrong value." );
 

tests/stochastic/sampling/mcmc/test-mh-poisson-statistics-and-convergence.cpp

@@ -42,7 +42,7 @@ namespace
         geode::ObjectSet< geode::Point2D > state =
             mh.initialize_object_set_with_sampling( engine, group_targets );
         mh.walk( state, engine, 500 );
-        constexpr geode::index_t N{ 1000 };
+        constexpr geode::index_t N{ 5000 };
 
         // Sampling