Skip to content

Commit d160a91

Browse files
committed
some fixes to event negate
1 parent 163ccab commit d160a91

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

amadeusgpt/analysis_objects/event.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,20 +163,20 @@ def event_negate(cls, events: List[BaseEvent]) -> List[BaseEvent]:
163163
Get list of events that are negates of those events
164164
The core attributes must stay the same
165165
"""
166-
# mask = np.zeros_like(events[0].mask, dtype=bool)
167166
mask = np.zeros(events[0].data_length, dtype=bool)
168167
sender_animal_name = events[0].sender_animal_name
169168
for event in events:
170169
assert sender_animal_name == event.sender_animal_name
171170
video_file_path = events[0].video_file_path
172171
for event in events:
173-
mask |= event.mask
172+
mask |= event.generate_mask()
174173
negate_mask = ~mask
175174

176-
start, end = cls.get_start_end_from_mask(negate_mask)
175+
177176

178177
negate_events = Event.mask2events(
179-
start, end, video_file_path, sender_animal_name
178+
negate_mask, video_file_path, sender_animal_name,
179+
set(), set(), smooth_window_size = 1
180180
)
181181

182182
return negate_events

amadeusgpt/managers/object_manager.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@ def add_roi_object(self, object) -> None:
8080
self.roi_objects = self.filter_duplicates(self.roi_objects)
8181

8282
def save_roi_objects(self, path: str) -> None:
83-
roi_obects = self.get_roi_objects()
84-
print("how many roi objects")
85-
print(roi_obects)
83+
roi_obects = self.get_roi_objects()
8684
for roi in roi_obects:
8785
print(roi.name)
8886
data = {}

amadeusgpt/programs/sandbox.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ def render_qa_message(self, qa_message):
399399

400400
else:
401401
for e in function_rets:
402-
if isinstance(e, list) and isinstance(e[0], BaseEvent):
402+
if isinstance(e, list) and len(e) > 0 and isinstance(e[0], BaseEvent):
403403
# here we need to understand what we do with the events
404404
# we have ethogram plot, keypoint plot, head orientation plot, scene plot
405405
# and animal interaction plot

0 commit comments

Comments
 (0)