Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
arbor
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Analyze
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
arbor-sim
arbor
Commits
76db8a5f
Commit
76db8a5f
authored
9 years ago
by
Benjamin Cumming
Browse files
Options
Downloads
Patches
Plain Diff
fix signed-unsigned comparison warnings and add <algorithm> for std::sort
parent
b09fb960
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/swcio.cpp
+3
-1
3 additions, 1 deletion
src/swcio.cpp
tests/test_swcio.cpp
+7
-7
7 additions, 7 deletions
tests/test_swcio.cpp
with
10 additions
and
8 deletions
src/swcio.cpp
+
3
−
1
View file @
76db8a5f
#include
<algorithm>
#include
<iomanip>
#include
<map>
#include
<sstream>
#include
<unordered_set>
#include
<swcio.hpp>
namespace
nestmc
...
...
@@ -38,7 +40,7 @@ void cell_record::check_consistency() const
if
(
id_
<
0
)
{
throw
std
::
invalid_argument
(
"negative ids not allowed"
);
}
if
(
parent_id_
<
-
1
)
{
throw
std
::
invalid_argument
(
"parent_id < -1 not allowed"
);
}
...
...
This diff is collapsed.
Click to expand it.
tests/test_swcio.cpp
+
7
−
7
View file @
76db8a5f
...
...
@@ -224,7 +224,7 @@ TEST(swc_parser, from_allen_db)
TEST
(
swc_parser
,
input_cleaning
)
{
using
namespace
nestmc
::
io
;
{
// Check duplicates
std
::
stringstream
is
;
...
...
@@ -234,7 +234,7 @@ TEST(swc_parser, input_cleaning)
is
<<
"2 1 14.566132 34.873772 7.857000 0.717830 1
\n
"
;
auto
cells
=
swc_read_cells
(
is
);
EXPECT_EQ
(
2
,
cells
.
size
());
EXPECT_EQ
(
2
u
,
cells
.
size
());
}
{
...
...
@@ -246,7 +246,7 @@ TEST(swc_parser, input_cleaning)
is
<<
"4 1 14.566132 34.873772 7.857000 0.717830 1
\n
"
;
auto
cells
=
swc_read_cells
(
is
);
EXPECT_EQ
(
2
,
cells
.
size
());
EXPECT_EQ
(
2
u
,
cells
.
size
());
}
{
...
...
@@ -259,8 +259,8 @@ TEST(swc_parser, input_cleaning)
std
::
array
<
cell_record
::
id_type
,
4
>
expected_id_list
=
{{
0
,
1
,
2
,
3
}};
auto
cells
=
swc_read_cells
(
is
);
ASSERT_EQ
(
4
,
cells
.
size
());
ASSERT_EQ
(
4
u
,
cells
.
size
());
auto
expected_id
=
expected_id_list
.
cbegin
();
for
(
const
auto
&
c
:
cells
)
{
EXPECT_EQ
(
*
expected_id
,
c
.
id
());
...
...
@@ -283,7 +283,7 @@ TEST(swc_parser, input_cleaning)
{{
0
,
1
,
2
,
3
,
4
,
5
}};
std
::
array
<
cell_record
::
id_type
,
6
>
expected_parent_list
=
{{
-
1
,
0
,
1
,
1
,
0
,
4
}};
ASSERT_EQ
(
6
,
cells
.
size
());
ASSERT_EQ
(
6
u
,
cells
.
size
());
auto
expected_id
=
expected_id_list
.
cbegin
();
auto
expected_parent
=
expected_parent_list
.
cbegin
();
...
...
@@ -293,6 +293,6 @@ TEST(swc_parser, input_cleaning)
++
expected_id
;
++
expected_parent
;
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
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