Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
radler
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ResearchAndDevelopment
radler
Commits
7dfadce4
Commit
7dfadce4
authored
3 years ago
by
Mark de Wever
Browse files
Options
Downloads
Patches
Plain Diff
Reduces the usage of the boost library
parent
66382b41
No related branches found
No related tags found
1 merge request
!54
Reduces the usage of the boost library
Pipeline
#31560
passed
3 years ago
Stage: versioning
Stage: prepare
Stage: linting
Stage: build
Stage: test
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
cpp/algorithms/iuwt/iuwt_mask.cc
+3
-3
3 additions, 3 deletions
cpp/algorithms/iuwt/iuwt_mask.cc
cpp/algorithms/iuwt_deconvolution_algorithm.cc
+3
-4
3 additions, 4 deletions
cpp/algorithms/iuwt_deconvolution_algorithm.cc
cpp/utils/write_model.h
+0
-2
0 additions, 2 deletions
cpp/utils/write_model.h
with
6 additions
and
9 deletions
cpp/algorithms/iuwt/iuwt_mask.cc
+
3
−
3
View file @
7dfadce4
...
@@ -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
=
boo
st
::
numeric
::
bound
s
<
double
>::
lowest
();
double
maxVal
=
st
d
::
numeric
_limit
s
<
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
==
boo
st
::
numeric
::
bound
s
<
double
>::
lowest
())
{
if
(
maxVal
==
st
d
::
numeric
_limit
s
<
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
();
}
}
...
...
This diff is collapsed.
Click to expand it.
cpp/algorithms/iuwt_deconvolution_algorithm.cc
+
3
−
4
View file @
7dfadce4
...
@@ -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
=
boo
st
::
numeric
::
bound
s
<
float
>::
lowest
();
float
maxVal
=
st
d
::
numeric
_limit
s
<
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
=
boo
st
::
numeric
::
bound
s
<
float
>::
lowest
();
float
maxVal
=
st
d
::
numeric
_limit
s
<
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
;
...
...
This diff is collapsed.
Click to expand it.
cpp/utils/write_model.h
+
0
−
2
View file @
7dfadce4
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment