remove GroupId to use a uuid.

francoisbonneau · francoisbonneau · commit 2e1807794698 · 2025-09-05T19:03:05.000+02:00
diff --git a/include/geode/stochastic/configuration/configuration.hpp b/include/geode/stochastic/configuration/configuration.hpp
@@ -25,30 +25,29 @@
 
 #include <vector>
 
+#include <geode/basic/uuid.hpp>
 #include <geode/geometry/basic_objects/segment.hpp>
 #include <geode/geometry/bounding_box.hpp>
 #include <geode/geometry/point.hpp>
 
 // #include <geode/stochastic/configuration/neighbors_object_ids.hpp>
 namespace geode
 {
-    // can be a index_t used as a key in unordored map but maybe a "string is
-    // beter?"
-    struct GroupId
+    struct GroupDescriptor
     {
-        index_t value;
-        bool operator==( GroupId const& other ) const noexcept
+        geode::uuid unique_id;
+        bool operator==( GroupDescriptor const& other ) const noexcept
         {
             {
-                return value == other.value;
+                return unique_id == other.unique_id;
             }
         }
     };
 
     struct ObjectId
     {
         index_t object;
-        GroupId group;
+        uuid group;
         bool operator==( const ObjectId& other ) const noexcept
         {
             return object == other.object && group == other.group;
@@ -58,14 +57,14 @@ namespace geode
 // Hash support for unordered_map
 namespace std
 {
-    template <>
-    struct hash< geode::GroupId >
-    {
-        std::size_t operator()( geode::GroupId const& g ) const noexcept
-        {
-            return std::hash< geode::index_t >()( g.value );
-        }
-    };
+    // template <>
+    // struct hash< geode::uuid >
+    //{
+    //     std::size_t operator()( geode::uuid const& g ) const noexcept
+    //     {
+    //         return std::hash< geode::index_t >()( g.unique_id );
+    //     }
+    // };
 
     // template <>
     // struct hash< geode::ObjectId >
@@ -83,16 +82,16 @@ namespace geode
     class Configuration
     {
     public:
-        const std::vector< Object >& get_group( const GroupId& group_id ) const;
+        const std::vector< Object >& get_group( const uuid& group_id ) const;
         const Object& get_object( const ObjectId& object_id ) const;
         std::vector< ObjectId > get_all_object() const;
 
         index_t nb_groups() const;
-        index_t nb_objects_in_group( const GroupId& group_id ) const;
+        index_t nb_objects_in_group( const uuid& group_id ) const;
         index_t nb_objects() const;
 
-        void add_group( const GroupId& group_id );
-        ObjectId add_object( Object&& object, const GroupId& group_id );
+        void add_group( const uuid& group_id );
+        ObjectId add_object( Object&& object, const uuid& group_id );
         void update_object( const ObjectId& object_id, Object&& object );
         void remove_object( const ObjectId& object_id );
 
@@ -105,10 +104,10 @@ namespace geode
             const Object& object, double searching_distance ) const;
 
     private:
-        std::vector< Object >& get_group( const GroupId& group_id );
+        std::vector< Object >& get_group( const uuid& group_id );
 
     private:
-        std::unordered_map< GroupId, std::vector< Object > > groups_;
+        std::unordered_map< uuid, std::vector< Object > > groups_;
         // ObjectIndexRTree< 2 > tree_;
     };
 } // namespace geode
diff --git a/include/geode/stochastic/sampling/direct/configuration_sampler/configuration_sampler.hpp b/include/geode/stochastic/sampling/direct/configuration_sampler/configuration_sampler.hpp
@@ -32,10 +32,10 @@ namespace geode
     class ConfigurationSampler
     {
     public:
-        ConfigurationSampler( GroupId group_id ) : group_id_{ group_id } {}
+        ConfigurationSampler( uuid group_id ) : group_id_{ group_id } {}
         virtual ~ConfigurationSampler() = default;
 
-        virtual std::pair< Object, GroupId > sample(
+        virtual std::pair< Object, uuid > sample(
             RandomEngine& engine ) const = 0;
 
         std::optional< ObjectId > sample_id(
@@ -54,12 +54,12 @@ namespace geode
             return result;
         }
 
-        virtual std::pair< Object, GroupId > change(
+        virtual std::pair< Object, uuid > change(
             const Object& object, RandomEngine& engine ) const = 0;
 
         virtual double log_pdf( const Object& obj ) const = 0;
 
     protected:
-        GroupId group_id_;
+        uuid group_id_;
     };
 } // namespace geode
diff --git a/include/geode/stochastic/sampling/direct/configuration_sampler/point_configuration_sampler.hpp b/include/geode/stochastic/sampling/direct/configuration_sampler/point_configuration_sampler.hpp
@@ -37,7 +37,7 @@ namespace geode
     {
     public:
         UniformPointConfigurationSampler(
-            const BoundingBox< dimension >& box, GroupId group_id )
+            const BoundingBox< dimension >& box, uuid group_id )
             : ConfigurationSampler< Point< dimension > >{ group_id },
               box_( box )
         {
@@ -48,14 +48,14 @@ namespace geode
             }
         }
 
-        std::pair< Point< dimension >, GroupId > sample(
+        std::pair< Point< dimension >, uuid > sample(
             RandomEngine& engine ) const override
         {
             return { PointUniformSampler::sample< dimension >( engine, box_ ),
                 this->group_id_ };
         }
 
-        std::pair< Point< dimension >, GroupId > change(
+        std::pair< Point< dimension >, uuid > change(
             const Point< dimension >& obj, RandomEngine& engine ) const override
         {
             double ratio = 0.1;
diff --git a/include/geode/stochastic/sampling/mcmc/metropolis_hasting_sampler.hpp b/include/geode/stochastic/sampling/mcmc/metropolis_hasting_sampler.hpp
@@ -62,7 +62,7 @@ namespace geode
 
         Configuration< Object > initialise_configuration_with_sampling(
             RandomEngine& engine,
-            const std::unordered_map< GroupId, index_t >& group_targets ) const
+            const std::unordered_map< uuid, index_t >& group_targets ) const
         {
             Configuration< Object > config;
             for( const auto& [gid, target] : group_targets )
@@ -87,23 +87,24 @@ namespace geode
                     }
                     OPENGEODE_EXCEPTION( added,
                         "[MH] Birth move need to be more probable for group: ",
-                        gid.value );
+                        gid.string() );
                 }
             }
             return config;
         }
 
