tidy

francoisbonneau · francoisbonneau · commit fb14a03a8182 · 2026-06-03T19:48:00.000+02:00
diff --git a/include/geode/stochastic/applications/fractures.hpp b/include/geode/stochastic/applications/fractures.hpp
@@ -21,14 +21,14 @@ namespace geode
         double death_ratio{ 1.0 };
         double change_ratio{ 1.0 };
 
-        std::string density_name() const
+        [[nodiscard]] std::string density_name() const
         {
             return absl::StrCat( fset_name, "_p20" );
         }
         double p20{ 0. };
         std::optional< double > expected_number;
 
-        std::string intensity_name() const
+        [[nodiscard]] std::string intensity_name() const
         {
             return absl::StrCat( fset_name, "_p21" );
         }
@@ -37,13 +37,13 @@ namespace geode
 
         std::vector< std::array< geode::Point2D, 2 > > observed_fractures;
 
-        std::string spacing_name() const
+        [[nodiscard]] std::string spacing_name() const
         {
             return absl::StrCat( fset_name, "_spacing" );
         }
         double minimal_spacing{ 0. };
 
-        std::string string() const
+        [[nodiscard]] std::string string() const
         {
             auto message =
                 absl::StrCat( "FractureSetDescription: ", fset_name );
@@ -94,14 +94,15 @@ namespace geode
 
         std::vector< FractureSetDescription > fracture_sets;
 
-        FractureSetDescription& add_fracture_set( absl::string_view fset_name )
+        [[nodiscard]] FractureSetDescription& add_fracture_set(
+            absl::string_view fset_name )
         {
             auto& fracture_set = fracture_sets.emplace_back();
             fracture_set.fset_name = fset_name;
             return fracture_set;
         }
 
-        std::string string() const
+        [[nodiscard]] std::string string() const
         {
             auto message =
                 absl::StrCat( "FractureNetworkDescription: ", fnet_name );
diff --git a/include/geode/stochastic/applications/poisson_process.hpp b/include/geode/stochastic/applications/poisson_process.hpp
@@ -24,16 +24,17 @@ namespace geode
     template < typename ObjectType >
     struct PoissonProcessDescription
     {
+        std::string process_name{ "Poisson" };
         SpatialDomainConfig< ObjectType::dim > domain;
 
         std::vector< PoissonSetDescription< ObjectType > > sets;
 
         PoissonSetDescription< ObjectType >& add_set(
-            absl::string_view set_name, absl::string_view density_name )
+            absl::string_view set_name )
         {
             auto& set = sets.emplace_back();
             set.set_name = set_name;
-            set.density_name = density_name;
+            set.density_name = absl::StrCat( set_name, "_density" );
             return set;
         }
     };
diff --git a/include/geode/stochastic/applications/strauss_process.hpp b/include/geode/stochastic/applications/strauss_process.hpp
@@ -32,11 +32,12 @@ namespace geode
         std::vector< StraussInteractionDescription< ObjectType > > interactions;
 
         PoissonSetDescription< ObjectType >& add_set(
-            absl::string_view set_name, absl::string_view density_name )
+            absl::string_view set_name )
         {
             auto& set = sets.emplace_back();
             set.set_name = set_name;
-            set.density_name = density_name;
+            set.density_name = absl::StrCat( set_name, "_density" );
+
             return set;
         }
 
