czyoung commited on
Commit
196b8f6
·
verified ·
1 Parent(s): 8d54233

Update sonogram.py

Browse files
Files changed (1) hide show
  1. sonogram.py +11 -4
sonogram.py CHANGED
@@ -211,12 +211,12 @@ class Sonogram():
211
  timeStepMembers.append(memberSet)
212
 
213
  for i,item in enumerate(timeStepAggregate):
214
- categoryId = max(item, key=item.get)
215
- timeStepClass.append(categoryId)
216
  # For group decisions, members include all in window
217
- if categoryId == 0:
218
  timeStepMembers[i] = '+'.join(timeStepMembers[i])
219
- elif categoryId == 1:
220
  timeStepMembers[i] = timeStepMembers[i][0]
221
  else:
222
  timeStepMembers[i] = None
@@ -233,12 +233,17 @@ class Sonogram():
233
  tracking = False
234
  for stepClass,timeIncrement,members in zip(timeStepClass,st,timeStepMembers):
235
  print(currList)
 
236
  if stepClass == c:
 
237
  if currMembers == members:
 
238
 
239
  duration += min(stepSize,maxTime-timeIncrement)
240
  else:
 
241
  if tracking:
 
242
  singleDimList.append((currMembers,Segment(start,start+duration)))
243
  currList.append((currMembers,Segment(start,start+duration)))
244
  if start+duration > endTime:
@@ -252,7 +257,9 @@ class Sonogram():
252
  duration += min(stepSize,maxTime-timeIncrement)
253
  tracking = True
254
  else:
 
255
  if tracking:
 
256
  singleDimList.append((currMembers,Segment(start,start+duration)))
257
  currList.append((currMembers,Segment(start,start+duration)))
258
  if start+duration > endTime:
 
211
  timeStepMembers.append(memberSet)
212
 
213
  for i,item in enumerate(timeStepAggregate):
214
+ cat = max(item, key=item.get)
215
+ timeStepClass.append(cat)
216
  # For group decisions, members include all in window
217
+ if cat == 'group':
218
  timeStepMembers[i] = '+'.join(timeStepMembers[i])
219
+ elif cat == 'individual':
220
  timeStepMembers[i] = timeStepMembers[i][0]
221
  else:
222
  timeStepMembers[i] = None
 
233
  tracking = False
234
  for stepClass,timeIncrement,members in zip(timeStepClass,st,timeStepMembers):
235
  print(currList)
236
+ print(stepClass,timeIncrement,members)
237
  if stepClass == c:
238
+ print(1)
239
  if currMembers == members:
240
+ print(2)
241
 
242
  duration += min(stepSize,maxTime-timeIncrement)
243
  else:
244
+ print(3)
245
  if tracking:
246
+ print(4)
247
  singleDimList.append((currMembers,Segment(start,start+duration)))
248
  currList.append((currMembers,Segment(start,start+duration)))
249
  if start+duration > endTime:
 
257
  duration += min(stepSize,maxTime-timeIncrement)
258
  tracking = True
259
  else:
260
+ print(5)
261
  if tracking:
262
+ print(6)
263
  singleDimList.append((currMembers,Segment(start,start+duration)))
264
  currList.append((currMembers,Segment(start,start+duration)))
265
  if start+duration > endTime: