Fix flight plan logic (destination, not origin)

[planeteer] / planeteer.go

diff --git a/planeteer.go b/planeteer.go
index 4dbb27b28c3cb5ece9e5380d83a910f90fc163f0..d5c359aaacf5f65bcc3791508da9342ba31cbc69 100644 (file)
--- a/planeteer.go
+++ b/planeteer.go
@@ -178,7 +178,7 @@ func DimensionSizes(data planet_data) []int {
        dims[UnusedCargo] = eden_capacity + cloak_capacity + 1
        dims[Fuel] = *fuel + 1
        dims[Location] = len(data.Planets)
-       dims[Hold] = len(data.Commodities)
+       dims[Hold] = len(data.Commodities) + 1
        dims[NeedFighters] = bint(*drones > 0) + 1
        dims[NeedShields] = bint(*batteries > 0) + 1
        dims[Visit] = 1 << uint(len(visit()))
@@ -276,10 +276,11 @@ func FillCellByArriving(data planet_data, dims []int, table []State, addr []int)
        /* Travel here via a hidey hole */
        if addr[Fuel]+1 < dims[Fuel] {
                hole_index := (dims[Fuel] - 1) - (addr[Fuel] + 1)
-               if hole_index < len(flight_plan()) {
+               if hole_index < len(flight_plan()) && addr[Location] == data.p2i[flight_plan()[hole_index]] {
                        other[Fuel] = addr[Fuel] + 1
-                       other[Location] = data.p2i[flight_plan()[hole_index]]
-                       UpdateCell(table, my_index, EncodeIndex(dims, other), 0)
+                       for other[Location] = 0; other[Location] < dims[Location]; other[Location]++ {
+                               UpdateCell(table, my_index, EncodeIndex(dims, other), 0)
+                       }
                        other[Location] = addr[Location]
                        other[Fuel] = addr[Fuel]
                }
@@ -319,12 +320,12 @@ func FillCellBySelling(data planet_data, dims []int, table []State, addr []int)
                        continue
                }
                base_price := data.Commodities[commodity].BasePrice
-               absolute_price := relative_price * base_price
-               sell_price := int(float64(absolute_price) * 0.9)
+               absolute_price := float64(base_price) * float64(relative_price) / 100.0
+               sell_price := int(absolute_price * 0.9)
 
                for other[UnusedCargo] = 0; other[UnusedCargo] < dims[UnusedCargo]; other[UnusedCargo]++ {
 
-                       quantity := *hold - other[UnusedCargo] // TODO: Partial sales
+                       quantity := *hold - (other[UnusedCargo] + other[Cloaks] + other[Edens])
                        sale_value := quantity * sell_price
                        UpdateCell(table, my_index, EncodeIndex(dims, other), sale_value)
                }
@@ -350,16 +351,35 @@ func FillCellByBuying(data planet_data, dims []int, table []State, addr []int) {
                return
        }
        base_price := data.Commodities[commodity].BasePrice
-       absolute_price := relative_price * base_price
-       quantity := *hold - addr[UnusedCargo]
+       absolute_price := int(float64(base_price) * float64(relative_price) / 100.0)
+       quantity := *hold - (addr[UnusedCargo] + addr[Cloaks] + addr[Edens])
        total_price := quantity * absolute_price
        other[Hold] = 0
+       other[UnusedCargo] = 0
        UpdateCell(table, my_index, EncodeIndex(dims, other), -total_price)
+       other[UnusedCargo] = addr[UnusedCargo]
+       other[Hold] = addr[Hold]
 }
 
 func FillCellByMisc(data planet_data, dims []int, table []State, addr []int) {
+       my_index := EncodeIndex(dims, addr)
+       other := make([]int, NumDimensions)
+       copy(other, addr)
        /* Buy Eden warp units */
        /* Buy a Device of Cloaking */
+       if addr[Cloaks] == 1 && addr[UnusedCargo] < dims[UnusedCargo]-1 {
+               relative_price, available := data.Planets[data.i2p[addr[Location]]].RelativePrices["Device Of Cloakings"]
+               if available {
+                       absolute_price := int(float64(data.Commodities["Device Of Cloakings"].BasePrice) * float64(relative_price) / 100.0)
+                       other[Cloaks] = 0
+                       if other[Hold] != 0 {
+                               other[UnusedCargo] = addr[UnusedCargo] + 1
+                       }
+                       UpdateCell(table, my_index, EncodeIndex(dims, other), -absolute_price)
+                       other[UnusedCargo] = addr[UnusedCargo]
+                       other[Cloaks] = addr[Cloaks]
+               }
+       }
        /* Silly: Dump a Device of Cloaking */
        /* Buy Fighter Drones */
        /* Buy Shield Batteries */
@@ -430,7 +450,7 @@ func FillStateTable1(data planet_data, dims []int, table []State) {
                                <-barrier
                        }
                        work_done++
-                       fmt.Printf("\r%3.0f%%", 100*work_done/work_units)
+                       print(fmt.Sprintf("\r%3.0f%%", 100*work_done/work_units))
                }
        }
        print("\n")
@@ -444,7 +464,7 @@ func FindBestState(data planet_data, dims []int, table []State) int {
        addr[NeedShields] = dims[NeedShields] - 1
        addr[Visit] = dims[Visit] - 1
        // Fuel, Hold, UnusedCargo left at 0
-       var max_index int
+       max_index := -1
        max_value := 0
        for addr[Location] = 0; addr[Location] < dims[Location]; addr[Location]++ {
                index := EncodeIndex(dims, addr)
@@ -456,9 +476,21 @@ func FindBestState(data planet_data, dims []int, table []State) int {
        return max_index
 }
 
+func Commas(n int) (s string) {
+       r := n % 1000
+       n /= 1000
+       for n > 0 {
+               s = fmt.Sprintf(",%03d", r) + s
+               r = n % 1000
+               n /= 1000
+       }
+       s = fmt.Sprint(r) + s
+       return
+}
+
 func DescribePath(data planet_data, dims []int, table []State, start int) (description []string) {
        for index := start; index > 0 && table[index].from > 0; index = table[index].from {
-               line := fmt.Sprintf("%10v", table[index].value)
+               line := fmt.Sprintf("%13v", Commas(table[index].value))
                addr := DecodeIndex(dims, index)
                prev := DecodeIndex(dims, table[index].from)
                if addr[Location] != prev[Location] {
@@ -484,6 +516,10 @@ func DescribePath(data planet_data, dims []int, table []State, start int) (descr
                        }
 
                }
+               if addr[Cloaks] == 1 && prev[Cloaks] == 0 {
+                       // TODO: Dump cloaks, convert from cargo?
+                       line += " Buy a Cloak"
+               }
                description = append(description, line)
        }
        return
@@ -522,10 +558,12 @@ func main() {
        table := InitializeStateTable(data, dims)
        FillStateTable1(data, dims, table)
        best := FindBestState(data, dims, table)
-       fmt.Printf("Best state: %v (%v) with $%v\n",
-               best, DecodeIndex(dims, best), table[best].value)
-       description := DescribePath(data, dims, table, best)
-       for i := len(description) - 1; i >= 0; i-- {
-               print(description[i], "\n")
+       if best == -1 {
+               print("Cannot acheive success criteria\n")
+       } else {
+               description := DescribePath(data, dims, table, best)
+               for i := len(description) - 1; i >= 0; i-- {
+                       fmt.Println(description[i])
+               }
        }
 }