Update annotationToNoiseList algorithm

sonogram.py

@@ -276,7 +276,7 @@ class Sonogram():
             # For each timestep in current segment, check current speaker against previous speaker
             for i in range(startI,endI+1):
                 # No active speaker yet, so apply self
-                if speakerAtStep[i] == None:
+                if speakerAtStep[i] is None:
                     speakerAtStep[i] = label
                 # If active speaker exists, check against hierarchy
                 else:
@@ -342,7 +342,7 @@ class Sonogram():
                 if sas[j] is not None:
                     memberSet.add(sas[i])
                 # Increase silence score if no speaker
-                if sas[j] == None:
+                if sas[j] is None:
                     silenceCount += 1
                 # Increase group score for known group IDs
                 elif sas[j] == 'group' or sas[j] == 99:
@@ -372,15 +372,30 @@ class Sonogram():
 
         # Iterate over aggregate scores for each window
         for i,item in enumerate(timeStepAggregate):
-            # Final classification is highest aggregate score
-            cat = max(item, key=item.get)
+            cat = None
+            # Shortcut areas known to be group or silence, as these are more definite
+            if sas[i] == 'group':
+                cat = 'group'
+            elif sas[i] is None:
+                cat = 'silence'
+            else:
+                # Final classification is highest aggregate score
+                cat = max(item, key=item.get)
             timeStepClass.append(cat)
+            
             # For group decisions, members include all in window
             if cat == 'group': 
                 timeStepMembers[i] = '+'.join(timeStepMembers[i])
             # Assume current speaker is the "individual" voice during window
             elif cat == 'individual':
-                timeStepMembers[i] = sas[i]
+                # Individual is first one seen
+                firstIndividual = sas[i]
+                firstIndividualIndex = i
+                # If none currently (at/near end of silence) then find first individual instead
+                while firstIndividual is None or firstIndividual == 'group':
+                    firstIndividual = firstIndividual[firstIndividualIndex+1]
+                    firstIndividualIndex += 1
+                timeStepMembers[i] = firstIndividual
             # Remove all members if silence
             else:
                 timeStepMembers[i] = None
@@ -415,7 +430,7 @@ class Sonogram():
                             if start+duration > endTime:
                                 endTime = start+duration
                             start = None
-                            currMembers == None
+                            currMembers is None
                             duration = 0
                             tracking = False
                         start = timeIncrement
@@ -431,7 +446,7 @@ class Sonogram():
                         if start+duration > endTime:
                             endTime = start+duration
                         start = None
-                        currMembers == None
+                        currMembers is None
                         duration = 0
                         tracking = False
             # Exit case, if still tracking then generate final Segment