Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
laser_scan_utils
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
labrobotica
algorithms
laser_scan_utils
Commits
753f402d
Commit
753f402d
authored
9 years ago
by
acoromin
Browse files
Options
Downloads
Patches
Plain Diff
Added std:: to isnan and isinf calls
parent
54cb7102
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/clustering.cpp
+2
-2
2 additions, 2 deletions
src/clustering.cpp
src/object_detector.cpp
+1
-1
1 addition, 1 deletion
src/object_detector.cpp
src/scan_basics.cpp
+2
-2
2 additions, 2 deletions
src/scan_basics.cpp
with
5 additions
and
5 deletions
src/clustering.cpp
+
2
−
2
View file @
753f402d
...
@@ -271,7 +271,7 @@ void laserscanutils::preFilterScan(const laserscanutils::ScanParams & _params,
...
@@ -271,7 +271,7 @@ void laserscanutils::preFilterScan(const laserscanutils::ScanParams & _params,
{
{
act_range
=
_ranges
[
i
];
act_range
=
_ranges
[
i
];
if
(
(
act_range
>=
_params
.
range_min_
)
&&
(
act_range
<=
_params
.
range_max_
)
&&
!
(
isnan
(
act_range
))
&&
!
(
isinf
(
act_range
))
)
if
(
(
act_range
>=
_params
.
range_min_
)
&&
(
act_range
<=
_params
.
range_max_
)
&&
!
(
std
::
isnan
(
act_range
))
&&
!
(
std
::
isinf
(
act_range
))
)
{
{
act_theta
=
_params
.
angle_min_
+
_params
.
angle_step_
*
(
i
);
act_theta
=
_params
.
angle_min_
+
_params
.
angle_step_
*
(
i
);
...
@@ -701,7 +701,7 @@ unsigned int laserscanutils::scanProcess(const ScanParams & _params,
...
@@ -701,7 +701,7 @@ unsigned int laserscanutils::scanProcess(const ScanParams & _params,
for
(
unsigned
int
i
=
0
;
i
<
_ranges
.
size
();
++
i
)
for
(
unsigned
int
i
=
0
;
i
<
_ranges
.
size
();
++
i
)
{
{
act_range
=
_ranges
[
i
];
act_range
=
_ranges
[
i
];
if
(
(
act_range
>=
_params
.
range_min_
)
&&
(
act_range
<=
_params
.
range_max_
)
&&
!
(
isnan
(
act_range
))
&&
!
(
isinf
(
act_range
))
)
if
(
(
act_range
>=
_params
.
range_min_
)
&&
(
act_range
<=
_params
.
range_max_
)
&&
!
(
std
::
isnan
(
act_range
))
&&
!
(
std
::
isinf
(
act_range
))
)
{
{
act_theta
=
_params
.
angle_min_
+
_params
.
angle_step_
*
(
i
);
act_theta
=
_params
.
angle_min_
+
_params
.
angle_step_
*
(
i
);
...
...
This diff is collapsed.
Click to expand it.
src/object_detector.cpp
+
1
−
1
View file @
753f402d
...
@@ -254,7 +254,7 @@ void laserscanutils::preFilterScan2homog(const laserscanutils::ScanParams & _par
...
@@ -254,7 +254,7 @@ void laserscanutils::preFilterScan2homog(const laserscanutils::ScanParams & _par
{
{
act_range
=
_ranges
[
i
];
act_range
=
_ranges
[
i
];
if
(
(
act_range
>=
_params
.
range_min_
)
&&
(
act_range
<=
_params
.
range_max_
)
&&
!
(
isnan
(
act_range
))
&&
!
(
isinf
(
act_range
))
)
if
(
(
act_range
>=
_params
.
range_min_
)
&&
(
act_range
<=
_params
.
range_max_
)
&&
!
(
std
::
isnan
(
act_range
))
&&
!
(
std
::
isinf
(
act_range
))
)
{
{
act_theta
=
_params
.
angle_min_
+
_params
.
angle_step_
*
(
i
);
act_theta
=
_params
.
angle_min_
+
_params
.
angle_step_
*
(
i
);
...
...
This diff is collapsed.
Click to expand it.
src/scan_basics.cpp
+
2
−
2
View file @
753f402d
...
@@ -26,7 +26,7 @@ void laserscanutils::ranges2xy(const ScanParams & _params, std::vector<float> &
...
@@ -26,7 +26,7 @@ void laserscanutils::ranges2xy(const ScanParams & _params, std::vector<float> &
//for each range, check correctness of value and translate from polar to xy coordinates
//for each range, check correctness of value and translate from polar to xy coordinates
while
(
ii
<
_ranges
.
size
())
while
(
ii
<
_ranges
.
size
())
{
{
if
(
_ranges
[
ii
]
>
_params
.
range_min_
&&
_ranges
[
ii
]
<
_params
.
range_max_
&&
!
isnan
(
_ranges
[
ii
])
&&
!
isinf
(
_ranges
[
ii
])
)
if
(
_ranges
[
ii
]
>
_params
.
range_min_
&&
_ranges
[
ii
]
<
_params
.
range_max_
&&
!
std
::
isnan
(
_ranges
[
ii
])
&&
!
std
::
isinf
(
_ranges
[
ii
])
)
{
{
//transform from polar to euclidean
//transform from polar to euclidean
_points
(
0
,
ii
)
=
_ranges
[
ii
]
*
cos
(
azimuth
);
_points
(
0
,
ii
)
=
_ranges
[
ii
]
*
cos
(
azimuth
);
...
@@ -66,7 +66,7 @@ void laserscanutils::ranges2xy(const ScanParams & _params, std::vector<float> &
...
@@ -66,7 +66,7 @@ void laserscanutils::ranges2xy(const ScanParams & _params, std::vector<float> &
//for each range, check correctness of value and translate from polar to xy coordinates
//for each range, check correctness of value and translate from polar to xy coordinates
while
(
ii
<
_ranges
.
size
())
while
(
ii
<
_ranges
.
size
())
{
{
if
(
_ranges
[
ii
]
>
_params
.
range_min_
&&
_ranges
[
ii
]
<
_params
.
range_max_
&&
!
isnan
(
_ranges
[
ii
])
&&
!
isinf
(
_ranges
[
ii
])
)
if
(
_ranges
[
ii
]
>
_params
.
range_min_
&&
_ranges
[
ii
]
<
_params
.
range_max_
&&
!
std
::
isnan
(
_ranges
[
ii
])
&&
!
std
::
isinf
(
_ranges
[
ii
])
)
{
{
//transform from polar to euclidean
//transform from polar to euclidean
_points
(
0
,
ii
)
=
_ranges
[
ii
]
*
cos
(
azimuth
);
_points
(
0
,
ii
)
=
_ranges
[
ii
]
*
cos
(
azimuth
);
...
...
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