Complete 'Event' class initializer

lycantropos · Mar 25, 2021 · ac67300 · ac67300
1 parent 1e32b53
commit ac67300
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 24 deletions.
diff --git a/bentley_ottmann/core/base.py b/bentley_ottmann/core/base.py
@@ -73,16 +73,9 @@ def to_events_queue(segments: Sequence[Segment],
         relationship = (Relation.DISJOINT
                         if len(same_segments_ids) == 1
                         else Relation.EQUAL)
-        start_event = Event(is_left_endpoint=True,
-                            relation=relationship,
-                            start=start,
-                            complement=None,
-                            segments_ids=same_segments_ids)
-        end_event = Event(is_left_endpoint=False,
-                          relation=relationship,
-                          start=end,
-                          complement=start_event,
-                          segments_ids=same_segments_ids)
+        start_event = Event(start, None, True, relationship, same_segments_ids)
+        end_event = Event(end, start_event, False, relationship,
+                          same_segments_ids)
         start_event.complement = end_event
         result.push(start_event)
         result.push(end_event)

diff --git a/bentley_ottmann/core/event.py b/bentley_ottmann/core/event.py
@@ -12,15 +12,14 @@ class Event:
                  'start')
 
     def __init__(self,
-                 is_left_endpoint: bool,
-                 relation: Relation,
                  start: Point,
                  complement: Optional['Event'],
+                 is_left_endpoint: bool,
+                 relation: Relation,
                  segments_ids: Sequence[int]) -> None:
+        self.start, self.complement = start, complement
         self.is_left_endpoint = is_left_endpoint
         self.relation = relation
-        self.start = start
-        self.complement = complement
         self.segments_ids = segments_ids
 
     __repr__ = recursive_repr()(generate_repr(__init__))

diff --git a/bentley_ottmann/core/events_queue.py b/bentley_ottmann/core/events_queue.py
@@ -129,16 +129,10 @@ def push(self, event: Event) -> None:
 
     def _divide_segment(self, event: Event, break_point: Point) -> None:
         left_event = event.complement.complement = Event(
-                start=break_point,
-                complement=event.complement,
-                is_left_endpoint=True,
-                relation=event.complement.relation,
-                segments_ids=event.segments_ids)
+                break_point, event.complement, True, event.complement.relation,
+                event.segments_ids)
         right_event = event.complement = Event(
-                start=break_point,
-                complement=event,
-                is_left_endpoint=False,
-                relation=event.relation,
-                segments_ids=event.complement.segments_ids)
+                break_point, event, False, event.relation,
+                event.complement.segments_ids)
         self.push(left_event)
         self.push(right_event)