Merge pull request #3743 from wowsims/apl

Move 3 tanks sims to Beta APl
wowsims · Sep 23, 2023 · 02d0a6c · 02d0a6c
2 parents f21bfe5 + 41df58a
commit 02d0a6c
Show file tree

Hide file tree

Showing 47 changed files with 2,015 additions and 2,183 deletions.
diff --git a/sim/core/test_generators.go b/sim/core/test_generators.go
@@ -145,10 +145,11 @@ func (combos *SettingsCombos) GetTest(testIdx int) (string, *proto.ComputeStatsR
 	specOptionsCombo := combos.SpecOptions[specOptionsIdx]
 	testNameParts = append(testNameParts, specOptionsCombo.Label)
 
-	if len(combos.Rotations) > 1 {
+	rotationsCombo := RotationCombo{Label: "None", Rotation: &proto.APLRotation{}}
+	if len(combos.Rotations) > 0 {
 		rotationsIdx := testIdx % len(combos.Rotations)
 		testIdx /= len(combos.Rotations)
-		rotationsCombo := combos.Rotations[rotationsIdx]
+		rotationsCombo = combos.Rotations[rotationsIdx]
 		testNameParts = append(testNameParts, rotationsCombo.Label)
 	}
 
@@ -173,6 +174,7 @@ func (combos *SettingsCombos) GetTest(testIdx int) (string, *proto.ComputeStatsR
 				Buffs:              buffsCombo.Player,
 				Profession1:        proto.Profession_Engineering,
 				Cooldowns:          combos.Cooldowns,
+				Rotation:           rotationsCombo.Rotation,
 				DistanceFromTarget: 30,
 				ReactionTimeMs:     150,
 				ChannelClipDelayMs: 50,

diff --git a/sim/deathknight/dps/TestBlood.results b/sim/deathknight/dps/TestBlood.results
@@ -832,84 +832,84 @@ dps_results: {
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Human-Blood P1 -Basic-FullBuffs-LongMultiTarget"
+ key: "TestBlood-Settings-Human-Blood P1 -Basic--FullBuffs-LongMultiTarget"
  value: {
   dps: 20042.2416
   tps: 10225.23803
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Human-Blood P1 -Basic-FullBuffs-LongSingleTarget"
+ key: "TestBlood-Settings-Human-Blood P1 -Basic--FullBuffs-LongSingleTarget"
  value: {
   dps: 7290.13746
   tps: 3646.47181
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Human-Blood P1 -Basic-FullBuffs-ShortSingleTarget"
+ key: "TestBlood-Settings-Human-Blood P1 -Basic--FullBuffs-ShortSingleTarget"
  value: {
   dps: 9389.51568
   tps: 4150.51977
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Human-Blood P1 -Basic-NoBuffs-LongMultiTarget"
+ key: "TestBlood-Settings-Human-Blood P1 -Basic--NoBuffs-LongMultiTarget"
  value: {
   dps: 10587.47794
   tps: 5395.93411
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Human-Blood P1 -Basic-NoBuffs-LongSingleTarget"
+ key: "TestBlood-Settings-Human-Blood P1 -Basic--NoBuffs-LongSingleTarget"
  value: {
   dps: 4119.74995
   tps: 2063.67127
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Human-Blood P1 -Basic-NoBuffs-ShortSingleTarget"
+ key: "TestBlood-Settings-Human-Blood P1 -Basic--NoBuffs-ShortSingleTarget"
  value: {
   dps: 4960.43121
   tps: 2158.52011
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-Blood P1 -Basic-FullBuffs-LongMultiTarget"
+ key: "TestBlood-Settings-Orc-Blood P1 -Basic--FullBuffs-LongMultiTarget"
  value: {
   dps: 20335.22812
   tps: 10288.45122
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-Blood P1 -Basic-FullBuffs-LongSingleTarget"
+ key: "TestBlood-Settings-Orc-Blood P1 -Basic--FullBuffs-LongSingleTarget"
  value: {
   dps: 7388.67747
   tps: 3664.47139
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-Blood P1 -Basic-FullBuffs-ShortSingleTarget"
+ key: "TestBlood-Settings-Orc-Blood P1 -Basic--FullBuffs-ShortSingleTarget"
  value: {
   dps: 9585.8367
   tps: 4191.62899
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-Blood P1 -Basic-NoBuffs-LongMultiTarget"
+ key: "TestBlood-Settings-Orc-Blood P1 -Basic--NoBuffs-LongMultiTarget"
  value: {
   dps: 10770.6032
   tps: 5438.19164
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-Blood P1 -Basic-NoBuffs-LongSingleTarget"
+ key: "TestBlood-Settings-Orc-Blood P1 -Basic--NoBuffs-LongSingleTarget"
  value: {
   dps: 4191.71974
   tps: 2084.80319
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-Blood P1 -Basic-NoBuffs-ShortSingleTarget"
+ key: "TestBlood-Settings-Orc-Blood P1 -Basic--NoBuffs-ShortSingleTarget"
  value: {
   dps: 5070.65498
   tps: 2183.78113