Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
820d7704
Commit
820d7704
authored
Jun 14, 2021
by
Robin Eschbach
Browse files
[FIX
#485
] errors in tests
parent
6be2f367
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
31 deletions
+26
-31
src/modules/writeProtonCSV/test/WMWriteCSV_test.h
src/modules/writeProtonCSV/test/WMWriteCSV_test.h
+26
-31
No files found.
src/modules/writeProtonCSV/test/WMWriteCSV_test.h
View file @
820d7704
...
...
@@ -52,35 +52,30 @@ public:
*/
typedef
boost
::
shared_ptr
<
std
::
vector
<
size_t
>
>
SPSizeVector
;
/**
* A shared_ptr for an int vector
*/
typedef
boost
::
shared_ptr
<
std
::
vector
<
int
>
>
SPIntVector
;
/**
* test for converting a fiber to a tuple of vectors and ids
*/
void
testgetListOfInternalVertex
()
{
WMWriteCSV
writerCSV
;
std
::
tuple
<
WDataSetFibers
::
SPtr
,
std
::
vector
<
std
::
tuple
<
float
,
float
,
float
,
in
t
>
>
>
std
::
tuple
<
WDataSetFibers
::
SPtr
,
std
::
vector
<
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
>
>
samples
=
createSampleFibers
();
WDataSetFibers
::
SPtr
fibers
=
std
::
get
<
0
>
(
samples
);
std
::
vector
<
std
::
tuple
<
float
,
float
,
float
,
in
t
>
>
referenceList
=
std
::
get
<
1
>
(
samples
);
std
::
list
<
std
::
tuple
<
float
,
float
,
float
,
in
t
>
>
testList
=
writerCSV
.
getListOfInternalVertex
(
fibers
);
std
::
vector
<
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
>
referenceList
=
std
::
get
<
1
>
(
samples
);
std
::
list
<
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
>
testList
=
writerCSV
.
getListOfInternalVertex
(
fibers
);
TS_ASSERT_EQUALS
(
referenceList
.
size
(),
testList
.
size
()
);
size_t
referenceListCounter
=
0
;
for
(
auto
element
=
testList
.
begin
();
element
!=
testList
.
end
();
element
++
)
{
std
::
tuple
<
float
,
float
,
float
,
in
t
>
refTuple
=
referenceList
.
at
(
referenceListCounter
++
);
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
refTuple
=
referenceList
.
at
(
referenceListCounter
++
);
osg
::
Vec3
refVector
(
std
::
get
<
0
>
(
refTuple
),
std
::
get
<
1
>
(
refTuple
),
std
::
get
<
2
>
(
refTuple
)
);
in
t
refIndex
=
std
::
get
<
3
>
(
refTuple
);
size_
t
refIndex
=
std
::
get
<
3
>
(
refTuple
);
osg
::
Vec3
testVector
(
std
::
get
<
0
>
(
*
element
),
std
::
get
<
1
>
(
*
element
),
std
::
get
<
2
>
(
*
element
)
);
in
t
testIndex
=
std
::
get
<
3
>
(
*
element
);
size_
t
testIndex
=
std
::
get
<
3
>
(
*
element
);
TS_ASSERT_EQUALS
(
refVector
.
x
(),
testVector
.
x
()
);
TS_ASSERT_EQUALS
(
refVector
.
y
(),
testVector
.
y
()
);
...
...
@@ -147,26 +142,26 @@ public:
{
WMWriteCSV
writerCSV
;
std
::
list
<
std
::
tuple
<
float
,
float
,
float
,
in
t
>
>
listOfInternalVertex
;
std
::
list
<
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
>
listOfInternalVertex
;
in
t
refCounter
=
0
;
size_
t
refCounter
=
0
;
for
(
refCounter
=
0
;
refCounter
<
100
;
refCounter
++
)
{
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
in
t
>
(
0.0
,
0.0
,
0.0
,
refCounter
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
(
0.0
,
0.0
,
0.0
,
refCounter
)
);
}
TS_ASSERT_EQUALS
(
writerCSV
.
createStartCounter
(
listOfInternalVertex
),
refCounter
);
listOfInternalVertex
.
clear
();
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
in
t
>
(
0.0
,
0.0
,
0.0
,
13
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
in
t
>
(
0.0
,
0.0
,
0.0
,
214
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
in
t
>
(
0.0
,
0.0
,
0.0
,
44
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
in
t
>
(
0.0
,
0.0
,
0.0
,
23
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
in
t
>
(
0.0
,
0.0
,
0.0
,
64
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
in
t
>
(
0.0
,
0.0
,
0.0
,
223
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
in
t
>
(
0.0
,
0.0
,
0.0
,
132
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
in
t
>
(
0.0
,
0.0
,
0.0
,
322
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
(
0.0
,
0.0
,
0.0
,
13
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
(
0.0
,
0.0
,
0.0
,
214
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
(
0.0
,
0.0
,
0.0
,
44
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
(
0.0
,
0.0
,
0.0
,
23
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
(
0.0
,
0.0
,
0.0
,
64
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
(
0.0
,
0.0
,
0.0
,
223
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
(
0.0
,
0.0
,
0.0
,
132
)
);
listOfInternalVertex
.
push_back
(
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
(
0.0
,
0.0
,
0.0
,
322
)
);
TS_ASSERT_EQUALS
(
writerCSV
.
createStartCounter
(
listOfInternalVertex
),
323
);
}
...
...
@@ -174,17 +169,17 @@ public:
private:
/**
* helpermethod that generates a fiber example
* \return std::tuple < WDataSetFibers::SPtr, std::vector< std::tuple < osg::Vec3,
in
t > > > The fibers
* \return std::tuple < WDataSetFibers::SPtr, std::vector< std::tuple < osg::Vec3,
size_
t > > > The fibers
*/
std
::
tuple
<
WDataSetFibers
::
SPtr
,
std
::
vector
<
std
::
tuple
<
float
,
float
,
float
,
in
t
>
>
>
createSampleFibers
()
std
::
tuple
<
WDataSetFibers
::
SPtr
,
std
::
vector
<
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
>
>
createSampleFibers
()
{
std
::
vector
<
std
::
tuple
<
float
,
float
,
float
,
in
t
>
>
referenceList
;
std
::
vector
<
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
>
referenceList
;
SPFloatVector
vertices
=
SPFloatVector
(
new
std
::
vector
<
float
>
()
);
SPSizeVector
fiberStartIndexes
=
SPSizeVector
(
new
std
::
vector
<
size_t
>
()
);
SPSizeVector
fiberLengths
=
SPSizeVector
(
new
std
::
vector
<
size_t
>
()
);
SPSizeVector
verticesReverse
=
SPSizeVector
(
new
std
::
vector
<
size_t
>
()
);
SP
Int
Vector
eventIDs
=
SP
Int
Vector
(
new
std
::
vector
<
in
t
>
()
);
SP
Size
Vector
eventIDs
=
SP
Size
Vector
(
new
std
::
vector
<
size_
t
>
()
);
size_t
eventIDCounter
=
0
;
size_t
counter
=
0
;
...
...
@@ -204,15 +199,15 @@ private:
eventIDs
->
push_back
(
eventIDCounter
);
std
::
tuple
<
float
,
float
,
float
,
in
t
>
tupleTemp
(
vertexCounter
,
vertexCounter
,
vertexCounter
,
eventIDCounter
);
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
tupleTemp
(
vertexCounter
,
vertexCounter
,
vertexCounter
,
eventIDCounter
);
referenceList
.
push_back
(
tupleTemp
);
counter
++
;
}
in
t
fiberLength
=
0
;
in
t
fiberStartIndex
=
0
;
in
t
reversePos
=
0
;
size_
t
fiberLength
=
0
;
size_
t
fiberStartIndex
=
0
;
size_
t
reversePos
=
0
;
size_t
currentEventID
=
eventIDs
->
at
(
0
);
fiberStartIndexes
->
push_back
(
fiberStartIndex
);
...
...
@@ -243,7 +238,7 @@ private:
verticesReverse
)
);
std
::
tuple
<
WDataSetFibers
::
SPtr
,
std
::
vector
<
std
::
tuple
<
float
,
float
,
float
,
in
t
>
>
>
std
::
tuple
<
WDataSetFibers
::
SPtr
,
std
::
vector
<
std
::
tuple
<
float
,
float
,
float
,
size_
t
>
>
>
returnTuple
(
fibers
,
referenceList
);
return
returnTuple
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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