From 30cbc8941000f1494d51b32fa3c4f482fdd49201 Mon Sep 17 00:00:00 2001 From: tzwang Date: Wed, 10 Jan 2024 16:40:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E7=BB=93=E6=9E=84refactor2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 2221bb8578fa8982e9f56da041c8e7c1a72313a6 --- pkg/scheduler/cloudScheduler.go | 2 +- pkg/scheduler/strategies/priceBasedStrategy.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/scheduler/cloudScheduler.go b/pkg/scheduler/cloudScheduler.go index ba30705a..eac03fb9 100644 --- a/pkg/scheduler/cloudScheduler.go +++ b/pkg/scheduler/cloudScheduler.go @@ -40,7 +40,7 @@ func (cs *cloudScheduler) pickOptimalStrategy(task *providerPricing.Task, provid //调度算法 strategy := strategies.NewPricingStrategy(task, providers...) - taskResult, err := strategies.ScheduleWithFullCollaboration(strategy, strategy.ProviderList) + taskResult, err := strategy.ScheduleWithFullCollaboration() if err != nil { return nil, err } diff --git a/pkg/scheduler/strategies/priceBasedStrategy.go b/pkg/scheduler/strategies/priceBasedStrategy.go index 2eb913dc..d8fa7ddf 100644 --- a/pkg/scheduler/strategies/priceBasedStrategy.go +++ b/pkg/scheduler/strategies/priceBasedStrategy.go @@ -106,18 +106,18 @@ func (ps *pricingStrategy) computeMaxScore() (*providerPricing.Task, error) { return ps.Task, nil } -type strategyService interface { - computeMaxScore() (*providerPricing.Task, error) -} +//type strategyService interface { +// computeMaxScore() (*providerPricing.Task, error) +//} -func ScheduleWithFullCollaboration(strategyService strategyService, ProviderList []*providerPricing.Provider) (*providerPricing.Task, error) { - task, err := strategyService.computeMaxScore() +func (ps *pricingStrategy) ScheduleWithFullCollaboration() (*providerPricing.Task, error) { + task, err := ps.computeMaxScore() if err != nil { return nil, err } //计算任务i的resourcePerTask属性 - for i, _ := range ProviderList { + for i, _ := range ps.ProviderList { tasksolu := task.MaxscoreStrategy.Tasksolution[i] // 第j个提供商分到的任务数 resourcesolu := task.MaxscoreStrategy.Resourcesolution[0][i] // 第j个提供商分到的资源数