Fix Damage Instances, Actions, Reactions statistics cannot be below 1.00 (#2446)

* Fixes the aggregator being unable to correct count damage instances, actions, etc, which occur 0 times in some iterations

* Fix undefined AddMultiple function

* Adjusted each aggregator to decide if it needs to pad each StreamStat

* Revert change to metadata aggregator

* Fix aura aggregator not incrementing iter

Author: Charlie-Zheng

pkg/agg/actions/actions.go

@@ -17,6 +17,7 @@ func init() {
 
 type buffer struct {
 	characterActions []map[string]*calc.StreamStats
+	iters            uint
 }
 
 func NewAgg(cfg *info.ActionList) (agg.Aggregator, error) {
@@ -44,13 +45,15 @@ func (b *buffer) Add(result stats.Result) {
 			b.characterActions[i][k].Add(v)
 		}
 	}
+	b.iters++
 }
 
 func (b *buffer) Flush(result *model.SimulationStatistics) {
 	result.CharacterActions = make([]*model.SourceStats, len(b.characterActions))
 	for i, c := range b.characterActions {
 		source := make(map[string]*model.DescriptiveStats)
 		for k, s := range c {
+			agg.PadStreamStatToCount(s, b.iters)
 			source[k] = agg.ToDescriptiveStats(s)
 		}
 

pkg/agg/aura/aura.go

@@ -17,6 +17,7 @@ func init() {
 
 type buffer struct {
 	auraUptime []map[string]*calc.StreamStats
+	iters      uint
 }
 
 func NewAgg(cfg *info.ActionList) (agg.Aggregator, error) {
@@ -40,13 +41,15 @@ func (b *buffer) Add(result stats.Result) {
 			b.auraUptime[i][k].Add(float64(v) / float64(result.Duration) * 100)
 		}
 	}
+	b.iters++
 }
 
 func (b *buffer) Flush(result *model.SimulationStatistics) {
 	result.TargetAuraUptime = make([]*model.SourceStats, len(b.auraUptime))
 	for i, c := range b.auraUptime {
 		source := make(map[string]*model.DescriptiveStats)
 		for k, s := range c {
+			agg.PadStreamStatToCount(s, b.iters)
 			source[k] = agg.ToDescriptiveStats(s)
 		}
 

pkg/agg/damage/damage.go

@@ -61,6 +61,7 @@ type buffer struct {
 	cumulativeContrib [][]*calc.StreamStats
 	// first index is for target, 2nd for iteration
 	cumulativeDamage []runs
+	iters            uint
 }
 
 func NewAgg(cfg *info.ActionList) (agg.Aggregator, error) {
@@ -218,18 +219,21 @@ func (b *buffer) Add(result stats.Result) {
 			},
 		)
 	}
+	b.iters++
 }
 
 func (b *buffer) Flush(result *model.SimulationStatistics) {
 	result.ElementDps = make(map[string]*model.DescriptiveStats)
 	for k, v := range b.elementDPS {
 		if v.Mean() > 0 {
+			agg.PadStreamStatToCount(v, b.iters)
 			result.ElementDps[k] = agg.ToDescriptiveStats(v)
 		}
 	}
 
 	result.TargetDps = make(map[int32]*model.DescriptiveStats)
 	for k, v := range b.targetDPS {
+		agg.PadStreamStatToCount(v, b.iters)
 		result.TargetDps[int32(k)] = agg.ToDescriptiveStats(v)
 	}
 
@@ -243,6 +247,7 @@ func (b *buffer) Flush(result *model.SimulationStatistics) {
 		elements := make(map[string]*model.DescriptiveStats)
 		for k, v := range em {
 			if v.Mean() > 0 {
+				agg.PadStreamStatToCount(v, b.iters)
 				elements[k] = agg.ToDescriptiveStats(v)
 			}
 		}
@@ -256,6 +261,7 @@ func (b *buffer) Flush(result *model.SimulationStatistics) {
 	for i, t := range b.dpsByTarget {
 		targets := make(map[int32]*model.DescriptiveStats)
 		for k, v := range t {
+			agg.PadStreamStatToCount(v, b.iters)
 			targets[int32(k)] = agg.ToDescriptiveStats(v)
 		}
 
@@ -288,6 +294,7 @@ func (b *buffer) Flush(result *model.SimulationStatistics) {
 	for i, c := range b.sourceDPS {
 		source := make(map[string]*model.DescriptiveStats)
 		for k, s := range c {
+			agg.PadStreamStatToCount(s, b.iters)
 			source[k] = agg.ToDescriptiveStats(s)
 		}
 
@@ -300,6 +307,7 @@ func (b *buffer) Flush(result *model.SimulationStatistics) {
 	for i, c := range b.sourceDamageInstances {
 		source := make(map[string]*model.DescriptiveStats)
 		for k, s := range c {
+			agg.PadStreamStatToCount(s, b.iters)
 			source[k] = agg.ToDescriptiveStats(s)
 		}
 

pkg/agg/energy/energy.go

@@ -17,6 +17,7 @@ func init() {
 
 type buffer struct {
 	sourceEnergy []map[string]*calc.StreamStats
+	iters        uint
 }
 
 func NewAgg(cfg *info.ActionList) (agg.Aggregator, error) {
@@ -44,13 +45,15 @@ func (b *buffer) Add(result stats.Result) {
 			b.sourceEnergy[i][k].Add(v)
 		}
 	}
+	b.iters++
 }
 
 func (b *buffer) Flush(result *model.SimulationStatistics) {
 	result.TotalSourceEnergy = make([]*model.SourceStats, len(b.sourceEnergy))
 	for i, c := range b.sourceEnergy {
 		source := make(map[string]*model.DescriptiveStats)
 		for k, s := range c {
+			agg.PadStreamStatToCount(s, b.iters)
 			source[k] = agg.ToDescriptiveStats(s)
 		}
 

pkg/agg/overview/overview.go

@@ -23,6 +23,7 @@ type buffer struct {
 	hps         *calc.Sample
 	shp         *calc.Sample
 	totalDamage calc.StreamStats
+	iters       uint
 }
 
 func newSample(itr int) *calc.Sample {
@@ -79,6 +80,7 @@ func (b *buffer) Add(result stats.Result) {
 	b.rps.Xs[iX] /= b.duration.Xs[iX]
 	b.hps.Xs[iX] /= b.duration.Xs[iX]
 	b.eps.Xs[iX] /= b.duration.Xs[iX]
+	b.iters++
 }
 
 func (b *buffer) Flush(result *model.SimulationStatistics) {

pkg/agg/reaction/reaction.go

@@ -17,6 +17,7 @@ func init() {
 
 type buffer struct {
 	sourceReactions []map[string]*calc.StreamStats
+	iters           uint
 }
 
 func NewAgg(cfg *info.ActionList) (agg.Aggregator, error) {
@@ -44,13 +45,15 @@ func (b *buffer) Add(result stats.Result) {
 			b.sourceReactions[i][k].Add(v)
 		}
 	}
+	b.iters++
 }
 
 func (b *buffer) Flush(result *model.SimulationStatistics) {
 	result.SourceReactions = make([]*model.SourceStats, len(b.sourceReactions))
 	for i, c := range b.sourceReactions {
 		source := make(map[string]*model.DescriptiveStats)
 		for k, s := range c {
+			agg.PadStreamStatToCount(s, b.iters)
 			source[k] = agg.ToDescriptiveStats(s)
 		}
 

pkg/agg/shield/shield.go

@@ -33,6 +33,7 @@ func init() {
 type buffer struct {
 	shieldHP map[string]map[string]*stats.WeightedStreamStats
 	uptime   map[string]*calc.StreamStats
+	iters    uint
 }
 
 func NewAgg(cfg *info.ActionList) (agg.Aggregator, error) {
@@ -82,6 +83,7 @@ func (b *buffer) Add(result stats.Result) {
 		}
 	}
 	b.uptime["effective"].Add(effectiveUptime / float64(result.Duration))
+	b.iters++
 }
 
 func (b *buffer) Flush(result *model.SimulationStatistics) {

pkg/agg/util.go

@@ -7,6 +7,17 @@ import (
 	"github.com/genshinsim/gcsim/pkg/model"
 )
 
+// If the count is smaller than ss.Count, nothing will happen.
+// Otherwise, 0s will be added to ss until ss.Count is equal to count.
+func PadStreamStatToCount(ss *stats.StreamStats, count uint) {
+	if count < ss.Count {
+		return
+	}
+	for range count - ss.Count {
+		ss.Add(0)
+	}
+}
+
 func ToDescriptiveStats(ss *stats.StreamStats) *model.DescriptiveStats {
 	sd := ss.StdDev()
 	if math.IsNaN(sd) {