Update and clarify some comments

[planeteer] / planeteer.go

diff --git a/planeteer.go b/planeteer.go
index 907bf206bb3833941b167497408eb1b7803a47ca..1597b9de49f23343eaf13374be2f6a1195c6dc7b 100644 (file)
--- a/planeteer.go
+++ b/planeteer.go
@@ -19,7 +19,7 @@ package main
 
 import "flag"
 import "fmt"
 
 import "flag"
 import "fmt"

-import "json"
+import "encoding/json"

 import "os"
 import "runtime/pprof"
 import "strings"
 import "os"
 import "runtime/pprof"
 import "strings"


@@ -43,6 +43,8 @@ var fuel = flag.Int("fuel", 16, "Hyper Jump power left")
 
 var hold = flag.Int("hold", 300, "Size of your cargo hold")
 
 
 var hold = flag.Int("hold", 300, "Size of your cargo hold")
 

+var start_hold = flag.String("start_hold", "", "Start with a hold full of cargo")
+

 var start_edens = flag.Int("start_edens", 0,
        "How many Eden Warp Units are you starting with?")
 
 var start_edens = flag.Int("start_edens", 0,
        "How many Eden Warp Units are you starting with?")
 


@@ -63,10 +65,16 @@ var battery_price = flag.Int("battery_price", 0, "Today's Shield Battery price")
 var visit_string = flag.String("visit", "",
        "A comma-separated list of planets to make sure to visit")
 
 var visit_string = flag.String("visit", "",
        "A comma-separated list of planets to make sure to visit")
 

-var cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file")
+var tomorrow_weight = flag.Float64("tomorrow_weight", 1.0,
+       "Weight for the expected value of tomorrow's trading.  0.0 - 1.0")

 
 

+var extra_stats = flag.Bool("extra_stats", true,
+       "Show additional information of possible interest")
+
+var cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file")

 
 var visit_cache []string
 
 var visit_cache []string

