From bbc8ad231742f8e96eaf6560f668c42c47c91b67 Mon Sep 17 00:00:00 2001 From: Newnius Date: Wed, 27 May 2020 14:20:32 +0800 Subject: [PATCH] update --- src/evaluator.go | 6 +++--- src/ga.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/evaluator.go b/src/evaluator.go index c7106ed..95ac17e 100644 --- a/src/evaluator.go +++ b/src/evaluator.go @@ -15,7 +15,7 @@ type Evaluator struct { factorRack float64 factorDomain float64 - factorPack float64 + factorSpread float64 } func (eva *Evaluator) init(nodes []NodeStatus, tasks []Task) { @@ -30,7 +30,7 @@ func (eva *Evaluator) init(nodes []NodeStatus, tasks []Task) { eva.factorDomain = 40.0 eva.costNetwork = 0.0 eva.costLoad = 0.0 - eva.factorPack = -1.0 + eva.factorSpread = -1.0 } func (eva *Evaluator) add(node NodeStatus, task Task) { @@ -109,7 +109,7 @@ func (eva *Evaluator) remove(node NodeStatus, task Task) { } func (eva *Evaluator) calculate() float64 { - return eva.costNetwork + eva.factorPack*eva.costLoad/float64(eva.totalPS+eva.totalWorker) + return eva.costNetwork + eva.factorSpread*eva.costLoad/float64(eva.totalPS+eva.totalWorker) } func evaluate(allocation Allocation) float64 { diff --git a/src/ga.go b/src/ga.go index f1c0e60..4240843 100644 --- a/src/ga.go +++ b/src/ga.go @@ -68,9 +68,9 @@ func fastBestFit(nodes []NodeStatus, tasks []Task) Allocation { minCost := math.MaxFloat64 var best *NodeStatus if task.IsPS { - eva.factorPack = -1.0 + eva.factorSpread = 1.0 } else { - eva.factorPack = 1.0 + eva.factorSpread = -1.0 } for i, node := range nodes { if _, ok := allocation.TasksOnNode[node.ClientID]; !ok {