More named types: Value

[planeteer] / planeteer.go

diff --git a/planeteer.go b/planeteer.go
index 1597b9de49f23343eaf13374be2f6a1195c6dc7b..2bb1b5539058feb98958bbe32d83eb1aa98ecbf4 100644 (file)
--- a/planeteer.go
+++ b/planeteer.go
@@ -247,8 +247,12 @@ func StateTableSize(dims []int) int {
        return product
 }
 
+type Value int32
+type PhysicalIndex int32
+
 type State struct {
-       value, from int32
+       value Value
+       from  PhysicalIndex
 }
 
 const (
@@ -259,7 +263,7 @@ const (
        VALUE_RUBISH
 )
 
-func EncodeIndex(dims, addr []int) int32 {
+func EncodeIndex(dims, addr []int) PhysicalIndex {
        index := addr[0]
        if addr[0] > dims[0] {
                panic(0)
@@ -270,16 +274,17 @@ func EncodeIndex(dims, addr []int) int32 {
                }
                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[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
 }
 
@@ -298,7 +303,7 @@ func CreateStateTable(data planet_data, dims []int) []State {
                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
@@ -307,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. */
 
-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)
-       if value_difference < 0 && int32(-value_difference) > there_value {
+       if value_difference < 0 && Value(-value_difference) > there_value {
                /* 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)
@@ -322,7 +327,7 @@ func Consider(data planet_data, dims []int, table []State, there []int, value_di
 
 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")
@@ -332,7 +337,7 @@ func CellValue(data planet_data, dims []int, table []State, addr []int) int32 {
        }
        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)
@@ -553,8 +558,8 @@ func FinalState(dims []int) []int {
        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 {
@@ -578,7 +583,7 @@ func FindBestState(data planet_data, dims []int, table []State, addr []int) int3
        return max_index
 }
 
-func Commas(n int32) (s string) {
+func Commas(n Value) (s string) {
        if n < 0 {
                panic(n)
        }
@@ -593,7 +598,7 @@ func Commas(n int32) (s string) {
        return
 }
 
-func FighterAndShieldCost(data planet_data, dims []int, table []State, best int32) {
+func FighterAndShieldCost(data planet_data, dims []int, table []State, best PhysicalIndex) {
        if *drones == 0 && *batteries == 0 {
                return
        }
@@ -614,7 +619,7 @@ func FighterAndShieldCost(data planet_data, dims []int, table []State, best int3
        }
 }
 
-func EndEdensCost(data planet_data, dims []int, table []State, best int32) {
+func EndEdensCost(data planet_data, dims []int, table []State, best PhysicalIndex) {
        if *end_edens == 0 {
                return
        }
@@ -626,11 +631,11 @@ func EndEdensCost(data planet_data, dims []int, table []State, best int32) {
                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)")
+                       Commas(extra_funds/Value(extra_edens)), "per eden)")
        }
 }
 
-func VisitCost(data planet_data, dims []int, table []State, best int32) {
+func VisitCost(data planet_data, dims []int, table []State, best PhysicalIndex) {
        if dims[Visit] == 1 {
                return
        }
@@ -645,7 +650,7 @@ func VisitCost(data planet_data, dims []int, table []State, best int32) {
        }
 }
 
-func EndLocationCost(data planet_data, dims []int, table []State, best int32) {
+func EndLocationCost(data planet_data, dims []int, table []State, best PhysicalIndex) {
        if len(end()) == 0 {
                return
        }
@@ -660,7 +665,7 @@ func EndLocationCost(data planet_data, dims []int, table []State, best int32) {
        *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 PhysicalIndex) (description []string) {
        for index := start; table[index].from > FROM_ROOT; index = table[index].from {
                if table[index].from == FROM_UNINITIALIZED {
                        panic(index)