Merge pull request xiv-gear-planner#181 from xiv-gear-planner/fix-dot…

…-tick-variance Fix variance calc for DoT ticks
xiashtra · Jul 3, 2024 · f27b7db · f27b7db
2 parents 77fcf88 + 2ee47bc
commit f27b7db
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/packages/core/src/sims/cycle_sim.ts b/packages/core/src/sims/cycle_sim.ts
@@ -26,7 +26,7 @@ import {
     STANDARD_ANIMATION_LOCK
 } from "@xivgear/xivmath/xivconstants";
 import {CooldownMode, CooldownTracker} from "./common/cooldown_manager";
-import {addValues, fixedValue, multiplyFixed, ValueWithDev} from "@xivgear/xivmath/deviation";
+import {addValues, fixedValue, multiplyFixed, multiplyIndependent, ValueWithDev} from "@xivgear/xivmath/deviation";
 import {abilityEquals, appDelay, completeComboData, FinalizedComboData} from "./ability_helpers";
 import {abilityToDamageNew, combineBuffEffects} from "./sim_utils";
 import {BuffSettingsExport} from "./common/party_comp_settings";
@@ -670,7 +670,7 @@ export class CycleProcessor {
                 const partialRate = record.totalTimeTaken > 0 ? Math.max(0, Math.min(1, (this.totalTime - record.usedAt) / record.totalTimeTaken)) : 1;
                 const directDamage = multiplyFixed(record.directDamage, partialRate);
                 const dot = record.dot;
-                const dotDmg = dot ? multiplyFixed(dot.damagePerTick, dot.actualTickCount) : fixedValue(0);
+                const dotDmg = dot ? multiplyIndependent(dot.damagePerTick, dot.actualTickCount) : fixedValue(0);
                 const totalDamage = addValues(directDamage, dotDmg);
                 const totalPotency = record.ability.potency + ('dot' in record.ability ? record.ability.dot.tickPotency * record.dot.actualTickCount : 0);
                 return {

diff --git a/packages/xivmath/src/test/std_dev_tests.ts b/packages/xivmath/src/test/std_dev_tests.ts
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {addValues, multiplyValues, ValueWithDev} from "../deviation";
+import {addValues, multiplyIndependent, multiplyValues, ValueWithDev} from "../deviation";
 
 describe('ValueWithDev calculations', () => {
 
@@ -84,5 +84,17 @@ describe('ValueWithDev calculations', () => {
             expect(result.stdDev).to.be.closeTo(Math.sqrt(expectedVariance), 0.000000001);
         });
     });
+    describe('multiplyIndependent', () => {
+        it('should return expected value and standard deviation for independent values', () => {
+            const value: ValueWithDev = {
+                expected: 10,
+                stdDev: 5
+            };
+            const result1 = multiplyIndependent(value, 4);
+            expect(result1.expected).to.equal(40); // 2 * 4 * 5
+            expect(result1.stdDev).to.equal(10); // 2 * 4 * 5
+        });
+
+    });
 
 });