[Error Update]:Correcting errors in the method automatonSegmentationAssignment from diar_tools.

s4d/diar_tools.py

@@ -220,7 +220,7 @@ def automatonAssignment(diarHyp,diarRef,diarUem=None,tolerance=0,diarFinal__clus
 ## WARNING: The automaton follows the temporal order
 ## tolerance: In centiseconds
 ## diarFinal__clusterToDeleteAccordingToDiarRef: List of clusters to delete in the diarFinal only
-## modeNoGap: Drops or not the segment actions (i.e. createSegment & deleteSegment) and the action "delete a boundary" can merge two consecutive segments with different cluster names (it takes the name of the left/first segment)
+## modeNoGap: Drops or not the segment actions (i.e. createSegment & deleteSegment)
 ## modeNoGap__mergeStrat_BiggestCluster: Whether we merge in the temporal order or first the biggest cluster for a given reference segment (only useful when the modeNoGap is False)
 ## deleteBoundarySameConsecutiveSpk: Whether we delete a boundary for two consecutive segments with the same speaker
 def automatonSegmentation(diarHyp,diarRef,diarUem=None,tolerance=0,modeNoGap=False,modeNoGap__mergeStrat_BiggestCluster=False,diarFinal__clusterToDeleteAccordingToDiarRef=list(),deleteBoundarySameConsecutiveSpk=False):
@@ -721,10 +721,11 @@ def automatonSegmentation(diarHyp,diarRef,diarUem=None,tolerance=0,modeNoGap=Fal
 ## WARNING: The automaton follows the temporal order
 ## tolerance: In centiseconds
 ## diarFinal__clusterToDeleteAccordingToDiarRef: List of clusters to delete in the diarFinal only
-## modeNoGap: Drops or not the segment actions (i.e. createSegment & deleteSegment) and the action "delete a boundary" can merge two consecutive segments with different cluster names (it takes the name of the left/first segment)
+## modeNoGap: Drops or not the segment actions (i.e. createSegment & deleteSegment)
 ## deleteBoundarySameConsecutiveSpk: Whether we delete a boundary for two consecutive segments with the same speaker
-def automatonSegmentationAssignment(diarHyp,diarRef,diarUem=None,tolerance=0,modeNoGap=False,diarFinal__clusterToDeleteAccordingToDiarRef=list(),deleteBoundarySameConsecutiveSpk=False):
-    assert isinstance(diarHyp,Diar) and isinstance(diarRef,Diar) and isinstance(modeNoGap,bool) and (diarUem is None or isinstance(diarUem,Diar)) and isinstance(tolerance,numbers.Number) and isinstance(diarFinal__clusterToDeleteAccordingToDiarRef,list) and isinstance(deleteBoundarySameConsecutiveSpk,bool)
+## deleteBoundaryMergeCluster: The action "delete a boundary" can merge two consecutive segments with different cluster names (it takes the name of the left/first segment)
+def automatonSegmentationAssignment(diarHyp,diarRef,diarUem=None,tolerance=0,modeNoGap=False,diarFinal__clusterToDeleteAccordingToDiarRef=list(),deleteBoundarySameConsecutiveSpk=False,deleteBoundaryMergeCluster=False):
+    assert isinstance(diarHyp,Diar) and isinstance(diarRef,Diar) and isinstance(modeNoGap,bool) and (diarUem is None or isinstance(diarUem,Diar)) and isinstance(tolerance,numbers.Number) and isinstance(diarFinal__clusterToDeleteAccordingToDiarRef,list) and isinstance(deleteBoundarySameConsecutiveSpk,bool) and isinstance(deleteBoundaryMergeCluster,bool)
     for u in diarFinal__clusterToDeleteAccordingToDiarRef:
         assert isinstance(u,str)
 
@@ -1085,6 +1086,8 @@ def automatonSegmentationAssignment(diarHyp,diarRef,diarUem=None,tolerance=0,mod
                         valueTmp=dropSegment(z,valueTmp)
                         valueTmp.append_seg(segmentTmp)
                         valueTmp.sort()
+                    if deleteBoundaryMergeCluster:
+                        break
                 if not perfectBoundary:
                     # Gets the new segments, modified by the previous steps
                     listHypRefSegment=list()
@@ -1176,7 +1179,10 @@ def automatonSegmentationAssignment(diarHyp,diarRef,diarUem=None,tolerance=0,mod
                                 actionsSegmentationBoundaryMerge.append(copy.deepcopy([newSegment,listTmp[y]]))
                                 actionsIncrementalSegmentationBoundaryMergeTurn.append(copy.deepcopy([newSegment,listTmp[y]]))
                                 if modeNoGap == True and newSegment['cluster']!=listTmp[y]['cluster']:
+                                    valueTmp=dropSegment(listTmp[y],valueTmp)
                                     listTmp[y]['cluster']=newSegment['cluster']
+                                    valueTmp.append_seg(listTmp[y])
+                                    valueTmp.sort()
                                 newSegment,valueTmp=mergeSegment(newSegment,listTmp[y],valueTmp)
                             else:
                                 newSegment=listTmp[y]