-        Configuration< Object > initialise_configuration_with_burnin(
-            RandomEngine& engine, index_t number_of_steps ) const
-        {
-            Configuration< Object > configuration;
-            for( const auto count : geode::Range{ number_of_steps } )
-            {
-                geode_unused( count );
-                step( configuration, engine );
-            }
-            return configuration;
-        }
+        //       Configuration< Object > initialise_configuration_with_burnin(
+        //           RandomEngine& engine, index_t number_of_steps ) const
+        //       {
+        //           Configuration< Object > configuration;
+        //
+        //           for( const auto count : geode::Range{ number_of_steps } )
+        //           {
+        //               geode_unused( count );
+        //               step( configuration, engine );
+        //           }
+        //           return configuration;
+        //       }
 
         StepResult< Object > step(
             Configuration< Object >& state, RandomEngine& engine ) const
diff --git a/include/geode/stochastic/sampling/mcmc/models/components/energy_term.hpp b/include/geode/stochastic/sampling/mcmc/models/components/energy_term.hpp
@@ -87,7 +87,7 @@ namespace geode
 
         virtual double delta_log_add( const Configuration< Object >& state,
             const Object& object,
-            const GroupId group_id ) const = 0;
+            const uuid group_id ) const = 0;
 
         virtual double delta_log_remove( const Configuration< Object >& state,
             ObjectId object_id ) const = 0;
diff --git a/include/geode/stochastic/sampling/mcmc/models/components/intensity_term.hpp b/include/geode/stochastic/sampling/mcmc/models/components/intensity_term.hpp
@@ -32,7 +32,7 @@ namespace geode
     class IntensityTerm : public EnergyTerm< Object >
     {
     public:
-        explicit IntensityTerm( double lambda, GroupId group_id )
+        explicit IntensityTerm( double lambda, uuid group_id )
             : EnergyTerm< Object >( lambda ), group_id_{ group_id }
         {
         }
@@ -45,7 +45,7 @@ namespace geode
 
         double delta_log_add( const Configuration< Object >& state,
             const Object& sample,
-            const GroupId target_group_id ) const final
+            const uuid target_group_id ) const final
         {
             return target_group_id == group_id_
                        ? this->neg_log_parameter_.scale( 1. )
@@ -79,6 +79,6 @@ namespace geode
         }
 
     private:
-        GroupId group_id_;
+        uuid group_id_;
     };
 } // namespace geode
