Correct default values for sustainability bonus thresholds.

Team254 · Sep 26, 2023 · 6037a09 · 6037a09
1 parent 05f1fa1
commit 6037a09
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/game/score.go b/game/score.go
@@ -16,8 +16,8 @@ type Score struct {
 	PlayoffDq                 bool
 }
 
-var SustainabilityBonusLinkThresholdWithoutCoop = 7
-var SustainabilityBonusLinkThresholdWithCoop = 6
+var SustainabilityBonusLinkThresholdWithoutCoop = 6
+var SustainabilityBonusLinkThresholdWithCoop = 5
 var ActivationBonusPointThreshold = 26
 
 // Represents the state of a robot at the end of the match.

diff --git a/game/score_test.go b/game/score_test.go
@@ -24,7 +24,7 @@ func TestScoreSummary(t *testing.T) {
 	assert.Equal(t, 78, redSummary.Score)
 	assert.Equal(t, false, redSummary.CoopertitionBonus)
 	assert.Equal(t, 0, redSummary.NumLinks)
-	assert.Equal(t, 7, redSummary.NumLinksGoal)
+	assert.Equal(t, 6, redSummary.NumLinksGoal)
 	assert.Equal(t, false, redSummary.SustainabilityBonusRankingPoint)
 	assert.Equal(t, false, redSummary.ActivationBonusRankingPoint)
 	assert.Equal(t, 0, redSummary.BonusRankingPoints)
@@ -42,7 +42,7 @@ func TestScoreSummary(t *testing.T) {
 	assert.Equal(t, 216, blueSummary.Score)
 	assert.Equal(t, false, blueSummary.CoopertitionBonus)
 	assert.Equal(t, 9, blueSummary.NumLinks)
-	assert.Equal(t, 7, blueSummary.NumLinksGoal)
+	assert.Equal(t, 6, blueSummary.NumLinksGoal)
 	assert.Equal(t, true, blueSummary.SustainabilityBonusRankingPoint)
 	assert.Equal(t, true, blueSummary.ActivationBonusRankingPoint)
 	assert.Equal(t, 2, blueSummary.BonusRankingPoints)
@@ -69,11 +69,11 @@ func TestScoreSustainabilityBonusRankingPoint(t *testing.T) {
 	blueScoreSummary := blueScore.Summarize(redScore)
 	assert.Equal(t, false, redScoreSummary.CoopertitionBonus)
 	assert.Equal(t, 0, redScoreSummary.NumLinks)
-	assert.Equal(t, 7, redScoreSummary.NumLinksGoal)
+	assert.Equal(t, 6, redScoreSummary.NumLinksGoal)
 	assert.Equal(t, false, redScoreSummary.SustainabilityBonusRankingPoint)
 	assert.Equal(t, false, blueScoreSummary.CoopertitionBonus)
 	assert.Equal(t, 9, blueScoreSummary.NumLinks)
-	assert.Equal(t, 7, blueScoreSummary.NumLinksGoal)
+	assert.Equal(t, 6, blueScoreSummary.NumLinksGoal)
 	assert.Equal(t, true, blueScoreSummary.SustainabilityBonusRankingPoint)
 
 	// Reduce blue links to 8 and verify that the bonus is still awarded.
@@ -82,11 +82,11 @@ func TestScoreSustainabilityBonusRankingPoint(t *testing.T) {
 	blueScoreSummary = blueScore.Summarize(redScore)
 	assert.Equal(t, false, redScoreSummary.CoopertitionBonus)
 	assert.Equal(t, 0, redScoreSummary.NumLinks)
-	assert.Equal(t, 7, redScoreSummary.NumLinksGoal)
+	assert.Equal(t, 6, redScoreSummary.NumLinksGoal)
 	assert.Equal(t, false, redScoreSummary.SustainabilityBonusRankingPoint)
 	assert.Equal(t, false, blueScoreSummary.CoopertitionBonus)
 	assert.Equal(t, 8, blueScoreSummary.NumLinks)
-	assert.Equal(t, 7, blueScoreSummary.NumLinksGoal)
+	assert.Equal(t, 6, blueScoreSummary.NumLinksGoal)
 	assert.Equal(t, true, blueScoreSummary.SustainabilityBonusRankingPoint)
 
 	// Increase non-coopertition threshold to 9.
@@ -122,11 +122,11 @@ func TestScoreSustainabilityBonusRankingPoint(t *testing.T) {
 	blueScoreSummary = blueScore.Summarize(redScore)
 	assert.Equal(t, true, redScoreSummary.CoopertitionBonus)
 	assert.Equal(t, 0, redScoreSummary.NumLinks)
-	assert.Equal(t, 6, redScoreSummary.NumLinksGoal)
+	assert.Equal(t, 5, redScoreSummary.NumLinksGoal)
 	assert.Equal(t, false, redScoreSummary.SustainabilityBonusRankingPoint)
 	assert.Equal(t, true, blueScoreSummary.CoopertitionBonus)
 	assert.Equal(t, 6, blueScoreSummary.NumLinks)
-	assert.Equal(t, 6, blueScoreSummary.NumLinksGoal)
+	assert.Equal(t, 5, blueScoreSummary.NumLinksGoal)
 	assert.Equal(t, true, blueScoreSummary.SustainabilityBonusRankingPoint)
 
 	// Reduce coopertition threshold to 1 and make red fulfill the sustainability bonus requirement.

diff --git a/model/event_settings_test.go b/model/event_settings_test.go
@@ -30,8 +30,8 @@ func TestEventSettingsReadWrite(t *testing.T) {
 			PauseDurationSec:            3,
 			TeleopDurationSec:           135,
 			WarningRemainingDurationSec: 30,
-			SustainabilityBonusLinkThresholdWithoutCoop: 7,
-			SustainabilityBonusLinkThresholdWithCoop:    6,
+			SustainabilityBonusLinkThresholdWithoutCoop: 6,
+			SustainabilityBonusLinkThresholdWithCoop:    5,
 			ActivationBonusPointThreshold:               26,
 		},
 		*eventSettings,