updated rand to math/rand, replaced vector with slices (of fixed lengths)

Author: blaine booher

breeder.go

@@ -9,7 +9,7 @@ go-galib beeders
 package ga
 
 import (
-	"rand"
+	"math/rand"
 )
 
 type GABreeder interface {

example/floating.go

@@ -8,11 +8,11 @@ subset sum solver
 package main
 
 import (
-	"math"
+	"../_obj/ga"
 	"fmt"
-	"rand"
+	"math"
+	"math/rand"
 	"time"
-	"../_obj/ga"
 )
 
 var scores int
@@ -41,7 +41,6 @@ func rosenbrock(g *ga.GAFloatGenome) float64 {
 	return sum
 }
 
-
 func main() {
 	rand.Seed(time.Nanoseconds())
 

example/floating_parallel.go

@@ -8,11 +8,11 @@ subset sum solver
 package main
 
 import (
-	"math"
+	"../_obj/ga"
 	"fmt"
-	"rand"
+	"math"
+	"math/rand"
 	"time"
-	"../_obj/ga"
 )
 
 var scores int
@@ -41,7 +41,6 @@ func rosenbrock(g *ga.GAFloatGenome) float64 {
 	return sum
 }
 
-
 func main() {
 	rand.Seed(time.Nanoseconds())
 

example/ordered_int.go

@@ -8,13 +8,14 @@ Example of uing the ordered int genome and mutators
 package main
 
 import (
+	"../_obj/ga"
 	"fmt"
-	"rand"
+	"math/rand"
 	"time"
-	"../_obj/ga"
 )
 
 var scores int
+
 // Boring fitness/score function.
 func score(g *ga.GAOrderedIntGenome) float64 {
 	var total int

example/subset_sum.go

@@ -8,15 +8,16 @@ subset sum solver
 package main
 
 import (
+	"../_obj/ga"
 	"fmt"
-	"rand"
+	"math/rand"
 	"time"
-	"../_obj/ga"
 )
 
 var theset = [200]int{332, 401, -178, 60, -436, -135, -275, 192, -223, -150, -67, 401, -140, -71, 152, 478, 210, -485, -465, -492, -355, -474, -420, 213, -63, 33, 366, -94, -469, 429, -307, -291, 176, 465, 180, 28, 408, -245, -318, -66, -158, -202, -191, 47, -71, -320, 142, 305, 429, -449, -58, -115, 153, -47, 95, 215, 82, 452, 390, 331, -419, -68, -416, 331, -35, -102, 270, -72, -81, 133, 159, -417, 455, -99, -137, -477, -99, 312, -409, -401, -468, -453, -165, 163, 415, -85, 304, 307, -38, -439, 162, 310, 13, 320, 362, 336, -461, 435, 378, 194, -430, -322, 307, -159, -325, -290, -339, 485, -464, 315, -205, 385, 98, 439, -82, 374, -288, -407, -225, -463, 302, -442, 237, -427, -40, -156, -117, -53, -386, -133, -5, -287, -403, -487, -134, -273, 481, -405, 459, 108, 454, -106, 76, 116, -390, 90, -52, -120, -213, -62, -481, -417, 115, -33, 484, -8, 243, 439, -491, -299, -289, 191, 394, -161, 109, -468, -289, 355, 293, -54, -499, -374, -99, -142, 238, 115, -46, -182, 398, -32, 186, -91, -479, -108, -399, -231, -212, -233, 178, 82, -126, 304, -140, -364, 14, -307, 280, -334, 2, -444}
 
 var scores int
+
 // Fitness function for subset sum
 func score(g *ga.GAFixedBitstringGenome) float64 {
 	scores++

ga.go

@@ -10,8 +10,8 @@ package ga
 
 import (
 	"fmt"
+	"math/rand"
 	"sort"
-	"rand"
 )
 
 type GAParameter struct {

genome_fixed_bitstring.go

@@ -10,7 +10,7 @@ package ga
 
 import (
 	"fmt"
-	"rand"
+	"math/rand"
 )
 
 type GAFixedBitstringGenome struct {
@@ -88,7 +88,6 @@ func (g *GAFixedBitstringGenome) Score() float64 {
 
 func (g *GAFixedBitstringGenome) Reset() { g.hasscore = false }
 
-
 func (g *GAFixedBitstringGenome) String() string {
 	return fmt.Sprintf("%v", g.Gene)
 }

genome_float64.go

@@ -11,7 +11,7 @@ package ga
 
 import (
 	"fmt"
-	"rand"
+	"math/rand"
 )
 
 type GAFloatGenome struct {
@@ -92,5 +92,4 @@ func (g *GAFloatGenome) Score() float64 {
 
 func (g *GAFloatGenome) Reset() { g.hasscore = false }
 
-
 func (g *GAFloatGenome) String() string { return fmt.Sprintf("%v", g.Gene) }

genome_ordered_int.go

@@ -9,10 +9,11 @@ Ordered list genome for problems where the order of Genes matter, tSP for exampl
 package ga
 
 import (
+	//"container/vector"
+	//"container/list"
 	"fmt"
-	"container/vector"
+	"math/rand"
 	"sort"
-	"rand"
 )
 
 type GAOrderedIntGenome struct {
@@ -47,24 +48,36 @@ func (a *GAOrderedIntGenome) Crossover(bi GAGenome, p1, p2 int) (GAGenome, GAGen
 	copy(ca.Gene[p1:p2+1], b.Gene[p1:p2+1])
 	copy(cb.Gene[p1:p2+1], a.Gene[p1:p2+1])
 	//Proto child needs fixing
-	amap := new(vector.IntVector)
-	bmap := new(vector.IntVector)
+	//amap := new(vector.IntVector)
+	//bmap := new(vector.IntVector)
+	amap := make([]int, 1000)
+	bmap := make([]int, 1000)
 	for i := p1; i <= p2; i++ {
 		ma, found := ca.pmxmap(ca.Gene[i], p1, p2)
 		if found {
-			amap.Push(ma)
-			if bmap.Len() > 0 {
-				i1 := amap.Pop()
-				i2 := bmap.Pop()
+			//amap.Push(ma)
+			amap = append(amap, ma)
+			//if bmap.Len() > 0 {
+			if len(bmap) > 0 {
+				//i1 := amap.Pop()
+				//i2 := bmap.Pop()
+				var i1, i2 int
+				i1, amap = amap[len(amap)-1], amap[:len(amap)-1]
+				i2, bmap = bmap[len(bmap)-1], bmap[:len(bmap)-1]
 				ca.Gene[i1], cb.Gene[i2] = cb.Gene[i2], ca.Gene[i1]
 			}
 		}
 		mb, found := cb.pmxmap(cb.Gene[i], p1, p2)
 		if found {
-			bmap.Push(mb)
-			if amap.Len() > 0 {
-				i1 := amap.Pop()
-				i2 := bmap.Pop()
+			//bmap.Push(mb)
+			bmap = append(bmap, mb)
+			//if amap.Len() > 0 {
+			if len(amap) > 0 {
+				//i1 := amap.Pop()
+				//i2 := bmap.Pop()
+				var i1, i2 int
+				i1, amap = amap[len(amap)-1], amap[:len(amap)-1]
+				i2, bmap = bmap[len(bmap)-1], bmap[:len(bmap)-1]
 				ca.Gene[i1], cb.Gene[i2] = cb.Gene[i2], ca.Gene[i1]
 			}
 		}

mutator_gaussian.go

@@ -9,7 +9,7 @@ Shifts the whole genome random length to the right.
 package ga
 
 import (
-	"rand"
+	"math/rand"
 )
 
 type GAGaussianMutator struct {

mutator_multi.go

@@ -9,47 +9,58 @@ Combines several mutators into one, each mutation has equal chance of occuring.
 package ga
 
 import (
-	"rand"
-	"container/vector"
+	//"container/vector"
 	"fmt"
+	"math/rand"
 )
 
 type GAMultiMutator struct {
-	v     *vector.Vector
+	//v     *vector.Vector
+	v     []GAMutator
 	stats []int
 }
 
 func NewMultiMutator() *GAMultiMutator {
 	m := new(GAMultiMutator)
-	m.v = new(vector.Vector)
+	//m.v = new(vector.Vector)
+	m.v = make([]GAMutator, 100)
 	m.stats = make([]int, 100)
 	return m
 }
 
 func (m GAMultiMutator) Mutate(a GAGenome) GAGenome {
-	if m.v.Len() == 0 {
+	//if m.v.Len() == 0 {
+	if len(m.v) == 0 {
 		panic("No mutators added!")
 	}
-	r := float64(1.0 / float64(m.v.Len()))
-	for i := 0; i < m.v.Len()-1; i++ {
+	//r := float64(1.0 / float64(m.v.Len()))
+	r := float64(1.0 / float64(len(m.v)))
+	//for i := 0; i < m.v.Len()-1; i++ {
+	for i := 0; i < (len(m.v) - 1); i++ {
 		if rand.Float64() < r {
-			sm := m.v.At(i).(GAMutator)
+			//sm := m.v.At(i).(GAMutator)
+			sm := m.v[i].(GAMutator)
 			m.stats[i]++
 			return sm.Mutate(a)
 		}
 	}
-	sm := m.v.At(m.v.Len() - 1).(GAMutator)
-	m.stats[m.v.Len()-1]++
+	//sm := m.v.At(m.v.Len() - 1).(GAMutator)
+	sm := m.v[len(m.v)-1].(GAMutator)
+	//m.stats[m.v.Len()-1]++
+	m.stats[len(m.v)-1]++
 	return sm.Mutate(a)
 }
 
 //Add mutator
-func (m *GAMultiMutator) Add(a GAMutator) { m.v.Push(a) }
+//func (m *GAMultiMutator) Add(a GAMutator) { m.v.Push(a) }
+func (m *GAMultiMutator) Add(a GAMutator) { m.v = append(m.v, a) }
 func (m GAMultiMutator) String() string   { return "GAMultiMutator" }
 func (m *GAMultiMutator) Stats() string {
 	o := "Used "
-	for i := 0; i < m.v.Len(); i++ {
-		sm := m.v.At(i).(GAMutator)
+	//for i := 0; i < m.v.Len(); i++ {
+	for i := 0; i < len(m.v); i++ {
+		//sm := m.v.At(i).(GAMutator)
+		sm := m.v[i].(GAMutator)
 		o = fmt.Sprintf("%s%s %d times, ", o, sm, m.stats[i])
 	}
 	return o

mutator_shift.go

@@ -9,7 +9,7 @@ Shifts the whole genome random length to the right.
 package ga
 
 import (
-	"rand"
+	"math/rand"
 )
 
 type GAShiftMutator struct{}

mutator_switch.go

@@ -10,7 +10,7 @@ the copy and returns the new mutated copy.
 package ga
 
 import (
-	"rand"
+	"math/rand"
 )
 
 type GASwitchMutator struct{}

selector.go

@@ -6,12 +6,11 @@ license that can be found in the LICENSE file.
 go-galib selectors
 */
 
-
 package ga
 
 import (
 	"math"
-	"rand"
+	"math/rand"
 	"sort"
 )