diff --git a/include/geode/stochastic/sampling/mcmc/models/components/pairwise_term.hpp b/include/geode/stochastic/sampling/mcmc/models/components/pairwise_term.hpp
@@ -47,7 +47,7 @@ namespace geode
 
         double delta_log_add( const Configuration< Object >& state,
             const Object& new_object,
-            GroupId group_id ) const final
+            uuid group_id ) const final
         {
             geode_unused( group_id );
             const auto neighbors = state.neighbors( new_object, 1.1 );
diff --git a/include/geode/stochastic/sampling/mcmc/models/gibbs_energy.hpp b/include/geode/stochastic/sampling/mcmc/models/gibbs_energy.hpp
@@ -78,7 +78,7 @@ namespace geode
 
         double delta_log_energy_add( const Configuration< Object > state,
             const Object& sample,
-            GroupId group_id ) const
+            uuid group_id ) const
         {
             double log_energy{ 0.0 };
             for( const auto& term : energy_terms_ )
diff --git a/include/geode/stochastic/sampling/mcmc/proposal/moves.hpp b/include/geode/stochastic/sampling/mcmc/proposal/moves.hpp
@@ -39,7 +39,7 @@ namespace geode
         };
 
         Type type{ Type::Invalid };
-        std::optional< std::pair< Object, GroupId > >
+        std::optional< std::pair< Object, uuid > >
             new_object; // for birth/change
         std::optional< ObjectId > old_object_id; // for death/change
         double log_forward_prob{ 0. };
diff --git a/src/geode/stochastic/configuration/configuration.cpp b/src/geode/stochastic/configuration/configuration.cpp
@@ -9,11 +9,11 @@ namespace geode
 {
     template < typename Object >
     const std::vector< Object >& Configuration< Object >::get_group(
-        const GroupId& group_id ) const
+        const uuid& group_id ) const
     {
         auto it = groups_.find( group_id );
         OPENGEODE_EXCEPTION( it != groups_.end(), "[Configuration] - group (",
-            group_id.value, ") is not defined." );
+            group_id.string(), ") is not defined." );
         return it->second;
     }
 
@@ -50,7 +50,7 @@ namespace geode
 
     template < typename Object >
     index_t Configuration< Object >::nb_objects_in_group(
-        const GroupId& group_id ) const
+        const uuid& group_id ) const
     {
         return get_group( group_id ).size();
     }
@@ -68,17 +68,17 @@ namespace geode
     }
 
     template < typename Object >
