Move the cost reporting out of main

[planeteer] / planeteer.go

diff --git a/planeteer.go b/planeteer.go
index a8e6516e26869422f005208df90337a2216f8907..7cea3cb9e914dac577c1de630ddcb7015d9326eb 100644 (file)
--- a/planeteer.go
+++ b/planeteer.go
@@ -480,8 +480,7 @@ func CellValue(data planet_data, dims []int, table []State, addr []int) int32 {
        }
 
        /* Visit this planet */
        }
 
        /* Visit this planet */

-       var i uint
-       for i = 0; i < uint(len(visit())); i++ {
+       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)
                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)


@@ -575,6 +574,9 @@ func FindBestState(data planet_data, dims []int, table []State, addr []int) int3
 }
 
 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 {


@@ -586,6 +588,73 @@ 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) {
        for index := start; table[index].from > FROM_ROOT; index = table[index].from {
                if table[index].from == FROM_UNINITIALIZED {
 func DescribePath(data planet_data, dims []int, table []State, start int32) (description []string) {
        for index := start; table[index].from > FROM_ROOT; index = table[index].from {
                if table[index].from == FROM_UNINITIALIZED {


@@ -711,35 +780,8 @@ func main() {
                fmt.Println(description[i])
        }
 
                fmt.Println(description[i])
        }
 

-       // Calculate total cost of fighters and shields
-       if *drones > 0 || *batteries > 0 {
-               fmt.Println()
-       }
-       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("Drones 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("Batteries were", float64(cost)/float64(*batteries), "each")
-               final_state[BuyShields] = 1
-       }
-
-       // Use extra eden warps
-       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)")
-       }
+       FighterAndShieldCost(data, dims, table, best)
+       EndEdensCost(data, dims, table, best)
+       VisitCost(data, dims, table, best)
+       EndLocationCost(data, dims, table, best)

 }
 }