From: Scott Worley Date: Sat, 15 Sep 2012 19:38:31 +0000 (-0700) Subject: Start using named types: PhysicalIndex X-Git-Url: http://git.scottworley.com/planeteer/commitdiff_plain/db81510d35a720dc85793c0684a9c13a5ae38237?ds=sidebyside Start using named types: PhysicalIndex --- diff --git a/planeteer.go b/planeteer.go index 1597b9d..7c5b2e7 100644 --- a/planeteer.go +++ b/planeteer.go @@ -248,7 +248,8 @@ func StateTableSize(dims []int) int { } type State struct { - value, from int32 + value int32 + from PhysicalIndex } const ( @@ -259,7 +260,9 @@ const ( VALUE_RUBISH ) -func EncodeIndex(dims, addr []int) int32 { +type PhysicalIndex int32 + +func EncodeIndex(dims, addr []int) PhysicalIndex { index := addr[0] if addr[0] > dims[0] { panic(0) @@ -270,16 +273,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 } @@ -553,8 +557,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 { @@ -593,7 +597,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 +618,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 } @@ -630,7 +634,7 @@ func EndEdensCost(data planet_data, dims []int, table []State, best int32) { } } -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 +649,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 +664,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) diff --git a/planeteer_test.go b/planeteer_test.go index 42baae0..a77d0be 100644 --- a/planeteer_test.go +++ b/planeteer_test.go @@ -4,7 +4,7 @@ import "testing" func TestEncodeDecode(t *testing.T) { dims := []int{3, 2, 4, 17, 26, 15, 2, 1, 2, 1} - var i int32 + var i PhysicalIndex for i = 0; i < 636480; i++ { // Product of dims addr := DecodeIndex(dims, i) for j := 0; j < len(dims); j++ {