More named types: Value

[planeteer] / planeteer.go

diff --git a/planeteer.go b/planeteer.go
index a3fb84ca76005256dc003559eeb4b33823ac9ac8..2bb1b5539058feb98958bbe32d83eb1aa98ecbf4 100644 (file)
--- a/planeteer.go
+++ b/planeteer.go
@@ -68,6 +68,9 @@ var visit_string = flag.String("visit", "",
 var tomorrow_weight = flag.Float64("tomorrow_weight", 1.0,
        "Weight for the expected value of tomorrow's trading.  0.0 - 1.0")
 
 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 cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file")
 
 var visit_cache []string


@@ -167,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.)


@@ -242,8 +247,12 @@ func StateTableSize(dims []int) int {
        return product
 }
 
        return product
 }
 

+type Value int32
+type PhysicalIndex int32
+

 type State struct {
 type State struct {

-       value, from int32
+       value Value
+       from  PhysicalIndex

 }
 
 const (
 }
 
 const (


@@ -254,7 +263,7 @@ const (
        VALUE_RUBISH
 )
 
        VALUE_RUBISH
 )
 

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

        index := addr[0]
        if addr[0] > dims[0] {
                panic(0)
        index := addr[0]
        if addr[0] > dims[0] {
                panic(0)


@@ -265,16 +274,17 @@ func EncodeIndex(dims, addr []int) int32 {
                }
                index = index*dims[i] + addr[i]
        }
                }
                index = index*dims[i] + addr[i]
        }

-       return int32(index)
+       return PhysicalIndex(index)

 }
 
 }
 

-func DecodeIndex(dims []int, index int32) []int {
+func DecodeIndex(dims []int, index PhysicalIndex) []int {
+       scratch := int(index)

        addr := make([]int, NumDimensions)
        for i := NumDimensions - 1; i > 0; i-- {
        addr := make([]int, NumDimensions)
        for i := NumDimensions - 1; i > 0; i-- {

-               addr[i] = int(index) % dims[i]
-               index /= int32(dims[i])
+               addr[i] = scratch % dims[i]
+               scratch /= dims[i]

        }
        }

-       addr[0] = int(index)
+       addr[0] = scratch

        return addr
 }
 
        return addr
 }
 


@@ -293,7 +303,7 @@ func CreateStateTable(data planet_data, dims []int) []State {
                addr[Hold] = data.c2i[*start_hold]
        }
        start_index := EncodeIndex(dims, addr)
                addr[Hold] = data.c2i[*start_hold]
        }
        start_index := EncodeIndex(dims, addr)

-       table[start_index].value = int32(*funds)
+       table[start_index].value = Value(*funds)

        table[start_index].from = FROM_ROOT
 
        return table
        table[start_index].from = FROM_ROOT
 
        return table


