Generalize json-slurping

[planeteer] / planeteer.go

diff --git a/planeteer.go b/planeteer.go
index 1597b9de49f23343eaf13374be2f6a1195c6dc7b..4976abe131d1ececa2a2b8ec256cfae2d39b609b 100644 (file)
--- a/planeteer.go
+++ b/planeteer.go
@@ -133,13 +133,21 @@ type planet_data struct {
        i2p, i2c    []string       // Generated; not read from file
 }
 
        i2p, i2c    []string       // Generated; not read from file
 }
 

-func ReadData() (data planet_data) {
-       f, err := os.Open(*planet_data_file)
+func json_slurp(filename string, receptacle interface{}) error {
+       f, err := os.Open(filename)

        if err != nil {
        if err != nil {

-               panic(err)
+               return err

        }
        defer f.Close()
        }
        defer f.Close()

-       err = json.NewDecoder(f).Decode(&data)
+       err = json.NewDecoder(f).Decode(receptacle)
+       if err != nil {
+               return err
+       }
+       return nil
+}
+
+func ReadData() (data planet_data) {
+       err := json_slurp(*planet_data_file, &data)

        if err != nil {
                panic(err)
        }
        if err != nil {
                panic(err)
        }


@@ -212,13 +220,13 @@ func bint(b bool) int {
        return 0
 }
 
        return 0
 }
 

-func DimensionSizes(data planet_data) []int {
+func DimensionSizes(data planet_data) LogicalIndex {

        eden_capacity := data.Commodities["Eden Warp Units"].Limit
        if *start_edens > eden_capacity {
                eden_capacity = *start_edens
        }
        cloak_capacity := bint(*cloak)
        eden_capacity := data.Commodities["Eden Warp Units"].Limit
        if *start_edens > eden_capacity {
                eden_capacity = *start_edens
        }
        cloak_capacity := bint(*cloak)

-       dims := make([]int, NumDimensions)
+       dims := make(LogicalIndex, NumDimensions)

        dims[Edens] = eden_capacity + 1
        dims[Cloaks] = cloak_capacity + 1
        dims[UnusedCargo] = eden_capacity + cloak_capacity + 1
        dims[Edens] = eden_capacity + 1
        dims[Cloaks] = cloak_capacity + 1
        dims[UnusedCargo] = eden_capacity + cloak_capacity + 1


@@ -239,7 +247,11 @@ func DimensionSizes(data planet_data) []int {
        return dims
 }
 
        return dims
 }
 

-func StateTableSize(dims []int) int {
+type Value int32
+type PhysicalIndex int32
+type LogicalIndex []int
+
+func StateTableSize(dims LogicalIndex) int {

        product := 1
        for _, size := range dims {
                product *= size
        product := 1
        for _, size := range dims {
                product *= size


@@ -248,7 +260,8 @@ func StateTableSize(dims []int) int {
 }
 
 type State struct {
 }
 
 type State struct {

-       value, from int32
+       value Value
+       from  PhysicalIndex

 }
 
 const (
 }
 
 const (


@@ -259,7 +272,7 @@ const (
        VALUE_RUBISH
 )
 
        VALUE_RUBISH
 )
 

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

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


@@ -270,27 +283,28 @@ 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 {
-       addr := make([]int, NumDimensions)
+func DecodeIndex(dims LogicalIndex, index PhysicalIndex) LogicalIndex {
+       scratch := int(index)
+       addr := make(LogicalIndex, NumDimensions)

        for i := NumDimensions - 1; i > 0; i-- {
        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
 }
 

-func CreateStateTable(data planet_data, dims []int) []State {
+func CreateStateTable(data planet_data, dims LogicalIndex) []State {

        table := make([]State, StateTableSize(dims))
        for i := range table {
                table[i].value = VALUE_UNINITIALIZED
                table[i].from = FROM_UNINITIALIZED
        }
 
        table := make([]State, StateTableSize(dims))
        for i := range table {
                table[i].value = VALUE_UNINITIALIZED
                table[i].from = FROM_UNINITIALIZED
        }
 

-       addr := make([]int, NumDimensions)
+       addr := make(LogicalIndex, NumDimensions)

        addr[Fuel] = *fuel
        addr[Edens] = *start_edens
        addr[Location] = data.p2i[*start]
        addr[Fuel] = *fuel
        addr[Edens] = *start_edens
        addr[Location] = data.p2i[*start]


@@ -298,7 +312,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


@@ -307,13 +321,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 LogicalIndex, table []State, there LogicalIndex, value_difference int, best_value *Value, best_source LogicalIndex) {

        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)


@@ -322,7 +336,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 LogicalIndex, table []State, addr LogicalIndex) 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")


@@ -332,9 +346,9 @@ 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_source := make([]int, NumDimensions)
-       other := make([]int, NumDimensions)
+       best_value := Value(VALUE_RUBISH)
+       best_source := make(LogicalIndex, NumDimensions)
+       other := make(LogicalIndex, NumDimensions)

        copy(other, addr)
        planet := data.i2p[addr[Location]]
 
        copy(other, addr)
        planet := data.i2p[addr[Location]]
 


@@ -539,8 +553,8 @@ func CellValue(data planet_data, dims []int, table []State, addr []int) int32 {
        return table[my_index].value
 }
 
        return table[my_index].value
 }
 

-func FinalState(dims []int) []int {
-       addr := make([]int, NumDimensions)
+func FinalState(dims LogicalIndex) LogicalIndex {
+       addr := make(LogicalIndex, NumDimensions)

        addr[Edens] = *end_edens
        addr[Cloaks] = dims[Cloaks] - 1
        addr[BuyFighters] = dims[BuyFighters] - 1
        addr[Edens] = *end_edens
        addr[Cloaks] = dims[Cloaks] - 1
        addr[BuyFighters] = dims[BuyFighters] - 1


@@ -553,8 +567,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 LogicalIndex, table []State, addr LogicalIndex) 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 {


@@ -578,7 +592,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)
        }


@@ -593,7 +607,7 @@ func Commas(n int32) (s string) {
        return
 }
 
        return
 }
 

-func FighterAndShieldCost(data planet_data, dims []int, table []State, best int32) {
+func FighterAndShieldCost(data planet_data, dims LogicalIndex, table []State, best PhysicalIndex) {

        if *drones == 0 && *batteries == 0 {
                return
        }
        if *drones == 0 && *batteries == 0 {
                return
        }


@@ -614,7 +628,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 LogicalIndex, table []State, best PhysicalIndex) {

        if *end_edens == 0 {
                return
        }
        if *end_edens == 0 {
                return
        }


@@ -626,11 +640,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), "(",
                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 LogicalIndex, table []State, best PhysicalIndex) {

        if dims[Visit] == 1 {
                return
        }
        if dims[Visit] == 1 {
                return
        }


@@ -645,7 +659,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 LogicalIndex, table []State, best PhysicalIndex) {

        if len(end()) == 0 {
                return
        }
        if len(end()) == 0 {
                return
        }


@@ -660,7 +674,7 @@ func EndLocationCost(data planet_data, dims []int, table []State, best int32) {
        *end_string = 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 LogicalIndex, 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)