Skip to content

Added operators to make using Ranges easier #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grofit merged 1 commit into from
Apr 23, 2025
Merged

Added operators to make using Ranges easier #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/OpenRpg.Core/Utils/Range.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,15 @@ public Range(int min, int max)

public static implicit operator Range(RangeF range)
{ return new Range((int)range.Min, (int)range.Max); }

public static Range operator +(Range a, Range b) => new Range(a.Min + b.Min, a.Max + b.Max);
public static Range operator -(Range a, Range b) => new Range(a.Min - b.Min, a.Max - b.Max);
public static Range operator *(Range a, Range b) => new Range(a.Min * b.Min, a.Max * b.Max);
public static Range operator /(Range a, Range b) => new Range(a.Min / b.Min, a.Max / b.Max);

public static Range operator +(Range a, int b) => new Range(a.Min + b, a.Max + b);
public static Range operator -(Range a, int b) => new Range(a.Min - b, a.Max - b);
public static Range operator *(Range a, int b) => new Range(a.Min * b, a.Max * b);
public static Range operator /(Range a, int b) => new Range(a.Min / b, a.Max / b);
}
}
10 changes: 10 additions & 0 deletions src/OpenRpg.Core/Utils/RangeF.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,15 @@ public RangeF(float min, float max)

public static implicit operator RangeF(Range range)
{ return new RangeF(range.Min, range.Max); }

public static RangeF operator +(RangeF a, RangeF b) => new RangeF(a.Min + b.Min, a.Max + b.Max);
public static RangeF operator -(RangeF a, RangeF b) => new RangeF(a.Min - b.Min, a.Max - b.Max);
public static RangeF operator *(RangeF a, RangeF b) => new RangeF(a.Min * b.Min, a.Max * b.Max);
public static RangeF operator /(RangeF a, RangeF b) => new RangeF(a.Min / b.Min, a.Max / b.Max);

public static RangeF operator +(RangeF a, float b) => new RangeF(a.Min + b, a.Max + b);
public static RangeF operator -(RangeF a, float b) => new RangeF(a.Min - b, a.Max - b);
public static RangeF operator *(RangeF a, float b) => new RangeF(a.Min * b, a.Max * b);
public static RangeF operator /(RangeF a, float b) => new RangeF(a.Min / b, a.Max / b);
}
}
106 changes: 106 additions & 0 deletions src/OpenRpg.UnitTests/Utility/Ranges/RangeFTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
using OpenRpg.Core.Utils;
using Xunit;

namespace OpenRpg.UnitTests.Utility.Ranges;

