@@ -54,7 +54,7 @@ public void NotCollinear_EventsOrderInSweepLine()
5454 Assert . False ( se2 . Below ( se1 . Point ) ) ;
5555 Assert . True ( se2 . Above ( se1 . Point ) ) ;
5656
57- AssertOrder ( se1 , se2 , Ordering . Less ) ;
57+ AssertOrder ( se1 , se2 , true ) ;
5858
5959 Assert . Equal ( 1 , eventComparer . Compare ( se3 , se4 ) ) ;
6060 Assert . False ( se4 . Above ( se3 . Point ) ) ;
@@ -126,49 +126,47 @@ public void TShapedCases()
126126 // /\
127127 var ( se1 , _) = this . MakeSimple ( 0 , 0.0 , 0.0 , 1.0 , 1.0 , true ) ;
128128 var ( se2 , _) = this . MakeSimple ( 0 , 0.5 , 0.5 , 1.0 , 0.0 , true ) ;
129- this . AssertOrder ( se1 , se2 , Ordering . Greater ) ;
129+ this . AssertOrder ( se1 , se2 , false ) ;
130130
131131 // shape: \/
132132 // \
133133 ( se1 , _ ) = this . MakeSimple ( 0 , 0.0 , 1.0 , 1.0 , 0.0 , true ) ;
134134 ( se2 , _ ) = this . MakeSimple ( 0 , 0.5 , 0.5 , 1.0 , 1.0 , true ) ;
135- this . AssertOrder ( se1 , se2 , Ordering . Less ) ;
135+ this . AssertOrder ( se1 , se2 , true ) ;
136136
137137 // shape: T
138138 ( se1 , _ ) = this . MakeSimple ( 0 , 0.0 , 1.0 , 1.0 , 1.0 , true ) ;
139139 ( se2 , _ ) = this . MakeSimple ( 0 , 0.5 , 0.0 , 0.5 , 1.0 , true ) ;
140- this . AssertOrder ( se1 , se2 , Ordering . Greater ) ;
140+ this . AssertOrder ( se1 , se2 , false ) ;
141141
142142 // shape: T upside down
143143 ( se1 , _ ) = this . MakeSimple ( 0 , 0.0 , 0.0 , 1.0 , 0.0 , true ) ;
144144 ( se2 , _ ) = this . MakeSimple ( 0 , 0.5 , 0.0 , 0.5 , 1.0 , true ) ;
145- this . AssertOrder ( se1 , se2 , Ordering . Less ) ;
145+ this . AssertOrder ( se1 , se2 , true ) ;
146146 }
147147
148148 [ Fact ]
149149 public void VerticalSegment ( )
150150 {
151- // Vertikales Referenzsegment bei x = 0, von y = -1 bis +1
151+ // Vertical Referencesegment at x = 0, from y = -1 to +1
152152 var ( se1 , _) = this . MakeSimple ( 0 , 0.0 , - 1.0 , 0.0 , 1.0 , true ) ;
153153
154- // "above" Fälle
155- this . AssertOrder ( se1 , this . MakeSimple ( 0 , - 1.0 , 1.0 , 0.0 , 1.0 , true ) . se1 , Ordering . Less ) ;
156- this . AssertOrder ( se1 , this . MakeSimple ( 0 , 0.0 , 1.0 , 1.0 , 1.0 , true ) . se1 , Ordering . Less ) ;
157- this . AssertOrder ( se1 , this . MakeSimple ( 0 , - 1.0 , 2.0 , 0.0 , 2.0 , true ) . se1 , Ordering . Less ) ;
158- this . AssertOrder ( se1 , this . MakeSimple ( 0 , 0.0 , 2.0 , 1.0 , 2.0 , true ) . se1 , Ordering . Less ) ;
159- this . AssertOrder ( se1 , this . MakeSimple ( 0 , 0.0 , 1.0 , 0.0 , 2.0 , true ) . se1 , Ordering . Less ) ;
160-
161- // "below" Fälle
162- this . AssertOrder ( se1 , this . MakeSimple ( 0 , - 1.0 , - 1.0 , 0.0 , - 1.0 , true ) . se1 , Ordering . Greater ) ;
163- this . AssertOrder ( se1 , this . MakeSimple ( 0 , 0.0 , - 1.0 , 1.0 , - 1.0 , true ) . se1 , Ordering . Greater ) ;
164- this . AssertOrder ( se1 , this . MakeSimple ( 0 , - 1.0 , - 2.0 , 0.0 , - 2.0 , true ) . se1 , Ordering . Greater ) ;
165- this . AssertOrder ( se1 , this . MakeSimple ( 0 , 0.0 , - 2.0 , 1.0 , - 2.0 , true ) . se1 , Ordering . Greater ) ;
166- this . AssertOrder ( se1 , this . MakeSimple ( 0 , 0.0 , - 2.0 , 0.0 , - 1.0 , true ) . se1 , Ordering . Greater ) ;
167-
168- // Überlappungen
169- this . AssertOrder ( se1 , this . MakeSimple ( 0 , 0.0 , - 0.5 , 0.0 , 0.5 , true ) . se1 , Ordering . Less ) ;
170- // Der folgende Fall ist im Rust-Test auskommentiert, da die Ordnung nicht anti-symmetrisch ist.
171- // this.AssertOrder(se1, this.MakeSimple(0, 0.0, -1.0, 0.0, 0.0, true).se1, Ordering.Less);
154+ // "above" Cases
155+ this . AssertOrder ( se1 , this . MakeSimple ( 0 , - 1.0 , 1.0 , 0.0 , 1.0 , true ) . se1 , true ) ;
156+ this . AssertOrder ( se1 , this . MakeSimple ( 0 , 0.0 , 1.0 , 1.0 , 1.0 , true ) . se1 , true ) ;
157+ this . AssertOrder ( se1 , this . MakeSimple ( 0 , - 1.0 , 2.0 , 0.0 , 2.0 , true ) . se1 , true ) ;
158+ this . AssertOrder ( se1 , this . MakeSimple ( 0 , 0.0 , 2.0 , 1.0 , 2.0 , true ) . se1 , true ) ;
159+ this . AssertOrder ( se1 , this . MakeSimple ( 0 , 0.0 , 1.0 , 0.0 , 2.0 , true ) . se1 , true ) ;
160+
161+ // "below" Cases
162+ this . AssertOrder ( se1 , this . MakeSimple ( 0 , - 1.0 , - 1.0 , 0.0 , - 1.0 , true ) . se1 , false ) ;
163+ this . AssertOrder ( se1 , this . MakeSimple ( 0 , 0.0 , - 1.0 , 1.0 , - 1.0 , true ) . se1 , false ) ;
164+ this . AssertOrder ( se1 , this . MakeSimple ( 0 , - 1.0 , - 2.0 , 0.0 , - 2.0 , true ) . se1 , false ) ;
165+ this . AssertOrder ( se1 , this . MakeSimple ( 0 , 0.0 , - 2.0 , 1.0 , - 2.0 , true ) . se1 , false ) ;
166+ this . AssertOrder ( se1 , this . MakeSimple ( 0 , 0.0 , - 2.0 , 0.0 , - 1.0 , true ) . se1 , false ) ;
167+
168+ // Overlapping Cases
169+ this . AssertOrder ( se1 , this . MakeSimple ( 0 , 0.0 , - 0.5 , 0.0 , 0.5 , true ) . se1 , true ) ;
172170 }
173171
174172 private ( SweepEvent se1 , SweepEvent se2 ) MakeSimple ( int contourId , double x1 , double y1 , double x2 , double y2 ,
@@ -187,16 +185,11 @@ public void VerticalSegment()
187185 return ( se1 , se2 ) ;
188186 }
189187
190- private void AssertOrder ( SweepEvent se1 , SweepEvent se2 , Ordering order )
188+ private void AssertOrder ( SweepEvent se1 , SweepEvent se2 , bool less )
191189 {
192- Ordering inverseOrder = order == Ordering . Less ? Ordering . Greater : Ordering . Less ;
193- Assert . Equal ( ( int ) order , this . segmentComparer . Compare ( se1 , se2 ) ) ;
194- Assert . Equal ( ( int ) inverseOrder , this . segmentComparer . Compare ( se2 , se1 ) ) ;
195- }
196-
197- public enum Ordering
198- {
199- Less = - 1 ,
200- Greater = 1 ,
190+ int order = less ? - 1 : 1 ;
191+ int inverseOrder = less ? 1 : - 1 ;
192+ Assert . Equal ( order , this . segmentComparer . Compare ( se1 , se2 ) ) ;
193+ Assert . Equal ( inverseOrder , this . segmentComparer . Compare ( se2 , se1 ) ) ;
201194 }
202195}
0 commit comments