Skip to content
Snippets Groups Projects
Commit 7dfadce4 authored by Mark de Wever's avatar Mark de Wever
Browse files

Reduces the usage of the boost library

parent 66382b41
No related branches found
No related tags found
1 merge request!54Reduces the usage of the boost library
Pipeline #31560 passed
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "algorithms/iuwt/iuwt_mask.h" #include "algorithms/iuwt/iuwt_mask.h"
#include <boost/numeric/conversion/bounds.hpp> #include <limits>
#include "algorithms/iuwt/iuwt_decomposition.h" #include "algorithms/iuwt/iuwt_decomposition.h"
...@@ -13,7 +13,7 @@ std::string IuwtMask::Summary(const IuwtDecomposition& iuwt) const { ...@@ -13,7 +13,7 @@ std::string IuwtMask::Summary(const IuwtDecomposition& iuwt) const {
str << "IUWTMask with " << _masks.size() str << "IUWTMask with " << _masks.size()
<< " scale masks (iuwt: " << iuwt.Summary() << ")\n"; << " scale masks (iuwt: " << iuwt.Summary() << ")\n";
for (size_t i = 0; i != _masks.size(); ++i) { 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(); double minVal = std::numeric_limits<double>::max();
size_t count = 0; size_t count = 0;
for (size_t j = 0; j != _masks[i].size(); ++j) { for (size_t j = 0; j != _masks[i].size(); ++j) {
...@@ -23,7 +23,7 @@ std::string IuwtMask::Summary(const IuwtDecomposition& iuwt) const { ...@@ -23,7 +23,7 @@ std::string IuwtMask::Summary(const IuwtDecomposition& iuwt) const {
if (iuwt[i][j] < minVal) minVal = iuwt[i][j]; 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(); maxVal = std::numeric_limits<double>::quiet_NaN();
minVal = std::numeric_limits<double>::quiet_NaN(); minVal = std::numeric_limits<double>::quiet_NaN();
} }
......
...@@ -4,10 +4,9 @@ ...@@ -4,10 +4,9 @@
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
#include <limits>
#include <memory> #include <memory>
#include <boost/numeric/conversion/bounds.hpp>
#include <aocommon/image.h> #include <aocommon/image.h>
#include <aocommon/system.h> #include <aocommon/system.h>
...@@ -127,7 +126,7 @@ float IuwtDeconvolutionAlgorithm::GetMaxAbsWithoutMask(const Image& data, ...@@ -127,7 +126,7 @@ float IuwtDeconvolutionAlgorithm::GetMaxAbsWithoutMask(const Image& data,
x = width; x = width;
y = height; y = height;
float maxVal = boost::numeric::bounds<float>::lowest(); float maxVal = std::numeric_limits<float>::lowest();
for (size_t yi = minY; yi != maxY; ++yi) { for (size_t yi = minY; yi != maxY; ++yi) {
const float* dataPtr = data.Data() + yi * width; const float* dataPtr = data.Data() + yi * width;
for (size_t xi = minX; xi != maxX; ++xi) { for (size_t xi = minX; xi != maxX; ++xi) {
...@@ -154,7 +153,7 @@ float IuwtDeconvolutionAlgorithm::GetMaxAbsWithMask(const Image& data, ...@@ -154,7 +153,7 @@ float IuwtDeconvolutionAlgorithm::GetMaxAbsWithMask(const Image& data,
x = width; x = width;
y = height; y = height;
float maxVal = boost::numeric::bounds<float>::lowest(); float maxVal = std::numeric_limits<float>::lowest();
for (size_t yi = minY; yi != maxY; ++yi) { for (size_t yi = minY; yi != maxY; ++yi) {
const float* dataPtr = data.Data() + yi * width; const float* dataPtr = data.Data() + yi * width;
const bool* maskPtr = mask_ + yi * width; const bool* maskPtr = mask_ + yi * width;
......
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
#include <fstream> #include <fstream>
#include <boost/filesystem/operations.hpp>
#include <aocommon/radeccoord.h> #include <aocommon/radeccoord.h>
#include <aocommon/uvector.h> #include <aocommon/uvector.h>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment