Commit 6ebd0f9f authored by Anthony Larcher's avatar Anthony Larcher
Browse files

first commit with clean cross show HAL

parent d857996d
......@@ -265,7 +265,8 @@ def cross_show_HAL(previous_vec,
th_x,
lim,
user,
file_info):
file_info,
archive_file_info):
"""
:param previous_vec:
......@@ -347,7 +348,7 @@ def cross_show_HAL(previous_vec,
complete_hyp = copy.deepcopy(previous_diar).append_diar(within_diar)
message_to_user = MessageToUser(file_info,
s4d_to_allies(complete_hyp),
Request('same', t1, t2, show2))
Request('same', t1, t2, archive_file_info[show2]))
keep_questioning, answer = user.validate(message_to_user)
......@@ -364,7 +365,6 @@ def cross_show_HAL(previous_vec,
else:
previous_spk_idx += 1
# concatenate previous_vec et within_vec
new_previous_vec = concat_statservers(previous_vec_backup, within_vec_backup)
new_previous_diar = copy.deepcopy(previous_diar)
......@@ -385,6 +385,7 @@ def cross_show_HAL(previous_vec,
def allies_cross_show_clustering(show_idx,
archive_vectors,
archive_file_info,
current_diar,
current_vec,
th_x,
......@@ -396,6 +397,7 @@ def allies_cross_show_clustering(show_idx,
:param show_idx:
:param archive_vectors:
:param archive_file_info:
:param current_diar:
:param current_vec:
:param th_x:
......@@ -413,7 +415,11 @@ def allies_cross_show_clustering(show_idx,
archive_vectors["previous_vec"] = copy.deepcopy(current_vec)
archive_vectors["previous_diar"] = current_diar
archive_file_info[file_info.file_id] = copy.deepcopy(file_info)
else:
archive_file_info[file_info.file_id] = copy.deepcopy(file_info)
if human_in_the_loop:
previous_vec, previous_diar, current_diar = cross_show_HAL(previous_vec=archive_vectors["previous_vec"],
previous_diar=archive_vectors["previous_diar"],
......@@ -423,8 +429,7 @@ def allies_cross_show_clustering(show_idx,
lim=lim,
user=user,
file_info=file_info,
uem=uem,
ref=ref)
archive_file_info=archive_file_info)
else:
previous_vec, previous_diar, current_diar = cross_show(previous_vec=archive_vectors["previous_vec"],
previous_diar=archive_vectors["previous_diar"],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment