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
9897ce84
Commit
9897ce84
authored
8 years ago
by
Benjamin Cumming
Browse files
Options
Downloads
Patches
Plain Diff
merge with master
parent
66b35c60
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/cell_group.hpp
+1
-6
1 addition, 6 deletions
src/cell_group.hpp
src/util/meta.hpp
+0
-6
0 additions, 6 deletions
src/util/meta.hpp
tests/global_communication/mpi_listener.hpp
+6
-4
6 additions, 4 deletions
tests/global_communication/mpi_listener.hpp
with
7 additions
and
16 deletions
src/cell_group.hpp
+
1
−
6
View file @
9897ce84
...
@@ -65,7 +65,7 @@ public:
...
@@ -65,7 +65,7 @@ public:
clear_spikes
();
clear_spikes
();
clear_events
();
clear_events
();
reset_samplers
();
reset_samplers
();
initialize_cells
();
//
initialize_cells();
for
(
auto
&
spike_source
:
spike_sources_
)
{
for
(
auto
&
spike_source
:
spike_sources_
)
{
spike_source
.
source
.
reset
(
cell_
,
0.
f
);
spike_source
.
source
.
reset
(
cell_
,
0.
f
);
}
}
...
@@ -175,11 +175,6 @@ public:
...
@@ -175,11 +175,6 @@ public:
}
}
private
:
private
:
void
initialize_cells
()
{
cell_
.
voltage
()(
memory
::
all
)
=
-
65.
;
cell_
.
initialize
();
}
/// gid of first cell in group
/// gid of first cell in group
cell_gid_type
gid_base_
;
cell_gid_type
gid_base_
;
...
...
This diff is collapsed.
Click to expand it.
src/util/meta.hpp
+
0
−
6
View file @
9897ce84
...
@@ -55,12 +55,6 @@ struct sequence_traits {
...
@@ -55,12 +55,6 @@ struct sequence_traits {
using
const_sentinel
=
decltype
(
cend
(
std
::
declval
<
Seq
&>
()));
using
const_sentinel
=
decltype
(
cend
(
std
::
declval
<
Seq
&>
()));
};
};
template
<
typename
X
>
std
::
size_t
size
(
const
X
&
x
)
{
return
x
.
size
();
}
template
<
typename
X
,
std
::
size_t
N
>
constexpr
std
::
size_t
size
(
X
(
&
)[
N
])
{
return
N
;
}
// Convenience short cuts
// Convenience short cuts
template
<
typename
T
>
template
<
typename
T
>
...
...
This diff is collapsed.
Click to expand it.
tests/global_communication/mpi_listener.hpp
+
6
−
4
View file @
9897ce84
...
@@ -89,15 +89,17 @@ public:
...
@@ -89,15 +89,17 @@ public:
}
}
virtual
void
OnTestCaseEnd
(
const
TestCase
&
test_case
)
override
{
virtual
void
OnTestCaseEnd
(
const
TestCase
&
test_case
)
override
{
pprintf
(
pprintf
(
"TESTCASE %s : %2d:%-2d pass:fail of %2d tests
\n\n
"
,
"[PASSED %3d; FAILED %3d] of %3d tests in %s
\n\n
"
,
test_case
.
name
(),
test_case_tests_
-
test_case_failures_
,
test_case_failures_
,
test_case_tests_
-
test_case_failures_
,
test_case_tests_
test_case_failures_
,
test_case_tests_
,
test_case
.
name
()
);
);
}
}
// Called before a test starts.
// Called before a test starts.
virtual
void
OnTestStart
(
const
TestInfo
&
test_info
)
override
{
virtual
void
OnTestStart
(
const
TestInfo
&
test_info
)
override
{
pprintf
(
" TEST %s::%s
\n
"
,
test_info
.
test_case_name
(),
test_info
.
name
());
pprintf
(
" TEST
%s::%s
\n
"
,
test_info
.
test_case_name
(),
test_info
.
name
());
test_failures_
=
0
;
test_failures_
=
0
;
}
}
...
...
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