From 29c425d376fb8fddcd38088cf98d250a13e3b127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=94?= =?UTF-8?q?=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BA?= =?UTF-8?q?=D1=81=D0=B0=D0=BD=D0=B4=D1=80=D0=BE=D0=B2=D0=B8=D1=87?= Date: Mon, 3 Jul 2023 12:13:13 +0500 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20unit=20=D1=82=D0=B5=D1=81=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Исправил сравнения у тестов траекторий --- .../Services/Trajectory/TrajectoryService.cs | 1 - .../TrajectoryVisualizationServiceTest.cs | 17 ++++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/AsbCloudInfrastructure/Services/Trajectory/TrajectoryService.cs b/AsbCloudInfrastructure/Services/Trajectory/TrajectoryService.cs index 6f65e1b9..e3adac11 100644 --- a/AsbCloudInfrastructure/Services/Trajectory/TrajectoryService.cs +++ b/AsbCloudInfrastructure/Services/Trajectory/TrajectoryService.cs @@ -47,7 +47,6 @@ abstract class TrajectoryBaseService var geoCoordinatesArray = geoCoordinates.OrderBy(c => c.WellboreDepth).ToArray(); for (var i = 1; i < geoCoordinatesLength; i++) { - var preCoordinates = cartesianCoordinates[i - 1]; var coordinates = Calculate(cartesianCoordinates[i - 1], geoCoordinatesArray[i - 1], geoCoordinatesArray[i]); diff --git a/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs index f0e47e8e..e3740ebd 100644 --- a/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs +++ b/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs @@ -1,5 +1,4 @@ using AsbCloudApp.Data; -using AsbCloudApp.Data.WITS; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.Trajectory; using Moq; @@ -84,12 +83,12 @@ namespace AsbCloudWebApi.Tests.ServicesTests var lastPointFact = result.Fact!.Last(); Assert.Equal(0d, lastPointPlan.X, 0.1d); - Assert.Equal(0d, lastPointPlan.Y, 0.1d); - Assert.Equal(50d, lastPointPlan.Z, 0.1d); + Assert.Equal(-50d, lastPointPlan.Y, 0.1d); + Assert.Equal(0d, lastPointPlan.Z, 0.1d); Assert.Equal(0d, lastPointFact.X, 0.1d); - Assert.Equal(0d, lastPointFact.Y, 0.1d); - Assert.Equal(50d, lastPointFact.Z, 0.1d); + Assert.Equal(-50d, lastPointFact.Y, 0.1d); + Assert.Equal(0d, lastPointFact.Z, 0.1d); } [Fact] @@ -118,12 +117,12 @@ namespace AsbCloudWebApi.Tests.ServicesTests var tolerancePlan = 0.001d; var toleranceFact = 0.001d; - Assert.InRange(lastPointPlan.Z, 10 + tolerancePlan, 20 - tolerancePlan); - Assert.InRange(lastPointPlan.Y, 0 + tolerancePlan, 10 - tolerancePlan); + Assert.InRange(lastPointPlan.Z, -10 - tolerancePlan, 0 - tolerancePlan); + Assert.InRange(lastPointPlan.Y, -20 - tolerancePlan, -10 + tolerancePlan); Assert.InRange(lastPointPlan.X, 0 + tolerancePlan, 10 - tolerancePlan); - Assert.InRange(lastPointFact.Z, 10 + toleranceFact, 20 - toleranceFact); - Assert.InRange(lastPointFact.Y, 0 + toleranceFact, 10 - toleranceFact); + Assert.InRange(lastPointFact.Z, -10 - toleranceFact, 0 - toleranceFact); + Assert.InRange(lastPointFact.Y, -20 - toleranceFact, -10 + toleranceFact); Assert.InRange(lastPointFact.X, 0 + toleranceFact, 10 - toleranceFact); } }