Skip to content

Features/improve bicubic calculator tests #10

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

Open
Ciszq wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Features/improve bicubic calculator tests #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b3fe5e
Rename tests classes and methods
Ciszq Oct 12, 2015
8ad973d
Create folder for BicubicinterpolationTests
Ciszq Oct 12, 2015
1d5aaca
Add simple plane tests for bicubic calculator
Ciszq Oct 12, 2015
d80b0e9
Change test cases to more varied
Ciszq Oct 12, 2015
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
4 changes: 2 additions & 2 deletions ...sts/Spline3DCalculatorExternalDataTest.cs → ...tion/BicubicCalculatorExternalDataTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
using NSrtm.Core.BicubicInterpolation;
using Xunit;

namespace NSrtm.Core.xTests
namespace NSrtm.Core.xTests.BicubicInterpolation
{
public class Spline3DCalculatorExternalDataTest
public class BicubicCalculatorExternalDataTest
{
[Theory]
[MemberData("ExternalData")]
Expand Down
93 changes: 93 additions & 0 deletions src/NSrtm.Core.xTests/BicubicInterpolation/BicubicCalculatorSimplePlaneTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
using System.Collections.Generic;
using System.Linq;
using NSrtm.Core.BicubicInterpolation;
using Xunit;

namespace NSrtm.Core.xTests.BicubicInterpolation
{
public class BicubicCalculatorSimplePlaneTests
{
[Theory]
[MemberData("SimplePlane")]
public void BicubicSplineCalculatorReturnsSimilarResultForNodes(
List<List<double>> values,
double step)
{
var spline = BicubicCalculator.GetSpline(values, step);
var nodes = Enumerable.Range(0, 2);
var positions = nodes.SelectMany(x => nodes.Select(y => new {x, y}))
.ToList();
foreach (var position in positions)
{
var result = spline.Evaluate(position.x, position.y);
var expected = values[position.x + 1][position.y + 1];
AssertDeep.Equal(result, expected, config => config.DoublePrecision = 1e-5);
}
}

[Theory]
[MemberData("SimplePlane")]
public void BicubicSplineCalculatorReturnsCorrectResultsForSpaceBetweenNodes(
List<List<double>> values,
double step)
{
var spline = BicubicCalculator.GetSpline(values, step);
var nodes = Enumerable.Range(0, 11).Select(p=>p*0.1);
var positions = nodes.SelectMany(x => nodes.Select(y => new {x, y}))
.ToList();
var expected = values[0][0];
foreach (var position in positions)
{
var result = spline.Evaluate(position.x, position.y);
AssertDeep.Equal(result, expected, config => config.DoublePrecision = 1e-5);
}
}

#region Static Members

public static IReadOnlyList<object[]> SimplePlane
{
get
{
return new List<object[]>
{
new object[]
{
new List<List<double>>
{
new List<double> {10, 10, 10, 10},
new List<double> {10, 10, 10, 10},
new List<double> {10, 10, 10, 10},
new List<double> {10, 10, 10, 10},
},
1
},
new object[]
{
new List<List<double>>
{
new List<double> {-0.5, -0.5, -0.5, -0.5},
new List<double> {-0.5, -0.5, -0.5, -0.5},
new List<double> {-0.5, -0.5, -0.5, -0.5},
new List<double> {-0.5, -0.5, -0.5, -0.5},
},
1
},
new object[]
{
new List<List<double>>
{
new List<double> {0, 0, 0, 0},
new List<double> {0, 0, 0, 0},
new List<double> {0, 0, 0, 0},
new List<double> {0, 0, 0, 0},
},
1
}
};
}
}

#endregion
}
}
10 changes: 5 additions & 5 deletions ...e.xTests/Spline3DCalculatorSimpleTests.cs → ...n/BicubicCalculatorWrongArgumentsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using NSrtm.Core.BicubicInterpolation;
using Xunit;

namespace NSrtm.Core.xTests
namespace NSrtm.Core.xTests.BicubicInterpolation
{
public class Spline3DCalculatorSimpleTests
public class BicubicCalculatorWrongArgumentsTests
{
[Fact]
public void EmptyValuesContainerThrowsArgumentNullException()
Expand All @@ -14,7 +14,7 @@ public void EmptyValuesContainerThrowsArgumentNullException()
}

[Fact]
public void ValuesWithWrongSizeDimensionThrowsArgumentNullException()
public void ValuesWithWrongSizeDimensionThrowsArgumentException()
{
Assert.Throws<ArgumentException>(
() =>
Expand All @@ -29,7 +29,7 @@ public void ValuesWithWrongSizeDimensionThrowsArgumentNullException()
}

[Fact]
public void ZeroStepThrowsArgumentNullException()
public void ZeroStepThrowsArgumentOutOfRangeException()
{
Assert.Throws<ArgumentOutOfRangeException>(
() =>
Expand All @@ -44,7 +44,7 @@ public void ZeroStepThrowsArgumentNullException()
}

[Fact]
public void NegativeStepThrowsArgumentNullException()
public void NegativeStepThrowsArgumentOutOfRangeException()
{
Assert.Throws<ArgumentOutOfRangeException>(
() =>
Expand Down
5 changes: 3 additions & 2 deletions src/NSrtm.Core.xTests/NSrtm.Core.xTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,14 @@
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="AssertDeep.cs" />
<Compile Include="BicubicInterpolation\BicubicCalculatorSimplePlaneTests.cs" />
<Compile Include="CoordinatesNormalizationToEgmDatumTests.cs" />
<Compile Include="PgmDataDescriptionExtractorTests.cs" />
<Compile Include="PgmElevationProviderCoordinatesFindingTests.cs" />
<Compile Include="PgmPreamblesHelper.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Spline3DCalculatorSimpleTests.cs" />
<Compile Include="Spline3DCalculatorExternalDataTest.cs" />
<Compile Include="BicubicInterpolation\BicubicCalculatorWrongArgumentsTests.cs" />
<Compile Include="BicubicInterpolation\BicubicCalculatorExternalDataTest.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NSrtm.Core\NSrtm.Core.csproj">
Expand Down