+

 func visit() []string {
        if visit_cache == nil {
                if *visit_string == "" {
 func visit() []string {
        if visit_cache == nil {
                if *visit_string == "" {


@@ -78,6 +86,7 @@ func visit() []string {
 }
 
 var flight_plan_cache []string
 }
 
 var flight_plan_cache []string

+

 func flight_plan() []string {
        if flight_plan_cache == nil {
                if *flight_plan_string == "" {
 func flight_plan() []string {
        if flight_plan_cache == nil {
                if *flight_plan_string == "" {


@@ -89,6 +98,7 @@ func flight_plan() []string {
 }
 
 var end_cache map[string]bool
 }
 
 var end_cache map[string]bool

+

 func end() map[string]bool {
        if end_cache == nil {
                if *end_string == "" {
 func end() map[string]bool {
        if end_cache == nil {
                if *end_string == "" {


@@ -109,8 +119,9 @@ type Commodity struct {
        Limit     int
 }
 type Planet struct {
        Limit     int
 }
 type Planet struct {

-       BeaconOn bool
-       Private bool
+       BeaconOn      bool
+       Private       bool
+       TomorrowValue int

        /* Use relative prices rather than absolute prices because you
           can get relative prices without traveling to each planet. */
        RelativePrices map[string]int
        /* Use relative prices rather than absolute prices because you
           can get relative prices without traveling to each planet. */
        RelativePrices map[string]int


@@ -159,16 +170,18 @@ func ReadData() (data planet_data) {
  * independent -- some combinations are illegal and not used.  They are
  * handled as three dimensions rather than one for simplicity.  Placing
  * these dimensions first causes the unused cells in the table to be
  * independent -- some combinations are illegal and not used.  They are
  * handled as three dimensions rather than one for simplicity.  Placing
  * these dimensions first causes the unused cells in the table to be

- * grouped together in large blocks.  This keeps them from polluting
- * cache lines, and if they are large enough, allows the memory manager
- * to swap out entire pages.
+ * grouped together in large blocks.  This keeps the unused cells from
+ * polluting cache lines, and if the spans of unused cells are large
+ * enough, allows the memory manager to swap out entire pages.

  *
  * If the table gets too big to fit in RAM:
  *    * Combine the Edens, Cloaks, and UnusedCargo dimensions.  Of the
  *      24 combinations, only 15 are legal: a 38% savings.
  *
  * If the table gets too big to fit in RAM:
  *    * Combine the Edens, Cloaks, and UnusedCargo dimensions.  Of the
  *      24 combinations, only 15 are legal: a 38% savings.

- *    * Reduce the size of the Fuel dimension to 3.  We only ever look
- *      backwards 2 units, so just rotate the logical values through
- *      the same 3 physical addresses.  This is good for an 82% savings.
+ *    * Reduce the size of the Fuel dimension to 3.  Explicit iteration
+ *      only ever needs to look backwards 2 units, so the logical values
+ *      can rotate through the same 3 physical addresses.  This would be
+ *      good for an 82% savings.  Note that explicit iteration went away
+ *      in 0372f045.

  *    * Reduce the size of the Edens dimension from 3 to 2, for the
  *      same reasons as Fuel above.  33% savings.
  *    * Buy more ram.  (Just sayin'.  It's cheaper than you think.)
  *    * Reduce the size of the Edens dimension from 3 to 2, for the
  *      same reasons as Fuel above.  33% savings.
  *    * Buy more ram.  (Just sayin'.  It's cheaper than you think.)


@@ -178,16 +191,16 @@ func ReadData() (data planet_data) {
 // The official list of dimensions:
 const (
        // Name                Num   Size  Description
 // The official list of dimensions:
 const (
        // Name                Num   Size  Description

-       Edens        = iota //   1      3  # of Eden warp units (0 - 2 typically)
-       Cloaks              //   2    1-2  # of Devices of Cloaking (0 or 1)
-       UnusedCargo         //   3      4  # of unused cargo spaces (0 - 3 typically)
-       Fuel                //   4     17  Hyper jump power left (0 - 16)
-       Location            //   5     26  Location (which planet)
-       Hold                //   6     15  Cargo bay contents (a *Commodity or nil)
-       Traded              //   7      2  Traded yet?
-       BuyFighters         //   8    1-2  Errand: Buy fighter drones
-       BuyShields          //   9    1-2  Errand: Buy shield batteries
-       Visit               //  10 1-2**N  Visit: Stop by these N planets in the route
+       Edens       = iota //   1      3  # of Eden warp units (0 - 2 typically)
+       Cloaks             //   2    1-2  # of Devices of Cloaking (0 or 1)
+       UnusedCargo        //   3      4  # of unused cargo spaces (0 - 3 typically)
+       Fuel               //   4     17  Hyper jump power left (0 - 16)
+       Location           //   5     26  Location (which planet)
+       Hold               //   6     15  Cargo bay contents (a *Commodity or nil)
+       Traded             //   7      2  Traded yet?
+       BuyFighters        //   8    1-2  Errand: Buy fighter drones
+       BuyShields         //   9    1-2  Errand: Buy shield batteries
+       Visit              //  10 1-2**N  Visit: Stop by these N planets in the route

 
        NumDimensions
 )
 
        NumDimensions
 )


@@ -238,22 +251,26 @@ type State struct {
        value, from int32
 }
 
        value, from int32
 }
 

-const CELL_UNINITIALIZED =   -2147483647
-const CELL_BEING_EVALUATED = -2147483646
-const CELL_RUBISH =          -2147483645
+const (
+       FROM_ROOT = -2147483647 + iota
+       FROM_UNINITIALIZED
+       VALUE_UNINITIALIZED
+       VALUE_BEING_EVALUATED
+       VALUE_RUBISH
+)

 
 func EncodeIndex(dims, addr []int) int32 {
 
 func EncodeIndex(dims, addr []int) int32 {

-       index := int32(addr[0])
+       index := addr[0]

        if addr[0] > dims[0] {
                panic(0)
        }
        for i := 1; i < NumDimensions; i++ {
        if addr[0] > dims[0] {
                panic(0)
        }
        for i := 1; i < NumDimensions; i++ {

-               if addr[i] < 0 || addr[i] > dims[i] {
+               if addr[i] < 0 || addr[i] >= dims[i] {

                        panic(i)
                }
                        panic(i)
                }

-               index = index*int32(dims[i]) + int32(addr[i])
+               index = index*dims[i] + addr[i]

        }
        }

-       return index
+       return int32(index)

 }
 
 func DecodeIndex(dims []int, index int32) []int {
 }
 
 func DecodeIndex(dims []int, index int32) []int {


@@ -269,15 +286,20 @@ func DecodeIndex(dims []int, index int32) []int {
 func CreateStateTable(data planet_data, dims []int) []State {
        table := make([]State, StateTableSize(dims))
        for i := range table {
 func CreateStateTable(data planet_data, dims []int) []State {
        table := make([]State, StateTableSize(dims))
        for i := range table {

-               table[i].value = CELL_UNINITIALIZED
+               table[i].value = VALUE_UNINITIALIZED
+               table[i].from = FROM_UNINITIALIZED

        }
 
        addr := make([]int, NumDimensions)
        addr[Fuel] = *fuel
        addr[Edens] = *start_edens
        addr[Location] = data.p2i[*start]
        }
 
        addr := make([]int, NumDimensions)
        addr[Fuel] = *fuel
        addr[Edens] = *start_edens
        addr[Location] = data.p2i[*start]

-       addr[Traded] = 1
-       table[EncodeIndex(dims, addr)].value = int32(*funds)
+       if *start_hold != "" {
+               addr[Hold] = data.c2i[*start_hold]
+       }
+       start_index := EncodeIndex(dims, addr)
+       table[start_index].value = int32(*funds)
+       table[start_index].from = FROM_ROOT

 
        return table
 }
 
        return table
 }


@@ -299,17 +321,18 @@ func Consider(data planet_data, dims []int, table []State, there []int, value_di
 }
 
 var cell_filled_count int
 }
 
 var cell_filled_count int

+

 func CellValue(data planet_data, dims []int, table []State, addr []int) int32 {
        my_index := EncodeIndex(dims, addr)
 func CellValue(data planet_data, dims []int, table []State, addr []int) int32 {
        my_index := EncodeIndex(dims, addr)

-       if table[my_index].value == CELL_BEING_EVALUATED {
+       if table[my_index].value == VALUE_BEING_EVALUATED {

                panic("Circular dependency")
        }
                panic("Circular dependency")
        }

-       if table[my_index].value != CELL_UNINITIALIZED {
+       if table[my_index].value != VALUE_UNINITIALIZED {

                return table[my_index].value
        }
                return table[my_index].value
        }

-       table[my_index].value = CELL_BEING_EVALUATED
+       table[my_index].value = VALUE_BEING_EVALUATED

 
 

-       best_value := int32(CELL_RUBISH)
+       best_value := int32(VALUE_RUBISH)

        best_source := make([]int, NumDimensions)
        other := make([]int, NumDimensions)
        copy(other, addr)
        best_source := make([]int, NumDimensions)
        other := make([]int, NumDimensions)
        copy(other, addr)


@@ -348,7 +371,7 @@ func CellValue(data planet_data, dims []int, table []State, addr []int) int32 {
                }
 
                /* Travel here via Eden Warp Unit */
                }
 
                /* Travel here via Eden Warp Unit */

-               if addr[Edens]+1 < dims[Edens] && addr[UnusedCargo] > 1 {
+               if addr[Edens]+1 < dims[Edens] && addr[UnusedCargo] > 0 {

                        _, available := data.Planets[data.i2p[addr[Location]]].RelativePrices["Eden Warp Units"]
                        if !available {
                                other[Edens] = addr[Edens] + 1
                        _, available := data.Planets[data.i2p[addr[Location]]].RelativePrices["Eden Warp Units"]
                        if !available {
                                other[Edens] = addr[Edens] + 1


@@ -421,6 +444,7 @@ func CellValue(data planet_data, dims []int, table []State, addr []int) int32 {
                                }
                        }
                }
                                }
                        }
                }

+               other[Traded] = addr[Traded]

        }
 
        /* Buy a Device of Cloaking */
        }
 
        /* Buy a Device of Cloaking */


@@ -444,7 +468,7 @@ func CellValue(data planet_data, dims []int, table []State, addr []int) int32 {
                if available {
                        absolute_price := int(float64(data.Commodities["Fighter Drones"].BasePrice) * float64(relative_price) / 100.0)
                        other[BuyFighters] = 0
                if available {
                        absolute_price := int(float64(data.Commodities["Fighter Drones"].BasePrice) * float64(relative_price) / 100.0)
                        other[BuyFighters] = 0

-                       Consider(data, dims, table, other, -absolute_price * *drones, &best_value, best_source)
+                       Consider(data, dims, table, other, -absolute_price**drones, &best_value, best_source)

                        other[BuyFighters] = addr[BuyFighters]
                }
        }
                        other[BuyFighters] = addr[BuyFighters]
                }
        }


@@ -455,15 +479,14 @@ func CellValue(data planet_data, dims []int, table []State, addr []int) int32 {
                if available {
                        absolute_price := int(float64(data.Commodities["Shield Batterys"].BasePrice) * float64(relative_price) / 100.0)
                        other[BuyShields] = 0
                if available {
                        absolute_price := int(float64(data.Commodities["Shield Batterys"].BasePrice) * float64(relative_price) / 100.0)
                        other[BuyShields] = 0

-                       Consider(data, dims, table, other, -absolute_price * *batteries, &best_value, best_source)
+                       Consider(data, dims, table, other, -absolute_price**batteries, &best_value, best_source)

                        other[BuyShields] = addr[BuyShields]
                }
        }
 
        /* Visit this planet */
                        other[BuyShields] = addr[BuyShields]
                }
        }
 
        /* Visit this planet */

-       var i uint
-       for i = 0; i < uint(len(visit())); i++ {
-               if addr[Visit] & (1 << i) != 0 && visit()[i] == data.i2p[addr[Location]] {
+       for i := uint(0); i < uint(len(visit())); i++ {
+               if addr[Visit]&(1<<i) != 0 && visit()[i] == data.i2p[addr[Location]] {

                        other[Visit] = addr[Visit] & ^(1 << i)
                        Consider(data, dims, table, other, 0, &best_value, best_source)
                }
                        other[Visit] = addr[Visit] & ^(1 << i)
                        Consider(data, dims, table, other, 0, &best_value, best_source)
                }


@@ -482,7 +505,7 @@ func CellValue(data planet_data, dims []int, table []State, addr []int) int32 {
                                        other[UnusedCargo] = addr[UnusedCargo] + quantity
                                }
                                if other[UnusedCargo] < dims[UnusedCargo] {
                                        other[UnusedCargo] = addr[UnusedCargo] + quantity
                                }
                                if other[UnusedCargo] < dims[UnusedCargo] {

-                                       Consider(data, dims, table, other, -absolute_price * quantity, &best_value, best_source)
+                                       Consider(data, dims, table, other, -absolute_price*quantity, &best_value, best_source)

                                }
                        }
                        other[Edens] = addr[Edens]
                                }
                        }
                        other[Edens] = addr[Edens]


@@ -490,21 +513,33 @@ func CellValue(data planet_data, dims []int, table []State, addr []int) int32 {
                }
        }
 
                }
        }
 

-       if table[my_index].value != CELL_BEING_EVALUATED {
+       // Check that we didn't lose track of any temporary modifications to other.
+       for i := 0; i < NumDimensions; i++ {
+               if addr[i] != other[i] {
+                       panic(i)
+               }
+       }
+
+       // Sanity check: This cell was in state BEING_EVALUATED
+       // the whole time that it was being evaluated.
+       if table[my_index].value != VALUE_BEING_EVALUATED {

                panic(my_index)
        }
                panic(my_index)
        }

+
+       // Record our findings

        table[my_index].value = best_value
        table[my_index].from = EncodeIndex(dims, best_source)
 
        table[my_index].value = best_value
        table[my_index].from = EncodeIndex(dims, best_source)
 

-       cell_filled_count ++
-       if cell_filled_count & 0xff == 0 {
+       // UI: Progress bar
+       cell_filled_count++
+       if cell_filled_count&0xfff == 0 {

                print(fmt.Sprintf("\r%3.1f%%", 100*float64(cell_filled_count)/float64(StateTableSize(dims))))
        }
 
        return table[my_index].value
 }
 
                print(fmt.Sprintf("\r%3.1f%%", 100*float64(cell_filled_count)/float64(StateTableSize(dims))))
        }
 
        return table[my_index].value
 }
 

-func FindBestState(data planet_data, dims []int, table []State) int32 {
+func FinalState(dims []int) []int {

        addr := make([]int, NumDimensions)
        addr[Edens] = *end_edens
        addr[Cloaks] = dims[Cloaks] - 1
        addr := make([]int, NumDimensions)
        addr[Edens] = *end_edens
        addr[Cloaks] = dims[Cloaks] - 1


@@ -512,14 +547,27 @@ func FindBestState(data planet_data, dims []int, table []State) int32 {
        addr[BuyShields] = dims[BuyShields] - 1
        addr[Visit] = dims[Visit] - 1
        addr[Traded] = 1
        addr[BuyShields] = dims[BuyShields] - 1
        addr[Visit] = dims[Visit] - 1
        addr[Traded] = 1

-       // Hold and UnusedCargo left at 0
+       addr[Hold] = 0
+       addr[UnusedCargo] = 0
+       // Fuel and Location are determined by FindBestState
+       return addr
+}
+
+func FindBestState(data planet_data, dims []int, table []State, addr []int) int32 {

        max_index := int32(-1)
        max_index := int32(-1)

-       max_value := int32(0)
-       for addr[Fuel] = 0; addr[Fuel] < 2; addr[Fuel]++ {
+       max_value := 0.0
+       max_fuel := 1
+       if *fuel == 0 {
+               max_fuel = 0
+       }
+       for addr[Fuel] = 0; addr[Fuel] <= max_fuel; addr[Fuel]++ {

                for addr[Location] = 0; addr[Location] < dims[Location]; addr[Location]++ {
                for addr[Location] = 0; addr[Location] < dims[Location]; addr[Location]++ {

-                       if len(end()) == 0 || end()[data.i2p[addr[Location]]] {
+                       planet := data.i2p[addr[Location]]
+                       if len(end()) == 0 || end()[planet] {

                                index := EncodeIndex(dims, addr)
                                index := EncodeIndex(dims, addr)

-                               value := CellValue(data, dims, table, addr)
+                               today_value := CellValue(data, dims, table, addr)
+                               tomorrow_value := *tomorrow_weight * float64(*hold+data.Planets[planet].TomorrowValue)
+                               value := float64(today_value) + tomorrow_value

                                if value > max_value {
                                        max_value = value
                                        max_index = index
                                if value > max_value {
                                        max_value = value
                                        max_index = index


@@ -531,6 +579,9 @@ func FindBestState(data planet_data, dims []int, table []State) int32 {
 }
 
 func Commas(n int32) (s string) {
 }
 
 func Commas(n int32) (s string) {

+       if n < 0 {
+               panic(n)
+       }

        r := n % 1000
        n /= 1000
        for n > 0 {
        r := n % 1000
        n /= 1000
        for n > 0 {


@@ -542,8 +593,78 @@ func Commas(n int32) (s string) {
        return
 }
 
        return
 }
 

+func FighterAndShieldCost(data planet_data, dims []int, table []State, best int32) {
+       if *drones == 0 && *batteries == 0 {
+               return
+       }
+       fmt.Println()
+       if *drones > 0 {
+               final_state := FinalState(dims)
+               final_state[BuyFighters] = 0
+               alt_best := FindBestState(data, dims, table, final_state)
+               cost := table[alt_best].value - table[best].value
+               fmt.Println("\rDrones were", float64(cost)/float64(*drones), "each")
+       }
+       if *batteries > 0 {
+               final_state := FinalState(dims)
+               final_state[BuyShields] = 0
+               alt_best := FindBestState(data, dims, table, final_state)
+               cost := table[alt_best].value - table[best].value
+               fmt.Println("\rBatteries were", float64(cost)/float64(*batteries), "each")
+       }
+}
+
+func EndEdensCost(data planet_data, dims []int, table []State, best int32) {
+       if *end_edens == 0 {
+               return
+       }
+       fmt.Println()
+       final_state := FinalState(dims)
+       for extra_edens := 1; extra_edens <= *end_edens; extra_edens++ {
+               final_state[Edens] = *end_edens - extra_edens
+               alt_best := FindBestState(data, dims, table, final_state)
+               extra_funds := table[alt_best].value - table[best].value
+               fmt.Println("\rUse", extra_edens, "extra edens, make an extra",
+                       Commas(extra_funds), "(",
+                       Commas(extra_funds/int32(extra_edens)), "per eden)")
+       }
+}
+
+func VisitCost(data planet_data, dims []int, table []State, best int32) {
+       if dims[Visit] == 1 {
+               return
+       }
+       fmt.Println()
+       final_state := FinalState(dims)
+       for i := uint(0); i < uint(len(visit())); i++ {
+               all_bits := dims[Visit] - 1
+               final_state[Visit] = all_bits & ^(1 << i)
+               alt_best := FindBestState(data, dims, table, final_state)
+               cost := table[alt_best].value - table[best].value
+               fmt.Printf("\r%11v Cost to visit %v\n", Commas(cost), visit()[i])
+       }
+}
+
+func EndLocationCost(data planet_data, dims []int, table []State, best int32) {
+       if len(end()) == 0 {
+               return
+       }
+       fmt.Println()
+       final_state := FinalState(dims)
+       save_end_string := *end_string
+       *end_string = ""
+       end_cache = nil
+       alt_best := FindBestState(data, dims, table, final_state)
+       cost := table[alt_best].value - table[best].value
+       fmt.Printf("\r%11v Cost of --end %v\n", Commas(cost), save_end_string)
+       *end_string = save_end_string
+}
+

 func DescribePath(data planet_data, dims []int, table []State, start int32) (description []string) {
 func DescribePath(data planet_data, dims []int, table []State, start int32) (description []string) {

-       for index := start; index > 0 && table[index].from > 0; index = table[index].from {
+       for index := start; table[index].from > FROM_ROOT; index = table[index].from {
+               if table[index].from == FROM_UNINITIALIZED {
+                       panic(index)
+               }

                var line string
                addr := DecodeIndex(dims, index)
                prev := DecodeIndex(dims, table[index].from)
                var line string
                addr := DecodeIndex(dims, index)
                prev := DecodeIndex(dims, table[index].from)


@@ -552,7 +673,7 @@ func DescribePath(data planet_data, dims []int, table []State, start int32) (des
                        to := data.i2p[addr[Location]]
                        line += fmt.Sprintf("Jump from %v to %v (%v hyper jump units)", from, to, prev[Fuel]-addr[Fuel])
                }
                        to := data.i2p[addr[Location]]
                        line += fmt.Sprintf("Jump from %v to %v (%v hyper jump units)", from, to, prev[Fuel]-addr[Fuel])
                }

-               if addr[Edens] == prev[Edens] - 1 {
+               if addr[Edens] == prev[Edens]-1 {

                        from := data.i2p[prev[Location]]
                        to := data.i2p[addr[Location]]
                        line += fmt.Sprintf("Eden warp from %v to %v", from, to)
                        from := data.i2p[prev[Location]]
                        to := data.i2p[addr[Location]]
                        line += fmt.Sprintf("Eden warp from %v to %v", from, to)


@@ -574,7 +695,7 @@ func DescribePath(data planet_data, dims []int, table []State, start int32) (des
                        line += "Buy a Cloak"
                }
                if addr[Edens] > prev[Edens] {
                        line += "Buy a Cloak"
                }
                if addr[Edens] > prev[Edens] {

-                       line += fmt.Sprint("Buy ", addr[Edens] - prev[Edens], " Eden Warp Units")
+                       line += fmt.Sprint("Buy ", addr[Edens]-prev[Edens], " Eden Warp Units")

                }
                if addr[BuyShields] == 1 && prev[BuyShields] == 0 {
                        line += fmt.Sprint("Buy ", *batteries, " Shield Batterys")
                }
                if addr[BuyShields] == 1 && prev[BuyShields] == 0 {
                        line += fmt.Sprint("Buy ", *batteries, " Shield Batterys")


@@ -594,7 +715,7 @@ func DescribePath(data planet_data, dims []int, table []State, start int32) (des
                if line == "" {
                        line = fmt.Sprint(prev, " -> ", addr)
                }
                if line == "" {
                        line = fmt.Sprint(prev, " -> ", addr)
                }

-               description = append(description, fmt.Sprintf("%13v ", Commas(table[index].value)) + line)
+               description = append(description, fmt.Sprintf("%13v ", Commas(table[index].value))+line)

        }
        return
 }
        }
        return
 }


@@ -625,6 +746,10 @@ func IndexCommodities(m *map[string]Commodity, start_at int) (map[string]int, []
 
 func main() {
        flag.Parse()
 
 func main() {
        flag.Parse()

+       if *start == "" || *funds == 0 {
+               print("--start and --funds are required.  --help for more\n")
+               return
+       }

        if *cpuprofile != "" {
                f, err := os.Create(*cpuprofile)
                if err != nil {
        if *cpuprofile != "" {
                f, err := os.Create(*cpuprofile)
                if err != nil {


@@ -648,14 +773,22 @@ func main() {
        data.c2i, data.i2c = IndexCommodities(&data.Commodities, 1)
        dims := DimensionSizes(data)
        table := CreateStateTable(data, dims)
        data.c2i, data.i2c = IndexCommodities(&data.Commodities, 1)
        dims := DimensionSizes(data)
        table := CreateStateTable(data, dims)

-       best := FindBestState(data, dims, table)
+       final_state := FinalState(dims)
+       best := FindBestState(data, dims, table, final_state)

        print("\n")
        if best == -1 {
                print("Cannot acheive success criteria\n")
        print("\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])
-               }
+               return
+       }
+       description := DescribePath(data, dims, table, best)
+       for i := len(description) - 1; i >= 0; i-- {
+               fmt.Println(description[i])
+       }
+
+       if *extra_stats {
+               FighterAndShieldCost(data, dims, table, best)
+               EndEdensCost(data, dims, table, best)
+               VisitCost(data, dims, table, best)
+               EndLocationCost(data, dims, table, best)

        }
 }
        }
 }