Skip to content

Commit 4b752f4

Browse files
PA review
1 parent 681f815 commit 4b752f4

2 files changed

Lines changed: 17 additions & 8 deletions

File tree

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace geode
3333
{
3434
Accepted,
3535
Rejected,
36-
UnDecided
36+
Undecided
3737
};
3838

3939
template < typename Geometry >
@@ -90,25 +90,29 @@ namespace geode
9090
OPENGEODE_EXCEPTION( b >= 0.0, "[MH] beta must be >= 0" );
9191
if( b == 0 )
9292
{
93-
geode::Logger::info( "[MH] - beta == 0 all move will be "
94-
"accepted - Uniform sampling." );
93+
geode::Logger::info(
94+
"[Metropolis Hastings] - beta == 0 all move will be "
95+
"accepted - Uniform sampling." );
9596
}
9697
if( b < 1 )
9798
{
9899
geode::Logger::info(
99-
"[MH] - beta < 1 moves that increase energy are "
100+
"[Metropolis Hastings] - beta < 1 moves that increase "
101+
"energy are "
100102
"more likely to be accepted - Hot system introduce "
101103
"randomness for exploration." );
102104
}
103105
if( b == 1 )
104106
{
105-
geode::Logger::info( "[MH] - beta == 1 Standars choice "
107+
geode::Logger::info( "[Metropolis Hastings] - beta == 1 "
108+
"default choice no temperature "
106109
"- only consider energy." );
107110
}
108111
if( b > 1 )
109112
{
110113
geode::Logger::info(
111-
"[MH] - beta > 1 moves that increase energy are "
114+
"[Metropolis Hastings] - beta > 1 moves that increase "
115+
"energy are "
112116
"less likely to be accepted - Cold system to ensure "
113117
"convergence but may find local minimum randomness." );
114118
}
@@ -132,8 +136,9 @@ namespace geode
132136
const double compute_log_accept(
133137
const double deltaU, const Proposal< Geometry >& proposal ) const
134138
{
135-
OPENGEODE_ASSERT( std::isfinite( log_forward_prob )
136-
&& std::isfinite( log_backward_prob ),
139+
OPENGEODE_ASSERT(
140+
std::isfinite( proposal.log_forward_prob )
141+
&& std::isfinite( proposal.log_backward_prob ),
137142
"[MH] Non-finite proposal log-probabilities" );
138143
return -beta_ * deltaU + proposal.log_backward_prob
139144
- proposal.log_forward_prob;

include/geode/stochastic/sampling/mcmc/proposal/marked_object_sampler/uniform_marked_point_sampler.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ namespace geode
4646
{
4747
auto volume = box_.n_volume();
4848
if( volume != 0. )
49+
{
4950
log_pdf_ = -std::log( volume );
51+
}
5052
}
5153

5254
MarkedPoint sample( RandomEngine& engine ) const override
@@ -76,7 +78,9 @@ namespace geode
7678
double log_pdf( const MarkedPoint& obj ) const override
7779
{
7880
if( !box_.contains( obj.geometry() ) )
81+
{
7982
return -std::numeric_limits< double >::infinity();
83+
}
8084
return log_pdf_;
8185
}
8286

0 commit comments

Comments
 (0)