Merge pull request #1921 from wowsims/fixes

Fix bug where duration used for computing metrics was slightly too short
wowsims · Nov 25, 2022 · 6a175a1 · 6a175a1
2 parents 15f111a + ffb4abf
commit 6a175a1
Show file tree

Hide file tree

Showing 31 changed files with 920 additions and 912 deletions.
diff --git a/sim/core/raid.go b/sim/core/raid.go
@@ -86,8 +86,8 @@ func (party *Party) doneIteration(sim *Simulation) {
 		party.hpsMetrics.Total += agent.GetCharacter().Metrics.hps.Total
 	}
 
-	party.dpsMetrics.doneIteration(sim.rand.GetSeed(), sim.CurrentTime.Seconds())
-	party.hpsMetrics.doneIteration(sim.rand.GetSeed(), sim.CurrentTime.Seconds())
+	party.dpsMetrics.doneIteration(sim.rand.GetSeed(), sim.Duration.Seconds())
+	party.hpsMetrics.doneIteration(sim.rand.GetSeed(), sim.Duration.Seconds())
 }
 
 func (party *Party) GetMetrics(numIterations int32) *proto.PartyMetrics {
@@ -405,8 +405,8 @@ func (raid *Raid) doneIteration(sim *Simulation) {
 		raid.hpsMetrics.Total += party.hpsMetrics.Total
 	}
 
-	raid.dpsMetrics.doneIteration(sim.rand.GetSeed(), sim.CurrentTime.Seconds())
-	raid.hpsMetrics.doneIteration(sim.rand.GetSeed(), sim.CurrentTime.Seconds())
+	raid.dpsMetrics.doneIteration(sim.rand.GetSeed(), sim.Duration.Seconds())
+	raid.hpsMetrics.doneIteration(sim.rand.GetSeed(), sim.Duration.Seconds())
 }
 
 func (raid *Raid) GetMetrics(numIterations int32) *proto.RaidMetrics {

diff --git a/sim/core/sim.go b/sim/core/sim.go
@@ -350,6 +350,12 @@ func (sim *Simulation) runOnce() {
 		pa.OnAction(sim)
 	}
 
+	// The last event loop will leave CurrentTime at some value close to but not
+	// quite at the Duration. Explicitly set this so that accesses to CurrentTime
+	// during the doneIteration phase will return the Duration value, which is
+	// intuitive.
+	sim.CurrentTime = sim.Duration
+
 	for _, pa := range sim.pendingActions {
 		if pa.CleanUp != nil {
 			pa.CleanUp(sim)
@@ -360,10 +366,10 @@ func (sim *Simulation) runOnce() {
 	sim.Encounter.doneIteration(sim)
 
 	for _, unit := range sim.Raid.AllUnits {
-		unit.Metrics.doneIteration(unit, sim.rand.GetSeed(), sim.CurrentTime.Seconds())
+		unit.Metrics.doneIteration(unit, sim.rand.GetSeed(), sim.Duration.Seconds())
 	}
 	for _, target := range sim.Encounter.Targets {
-		target.Metrics.doneIteration(&target.Unit, sim.rand.GetSeed(), sim.CurrentTime.Seconds())
+		target.Metrics.doneIteration(&target.Unit, sim.rand.GetSeed(), sim.Duration.Seconds())
 	}
 }
 

diff --git a/sim/deathknight/dps/TestFrost.results b/sim/deathknight/dps/TestFrost.results
@@ -633,8 +633,8 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Average-Default"
  value: {
-  dps: 7935.52774
-  tps: 4691.1326
+  dps: 7928.30373
+  tps: 4686.86215
  }
 }
 dps_results: {

diff --git a/sim/deathknight/dps/TestUnholy.results b/sim/deathknight/dps/TestUnholy.results
@@ -701,9 +701,9 @@ dps_results: {
 dps_results: {
  key: "TestUnholy-Average-Default"
  value: {
-  dps: 8157.02672
-  tps: 5095.55902
-  hps: 273.24719
+  dps: 8153.96429
+  tps: 5093.64555
+  hps: 273.14462
  }
 }
 dps_results: {