Fixed implementation to use range check for doubles.

TensionDev · Dec 14, 2024 · 643fb1a · 643fb1a
1 parent 4edda4b
commit 643fb1a
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 9 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -13,18 +13,48 @@ jobs:
 
     strategy:
       matrix:
-        dotnet: [ '6.0.x', '8.0.x' ]
+        dotnet: [ '8.0.x' ]
     name: .NET ${{ matrix.dotnet }}
 
     steps:
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: 17
+        distribution: 'zulu' # Alternative distribution options are available.
     - uses: actions/checkout@v4
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: ${{ matrix.dotnet }}
+    - name: Cache SonarQube Cloud packages
+      uses: actions/cache@v4
+      with:
+        path: ~\sonar\cache
+        key: ${{ runner.os }}-sonar
+        restore-keys: ${{ runner.os }}-sonar
+    - name: Cache SonarQube Cloud scanner
+      id: cache-sonar-scanner
+      uses: actions/cache@v4
+      with:
+        path: .\.sonar\scanner
+        key: ${{ runner.os }}-sonar-scanner
+        restore-keys: ${{ runner.os }}-sonar-scanner
+    - name: Install SonarQube Cloud scanner
+      if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
+      shell: powershell
+      run: |
+        New-Item -Path .\.sonar\scanner -ItemType Directory
+        dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
-      run: dotnet build --no-restore
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      run: |
+        .\.sonar\scanner\dotnet-sonarscanner begin /k:"TensionDev_Navigation" /o:"tensiondev" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
+        dotnet build --no-restore
+        .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
     - name: Test
       run: dotnet test --no-build --verbosity normal
diff --git a/Navigation/ClosestPointOfApproach.cs b/Navigation/ClosestPointOfApproach.cs
@@ -30,21 +30,21 @@ public static void CalculateCPAandTCPA(VesselTrack ownVessel, VesselTrack target
             double RelY = ObjectY - OwnY;
             double dRelativeSOG = Math.Sqrt((RelX * RelX) + (RelY * RelY));
 
-            if (dRelativeSOG == 0.0)
+            if (dRelativeSOG <= double.Epsilon)
             {
                 closestPointOfApproachMetres = distanceMetres;
                 timeToClosestPointOfApproachSeconds = 0.0;
 
                 return;
             }
 
-            if (RelY == 0.0)
+            if (RelY <= double.Epsilon)
             {
                 closestPointOfApproachMetres = dRelativePosX;
                 timeToClosestPointOfApproachSeconds = (dRelativePosX / RelX);
 
             }
-            else if (RelX == 0.0)
+            else if (RelX <= double.Epsilon)
             {
                 closestPointOfApproachMetres = dRelativePosY;
                 timeToClosestPointOfApproachSeconds = (dRelativePosY / RelY);

diff --git a/Navigation/Navigation.csproj b/Navigation/Navigation.csproj
@@ -7,7 +7,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageId>TensionDev.Maritime.Navigation</PackageId>
-    <Version>0.2.0-alpha</Version>
+    <Version>0.2.1-alpha</Version>
     <Authors>TensionDev amsga</Authors>
     <Company>TensionDev</Company>
     <Product>TensionDev.Maritime.Navigation</Product>
@@ -20,8 +20,8 @@
     <PackageTags>Maritime</PackageTags>
     <PackageReleaseNotes>Initial project release</PackageReleaseNotes>
     <NeutralLanguage>en-SG</NeutralLanguage>
-    <AssemblyVersion>0.2.0.0</AssemblyVersion>
-    <FileVersion>0.2.0.0</FileVersion>
+    <AssemblyVersion>0.2.1.0</AssemblyVersion>
+    <FileVersion>0.2.1.0</FileVersion>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>

diff --git a/XUnitTestProjectNavigation/XUnitTestProjectNavigation.csproj b/XUnitTestProjectNavigation/XUnitTestProjectNavigation.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>