@@ -302,13 +312,13 @@ func CreateStateTable(data planet_data, dims []int) []State {
 /* CellValue fills in the one cell at address addr by looking at all
  * the possible ways to reach this cell and selecting the best one. */
 
 /* CellValue fills in the one cell at address addr by looking at all
  * the possible ways to reach this cell and selecting the best one. */
 

-func Consider(data planet_data, dims []int, table []State, there []int, value_difference int, best_value *int32, best_source []int) {
+func Consider(data planet_data, dims []int, table []State, there []int, value_difference int, best_value *Value, best_source []int) {

        there_value := CellValue(data, dims, table, there)
        there_value := CellValue(data, dims, table, there)

-       if value_difference < 0 && int32(-value_difference) > there_value {
+       if value_difference < 0 && Value(-value_difference) > there_value {

                /* Can't afford this transition */
                return
        }
                /* Can't afford this transition */
                return
        }

-       possible_value := there_value + int32(value_difference)
+       possible_value := there_value + Value(value_difference)

        if possible_value > *best_value {
                *best_value = possible_value
                copy(best_source, there)
        if possible_value > *best_value {
                *best_value = possible_value
                copy(best_source, there)


@@ -317,7 +327,7 @@ 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 {
+func CellValue(data planet_data, dims []int, table []State, addr []int) Value {

        my_index := EncodeIndex(dims, addr)
        if table[my_index].value == VALUE_BEING_EVALUATED {
                panic("Circular dependency")
        my_index := EncodeIndex(dims, addr)
        if table[my_index].value == VALUE_BEING_EVALUATED {
                panic("Circular dependency")


@@ -327,7 +337,7 @@ func CellValue(data planet_data, dims []int, table []State, addr []int) int32 {
        }
        table[my_index].value = VALUE_BEING_EVALUATED
 
        }
        table[my_index].value = VALUE_BEING_EVALUATED
 

-       best_value := int32(VALUE_RUBISH)
+       best_value := Value(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)


@@ -548,8 +558,8 @@ func FinalState(dims []int) []int {
        return addr
 }
 
        return addr
 }
 

-func FindBestState(data planet_data, dims []int, table []State, addr []int) int32 {
-       max_index := int32(-1)
+func FindBestState(data planet_data, dims []int, table []State, addr []int) PhysicalIndex {
+       max_index := PhysicalIndex(-1)

        max_value := 0.0
        max_fuel := 1
        if *fuel == 0 {
        max_value := 0.0
        max_fuel := 1
        if *fuel == 0 {


@@ -573,7 +583,7 @@ func FindBestState(data planet_data, dims []int, table []State, addr []int) int3
        return max_index
 }
 
        return max_index
 }
 

-func Commas(n int32) (s string) {
+func Commas(n Value) (s string) {

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


@@ -588,7 +598,74 @@ func Commas(n int32) (s string) {
        return
 }
 
        return
 }
 

-func DescribePath(data planet_data, dims []int, table []State, start int32) (description []string) {
+func FighterAndShieldCost(data planet_data, dims []int, table []State, best PhysicalIndex) {
+       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 PhysicalIndex) {
+       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/Value(extra_edens)), "per eden)")
+       }
+}
+
+func VisitCost(data planet_data, dims []int, table []State, best PhysicalIndex) {
+       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 PhysicalIndex) {
+       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 PhysicalIndex) (description []string) {

        for index := start; table[index].from > FROM_ROOT; index = table[index].from {
                if table[index].from == FROM_UNINITIALIZED {
                        panic(index)
        for index := start; table[index].from > FROM_ROOT; index = table[index].from {
                if table[index].from == FROM_UNINITIALIZED {
                        panic(index)


@@ -713,63 +790,10 @@ func main() {
                fmt.Println(description[i])
        }
 
                fmt.Println(description[i])
        }
 

-       // Ok, that was the important stuff.  Now some fun stuff.
-
-       // Calculate total cost of fighters and shields
-       if *drones > 0 || *batteries > 0 {
-               fmt.Println()
+       if *extra_stats {
+               FighterAndShieldCost(data, dims, table, best)
+               EndEdensCost(data, dims, table, best)
+               VisitCost(data, dims, table, best)
+               EndLocationCost(data, dims, table, best)

        }
        }

-       if *drones > 0 {
-               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")
-               final_state[BuyFighters] = 1
-       }
-       if *batteries > 0 {
-               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")
-               final_state[BuyShields] = 1
-       }
-
-       // Use extra eden warps / cost of --end_edends
-       if *end_edens > 0 {
-               fmt.Println()
-       }
-       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)")
-       }
-       final_state[Edens] = *end_edens
-
-       // Cost of visiting places
-       if dims[Visit] > 1 {
-               fmt.Println()
-       }
-       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])
-       }
-       final_state[Visit] = dims[Visit] - 1
-
-       // Cost of --end
-       if len(end()) > 0 {
-               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\n%11v Cost of --end %v\n", Commas(cost), save_end_string)
-               *end_string = save_end_string
-       }
-

 }
 }