Fix bug: account for the empty hold

[planeteer] / planeteer.go

diff --git a/planeteer.go b/planeteer.go
index 7e915d20b4e8aadc51dd62c3173d8115fa934649..ca90a02e03092a2ef6f7d7e6bed78dbf4316dfa9 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()))
@@ -319,8 +319,8 @@ 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]++ {
 
@@ -350,7 +350,7 @@ func FillCellByBuying(data planet_data, dims []int, table []State, addr []int) {
                return
        }
        base_price := data.Commodities[commodity].BasePrice
-       absolute_price := relative_price * base_price
+       absolute_price := int(float64(base_price) * float64(relative_price) / 100.0)
        quantity := *hold - addr[UnusedCargo]
        total_price := quantity * absolute_price
        other[Hold] = 0
@@ -430,7 +430,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")
@@ -456,6 +456,51 @@ 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("%13v", Commas(table[index].value))
+               addr := DecodeIndex(dims, index)
+               prev := DecodeIndex(dims, table[index].from)
+               if addr[Location] != prev[Location] {
+                       from := data.i2p[prev[Location]]
+                       to := data.i2p[addr[Location]]
+                       if addr[Fuel] != prev[Fuel] {
+                               line += fmt.Sprintf(" Jump from %v to %v (%v reactor units)", from, to, prev[Fuel]-addr[Fuel])
+                       } else if addr[Edens] != prev[Edens] {
+                               line += fmt.Sprintf(" Eden warp from %v to %v", from, to)
+                       } else {
+                               panic("Traveling without fuel?")
+                       }
+               }
+               if addr[Hold] != prev[Hold] {
+                       if addr[Hold] == 0 {
+                               quantity := *hold - (prev[UnusedCargo] + prev[Edens] + prev[Cloaks])
+                               line += fmt.Sprintf(" Sell %v %v", quantity, data.i2c[prev[Hold]])
+                       } else if prev[Hold] == 0 {
+                               quantity := *hold - (addr[UnusedCargo] + addr[Edens] + addr[Cloaks])
+                               line += fmt.Sprintf(" Buy %v %v", quantity, data.i2c[addr[Hold]])
+                       } else {
+                               panic("Switched cargo?")
+                       }
+
+               }
+               description = append(description, line)
+       }
+       return
+}
+
 // (Example of a use case for generics in Go)
 func IndexPlanets(m *map[string]Planet, start_at int) (map[string]int, []string) {
        e2i := make(map[string]int, len(*m)+start_at)
@@ -491,4 +536,8 @@ func main() {
        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-- {
+               fmt.Println(description[i])
+       }
 }