take the spot quality into account when calculating the value of a ba…

…ndmap entry
ftl · May 19, 2024 · 6c7f6e6 · 6c7f6e6
1 parent 2931a9f
commit 6c7f6e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/core/bandmap/bandmap.go b/core/bandmap/bandmap.go
@@ -42,6 +42,7 @@ var defaultWeights = core.BandmapWeights{
 	AgeSeconds:  -0.001,
 	Spots:       0.001,
 	Source:      0,
+	Quality:     0.01,
 }
 
 type Bandmap struct {

diff --git a/core/bandmap/entries.go b/core/bandmap/entries.go
@@ -366,7 +366,11 @@ func (l *Entries) calculateWeightedValue(entry *Entry, now time.Time, weights co
 	ageSeconds := now.Sub(entry.LastHeard).Seconds()
 	spots := float64(entry.SpotCount)
 	sourcePriority := float64(entry.Source.Priority())
-	weight := 1 + (ageSeconds * weights.AgeSeconds) + (spots * weights.Spots) + (sourcePriority * weights.Source)
+	qualityFactor := 0.0
+	if entry.Quality > core.BustedSpotQuality {
+		qualityFactor = float64(entry.Quality)
+	}
+	weight := 1 + (ageSeconds * weights.AgeSeconds) + (spots * weights.Spots) + (sourcePriority * weights.Source) + (qualityFactor * weights.Quality)
 
 	return value * weight
 }

diff --git a/core/core.go b/core/core.go
@@ -958,6 +958,7 @@ type BandmapWeights struct {
 	AgeSeconds  float64
 	Spots       float64
 	Source      float64
+	Quality     float64
 }
 
 type VFO interface {