Skip to content
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

Jump to bottom

Feature/fm1 d2 d 990 generate correct 1 d2 d embedded links #4

Merged
merged 3 commits into from
Oct 19, 2021
Merged

Feature/fm1 d2 d 990 generate correct 1 d2 d embedded links #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
675e74c
Update to Deltares.MeshKernel 1.0.0-dev.1340
Oct 18, 2021
6cee3f1
Correct unit tests
lucacarniato Oct 18, 2021
ce6fc99
Correct unit tests
lucacarniato Oct 18, 2021
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
1 change: 0 additions & 1 deletion MeshKernelNET/src/MeshKernelNETCore/Helpers/NativeStructConversionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ internal static MakeGridParametersNative ToMakeGridParametersNative(this MakeGri
{
return new MakeGridParametersNative
{
GridType = (int)makeGridParameters.GridType,
NumberOfColumns = makeGridParameters.NumberOfColumns,
NumberOfRows = makeGridParameters.NumberOfRows,
GridAngle = makeGridParameters.GridAngle,
Expand Down
4 changes: 2 additions & 2 deletions MeshKernelNET/src/MeshKernelNETCore/MeshKernelNETCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Deltares.MeshKernel" Version="1.0.0-dev.1297" />
<PackageReference Include="NetTopologySuite" Version="1.15.0" />
<PackageReference Include="Deltares.MeshKernel" Version="1.0.0-dev.1340" />
<PackageReference Include="NetTopologySuite" Version="1.15.3" />
<PackageReference Include="protobuf-net" Version="2.4.6" />
</ItemGroup>

Expand Down
5 changes: 0 additions & 5 deletions MeshKernelNET/src/MeshKernelNETCore/Native/MakeGridParametersNative.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ namespace MeshKernelNETCore.Native
[StructLayout(LayoutKind.Sequential)]
public struct MakeGridParametersNative
{
/// <summary>
/// * The type of grid to create : square = 0, wieber = 1, hexagonal type 1 = 2, hexagonal type 2 = 3, triangular = 4 (0)
/// </summary>
public int GridType;

/// <summary>
/// * The number of columns in x direction (3)
/// </summary>
Expand Down
7 changes: 2 additions & 5 deletions MeshKernelNET/test/MeshKernelNETCoreTest/Api/MeshKernelTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ public void PolygonOffsetThroughAPI()
var geometryListIn = new DisposableGeometryList();
var geometrySeparator = api.GetSeparator();
geometryListIn.GeometrySeparator = geometrySeparator;
geometryListIn.NumberOfCoordinates = 16;
geometryListIn.NumberOfCoordinates = 4;

geometryListIn.XCoordinates = new[]
{
Expand Down Expand Up @@ -846,16 +846,13 @@ public void PolygonOffsetThroughAPI()
bool innerOffsetedPolygon = false;
Assert.IsTrue(api.PolygonCountOffset(id, ref geometryListIn, innerOffsetedPolygon,
distance, ref numberOfPolygonVertices));
Assert.AreEqual(16, numberOfPolygonVertices);
Assert.AreEqual(4, numberOfPolygonVertices);

var disposableGeometryListOut = new DisposableGeometryList();
bool success = api.PolygonGetOffset(id, ref geometryListIn, innerOffsetedPolygon, distance,
ref disposableGeometryListOut);
Assert.IsTrue(success);

var mesh2d = api.Mesh2dGetData(id);
Assert.NotNull(mesh2d);

}
finally
{
Expand Down
4 changes: 2 additions & 2 deletions MeshKernelNET/test/MeshKernelNETCoreTest/MeshKernelNETCoreTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Deltares.MeshKernel" Version="1.0.0-dev.1297" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Deltares.MeshKernel" Version="1.0.0-dev.1340" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="NetTopologySuite" Version="1.15.3" />
<PackageReference Include="coverlet.collector" Version="3.0.2" />
<PackageReference Include="NUnit" Version="3.13.2" />
Expand Down
1 change: 0 additions & 1 deletion MeshKernelNET/test/MeshKernelNETCoreTest/Native/NativeStructConversionExtensionsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ public void GivenMakeGridParameters_ToMakeGridParametersNative_ShouldCreateValid
var native = makeGridParameters.ToMakeGridParametersNative();

// Assert
Assert.AreEqual(native.GridType, (int)makeGridParameters.GridType);
Assert.AreEqual(native.NumberOfColumns, makeGridParameters.NumberOfColumns);
Assert.AreEqual(native.NumberOfRows, makeGridParameters.NumberOfRows);
Assert.AreEqual(native.GridAngle, makeGridParameters.GridAngle);
Expand Down