Skip to content

WIP: Parameters of Histogram1D used by AM_Entropy and AM_Mode modes #692

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
schuhschuh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: Parameters of Histogram1D used by AM_Entropy and AM_Mode modes #692

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90a4ced
fix: Parameters of Histogram1D used by AM_Entropy and AM_Mode modes o…
schuhschuh Oct 8, 2019
0e11ae4
fix: Avoid dividion by zero when calculating bin_width in aggregate-i…
schuhschuh Oct 8, 2019
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
22 changes: 11 additions & 11 deletions Applications/src/aggregate-images.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,12 +658,16 @@ int main(int argc, char **argv)

// Parameters of histogram based measures
InputType min_value, max_value;
double hist_lower, hist_upper, bin_width;
if (mode == AM_Entropy || mode == AM_Mode) {
GetMinMax(images, min_value, max_value);
if (bins == 0) {
bins = iceil(max_value) - ifloor(min_value);
if (bins == 0) bins = 1;
if (bins < 2) {
bins = max(2, iround(max_value - min_value) + 1);
}
bin_width = static_cast<double>(max_value - min_value) / (bins - 1);
const auto half_bin_width = 0.5 * bin_width;
hist_lower = min_value - half_bin_width;
hist_upper = max_value + half_bin_width;
}

// Evaluate aggregation function for samples given at each voxel
Expand Down Expand Up @@ -724,10 +728,8 @@ int main(int argc, char **argv)
} break;

case AM_Entropy: {
eval._Function = [min_value, max_value, bins, parzen](const InputArray &values) -> OutputType {
Histogram1D<int> hist(bins);
hist.Min(static_cast<double>(min_value));
hist.Max(static_cast<double>(max_value));
eval._Function = [hist_lower, hist_upper, bin_width, parzen](const InputArray &values) -> OutputType {
Histogram1D<int> hist(hist_lower, hist_upper, bin_width);
for (auto value : values) {
hist.AddSample(static_cast<double>(value));
}
Expand All @@ -737,10 +739,8 @@ int main(int argc, char **argv)
} break;

case AM_Mode: {
eval._Function = [min_value, max_value, bins, parzen](const InputArray &values) -> OutputType {
Histogram1D<int> hist(bins);
hist.Min(static_cast<double>(min_value));
hist.Max(static_cast<double>(max_value));
eval._Function = [hist_lower, hist_upper, bin_width, parzen](const InputArray &values) -> OutputType {
Histogram1D<int> hist(hist_lower, hist_upper, bin_width);
for (auto value : values) {
hist.AddSample(static_cast<double>(value));
}
Expand Down