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
346b397f
Commit
346b397f
authored
Nov 30, 2010
by
Alexander Wiebel
Browse files
[STYLE] missing include and too long line fixed
parent
cb0ff4bc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
src/common/datastructures/WDendrogram.cpp
src/common/datastructures/WDendrogram.cpp
+5
-2
src/common/datastructures/WDendrogram.h
src/common/datastructures/WDendrogram.h
+1
-0
No files found.
src/common/datastructures/WDendrogram.cpp
View file @
346b397f
...
@@ -86,7 +86,10 @@ std::string WDendrogram::toTXTString() const
...
@@ -86,7 +86,10 @@ std::string WDendrogram::toTXTString() const
level
[
i
]
=
std
::
max
(
level
[
left
],
level
[
right
]
)
+
1
;
level
[
i
]
=
std
::
max
(
level
[
left
],
level
[
right
]
)
+
1
;
preds
[
m_parents
[
i
]
].
insert
(
i
);
preds
[
m_parents
[
i
]
].
insert
(
i
);
std
::
set
<
size_t
>
join
;
std
::
set
<
size_t
>
join
;
std
::
set_union
(
childsOfInnerNodes
[
m_parents
[
i
]
].
begin
(),
childsOfInnerNodes
[
m_parents
[
i
]
].
end
(),
childsOfInnerNodes
[
i
].
begin
(),
childsOfInnerNodes
[
i
].
end
(),
std
::
set_union
(
childsOfInnerNodes
[
m_parents
[
i
]
].
begin
(),
childsOfInnerNodes
[
m_parents
[
i
]
].
end
(),
childsOfInnerNodes
[
i
].
begin
(),
childsOfInnerNodes
[
i
].
end
(),
std
::
inserter
(
join
,
join
.
begin
()
)
);
std
::
inserter
(
join
,
join
.
begin
()
)
);
childsOfInnerNodes
[
m_parents
[
i
]
]
=
join
;
childsOfInnerNodes
[
m_parents
[
i
]
]
=
join
;
ss
<<
"("
<<
level
[
i
]
<<
", ("
;
ss
<<
"("
<<
level
[
i
]
<<
", ("
;
...
...
src/common/datastructures/WDendrogram.h
View file @
346b397f
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
#define WDENDROGRAM_H
#define WDENDROGRAM_H
#include <vector>
#include <vector>
#include <string>
#include <boost/shared_ptr.hpp>
#include <boost/shared_ptr.hpp>
...
...
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