Added ProcTimeGenerator to NewProcessor().

Resolves #1.

Author: danslimmon

arrbeh_test.go

@@ -21,8 +21,7 @@ func TestShortestQueueArrBeh(t *testing.T) {
 	}
 	procs = make([]*Processor, 3)
 	for i = 0; i < 3; i++ {
-		procs[i] = NewProcessor()
-		procs[i].SetProcTimeGenerator(simplePtg)
+		procs[i] = NewProcessor(simplePtg)
 	}
 	ab = NewShortestQueueArrBeh(queues, procs)
 
@@ -131,8 +130,7 @@ func TestShortestQueueArrBehBeforeAssign(t *testing.T) {
 	}
 	procs = make([]*Processor, 3)
 	for i = 0; i < 3; i++ {
-		procs[i] = NewProcessor()
-		procs[i].SetProcTimeGenerator(simplePtg)
+		procs[i] = NewProcessor(simplePtg)
 	}
 	ab = NewShortestQueueArrBeh(queues, procs)
 
@@ -171,8 +169,7 @@ func TestShortestQueueArrBehAfterAssign(t *testing.T) {
 	}
 	procs = make([]*Processor, 3)
 	for i = 0; i < 3; i++ {
-		procs[i] = NewProcessor()
-		procs[i].SetProcTimeGenerator(simplePtg)
+		procs[i] = NewProcessor(simplePtg)
 	}
 	ab = NewShortestQueueArrBeh(queues, procs)
 

discipline_test.go

@@ -14,8 +14,7 @@ func TestOneToOneFIFODiscipline(t *testing.T) {
 
 	for i = 0; i < 3; i++ {
 		queues = append(queues, NewQueue())
-		procs = append(procs, NewProcessor())
-		procs[i].SetProcTimeGenerator(simplePtg)
+		procs = append(procs, NewProcessor(simplePtg))
 	}
 	NewOneToOneFIFODiscipline(queues, procs)
 

grocery_test.go

@@ -50,9 +50,8 @@ func (sys *GrocerySystem) Init() {
 	for i = 0; i < 3; i++ {
 		sys.queues[i] = NewQueue()
 		sys.queues[i].QueueId = i
-		sys.processors[i] = NewProcessor()
+		sys.processors[i] = NewProcessor(procTimeGenerator)
 		sys.processors[i].ProcessorId = i
-		sys.processors[i].SetProcTimeGenerator(procTimeGenerator)
 		sys.processors[i].AfterFinish(func(p *Processor, j *Job) {
 			sys.FinishedJobs = append(sys.FinishedJobs, j)
 		})

processor.go

@@ -138,6 +138,8 @@ func (p *Processor) afterFinish(j *Job) {
 }
 
 // NewProcessor creates a new Processor struct.
-func NewProcessor() (p *Processor) {
-	return new(Processor)
+func NewProcessor(procTimeGenerator func(j *Job) int) (p *Processor) {
+	p = new(Processor)
+	p.SetProcTimeGenerator(procTimeGenerator)
+	return
 }

processor_test.go

@@ -17,8 +17,7 @@ func TestProcessorStart(t *testing.T) {
 	var procTime int
 	var err error
 
-	proc = NewProcessor()
-	proc.SetProcTimeGenerator(simplePtg)
+	proc = NewProcessor(simplePtg)
 	j0 = NewJob(0)
 
 	procTime, err = proc.Start(j0)
@@ -60,8 +59,7 @@ func TestProcessorFinish(t *testing.T) {
 	var proc *Processor
 	var j *Job
 
-	proc = NewProcessor()
-	proc.SetProcTimeGenerator(simplePtg)
+	proc = NewProcessor(simplePtg)
 	j = NewJob(0)
 	proc.Start(j)
 	if j != proc.Finish() {
@@ -81,8 +79,7 @@ func TestBeforeStart(t *testing.T) {
 	var proc, receivedProc *Processor
 	var j0, j1, receivedJob *Job
 
-	proc = NewProcessor()
-	proc.SetProcTimeGenerator(simplePtg)
+	proc = NewProcessor(simplePtg)
 	j0 = NewJob(0)
 
 	cbBeforeStart := func(cbProc *Processor, cbJob *Job) {
@@ -122,8 +119,7 @@ func TestAfterStart(t *testing.T) {
 	var j0, j1, receivedJob *Job
 	var receivedProcTime int
 
-	proc = NewProcessor()
-	proc.SetProcTimeGenerator(simplePtg)
+	proc = NewProcessor(simplePtg)
 	j0 = NewJob(0)
 
 	cbAfterStart := func(cbProc *Processor, cbJob *Job, cbProcTime int) {
@@ -163,8 +159,7 @@ func TestBeforeFinish(t *testing.T) {
 	var proc, receivedProc *Processor
 	var j, receivedJob *Job
 
-	proc = NewProcessor()
-	proc.SetProcTimeGenerator(simplePtg)
+	proc = NewProcessor(simplePtg)
 	j = NewJob(0)
 	proc.Start(j)
 
@@ -203,8 +198,7 @@ func TestAfterFinish(t *testing.T) {
 	var proc, receivedProc *Processor
 	var j, receivedJob *Job
 
-	proc = NewProcessor()
-	proc.SetProcTimeGenerator(simplePtg)
+	proc = NewProcessor(simplePtg)
 	j = NewJob(0)
 	proc.Start(j)