more tidy

Author: francoisbonneau

include/geode/stochastic/sampling/direct/object_set_sampler/point_set_sampler.hpp

@@ -31,7 +31,9 @@ namespace geode
     struct ObjectSamplerConfig< Point< dimension > >
     {
         // use to define the step for change move (move_ratio*domain volume)
+        // NOLINTBEGING(*-magic-numbers)
         double move_ratio{ 0.1 };
+        // NOLINTEND(*-magic-numbers)
     };
 
     template < index_t dimension >

include/geode/stochastic/sampling/direct/object_set_sampler/segment_set_sampler.hpp

@@ -33,7 +33,9 @@ namespace geode
     template <>
     struct ObjectSamplerConfig< OwnerSegment2D >
     {
-        double move_ratio = 0.1;
+        // NOLINTBEGING(*-magic-numbers)
+        double move_ratio{ 0.1 };
+        // NOLINTEND(*-magic-numbers)
 
         DoubleSampler::DistributionDescription length;
         DoubleSampler::DistributionDescription azimuth;
@@ -59,7 +61,7 @@ namespace geode
         const SpatialDomain< 2 >& domain_;
         DoubleSampler::Distribution length_;
         DoubleSampler::Distribution azimuth_;
-        double move_ratio_{ 0.1 };
+        double move_ratio_;
     };
 
 } // namespace geode

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

@@ -29,7 +29,7 @@
 
 namespace geode
 {
-    enum struct MH_DECISION
+    enum struct MH_DECISION : local_index_t
     {
         accepted,
         rejected,

include/geode/stochastic/spatial/object_set.hpp

@@ -35,26 +35,27 @@ namespace geode
 
     public:
         ObjectSet() noexcept = default;
+        ~ObjectSet() = default;
         ObjectSet( ObjectSet&& ) noexcept = default;
         ObjectSet& operator=( ObjectSet&& ) noexcept = default;
 
         void set_name( std::string_view name );
-        const Type& get_fixed_object( index_t index ) const;
-        const Type& get_free_object( index_t index ) const;
+        [[nodiscard]] const Type& get_fixed_object( index_t index ) const;
+        [[nodiscard]] const Type& get_free_object( index_t index ) const;
 
         index_t add_fixed_object( Type&& object );
 
         index_t add_free_object( Type&& object );
         void update_free_object( index_t index, Type&& object );
         void remove_free_object( index_t index );
 
-        index_t nb_objects() const;
-        index_t nb_fixed_objects() const;
-        index_t nb_free_objects() const;
+        [[nodiscard]] index_t nb_objects() const;
+        [[nodiscard]] index_t nb_fixed_objects() const;
+        [[nodiscard]] index_t nb_free_objects() const;
 
-        bool empty() const;
+        [[nodiscard]] bool empty() const;
 
-        std::string string() const;
+        [[nodiscard]] std::string string() const;
 
     private:
         std::vector< Type > fixed_objects_;

src/geode/stochastic/applications/strauss_process.cpp

@@ -30,9 +30,9 @@ namespace
         std::vector< std::pair< std::string, std::string > >& interactions,
         const std::vector< std::string >& set_names )
     {
-        for( const auto id : geode::Range{ set_names.size() } )
+        for( const auto name_id : geode::Range{ set_names.size() } )
         {
-            interactions.emplace_back( set_names[id], set_names[id] );
+            interactions.emplace_back( set_names[name_id], set_names[name_id] );
         }
     }
 

src/geode/stochastic/sampling/direct/object_set_sampler/point_set_sampler.cpp

@@ -35,15 +35,16 @@ namespace geode
     UniformPointSetSampler< dimension >::UniformPointSetSampler(
         const SpatialDomain< dimension >& domain,
         const ObjectSamplerConfig< Point< dimension > >& config )
-        : ObjectSetSampler< Point< dimension > >{}, domain_{ domain }
+        : ObjectSetSampler< Point< dimension > >{},
+          domain_{ domain },
+          step_move_( define_step_for_move( config.move_ratio ) )
     {
         auto volume = domain_.extended_n_volume();
         OpenGeodeStochasticStochasticException::check_exception( volume != 0.,
             nullptr, OpenGeodeException::TYPE::data,
             "[UniformPointSetSampler] Undefined Extended Bounding "
             "Box (volume ==0)." );
         this->set_log_pdf( -std::log( volume ) );
-        step_move_ = define_step_for_move( config.move_ratio );
         OpenGeodeStochasticStochasticException::check_exception(
             step_move_ > 0., nullptr, OpenGeodeException::TYPE::data,
             "[UniformPointSetSampler] Undefined step length for move "

src/geode/stochastic/sampling/direct/object_set_sampler/segment_set_sampler.cpp

@@ -21,8 +21,6 @@
  *
  */
 
-#pragma once
-
 #include <geode/stochastic/sampling/direct/object_set_sampler/segment_set_sampler.hpp>
 
 #include <geode/geometry/basic_objects/segment.hpp>
@@ -38,8 +36,7 @@ namespace geode
     UniformSegmentSetSampler::UniformSegmentSetSampler(
         const SpatialDomain< 2 >& domain,
         const ObjectSamplerConfig< OwnerSegment2D >& config )
-        : ObjectSetSampler< OwnerSegment2D >{},
-          domain_{ domain },
+        : domain_{ domain },
           length_{ DoubleSampler::create_distribution( config.length ) },
           azimuth_{ DoubleSampler::create_distribution( config.azimuth ) },
           move_ratio_{ config.move_ratio }