Browse Source

uncomment EarliestFinish and add a threshold for D

Gildas Chabot 8 years ago
parent
commit
6eae2adb6c
1 changed files with 6 additions and 3 deletions
  1. 6 3
      main.go

+ 6 - 3
main.go

@@ -136,9 +136,12 @@ func Choose(c *Car) *Ride {
136
 		if r.used {
136
 		if r.used {
137
 			continue
137
 			continue
138
 		}
138
 		}
139
-		// if r.f < c.EarliestFinish(r) {
140
-		// 	continue
141
-		// }
139
+		if r.Length() > 6000 {
140
+			continue
141
+		}
142
+		if r.f < c.EarliestFinish(r) {
143
+			continue
144
+		}
142
 		// fmt.Printf("%d %d -> %d %d\n", r.a, r.b, r.x, r.y)
145
 		// fmt.Printf("%d %d -> %d %d\n", r.a, r.b, r.x, r.y)
143
 		lenOfRide := r.length()
146
 		lenOfRide := r.length()
144
 		total := max(c.distanceTo(r.a, r.b), r.s-c.Arrival) + lenOfRide
147
 		total := max(c.distanceTo(r.a, r.b), r.s-c.Arrival) + lenOfRide