Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mirrors
SuperElastix
Commits
9e413ef7
Commit
9e413ef7
authored
Jan 31, 2017
by
Floris Berendsen
Browse files
ENH: removed NetworkBuilder non-default constructors
parent
7ebb4b4b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Modules/Core/ComponentInterface/include/selxNetworkBuilder.h
View file @
9e413ef7
...
...
@@ -59,8 +59,6 @@ public:
typedef
std
::
map
<
std
::
string
,
RegistrationControllerStartInterface
*
>
RegistrationControllerStartInterfaceMapType
;
NetworkBuilder
(
std
::
shared_ptr
<
Blueprint
>
blueprint
);
NetworkBuilder
(
Blueprint
*
blueprint
);
NetworkBuilder
();
virtual
~
NetworkBuilder
()
{};
...
...
Modules/Core/ComponentInterface/include/selxNetworkBuilder.hxx
View file @
9e413ef7
...
...
@@ -23,15 +23,6 @@
namespace
selx
{
template
<
typename
ComponentList
>
NetworkBuilder
<
ComponentList
>::
NetworkBuilder
(
std
::
shared_ptr
<
Blueprint
>
blueprint
)
:
m_Blueprint
(
blueprint
),
m_isConfigured
(
false
)
{
}
template
<
typename
ComponentList
>
NetworkBuilder
<
ComponentList
>::
NetworkBuilder
(
Blueprint
*
blueprint
)
:
m_Blueprint
(
blueprint
),
m_isConfigured
(
false
)
{
}
template
<
typename
ComponentList
>
NetworkBuilder
<
ComponentList
>::
NetworkBuilder
()
:
m_isConfigured
(
false
)
...
...
Modules/Core/ComponentInterface/test/selxNetworkBuilderTest.cxx
View file @
9e413ef7
...
...
@@ -77,12 +77,13 @@ public:
TEST_F
(
NetworkBuilderTest
,
Create
)
{
NetworkBuilderPointer
networkBuilderA
=
NetworkBuilderPointer
(
new
NetworkBuilder
<
CustomComponentList
>
());
NetworkBuilderPointer
networkBuilderB
=
NetworkBuilderPointer
(
new
NetworkBuilder
<
CustomComponentList
>
(
new
Blueprint
()));
}
TEST_F
(
NetworkBuilderTest
,
Configure
)
{
NetworkBuilderPointer
networkBuilder
=
NetworkBuilderPointer
(
new
NetworkBuilder
<
CustomComponentList
>
(
blueprint
));
NetworkBuilderPointer
networkBuilder
=
NetworkBuilderPointer
(
new
NetworkBuilder
<
CustomComponentList
>
());
networkBuilder
->
AddBlueprint
(
blueprint
);
bool
allUniqueComponents
;
EXPECT_NO_THROW
(
allUniqueComponents
=
networkBuilder
->
Configure
()
);
EXPECT_TRUE
(
allUniqueComponents
);
...
...
@@ -90,7 +91,8 @@ TEST_F( NetworkBuilderTest, Configure )
TEST_F
(
NetworkBuilderTest
,
Connect
)
{
std
::
unique_ptr
<
NetworkBuilderBase
>
networkBuilder
(
new
NetworkBuilder
<
CustomComponentList
>
(
blueprint
));
NetworkBuilderPointer
networkBuilder
=
NetworkBuilderPointer
(
new
NetworkBuilder
<
CustomComponentList
>
());
networkBuilder
->
AddBlueprint
(
blueprint
);
EXPECT_NO_THROW
(
bool
allUniqueComponents
=
networkBuilder
->
Configure
()
);
bool
success
;
EXPECT_NO_THROW
(
success
=
networkBuilder
->
ConnectComponents
());
...
...
@@ -209,7 +211,8 @@ TEST_F( NetworkBuilderTest, DeduceComponentsFromConnections )
blueprint
->
SetConnection
(
"ResampleFilter"
,
"Controller"
,
{
{}
}
);
//ReconnectTransformInterface
blueprint
->
SetConnection
(
"TransformDisplacementFilter"
,
"Controller"
,
{
{}
}
);
//ReconnectTransformInterface
std
::
unique_ptr
<
NetworkBuilderBase
>
networkBuilder
(
new
NetworkBuilder
<
RegisterComponents
>
(
blueprint
));
std
::
unique_ptr
<
NetworkBuilderBase
>
networkBuilder
(
new
NetworkBuilder
<
RegisterComponents
>
());
networkBuilder
->
AddBlueprint
(
blueprint
);
bool
allUniqueComponents
;
EXPECT_NO_THROW
(
allUniqueComponents
=
networkBuilder
->
Configure
());
EXPECT_TRUE
(
allUniqueComponents
);
...
...
Write
Preview
Supports
Markdown
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!
Cancel
Please
register
or
sign in
to comment