diff --git a/include/geode/stochastic/sampling/direct/double_sampler.hpp b/include/geode/stochastic/sampling/direct/double_sampler.hpp
@@ -48,7 +48,7 @@ namespace geode
 
         struct DistributionDescription
         {
-            DistributionDescription( absl::string_view name_in )
+            explicit DistributionDescription( absl::string_view name_in )
                 : name{ name_in }
             {
             }
@@ -67,7 +67,7 @@ namespace geode
             std::optional< double >
                 alpha; // exponent parameter for power law distribution
 
-            std::string string() const
+            [[nodiscard]] std::string string() const
             {
                 auto message = absl::StrCat( "Distribution - ", name );
                 absl::StrAppend( &message,
diff --git a/include/geode/stochastic/sampling/direct/object_set_sampler/point_set_sampler.hpp b/include/geode/stochastic/sampling/direct/object_set_sampler/point_set_sampler.hpp
@@ -31,7 +31,7 @@ namespace geode
     struct ObjectSamplerConfig< Point< dimension > >
     {
         // use to define the step for change move (move_ratio*domain volume)
-        // NOLINTBEGING(*-magic-numbers)
+        // NOLINTBEGIN(*-magic-numbers)
         double move_ratio{ 0.1 };
         // NOLINTEND(*-magic-numbers)
     };
diff --git a/include/geode/stochastic/sampling/direct/object_set_sampler/segment_set_sampler.hpp b/include/geode/stochastic/sampling/direct/object_set_sampler/segment_set_sampler.hpp
@@ -33,7 +33,7 @@ namespace geode
     template <>
     struct ObjectSamplerConfig< OwnerSegment2D >
     {
-        // NOLINTBEGING(*-magic-numbers)
+        // NOLINTBEGIN(*-magic-numbers)
         double move_ratio{ 0.1 };
         // NOLINTEND(*-magic-numbers)
 
diff --git a/include/geode/stochastic/spatial/spatial_domain.hpp b/include/geode/stochastic/spatial/spatial_domain.hpp
@@ -152,7 +152,8 @@ namespace geode
         Point< dimension > min_point;
         Point< dimension > max_point;
         double buffer_size{ 0.0 };
-        std::string string() const
+
+        [[nodiscard]] std::string string() const
         {
             std::string message = "Domain: ";
             absl::StrAppend(
diff --git a/src/geode/stochastic/applications/fractures.cpp b/src/geode/stochastic/applications/fractures.cpp
@@ -30,10 +30,10 @@ namespace
             fracture_extremities )
     {
         std::vector< geode::Fracture > fractures;
+        fractures.reserve( fracture_extremities.size() );
         for( const auto& extremities : fracture_extremities )
         {
-            fractures.emplace_back(
-                geode::OwnerSegment2D{ extremities[0], extremities[1] } );
+            fractures.emplace_back( extremities[0], extremities[1] );
         }
         return fractures;
     }
@@ -75,9 +75,10 @@ namespace geode
             intensity.term_name = fset_desc.intensity_name();
             intensity.object_set_names = { fset_desc.fset_name };
             intensity.lambda = fset_desc.p21;
-            constexpr double caracteristic_length = 1.0;
+            constexpr double CARACTERISTIC_LENGTH = 1.0; // mean fracture
+                                                         // length?
             intensity.object_feature =
-                SegmentLengthInsideBoxFeatureConfig{ caracteristic_length };
+                SegmentLengthInsideBoxFeatureConfig{ CARACTERISTIC_LENGTH };
             simulation_config.model.terms.emplace_back(
                 std::move( intensity ) );
 
diff --git a/tests/stochastic/applications/test-fractures.cpp b/tests/stochastic/applications/test-fractures.cpp
@@ -38,9 +38,9 @@ namespace
         // NOLINTBEGIN(*-magic-numbers)
         geode::FractureNetworkDescription fnet_desc;
         fnet_desc.fnet_name = "One_Set_FNet";
-        constexpr double domain_buffer{ 10 };
+        constexpr double DOMAIN_BUFFER{ 10 };
         fnet_desc.domain = { geode::Point2D{ { 0, 0 } },
-            geode::Point2D{ { 100.0, 100.0 } }, domain_buffer };
+            geode::Point2D{ { 100.0, 100.0 } }, DOMAIN_BUFFER };
 
         // --- Object set
         auto& fset = fnet_desc.add_fracture_set( "fset_A" );
diff --git a/tests/stochastic/applications/test-poisson-process.cpp b/tests/stochastic/applications/test-poisson-process.cpp
@@ -47,7 +47,7 @@ namespace
             geode::PoissonProcessDescription< geode::Point2D > poisson;
             poisson.domain = { geode::Point2D{ { 0, 0 } },
                 geode::Point2D{ { 10, 10 } }, 0. };
-            auto& set_config = poisson.add_set( "set_A", "density_A" );
+            auto& set_config = poisson.add_set( "set_A" );
             set_config.lambda = 0.3;
             set_config.expected_nb_objects = 30;
             set_config.birth_ratio = birth_ratio[config];
@@ -96,21 +96,21 @@ namespace
         geode::PoissonProcessDescription< geode::Point2D > poisson;
         poisson.domain = { geode::Point2D{ { 0, 0 } },
             geode::Point2D{ { 10, 10 } }, 0. };
-        auto& set_config_01 = poisson.add_set( "set01", "density_01" );
+        auto& set_config_01 = poisson.add_set( "set01" );
         set_config_01.lambda = 0.1;
         set_config_01.expected_nb_objects = 10;
         set_config_01.birth_ratio = 2.0;
         set_config_01.death_ratio = 3.0;
         set_config_01.change_ratio = 1.0;
 
-        auto& set_config_02 = poisson.add_set( "set02", "density_02" );
+        auto& set_config_02 = poisson.add_set( "set02" );
         set_config_02.lambda = 0.4;
         set_config_01.expected_nb_objects = 40;
         set_config_02.birth_ratio = 3.0;
         set_config_02.death_ratio = 0.5;
         set_config_02.change_ratio = 1.0;
 
-        auto& set_config_03 = poisson.add_set( "set03", "density_03" );
+        auto& set_config_03 = poisson.add_set( "set03" );
         set_config_03.lambda = 0.3;
         set_config_01.expected_nb_objects = 30;
         set_config_03.birth_ratio = 4.0;
diff --git a/tests/stochastic/applications/test-strauss-process.cpp b/tests/stochastic/applications/test-strauss-process.cpp
@@ -52,7 +52,7 @@ namespace
             strauss.domain = { geode::Point2D{ { 0.0, 0.0 } },
                 geode::Point2D{ { 10.0, 10.0 } }, 1. };
 
-            auto& set_config = strauss.add_set( "set_A", "density_A" );
+            auto& set_config = strauss.add_set( "set_A" );
             set_config.lambda = 0.5;
             set_config.expected_nb_objects = nb_points[config];
 
@@ -115,21 +115,21 @@ namespace
             strauss.domain = { geode::Point2D{ { 0, 0 } },
                 geode::Point2D{ { 10, 10 } }, 2. };
 
-            auto& set_config_01 = strauss.add_set( "set01", "density_01" );
+            auto& set_config_01 = strauss.add_set( "set01" );
             set_config_01.lambda = 0.1;
             set_config_01.expected_nb_objects = 10;
             set_config_01.birth_ratio = 1.0;
             set_config_01.death_ratio = 3.0;
             set_config_01.change_ratio = 1.0;
 
-            auto& set_config_02 = strauss.add_set( "set02", "density_02" );
+            auto& set_config_02 = strauss.add_set( "set02" );
             set_config_02.lambda = 0.4;
             set_config_01.expected_nb_objects = 40;
             set_config_02.birth_ratio = 3.0;
             set_config_02.death_ratio = 0.5;
             set_config_02.change_ratio = 1.0;
 
-            auto& set_config_03 = strauss.add_set( "set03", "density_03" );
+            auto& set_config_03 = strauss.add_set( "set03" );
             set_config_03.lambda = 0.3;
             set_config_01.expected_nb_objects = 30;
             set_config_03.birth_ratio = 4.0;
diff --git a/tests/stochastic/sampling/mcmc/test-metropolis-hasting-sampler.cpp b/tests/stochastic/sampling/mcmc/test-metropolis-hasting-sampler.cpp
@@ -31,6 +31,8 @@ namespace
 {
     void test_acceptance_prob_helper()
     {
+        // NOLINTBEGIN(*-magic-numbers)
+
         // log_accept >= 0 → prob = 1
         geode::OpenGeodeStochasticStochasticException::test(
             geode::MetropolisHastings< geode::Point2D >::acceptance_prob_helper(
@@ -46,49 +48,53 @@ namespace
             "[MH test] acceptance_prob_helper wrong for extreme negative." );
 
         // moderate negative → exp(log_accept)
-        double val =
+        auto val =
             geode::MetropolisHastings< geode::Point2D >::acceptance_prob_helper(
                 -1.0 );
         geode::OpenGeodeStochasticStochasticException::test(
-            std::fabs( val - std::exp( -1.0 ) ) < 1e-12,
+            std::fabs( val - std::exp( -1.0 ) ) < geode::GLOBAL_EPSILON,
             "[MH test] acceptance_prob_helper wrong for -1.0." );
+        // NOLINTEND(*-magic-numbers)
     }
 
-    void test_beta_setter( geode::MetropolisHastings< geode::Point2D >& mh )
+    void test_beta_setter( geode::MetropolisHastings< geode::Point2D >& mh_eng )
     {
-        mh.set_beta( 0.5 );
+        // NOLINTBEGIN(*-magic-numbers)
+        mh_eng.set_beta( 0.5 );
         geode::OpenGeodeStochasticStochasticException::test(
-            mh.beta() == 0.5, "[MH test] beta not set correctly." );
+            mh_eng.beta() == 0.5, "[MH test] beta not set correctly." );
 
         bool exception_thrown = false;
         try
         {
-            mh.set_beta( -1.0 );
+            mh_eng.set_beta( -1.0 );
         }
         catch( ... )
         {
             exception_thrown = true;
         }
         geode::OpenGeodeStochasticStochasticException::test(
             exception_thrown, "[MH test] negative beta did not throw." );
+        // NOLINTEND(*-magic-numbers)
     }
 
-    void test_steps( const geode::MetropolisHastings< geode::Point2D >& mh,
+    void test_steps( const geode::MetropolisHastings< geode::Point2D >& mh_eng,
         geode::ObjectSets< geode::Point2D >& state )
     {
+        // NOLINTBEGIN(*-magic-numbers)
         geode::RandomEngine engine;
 
         geode::index_t stat_sum{ 0 };
-        constexpr geode::index_t N{ 100000 };
+        constexpr geode::index_t NUNBER_ITR{ 100000 };
 
         geode::index_t accepted_birth{ 0 };
         geode::index_t accepted_death{ 0 };
         geode::index_t accepted_change{ 0 };
         geode::index_t nb_accepted{ 0 };
 
-        for( const auto count : geode::Range{ N } )
+        for( const auto count : geode::Range{ NUNBER_ITR } )
         {
-            auto result = mh.step( state, engine );
+            auto result = mh_eng.step( state, engine );
             // Invariant: fixed object must remain
 
             geode::OpenGeodeStochasticStochasticException::test(
@@ -146,6 +152,7 @@ namespace
                         / static_cast< double >( nb_accepted ) );
             }
         }
+        // NOLINTEND(*-magic-numbers)
     }
 
 } // namespace
@@ -155,7 +162,7 @@ int main()
     try
     {
         geode::OpenGeodeStochasticStochasticLibrary::initialize();
-
+        // NOLINTBEGIN(*-magic-numbers)
         geode::Point2D min_point{ { 0., 0. } };
         geode::Point2D max_point{ { 10., 10. } };
 
@@ -182,23 +189,24 @@ int main()
                 domain ) );
         geode_unused( term_id );
 
-        geode::MetropolisHastings< geode::Point2D > mh(
+        geode::MetropolisHastings< geode::Point2D > mh_eng(
             energy_terms, std::move( kernel ) );
 
         state.add_object( geode::Point2D{ { 1., 1. } }, set_id, true );
         state.add_object( geode::Point2D{ { 2., 2. } }, set_id, false );
         state.add_object( geode::Point2D{ { 3., 3. } }, set_id, true );
 
-        test_steps( mh, state );
+        test_steps( mh_eng, state );
         // geode::OpenGeodeStochasticStochasticException::test( state.get_set(
         // set_id ).nb_fixed_objects() == 2
         // );
 
-        test_beta_setter( mh );
+        test_beta_setter( mh_eng );
         test_acceptance_prob_helper();
 
         geode::Logger::info( "MH TEST SUCCESS" );
         return 0;
+        // NOLINTEND(*-magic-numbers)
     }
     catch( ... )
     {
diff --git a/tests/stochastic/sampling/test-random-engine.cpp b/tests/stochastic/sampling/test-random-engine.cpp

Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,14 @@ namespace geode`
`21`	`21`	`double death_ratio{ 1.0 };`
`22`	`22`	`double change_ratio{ 1.0 };`
`23`	`23`
`24`		`- std::string density_name() const`
	`24`	`+ [[nodiscard]] std::string density_name() const`
`25`	`25`	`{`
`26`	`26`	`return absl::StrCat( fset_name, "_p20" );`
`27`	`27`	`}`
`28`	`28`	`double p20{ 0. };`
`29`	`29`	`std::optional< double > expected_number;`
`30`	`30`
`31`		`- std::string intensity_name() const`
	`31`	`+ [[nodiscard]] std::string intensity_name() const`
`32`	`32`	`{`
`33`	`33`	`return absl::StrCat( fset_name, "_p21" );`
`34`	`34`	`}`
`@@ -37,13 +37,13 @@ namespace geode`
`37`	`37`
`38`	`38`	`std::vector< std::array< geode::Point2D, 2 > > observed_fractures;`
`39`	`39`
`40`		`- std::string spacing_name() const`
	`40`	`+ [[nodiscard]] std::string spacing_name() const`
`41`	`41`	`{`
`42`	`42`	`return absl::StrCat( fset_name, "_spacing" );`
`43`	`43`	`}`
`44`	`44`	`double minimal_spacing{ 0. };`
`45`	`45`
`46`		`- std::string string() const`
	`46`	`+ [[nodiscard]] std::string string() const`
`47`	`47`	`{`
`48`	`48`	`auto message =`
`49`	`49`	`absl::StrCat( "FractureSetDescription: ", fset_name );`
`@@ -94,14 +94,15 @@ namespace geode`
`94`	`94`
`95`	`95`	`std::vector< FractureSetDescription > fracture_sets;`
`96`	`96`
`97`		`- FractureSetDescription& add_fracture_set( absl::string_view fset_name )`
	`97`	`+ [[nodiscard]] FractureSetDescription& add_fracture_set(`
	`98`	`+ absl::string_view fset_name )`
`98`	`99`	`{`
`99`	`100`	`auto& fracture_set = fracture_sets.emplace_back();`
`100`	`101`	`fracture_set.fset_name = fset_name;`
`101`	`102`	`return fracture_set;`
`102`	`103`	`}`
`103`	`104`
`104`		`- std::string string() const`
	`105`	`+ [[nodiscard]] std::string string() const`
`105`	`106`	`{`
`106`	`107`	`auto message =`
`107`	`108`	`absl::StrCat( "FractureNetworkDescription: ", fnet_name );`
Original file line number	Diff line number	Diff line change
`@@ -24,16 +24,17 @@ namespace geode`
`24`	`24`	`template < typename ObjectType >`
`25`	`25`	`struct PoissonProcessDescription`
`26`	`26`	`{`
	`27`	`+ std::string process_name{ "Poisson" };`
`27`	`28`	`SpatialDomainConfig< ObjectType::dim > domain;`
`28`	`29`
`29`	`30`	`std::vector< PoissonSetDescription< ObjectType > > sets;`
`30`	`31`
`31`	`32`	`PoissonSetDescription< ObjectType >& add_set(`
`32`		`- absl::string_view set_name, absl::string_view density_name )`
	`33`	`+ absl::string_view set_name )`
`33`	`34`	`{`
`34`	`35`	`auto& set = sets.emplace_back();`
`35`	`36`	`set.set_name = set_name;`
`36`		`- set.density_name = density_name;`
	`37`	`+ set.density_name = absl::StrCat( set_name, "_density" );`
`37`	`38`	`return set;`
`38`	`39`	`}`
`39`	`40`	`};`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,12 @@ namespace geode`
`32`	`32`	`std::vector< StraussInteractionDescription< ObjectType > > interactions;`
`33`	`33`
`34`	`34`	`PoissonSetDescription< ObjectType >& add_set(`
`35`		`- absl::string_view set_name, absl::string_view density_name )`
	`35`	`+ absl::string_view set_name )`
`36`	`36`	`{`
`37`	`37`	`auto& set = sets.emplace_back();`
`38`	`38`	`set.set_name = set_name;`
`39`		`- set.density_name = density_name;`
	`39`	`+ set.density_name = absl::StrCat( set_name, "_density" );`
	`40`	`+`
`40`	`41`	`return set;`
`41`	`42`	`}`
`42`	`43`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ namespace geode`
`48`	`48`
`49`	`49`	`struct DistributionDescription`
`50`	`50`	`{`
`51`		`- DistributionDescription( absl::string_view name_in )`
	`51`	`+ explicit DistributionDescription( absl::string_view name_in )`
`52`	`52`	`: name{ name_in }`
`53`	`53`	`{`
`54`	`54`	`}`
`@@ -67,7 +67,7 @@ namespace geode`
`67`	`67`	`std::optional< double >`
`68`	`68`	`alpha; // exponent parameter for power law distribution`
`69`	`69`
`70`		`- std::string string() const`
	`70`	`+ [[nodiscard]] std::string string() const`
`71`	`71`	`{`
`72`	`72`	`auto message = absl::StrCat( "Distribution - ", name );`
`73`	`73`	`absl::StrAppend( &message,`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ namespace geode`
`31`	`31`	`struct ObjectSamplerConfig< Point< dimension > >`
`32`	`32`	`{`
`33`	`33`	`// use to define the step for change move (move_ratio*domain volume)`
`34`		`- // NOLINTBEGING(*-magic-numbers)`
	`34`	`+ // NOLINTBEGIN(*-magic-numbers)`
`35`	`35`	`double move_ratio{ 0.1 };`
`36`	`36`	`// NOLINTEND(*-magic-numbers)`
`37`	`37`	`};`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ namespace geode`
`33`	`33`	`template <>`
`34`	`34`	`struct ObjectSamplerConfig< OwnerSegment2D >`
`35`	`35`	`{`
`36`		`- // NOLINTBEGING(*-magic-numbers)`
	`36`	`+ // NOLINTBEGIN(*-magic-numbers)`
`37`	`37`	`double move_ratio{ 0.1 };`
`38`	`38`	`// NOLINTEND(*-magic-numbers)`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@ namespace`
`30`	`30`	`fracture_extremities )`
`31`	`31`	`{`
`32`	`32`	`std::vector< geode::Fracture > fractures;`
	`33`	`+ fractures.reserve( fracture_extremities.size() );`
`33`	`34`	`for( const auto& extremities : fracture_extremities )`
`34`	`35`	`{`
`35`		`- fractures.emplace_back(`
`36`		`- geode::OwnerSegment2D{ extremities[0], extremities[1] } );`
	`36`	`+ fractures.emplace_back( extremities[0], extremities[1] );`
`37`	`37`	`}`
`38`	`38`	`return fractures;`
`39`	`39`	`}`
`@@ -75,9 +75,10 @@ namespace geode`
`75`	`75`	`intensity.term_name = fset_desc.intensity_name();`
`76`	`76`	`intensity.object_set_names = { fset_desc.fset_name };`
`77`	`77`	`intensity.lambda = fset_desc.p21;`
`78`		`- constexpr double caracteristic_length = 1.0;`
	`78`	`+ constexpr double CARACTERISTIC_LENGTH = 1.0; // mean fracture`
	`79`	`+ // length?`
`79`	`80`	`intensity.object_feature =`
`80`		`- SegmentLengthInsideBoxFeatureConfig{ caracteristic_length };`
	`81`	`+ SegmentLengthInsideBoxFeatureConfig{ CARACTERISTIC_LENGTH };`
`81`	`82`	`simulation_config.model.terms.emplace_back(`
`82`	`83`	`std::move( intensity ) );`
`83`	`84`