tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ratio issues on SlipSolution

Browse Source
This commit is contained in:
PrPleGoo
2020-04-14 15:41:23 +02:00
parent d261a21b57
commit 409d873403
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Chemistry/Solution.cs
View File

@@ -181,11 +181,13 @@ namespace Content.Shared.Chemistry
newSolution = new Solution();
var newTotalVolume = ReagentUnit.New(0M);
var ratio = (TotalVolume - quantity).Decimal() / TotalVolume.Decimal();
var remainingVolume = TotalVolume;
for (var i = 0; i < _contents.Count; i++)
{
var reagent = _contents[i];
var ratio = (remainingVolume - quantity).Decimal() / remainingVolume.Decimal();
remainingVolume -= reagent.Quantity;
var newQuantity = reagent.Quantity * ratio;
var splitQuantity = reagent.Quantity - newQuantity;
@@ -193,10 +195,11 @@ namespace Content.Shared.Chemistry
_contents[i] = new ReagentQuantity(reagent.ReagentId, newQuantity);
newSolution._contents.Add(new ReagentQuantity(reagent.ReagentId, splitQuantity));
newTotalVolume += splitQuantity;
quantity -= splitQuantity;
}
TotalVolume = TotalVolume * ratio;
newSolution.TotalVolume = newTotalVolume;
TotalVolume -= newTotalVolume;
return newSolution;
}

18
Content.Tests/Shared/Chemistry/Solution_Tests.cs
View File

@@ -256,6 +256,24 @@ namespace Content.Tests.Shared.Chemistry
Assert.That(splitSolution.TotalVolume.Float(), Is.EqualTo(reduce));
}
[Test]
[TestCase(2)]
[TestCase(10)]
[TestCase(100)]
[TestCase(1000)]
public void SplitRounding(int amount)
{
var solutionOne = new Solution();
solutionOne.AddReagent("foo", ReagentUnit.New(amount));
solutionOne.AddReagent("bar", ReagentUnit.New(amount));
solutionOne.AddReagent("baz", ReagentUnit.New(amount));
var splitAmount = ReagentUnit.New(5);
var split = solutionOne.SplitSolution(splitAmount);
Assert.That(split.TotalVolume, Is.EqualTo(splitAmount));
}
[Test]
public void SplitSolutionMoreThanTotalRemovesAll()
{