From 7dfadce47041e4e30d2e65757d6cf60c43dfa33e Mon Sep 17 00:00:00 2001
From: Mark de Wever <mark.dewever@stcorp.nl>
Date: Thu, 9 Jun 2022 11:06:26 +0000
Subject: [PATCH] Reduces the usage of the boost library
---
cpp/algorithms/iuwt/iuwt_mask.cc | 6 +++---
cpp/algorithms/iuwt_deconvolution_algorithm.cc | 7 +++----
cpp/utils/write_model.h | 2 --
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/cpp/algorithms/iuwt/iuwt_mask.cc b/cpp/algorithms/iuwt/iuwt_mask.cc
index 6ddba04c..102a1eb7 100644
--- a/cpp/algorithms/iuwt/iuwt_mask.cc
+++ b/cpp/algorithms/iuwt/iuwt_mask.cc
@@ -2,7 +2,7 @@
#include "algorithms/iuwt/iuwt_mask.h"
-#include <boost/numeric/conversion/bounds.hpp>
+#include <limits>
#include "algorithms/iuwt/iuwt_decomposition.h"
@@ -13,7 +13,7 @@ std::string IuwtMask::Summary(const IuwtDecomposition& iuwt) const {
str << "IUWTMask with " << _masks.size()
<< " scale masks (iuwt: " << iuwt.Summary() << ")\n";
for (size_t i = 0; i != _masks.size(); ++i) {
- double maxVal = boost::numeric::bounds<double>::lowest();
+ double maxVal = std::numeric_limits<double>::lowest();
double minVal = std::numeric_limits<double>::max();
size_t count = 0;
for (size_t j = 0; j != _masks[i].size(); ++j) {
@@ -23,7 +23,7 @@ std::string IuwtMask::Summary(const IuwtDecomposition& iuwt) const {
if (iuwt[i][j] < minVal) minVal = iuwt[i][j];
}
}
- if (maxVal == boost::numeric::bounds<double>::lowest()) {
+ if (maxVal == std::numeric_limits<double>::lowest()) {
maxVal = std::numeric_limits<double>::quiet_NaN();
minVal = std::numeric_limits<double>::quiet_NaN();
}
diff --git a/cpp/algorithms/iuwt_deconvolution_algorithm.cc b/cpp/algorithms/iuwt_deconvolution_algorithm.cc
index 8c8bd817..557337c9 100644
--- a/cpp/algorithms/iuwt_deconvolution_algorithm.cc
+++ b/cpp/algorithms/iuwt_deconvolution_algorithm.cc
@@ -4,10 +4,9 @@
#include <algorithm>
#include <iostream>
+#include <limits>
#include <memory>
-#include <boost/numeric/conversion/bounds.hpp>
-
#include <aocommon/image.h>
#include <aocommon/system.h>
@@ -127,7 +126,7 @@ float IuwtDeconvolutionAlgorithm::GetMaxAbsWithoutMask(const Image& data,
x = width;
y = height;
- float maxVal = boost::numeric::bounds<float>::lowest();
+ float maxVal = std::numeric_limits<float>::lowest();
for (size_t yi = minY; yi != maxY; ++yi) {
const float* dataPtr = data.Data() + yi * width;
for (size_t xi = minX; xi != maxX; ++xi) {
@@ -154,7 +153,7 @@ float IuwtDeconvolutionAlgorithm::GetMaxAbsWithMask(const Image& data,
x = width;
y = height;
- float maxVal = boost::numeric::bounds<float>::lowest();
+ float maxVal = std::numeric_limits<float>::lowest();
for (size_t yi = minY; yi != maxY; ++yi) {
const float* dataPtr = data.Data() + yi * width;
const bool* maskPtr = mask_ + yi * width;
diff --git a/cpp/utils/write_model.h b/cpp/utils/write_model.h
index cc7d5bd7..2db3d9e0 100644
--- a/cpp/utils/write_model.h
+++ b/cpp/utils/write_model.h
@@ -6,8 +6,6 @@
#include <fstream>
-#include <boost/filesystem/operations.hpp>
-
#include <aocommon/radeccoord.h>
#include <aocommon/uvector.h>
--
GitLab