Skip to content

Fix heights update in weighted_extended_p_square #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adimajo wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix heights update in weighted_extended_p_square #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions include/boost/accumulators/statistics/weighted_extended_p_square.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,9 @@ namespace impl
float_type hp = (this->heights[i + 1] - this->heights[i]) / dp;
float_type hm = (this->heights[i - 1] - this->heights[i]) / dm;

if((d >= 1 && dp > 1) || (d <= -1 && dm < -1))
if((d >= args[weight] && dp > args[weight]) || (d <= -args[weight] && dm < -args[weight]))
{
short sign_d = static_cast<short>(d / std::abs(d));

float_type h = this->heights[i] + sign_d / (dp - dm) * ((sign_d - dm)*hp + (dp - sign_d) * hm);
float_type h = this->heights[i] + d / (dp - dm) * ((d - dm) * hp + (dp - d) * hm);

// try adjusting heights[i] using p-squared formula
if(this->heights[i - 1] < h && h < this->heights[i + 1])
Expand All @@ -227,14 +225,14 @@ namespace impl
// use linear formula
if(d > 0)
{
this->heights[i] += hp;
this->heights[i] += args[weight] * hp;
}
if(d < 0)
{
this->heights[i] -= hm;
this->heights[i] -= args[weight] * hm;
}
}
this->actual_positions[i] += sign_d;
this->actual_positions[i] += d;
}
}
}
Expand Down