public class RangeFTests
{
[Fact]
public void should_correctly_convert_from_float_range_to_int_range()
{
var expectedRange = new Range(22, 33);
var range = new RangeF(22.4f, 33.6f);
Range actualRange = range;

Assert.Equal(expectedRange, actualRange);
}

[Fact]
public void should_correctly_add_from_two_ranges()
{
var expectedRange = new RangeF(5.0f, 10.0f);
var rangeA = new RangeF(2.5f, 5.0f);
var rangeB = new RangeF(2.5f, 5.0f);
var actualRange = rangeA + rangeB;

Assert.Equal(expectedRange, actualRange);
}

[Fact]
public void should_correctly_add_from_number()
{
var expectedRange = new RangeF(5.0f, 7.5f);
var rangeA = new RangeF(2.5f, 5.0f);
var number = 2.5f;
var actualRange = rangeA + number;

Assert.Equal(expectedRange, actualRange);
}

[Fact]
public void should_correctly_subtract_from_two_ranges()
{
var expectedRange = new RangeF(0, 2.5f);
var rangeA = new RangeF(2.5f, 5.0f);
var rangeB = new RangeF(2.5f, 2.5f);
var actualRange = rangeA - rangeB;

Assert.Equal(expectedRange, actualRange);
}

[Fact]
public void should_correctly_subtract_from_number()
{
var expectedRange = new RangeF(0, 2.5f);
var rangeA = new RangeF(2.5f, 5.0f);
var number = 2.5f;
var actualRange = rangeA - number;

Assert.Equal(expectedRange, actualRange);
}

[Fact]
public void should_correctly_multiply_from_two_ranges()
{
var expectedRange = new RangeF(5.0f, 50.0f);
var rangeA = new RangeF(0.5f, 5.0f);
var rangeB = new RangeF(10.0f, 10.0f);
var actualRange = rangeA * rangeB;

Assert.Equal(expectedRange, actualRange);
}

[Fact]
public void should_correctly_multiply_from_number()
{
var expectedRange = new RangeF(25.0f, 50.0f);
var rangeA = new RangeF(2.5f, 5.0f);
var number = 10.0f;
var actualRange = rangeA * number;

Assert.Equal(expectedRange, actualRange);
}


[Fact]
public void should_correctly_divide_from_two_ranges()
{
var expectedRange = new RangeF(1.0f, 0.5f);
var rangeA = new RangeF(10.0f, 5.0f);
var rangeB = new RangeF(10.0f, 10.0f);
var actualRange = rangeA / rangeB;

Assert.Equal(expectedRange, actualRange);
}

[Fact]
public void should_correctly_divide_from_number()
{
var expectedRange = new RangeF(0.5f, 1.0f);
var rangeA = new RangeF(5.0f, 10.0f);
var number = 10.0f;
var actualRange = rangeA / number;

Assert.Equal(expectedRange, actualRange);
}
}
106 changes: 106 additions & 0 deletions src/OpenRpg.UnitTests/Utility/Ranges/RangeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
using OpenRpg.Core.Utils;
using Xunit;

namespace OpenRpg.UnitTests.Utility.Ranges;

public class RangeTests
{
[Fact]
public void should_correctly_convert_from_int_range_to_float_range()
{
var expectedRange = new RangeF(22, 33);
var range = new Range(22, 33);
RangeF actualRange = range;

Assert.Equal(expectedRange, actualRange);
}

[Fact]
public void should_correctly_add_from_two_ranges()
{
var expectedRange = new Range(50, 100);
var rangeA = new Range(25, 50);
var rangeB = new Range(25, 50);
var actualRange = rangeA + rangeB;

Assert.Equal(expectedRange, actualRange);
}

[Fact]
public void should_correctly_add_from_number()
{
var expectedRange = new Range(50, 75);
var rangeA = new Range(25, 50);
var number = 25;
var actualRange = rangeA + number;

Assert.Equal(expectedRange, actualRange);
}

[Fact]
public void should_correctly_subtract_from_two_ranges()
{
var expectedRange = new Range(0, 25);
var rangeA = new Range(25, 50);
var rangeB = new Range(25, 25);
var actualRange = rangeA - rangeB;

Assert.Equal(expectedRange, actualRange);
}

[Fact]
public void should_correctly_subtract_from_number()
{
var expectedRange = new Range(0, 25);
var rangeA = new Range(25, 50);
var number = 25;
var actualRange = rangeA - number;

Assert.Equal(expectedRange, actualRange);
}

[Fact]
public void should_correctly_multiply_from_two_ranges()
{
var expectedRange = new Range(50, 500);
var rangeA = new Range(5, 50);
var rangeB = new Range(10, 10);
var actualRange = rangeA * rangeB;

Assert.Equal(expectedRange, actualRange);
}

[Fact]
public void should_correctly_multiply_from_number()
{
var expectedRange = new Range(250, 500);
var rangeA = new Range(25, 50);
var number = 10;
var actualRange = rangeA * number;

Assert.Equal(expectedRange, actualRange);
}


[Fact]
public void should_correctly_divide_from_two_ranges()
{
var expectedRange = new Range(10, 5);
var rangeA = new Range(100, 50);
var rangeB = new Range(10, 10);
var actualRange = rangeA / rangeB;

Assert.Equal(expectedRange, actualRange);
}

[Fact]
public void should_correctly_divide_from_number()
{
var expectedRange = new Range(5, 10);
var rangeA = new Range(50, 100);
var number = 10;
var actualRange = rangeA / number;

Assert.Equal(expectedRange, actualRange);
}
}
Loading