pass exclude in explore (#304)

gorse-io · Nov 6, 2021 · 6c351c7 · 6c351c7
1 parent 84ec522
commit 6c351c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/worker/worker.go b/worker/worker.go
@@ -560,7 +560,7 @@ func (w *Worker) Recommend(m ranking.MatrixFactorization, users []string) {
 		}
 
 		// explore latest and popular
-		result, err = w.exploreRecommend(result)
+		result, err = w.exploreRecommend(result, excludeSet)
 		if err != nil {
 			base.Logger().Error("failed to explore latest and popular items", zap.Error(err))
 			return errors.Trace(err)
@@ -673,7 +673,7 @@ func mergeAndShuffle(candidates [][]string) []cache.Scored {
 	return recommend
 }
 
-func (w *Worker) exploreRecommend(exploitRecommend []cache.Scored) ([]cache.Scored, error) {
+func (w *Worker) exploreRecommend(exploitRecommend []cache.Scored, excludeSet *strset.Set) ([]cache.Scored, error) {
 	// create thresholds
 	explorePopularThreshold := 0.0
 	if threshold, exist := w.cfg.Recommend.ExploreRecommend["popular"]; exist {
@@ -695,7 +695,6 @@ func (w *Worker) exploreRecommend(exploitRecommend []cache.Scored) ([]cache.Scor
 	}
 	// explore recommendation
 	var exploreRecommend []cache.Scored
-	memo := strset.New()
 	for range exploitRecommend {
 		dice := rand.Float64()
 		var recommendItem cache.Scored
@@ -711,8 +710,8 @@ func (w *Worker) exploreRecommend(exploitRecommend []cache.Scored) ([]cache.Scor
 		} else {
 			break
 		}
-		if !memo.Has(recommendItem.Id) {
-			memo.Add(recommendItem.Id)
+		if !excludeSet.Has(recommendItem.Id) {
+			excludeSet.Add(recommendItem.Id)
 			exploreRecommend = append(exploreRecommend, recommendItem)
 		}
 	}

diff --git a/worker/worker_test.go b/worker/worker_test.go
@@ -19,6 +19,7 @@ import (
 	"encoding/json"
 	"github.com/alicebob/miniredis/v2"
 	cmap "github.com/orcaman/concurrent-map"
+	"github.com/scylladb/go-set/strset"
 	"github.com/stretchr/testify/assert"
 	"github.com/zhenghaoz/gorse/base"
 	"github.com/zhenghaoz/gorse/config"
@@ -327,7 +328,7 @@ func TestExploreRecommend(t *testing.T) {
 
 	recommend, err := w.exploreRecommend(cache.CreateScoredItems(
 		[]string{"1", "2", "3", "4", "5", "6", "7", "8"},
-		[]float32{0, 0, 0, 0, 0, 0, 0, 0}))
+		[]float32{0, 0, 0, 0, 0, 0, 0, 0}), strset.New())
 	assert.NoError(t, err)
 	items := cache.RemoveScores(recommend)
 	assert.Contains(t, items, "latest")