Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vidjil
vidjil
Commits
97751b5c
Commit
97751b5c
authored
Feb 08, 2018
by
Mathieu Giraud
Browse files
Merge branch 'feature-a/clean-dbscan' into 'dev'
Cleaning some clustering aspects See merge request
!152
parents
1061485d
4a35a442
Pipeline
#16533
passed with stages
in 25 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
algo/core/cluster-junctions.cpp
View file @
97751b5c
...
...
@@ -65,7 +65,7 @@ void comp_matrix::compare(ostream &out, Cost cluster_cost)
j2
=
it1
->
first
;
DynProg
dp
=
DynProg
(
j1
,
j2
,
DynProg
::
Local
,
compareCost
);
int
score
=
dp
.
compute
();
int
distance
=
max
(
j1
.
size
(),
j2
.
size
())
-
score
;
int
distance
=
max
(
j1
.
size
(),
j2
.
size
())
*
compareCost
.
match
-
score
;
m
[
c2
][
c1
]
=
distance
;
m
[
c1
][
c2
]
=
distance
;
c1
++
;
...
...
algo/vidjil.cpp
View file @
97751b5c
...
...
@@ -1189,9 +1189,6 @@ int main (int argc, char **argv)
list
<
list
<
junction
>
>
clones_windows
;
comp_matrix
comp
=
comp_matrix
(
sort_clones
);
//$$ Further analyze some clones (-z)
if
(
command
==
CMD_CLONES
)
{
if
(
epsilon
||
forced_edges
.
size
())
{
cout
<<
"Cluster similar windows"
<<
endl
;
...
...
@@ -1221,6 +1218,9 @@ int main (int argc, char **argv)
}
//$$ Further analyze some clones (-z)
if
(
command
==
CMD_CLONES
)
{
// TODO: output clones_windows (.data, other places ?)
// TODO: Are these constraints checked somewhere ? keepInterestingWindows ?
...
...
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