-    void Configuration< Object >::add_group( const GroupId& group_id )
+    void Configuration< Object >::add_group( const uuid& group_id )
     {
         auto [it, inserted] =
             groups_.emplace( group_id, std::vector< Object >{} );
         OPENGEODE_EXCEPTION( inserted, "[Configuration]- group (",
-            group_id.value, ") already exists." );
+            group_id.string(), ") already exists." );
     }
 
     template < typename Object >
     ObjectId Configuration< Object >::add_object(
-        Object&& object, const GroupId& group_id )
+        Object&& object, const uuid& group_id )
     {
         auto& group = get_group( group_id );
         ObjectId new_object_id{ static_cast< index_t >( group.size() ),
@@ -148,7 +148,7 @@ namespace geode
 
     template < typename Object >
     std::vector< Object >& Configuration< Object >::get_group(
-        const GroupId& group_id )
+        const uuid& group_id )
     {
         return const_cast< std::vector< Object >& >(
             static_cast< const Configuration* >( this )->get_group(
diff --git a/tests/stochastic/sampling/mcmc/models/components/test-intensity-term.cpp b/tests/stochastic/sampling/mcmc/models/components/test-intensity-term.cpp
@@ -26,7 +26,7 @@
 #include <geode/stochastic/configuration/configuration.hpp>
 
 geode::Configuration< geode::Point2D > create_configuration(
-    geode::GroupId group_id )
+    const geode::uuid &group_id )
 {
     geode::Point2D p1{ { 0., 0. } };
     geode::Point2D p2{ { 1., 1. } };
@@ -41,7 +41,7 @@ geode::Configuration< geode::Point2D > create_configuration(
 
 void test_normal_positive_intensity( double lambda,
     const geode::Configuration< geode::Point2D > &pattern,
-    const geode::GroupId &group_id )
+    const geode::uuid &group_id )
 {
     geode::IntensityTerm< geode::Point2D > term( lambda, group_id );
     auto neg_log_lambda = -std::log( lambda );
@@ -69,7 +69,7 @@ void test_normal_positive_intensity( double lambda,
 
 void test_normal_zero_intensity( double lambda,
     const geode::Configuration< geode::Point2D > &pattern,
-    const geode::GroupId &group_id )
+    const geode::uuid &group_id )
 {
     geode::IntensityTerm< geode::Point2D > term( lambda, group_id );
     double total = term.total_log( pattern );
@@ -99,8 +99,8 @@ int main()
     try
     {
         geode::StochasticLibrary::initialize();
+        geode::uuid group_id;
 
-        geode::GroupId group_id{ 0 };
         auto pattern = create_configuration( group_id );
 
         test_normal_positive_intensity( 0.5, pattern, group_id );
@@ -120,7 +120,7 @@ int main()
     try
     {
         geode::StochasticLibrary::initialize();
-        geode::GroupId group_id{ 0 };
+        geode::uuid group_id;
         geode::IntensityTerm< geode::Point2D > term(
             -geode::GLOBAL_EPSILON, group_id );
         geode::Logger::info( "TEST FAILED" );
diff --git a/tests/stochastic/sampling/mcmc/models/components/test-pairwise-term.cpp b/tests/stochastic/sampling/mcmc/models/components/test-pairwise-term.cpp
@@ -28,7 +28,7 @@
 #include <geode/stochastic/configuration/configuration.hpp>
 
 geode::Configuration< geode::Point2D > create_pairwise_configuration(
-    geode::GroupId group_id )
+    const geode::uuid& group_id )
 {
     geode::Point2D p1{ { 0., 0. } };
     geode::Point2D p2{ { 1., 1. } };
@@ -43,7 +43,7 @@ geode::Configuration< geode::Point2D > create_pairwise_configuration(
 
 void test_normal_positive_pairwise( double gamma,
     const geode::Configuration< geode::Point2D >& pattern,
-    geode::GroupId group_id )
+    const geode::uuid& group_id )
 {
     auto interaction_fn = []( const geode::Point2D& a,
                               const geode::Point2D& b ) {
@@ -86,7 +86,7 @@ void test_normal_positive_pairwise( double gamma,
 
 void test_zero_pairwise( double gamma,
     const geode::Configuration< geode::Point2D >& pattern,
-    geode::GroupId group_id )
+    const geode::uuid& group_id )
 {
     auto interaction_fn = []( const geode::Point2D& a,
                               const geode::Point2D& b ) {
@@ -124,7 +124,7 @@ int main()
     {
         geode::StochasticLibrary::initialize();
 
-        geode::GroupId group_id{ 0 };
+        geode::uuid group_id;
         auto pattern = create_pairwise_configuration( group_id );
 
         test_normal_positive_pairwise( 0.5, pattern, group_id );
diff --git a/tests/stochastic/sampling/mcmc/models/test-gibbs-energy.cpp b/tests/stochastic/sampling/mcmc/models/test-gibbs-energy.cpp
diff --git a/tests/stochastic/sampling/mcmc/proposal/test-proposal-kernel.cpp b/tests/stochastic/sampling/mcmc/proposal/test-proposal-kernel.cpp
diff --git a/tests/stochastic/sampling/mcmc/test-metropolis-hasting-sampler.cpp b/tests/stochastic/sampling/mcmc/test-metropolis-hasting-sampler.cpp
diff --git a/tests/stochastic/sampling/mcmc/test-mh-poisson-statistics-and-convergence.cpp b/tests/stochastic/sampling/mcmc/test-mh-poisson-statistics-and-convergence.cpp
diff --git a/tests/stochastic/sampling/mcmc/test-mh-strauss-statistics-and-convergence.cpp b/tests/stochastic/sampling/mcmc/test-mh-strauss-statistics-and-convergence.cpp

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ namespace geode`
`37`	`37`	`{`
`38`	`38`	`public:`
`39`	`39`	`UniformPointConfigurationSampler(`
`40`		`- const BoundingBox< dimension >& box, GroupId group_id )`
	`40`	`+ const BoundingBox< dimension >& box, uuid group_id )`
`41`	`41`	`: ConfigurationSampler< Point< dimension > >{ group_id },`
`42`	`42`	`box_( box )`
`43`	`43`	`{`
`@@ -48,14 +48,14 @@ namespace geode`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- std::pair< Point< dimension >, GroupId > sample(`
	`51`	`+ std::pair< Point< dimension >, uuid > sample(`
`52`	`52`	`RandomEngine& engine ) const override`
`53`	`53`	`{`
`54`	`54`	`return { PointUniformSampler::sample< dimension >( engine, box_ ),`
`55`	`55`	`this->group_id_ };`
`56`	`56`	`}`
`57`	`57`
`58`		`- std::pair< Point< dimension >, GroupId > change(`
	`58`	`+ std::pair< Point< dimension >, uuid > change(`
`59`	`59`	`const Point< dimension >& obj, RandomEngine& engine ) const override`
`60`	`60`	`{`
`61`	`61`	`double ratio = 0.1;`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ namespace geode`
`32`	`32`	`class IntensityTerm : public EnergyTerm< Object >`
`33`	`33`	`{`
`34`	`34`	`public:`
`35`		`- explicit IntensityTerm( double lambda, GroupId group_id )`
	`35`	`+ explicit IntensityTerm( double lambda, uuid group_id )`
`36`	`36`	`: EnergyTerm< Object >( lambda ), group_id_{ group_id }`
`37`	`37`	`{`
`38`	`38`	`}`
`@@ -45,7 +45,7 @@ namespace geode`
`45`	`45`
`46`	`46`	`double delta_log_add( const Configuration< Object >& state,`
`47`	`47`	`const Object& sample,`
`48`		`- const GroupId target_group_id ) const final`
	`48`	`+ const uuid target_group_id ) const final`
`49`	`49`	`{`
`50`	`50`	`return target_group_id == group_id_`
`51`	`51`	`? this->neg_log_parameter_.scale( 1. )`
`@@ -79,6 +79,6 @@ namespace geode`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`private:`
`82`		`- GroupId group_id_;`
	`82`	`+ uuid group_id_;`
`83`	`83`	`};`
`84`	`84`	`} // namespace geode`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ namespace geode`
`47`	`47`
`48`	`48`	`double delta_log_add( const Configuration< Object >& state,`
`49`	`49`	`const Object& new_object,`
`50`		`- GroupId group_id ) const final`
	`50`	`+ uuid group_id ) const final`
`51`	`51`	`{`
`52`	`52`	`geode_unused( group_id );`
`53`	`53`	`const auto neighbors = state.neighbors( new_object, 1.1 );`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ namespace geode`
`78`	`78`
`79`	`79`	`double delta_log_energy_add( const Configuration< Object > state,`
`80`	`80`	`const Object& sample,`
`81`		`- GroupId group_id ) const`
	`81`	`+ uuid group_id ) const`
`82`	`82`	`{`
`83`	`83`	`double log_energy{ 0.0 };`
`84`	`84`	`for( const auto& term : energy_terms_ )`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,11 @@ namespace geode`
`9`	`9`	`{`
`10`	`10`	`template < typename Object >`
`11`	`11`	`const std::vector< Object >& Configuration< Object >::get_group(`
`12`		`- const GroupId& group_id ) const`
	`12`	`+ const uuid& group_id ) const`
`13`	`13`	`{`
`14`	`14`	`auto it = groups_.find( group_id );`
`15`	`15`	`OPENGEODE_EXCEPTION( it != groups_.end(), "[Configuration] - group (",`
`16`		`- group_id.value, ") is not defined." );`
	`16`	`+ group_id.string(), ") is not defined." );`
`17`	`17`	`return it->second;`
`18`	`18`	`}`
`19`	`19`
`@@ -50,7 +50,7 @@ namespace geode`
`50`	`50`
`51`	`51`	`template < typename Object >`
`52`	`52`	`index_t Configuration< Object >::nb_objects_in_group(`
`53`		`- const GroupId& group_id ) const`
	`53`	`+ const uuid& group_id ) const`
`54`	`54`	`{`
`55`	`55`	`return get_group( group_id ).size();`
`56`	`56`	`}`
`@@ -68,17 +68,17 @@ namespace geode`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`template < typename Object >`
`71`		`- void Configuration< Object >::add_group( const GroupId& group_id )`
	`71`	`+ void Configuration< Object >::add_group( const uuid& group_id )`
`72`	`72`	`{`
`73`	`73`	`auto [it, inserted] =`
`74`	`74`	`groups_.emplace( group_id, std::vector< Object >{} );`
`75`	`75`	`OPENGEODE_EXCEPTION( inserted, "[Configuration]- group (",`
`76`		`- group_id.value, ") already exists." );`
	`76`	`+ group_id.string(), ") already exists." );`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`template < typename Object >`
`80`	`80`	`ObjectId Configuration< Object >::add_object(`
`81`		`- Object&& object, const GroupId& group_id )`
	`81`	`+ Object&& object, const uuid& group_id )`
`82`	`82`	`{`
`83`	`83`	`auto& group = get_group( group_id );`
`84`	`84`	`ObjectId new_object_id{ static_cast< index_t >( group.size() ),`
`@@ -148,7 +148,7 @@ namespace geode`
`148`	`148`
`149`	`149`	`template < typename Object >`
`150`	`150`	`std::vector< Object >& Configuration< Object >::get_group(`
`151`		`- const GroupId& group_id )`
	`151`	`+ const uuid& group_id )`
`152`	`152`	`{`
`153`	`153`	`return const_cast< std::vector< Object >& >(`
`154`	`154`	`static_cast< const Configuration* >( this )->get_group(`