From: Scott Worley Date: Mon, 17 Sep 2012 08:03:53 +0000 (-0700) Subject: Move the BeaconOn check out from the inner loop X-Git-Url: http://git.scottworley.com/planeteer/commitdiff_plain/58c3880d618ba797aba4e17e9feceb5dd9c24d34 Move the BeaconOn check out from the inner loop There's no reason to check this more than once here. --- diff --git a/planeteer.go b/planeteer.go index 42a7236..6c8f087 100644 --- a/planeteer.go +++ b/planeteer.go @@ -373,14 +373,12 @@ func CellValue(data planet_data, dims LogicalIndex, table []State, addr LogicalI other[Traded] = 1 /* Travel from states that have done trading. */ /* Travel here via a 2-fuel unit jump */ - if addr[Fuel]+2 < dims[Fuel] { + if data.Planets[data.i2p[addr[Location]]].BeaconOn && addr[Fuel]+2 < dims[Fuel] { other[Fuel] = addr[Fuel] + 2 hole_index := (dims[Fuel] - 1) - (addr[Fuel] + 2) if hole_index >= len(flight_plan()) || addr[Location] != PlanetIndex(data, flight_plan()[hole_index]) { for other[Location] = 0; other[Location] < dims[Location]; other[Location]++ { - if data.Planets[data.i2p[addr[Location]]].BeaconOn { - Consider(data, dims, table, other, 0, &best_value, best_source) - } + Consider(data, dims, table, other, 0, &best_value, best_source) } } other[Location] = addr[Location]