From: Scott Worley Date: Tue, 25 Oct 2011 07:22:40 +0000 (-0700) Subject: Add a lot of code that isn't exercised yet. X-Git-Url: http://git.scottworley.com/planeteer/commitdiff_plain/c45c1bcae7063b858bfa08a2376efe3a87b2c7f2?ds=sidebyside Add a lot of code that isn't exercised yet. --- diff --git a/planet-data b/planet-data index f9d119f..6c50a43 100644 --- a/planet-data +++ b/planet-data @@ -91,9 +91,8 @@ "Limit": 0 } }, - "Planets": [ - { - "Name": "Earth", + "Planets": { + "Earth": { "BeaconOn": true, "RelativePrices": { "Shield Batterys": 100, @@ -113,8 +112,7 @@ "Fighter Drones": 100 } }, - { - "Name": "Hothor", + "Hothor": { "BeaconOn": true, "RelativePrices": { "Shield Batterys": 176, @@ -128,8 +126,7 @@ "Clothes Bundles": 290 } }, - { - "Name": "Volcana", + "Volcana": { "BeaconOn": true, "RelativePrices": { "Device Of Cloakings": 187, @@ -141,8 +138,7 @@ "Clothes Bundles": 57 } }, - { - "Name": "Metallica", + "Metallica": { "BeaconOn": true, "RelativePrices": { "Shield Batterys": 67, @@ -153,8 +149,7 @@ "Fighter Drones": 322 } }, - { - "Name": "Medoca", + "Medoca": { "BeaconOn": true, "RelativePrices": { "Medical Units": 23, @@ -164,8 +159,7 @@ "Clothes Bundles": 54 } }, - { - "Name": "Gojuon", + "Gojuon": { "BeaconOn": true, "RelativePrices": { "Heating Units": 99, @@ -177,8 +171,7 @@ "Clothes Bundles": 89 } }, - { - "Name": "Desha Rockna", + "Desha Rockna": { "BeaconOn": true, "RelativePrices": { "Medical Units": 134, @@ -191,8 +184,7 @@ "Clothes Bundles": 87 } }, - { - "Name": "Dogafetch", + "Dogafetch": { "BeaconOn": true, "RelativePrices": { "Shield Batterys": 123, @@ -207,8 +199,7 @@ "Clothes Bundles": 23 } }, - { - "Name": "Eden", + "Eden": { "BeaconOn": false, "RelativePrices": { "Medical Units": 100, @@ -216,8 +207,7 @@ "Eden Warp Units": 100 } }, - { - "Name": "Richiana", + "Richiana": { "BeaconOn": true, "RelativePrices": { "Device Of Cloakings": 157, @@ -232,8 +222,7 @@ "Clothes Bundles": 465 } }, - { - "Name": "Tribonia", + "Tribonia": { "BeaconOn": true, "RelativePrices": { "Medical Units": 187, @@ -246,8 +235,7 @@ "Clothes Bundles": 898 } }, - { - "Name": "Dune", + "Dune": { "BeaconOn": true, "RelativePrices": { "Shield Batterys": 143, @@ -261,8 +249,7 @@ "Jewels": 88 } }, - { - "Name": "Plague", + "Plague": { "BeaconOn": true, "RelativePrices": { "Medical Units": 239, @@ -274,8 +261,7 @@ "Clothes Bundles": 90 } }, - { - "Name": "Norhaven", + "Norhaven": { "BeaconOn": true, "RelativePrices": { "Shield Batterys": 100, @@ -296,8 +282,7 @@ "Onboard Printing Kits": 100 } }, - { - "Name": "Loony", + "Loony": { "BeaconOn": true, "RelativePrices": { "Shield Batterys": 500, @@ -311,8 +296,7 @@ "Clothes Bundles": 67 } }, - { - "Name": "WeaponWorld", + "WeaponWorld": { "BeaconOn": true, "RelativePrices": { "Shield Batterys": 100, @@ -330,8 +314,7 @@ "Onboard Printing Kits": 100 } }, - { - "Name": "Zoolie", + "Zoolie": { "BeaconOn": true, "RelativePrices": { "Medical Units": 78, @@ -343,8 +326,7 @@ "Clothes Bundles": 100 } }, - { - "Name": "Baboria", + "Baboria": { "BeaconOn": true, "RelativePrices": { "Medical Units": 100, @@ -358,8 +340,7 @@ "Clothes Bundles": 345 } }, - { - "Name": "StockWorld", + "StockWorld": { "BeaconOn": true, "RelativePrices": { "Shield Batterys": 103, @@ -377,8 +358,7 @@ "Clothes Bundles": 98 } }, - { - "Name": "HugeLind Mar", + "HugeLind Mar": { "BeaconOn": true, "RelativePrices": { "Device Of Cloakings": 123, @@ -390,8 +370,7 @@ "Clothes Bundles": 1320 } }, - { - "Name": "Sickonia", + "Sickonia": { "BeaconOn": true, "RelativePrices": { "Medical Units": 1756, @@ -401,8 +380,7 @@ "Clothes Bundles": 1302 } }, - { - "Name": "Schooloria", + "Schooloria": { "BeaconOn": true, "RelativePrices": { "Heating Units": 100, @@ -412,14 +390,12 @@ "Jewels": 134 } }, - { - "Name": "Uniland", + "Uniland": { "BeaconOn": true, "RelativePrices": { } }, - { - "Name": "HomeWorld", + "HomeWorld": { "BeaconOn": true, "RelativePrices": { "Medical Units": 1783, @@ -432,8 +408,7 @@ "Clothes Bundles": 123 } }, - { - "Name": "Dreamora", + "Dreamora": { "BeaconOn": true, "RelativePrices": { "Device Of Cloakings": 123, @@ -446,8 +421,7 @@ "Fighter Drones": 101 } }, - { - "Name": "Nirvana", + "Nirvana": { "BeaconOn": true, "RelativePrices": { "Device Of Cloakings": 67, @@ -462,5 +436,5 @@ "Clothes Bundles": 68 } } - ] + } } diff --git a/planeteer.go b/planeteer.go index bc47c3d..25c9e03 100644 --- a/planeteer.go +++ b/planeteer.go @@ -18,20 +18,53 @@ package main import "flag" +import "fmt" import "json" import "os" -import "fmt" +import "strings" + +var start = flag.String("start", "", + "The planet to start at") -var datafile = flag.String("planet_data_file", "planet-data", +var end = flag.String("end", "", + "A comma-separated list of planets to end at") + +var planet_data_file = flag.String("planet_data_file", "planet-data", "The file to read planet data from") +var fuel = flag.Int("fuel", 16, + "Reactor units; How many non-Eden jumps we can make " + + "(but remember that deviating from the flight plan " + + "costs two units of fuel per jump)") + +var start_edens = flag.Int("start_edens", 0, + "How many Eden Warp Units are you starting with?") + +var end_edens = flag.Int("end_edens", 0, + "How many Eden Warp Units would you like to keep (not use)?") + +var cloak = flag.Bool("cloak", false, + "Make sure to end with a Device of Cloaking") + +var drones = flag.Int("drones", 0, + "Buy this many Fighter Drones") + +var batteries = flag.Int("batteries", 0, + "Buy this many Shield Batterys") + +var visit_string = flag.String("visit", "", + "A comma-separated list of planets to make sure to visit") + +func visit() []string { + return strings.Split(*visit_string, ",") +} + type Commodity struct { BasePrice int CanSell bool Limit int } type Planet struct { - Name string BeaconOn bool /* Use relative prices rather than absolute prices because you can get relative prices without traveling to each planet. */ @@ -39,11 +72,12 @@ type Planet struct { } type planet_data struct { Commodities map [string] Commodity - Planets []Planet + Planets map [string] Planet + pi, ci map [string] int // Generated; not read from file } func ReadData() (data planet_data) { - f, err := os.Open(*datafile) + f, err := os.Open(*planet_data_file) if err != nil { panic(err) } @@ -55,10 +89,105 @@ func ReadData() (data planet_data) { return } +/* This program operates by filling in a state table representing the best + * possible trips you could make; the ones that makes you the most money. + * This is feasible because we don't look at all the possible trips. + * We define a list of things that are germane to this game and then only + * consider the best outcome in each possible game state. + * + * Each cell in the table represents a state in the game. In each cell, + * we track two things: 1. the most money you could possibly have while in + * that state and 2. one possible way to get into that state with that + * amount of money. + * + * A basic analysis can be done with a two-dimensional table: location and + * fuel. planeteer-1.0 used this two-dimensional table. This version + * adds features mostly by adding dimensions to this table. + * + * Note that the sizes of each dimension are data driven. Many dimensions + * collapse to one possible value (ie, disappear) if the corresponding + * feature is not enabled. + */ + +// The official list of dimensions: +const ( + // Name Num Size Description + Edens = iota // 1 3 # of Eden warp units (0 - 2 typically) + Cloaks // 2 2 # of Devices of Cloaking (0 or 1) + UnusedCargo // 3 4 # of unused cargo spaces (0 - 3 typically) + Fuel // 4 17 Reactor power left (0 - 16) + Location // 5 26 Location (which planet) + Hold // 6 15 Cargo bay contents (a *Commodity or nil) + NeedFighters // 7 2 Errand: Buy fighter drones (needed or not) + NeedShields // 8 2 Errand: Buy shield batteries (needed or not) + Visit // 9 2**N Visit: Stop by these N planets in the route + + NumDimensions +) + +func bint(b bool) int { + if b { return 1 } + return 0 +} + +func DimensionSizes(data planet_data) []int { + eden_capacity := data.Commodities["Eden Warp Units"].Limit + cloak_capacity := bint(*cloak) + dims := []int{ + eden_capacity + 1, + cloak_capacity + 1, + eden_capacity + cloak_capacity + 1, + *fuel + 1, + len(data.Planets), + len(data.Commodities), + bint(*drones > 0) + 1, + bint(*batteries > 0) + 1, + 1 << uint(len(visit())), + } + if len(dims) != NumDimensions { + panic("Dimensionality mismatch") + } + return dims +} + +func StateTableSize(dims []int) int { + sum := 0 + for _, size := range dims { + sum += size + } + return sum +} + +type State struct { + funds, from int +} + +func NewStateTable(dims []int) []State { + return make([]State, StateTableSize(dims)) +} + +func EncodeIndex(dims, addr []int) int { + index := addr[0] + for i := 1; i < len(dims); i++ { + index = index * dims[i] + addr[i] + } + return index +} + +func DecodeIndex(dims []int, index int) []int { + addr := make([]int, len(dims)) + for i := len(dims) - 1; i > 0; i-- { + addr[i] = index % dims[i] + index /= dims[i] + } + addr[0] = index + return addr +} + /* What is the value of hauling 'commodity' from 'from' to 'to'? * Take into account the available funds and the available cargo space. */ func TradeValue(data planet_data, - from, to *Planet, + from, to Planet, commodity string, initial_funds, max_quantity int) int { if !data.Commodities[commodity].CanSell { @@ -87,24 +216,25 @@ func TradeValue(data planet_data, } func FindBestTrades(data planet_data) [][]string { + // TODO: We can't cache this because this can change based on available funds. best := make([][]string, len(data.Planets)) - for from_index, from_planet := range data.Planets { - best[from_index] = make([]string, len(data.Planets)) - for to_index, to_planet := range data.Planets { + for from := range data.Planets { + best[data.pi[from]] = make([]string, len(data.Planets)) + for to := range data.Planets { best_gain := 0 - price_list := from_planet.RelativePrices - if len(to_planet.RelativePrices) < len(from_planet.RelativePrices) { - price_list = to_planet.RelativePrices + price_list := data.Planets[from].RelativePrices + if len(data.Planets[to].RelativePrices) < len(data.Planets[from].RelativePrices) { + price_list = data.Planets[to].RelativePrices } for commodity := range price_list { gain := TradeValue(data, - &from_planet, - &to_planet, + data.Planets[from], + data.Planets[to], commodity, 10000000, 1) if gain > best_gain { - best[from_index][to_index] = commodity + best[data.pi[from]][data.pi[to]] = commodity gain = best_gain } } @@ -113,17 +243,43 @@ func FindBestTrades(data planet_data) [][]string { return best } +// (Example of a use case for generics in Go) +func IndexPlanets(m *map [string] Planet) map [string] int { + index := make(map [string] int, len(*m)) + i := 0 + for e := range *m { + index[e] = i + i++ + } + return index +} +func IndexCommodities(m *map [string] Commodity) map [string] int { + index := make(map [string] int, len(*m)) + i := 0 + for e := range *m { + index[e] = i + i++ + } + return index +} + func main() { flag.Parse() data := ReadData() + data.pi = IndexPlanets(&data.Planets) + data.ci = IndexCommodities(&data.Commodities) + dims := DimensionSizes(data) + table := NewStateTable(dims) + table[0] = State{ 1, 1 } best_trades := FindBestTrades(data) - for from_index, from_planet := range data.Planets { - for to_index, to_planet := range data.Planets { + + for from := range data.Planets { + for to := range data.Planets { best_trade := "(nothing)" - if best_trades[from_index][to_index] != "" { - best_trade = best_trades[from_index][to_index] + if best_trades[data.pi[from]][data.pi[to]] != "" { + best_trade = best_trades[data.pi[from]][data.pi[to]] } - fmt.Printf("%s to %s: %s\n", from_planet.Name, to_planet.Name, best_trade) + fmt.Printf("%s to %s: %s\n", from, to, best_trade) } } } diff --git a/planeteer_test.go b/planeteer_test.go new file mode 100644 index 0000000..0cc7f65 --- /dev/null +++ b/planeteer_test.go @@ -0,0 +1,18 @@ +package main + +import "testing" + +func TestEncodeDecode(t *testing.T) { + dims := []int{3, 2, 4, 17, 26, 15, 1, 2, 1} + for i := 0; i < 318240; i++ { // Product of dims + addr := DecodeIndex(dims, i) + for j := 0; j < len(dims); j++ { + if addr[j] >= dims[j] { + t.Fail() + } + } + if EncodeIndex(dims, addr) != i { + t.Fail() + } + } +}