Fix/kernels (#110)

sylvain-guillet · web-flow · commit cb9c6130a663 · 2024-08-02T11:18:27.000+02:00
* Upgrade kernel manager

* Add clear kernels and consolidate kernel loading and unloading
diff --git a/IO.Astrodynamics.CLI/IO.Astrodynamics.CLI.csproj b/IO.Astrodynamics.CLI/IO.Astrodynamics.CLI.csproj
@@ -9,7 +9,7 @@
         <FileVersion>0.0.1</FileVersion>
         <PackAsTool>true</PackAsTool>
         <ToolCommandName>astro</ToolCommandName>
-        <Version>0.1.13</Version>
+        <Version>0.2.0</Version>
         <Title>Astrodynamics command line interface</Title>
         <Authors>Sylvain Guillet</Authors>
         <Description>This CLI allows end user to exploit IO.Astrodynamics framework </Description>
diff --git a/IO.Astrodynamics.Tests/APITest.cs b/IO.Astrodynamics.Tests/APITest.cs
@@ -25,6 +25,7 @@
 
 namespace IO.Astrodynamics.Tests;
 
+
 public class APITest
 {
     public APITest()
@@ -307,7 +308,7 @@ public async Task ReadOrientation()
         spacecraft.AddPayload(new Payload("payload1", 50.0, "pay01"));
         spacecraft.AddCircularInstrument(-1794600, "CAM600", "mod1", 1.5, Vector3.VectorZ, Vector3.VectorX, Vector3.VectorX);
 
-        spacecraft.SetStandbyManeuver(new NadirAttitude(TestHelpers.EarthAtJ2000,DateTime.MinValue, TimeSpan.Zero,
+        spacecraft.SetStandbyManeuver(new NadirAttitude(TestHelpers.EarthAtJ2000, DateTime.MinValue, TimeSpan.Zero,
             spacecraft.Engines.First()));
 
         scenario.AddSpacecraft(spacecraft);
@@ -322,12 +323,12 @@ public async Task ReadOrientation()
 
         //Read results
         Assert.Equal(0.70710678118654757, res.ElementAt(0).Rotation.W);
-        Assert.Equal(0.0, res.ElementAt(0).Rotation.VectorPart.X,6);
-        Assert.Equal(0.0, res.ElementAt(0).Rotation.VectorPart.Y,6);
+        Assert.Equal(0.0, res.ElementAt(0).Rotation.VectorPart.X, 6);
+        Assert.Equal(0.0, res.ElementAt(0).Rotation.VectorPart.Y, 6);
         Assert.Equal(0.70710678118654746, res.ElementAt(0).Rotation.VectorPart.Z);
-        Assert.Equal(0.0, res.ElementAt(0).AngularVelocity.X,6);
-        Assert.Equal(0.0, res.ElementAt(0).AngularVelocity.Y,6);
-        Assert.Equal(0.0, res.ElementAt(0).AngularVelocity.Z,6);
+        Assert.Equal(0.0, res.ElementAt(0).AngularVelocity.X, 6);
+        Assert.Equal(0.0, res.ElementAt(0).AngularVelocity.Y, 6);
+        Assert.Equal(0.0, res.ElementAt(0).AngularVelocity.Z, 6);
         Assert.Equal(window.StartDate, res.ElementAt(0).Epoch);
         Assert.Equal(Frames.Frame.ICRF, res.ElementAt(0).ReferenceFrame);
 
@@ -537,15 +538,65 @@ void AzimuthRange()
     }
 
     [Fact]
-    void UnloadKernelException()
+    void LoadKernelException()
     {
-        Assert.Throws<ArgumentNullException>(() => API.Instance.UnloadKernels(null));
+        Assert.Throws<ArgumentNullException>(() => API.Instance.LoadKernels(null));
     }
 
+    private static object lockobj = new Object();
     [Fact]
-    void LoadKernelException()
+    void UnloadKernels()
     {
-        Assert.Throws<ArgumentNullException>(() => API.Instance.LoadKernels(null));
+        lock (lockobj)
+        {
+            API.Instance.LoadKernels(new FileInfo(@"Data/UserDataTest/scn100/Sites/MySite/Ephemeris/MySite.spk"));
+            API.Instance.LoadKernels(new FileInfo(@"Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Ephemeris/DRAGONFLY32.spk"));
+            API.Instance.LoadKernels(new DirectoryInfo(@"Data/UserDataTest/scn100"));
+            API.Instance.UnloadKernels(new FileInfo(@"Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Ephemeris/DRAGONFLY32.spk"));
+            var kernels = API.Instance.GetLoadedKernels().ToArray();
+            Assert.Equal(1, @kernels.Count(x => x.FullName.Contains("scn100")));
+        }
+    }
+    
+    [Fact]
+    void UnloadKernels2()
+    {
+        lock (lockobj)
+        {
+            API.Instance.LoadKernels(new FileInfo(@"Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Clocks/DRAGONFLY32.tsc"));
+            
+            API.Instance.UnloadKernels(new FileInfo(@"Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Clocks/DRAGONFLY32.tsc"));
+            var kernels = API.Instance.GetLoadedKernels().ToArray();
+            Assert.Equal(0, kernels.Count(x => x.FullName.Contains("DRAGONFLY32.tsc")));
+        }
+    }
+
+    [Fact]
+    void LoadKernels()
+    {
+        lock (lockobj)
+        {
+            API.Instance.LoadKernels(new FileInfo(@"Data/UserDataTest/scn100/Sites/MySite/Ephemeris/MySite.spk"));
+            API.Instance.LoadKernels(new FileInfo(@"Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Ephemeris/DRAGONFLY32.spk"));
+            API.Instance.LoadKernels(new DirectoryInfo(@"Data/UserDataTest/scn100"));
+
+            var kernels = API.Instance.GetLoadedKernels().ToArray();
+            Assert.Equal(1, @kernels.Count(x => x.FullName.Contains("scn100")));
+        }
+    }
+
+    [Fact]
+    void LoadKernels2()
+    {
+        lock (lockobj)
+        {
+            API.Instance.LoadKernels(new DirectoryInfo(@"Data/UserDataTest/scn100"));
+            API.Instance.LoadKernels(new FileInfo(@"Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Ephemeris/DRAGONFLY32.spk"));
+            API.Instance.LoadKernels(new FileInfo(@"Data/UserDataTest/scn100/Sites/MySite/Ephemeris/MySite.spk"));
+
+            var kernels = API.Instance.GetLoadedKernels().ToArray();
+            Assert.Equal(1, @kernels.Count(x => x.FullName.Contains("scn100")));
+        }
     }
 
     [Fact]
@@ -580,6 +631,4 @@ void TLEElements()
         Assert.Equal(9, tle.O);
         Assert.Equal(10, tle.M);
     }
-
-    
 }
diff --git a/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Sites/MySite/Ephemeris/MySite.spk b/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Sites/MySite/Ephemeris/MySite.spk
diff --git a/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Sites/MySite/Frames/MySite.tf b/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Sites/MySite/Frames/MySite.tf
@@ -0,0 +1,16 @@
+KPL/FK
+\begindata
+NAIF_BODY_NAME              += 'MYSITE'
+NAIF_BODY_CODE              += 399132
+FRAME_MYSITE_TOPO        = 1399132
+FRAME_1399132_NAME        = 'MYSITE_TOPO'
+FRAME_1399132_CLASS       = 4
+FRAME_1399132_CLASS_ID    = 1399132
+FRAME_1399132_CENTER      = 399132
+OBJECT_399132_FRAME       = 'MYSITE_TOPO'
+TKFRAME_1399132_SPEC      = 'ANGLES'
+TKFRAME_1399132_RELATIVE  = 'ITRF93'
+TKFRAME_1399132_ANGLES    = (-0.5,-1.2707963267948965,3.141592653589793116)
+TKFRAME_1399132_AXES      = (3,2,3)
+TKFRAME_1399132_UNITS     = 'RADIANS'
+\begintext
diff --git a/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Clocks/DRAGONFLY32.tsc b/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Clocks/DRAGONFLY32.tsc
@@ -0,0 +1,13 @@
+KPL/SCLK
+\begindata
+SCLK_KERNEL_ID           = ( @1957-01-01/00:00:00.0 )
+SCLK_DATA_TYPE_1785        = ( 1 )
+SCLK01_TIME_SYSTEM_1785    = ( 1 )
+SCLK01_N_FIELDS_1785       = ( 2 )
+SCLK01_MODULI_1785         = ( 4294967296 65536 )
+SCLK01_OFFSETS_1785        = ( 0 0 )
+SCLK01_OUTPUT_DELIM_1785   = ( 2 )
+SCLK_PARTITION_START_1785  = ( 0.0000000000000E+00 )
+SCLK_PARTITION_END_1785    = ( 2.8147497671065E+14 )
+SCLK01_COEFFICIENTS_1785   = ( 0.0000000000000E+00     -1.3569552000000E+09     1.0000000000000E+00 )
+\begintext
diff --git a/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Ephemeris/DRAGONFLY32.spk b/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Ephemeris/DRAGONFLY32.spk
diff --git a/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Frames/DRAGONFLY32.tf b/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Frames/DRAGONFLY32.tf
@@ -0,0 +1,15 @@
+KPL/FK
+\begindata
+FRAME_DRAGONFLY32_FRAME   = -1785000
+FRAME_-1785000_NAME      = 'DRAGONFLY32_FRAME'
+FRAME_-1785000_CLASS     =  3
+FRAME_-1785000_CLASS_ID  = -1785000
+FRAME_-1785000_CENTER    = -1785
+CK_-1785000_SCLK         = -1785
+CK_-1785000_SPK          = -1785
+OBJECT_-1785_FRAME       = 'DRAGONFLY32_FRAME'
+NAIF_BODY_NAME              += 'DRAGONFLY32_FRAME'
+NAIF_BODY_CODE              += -1785000
+NAIF_BODY_NAME              += 'DRAGONFLY32'
+NAIF_BODY_CODE              += -1785
+\begintext
diff --git a/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Instruments/CAM601.tf b/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Instruments/CAM601.tf
@@ -0,0 +1,15 @@
+KPL/FK
+\begindata
+FRAME_DRAGONFLY32_CAM601             = -1785601
+FRAME_-1785601_NAME        = 'DRAGONFLY32_CAM601'
+FRAME_-1785601_CLASS       = 4
+FRAME_-1785601_CLASS_ID    = -1785601
+FRAME_-1785601_CENTER      = -1785
+TKFRAME_-1785601_SPEC      = 'ANGLES'
+TKFRAME_-1785601_RELATIVE  = 'DRAGONFLY32_FRAME'
+TKFRAME_-1785601_ANGLES    = ( 1,0,0 )
+TKFRAME_-1785601_AXES      = ( 1,    2,   3   )
+TKFRAME_-1785601_UNITS     = 'RADIANS'
+NAIF_BODY_NAME              += 'DRAGONFLY32_CAM601'
+NAIF_BODY_CODE              += -1785601
+\begintext
diff --git a/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Instruments/CAM601.ti b/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Instruments/CAM601.ti
@@ -0,0 +1,10 @@
+KPL/IK
+\begindata
+INS-1785601_FOV_CLASS_SPEC       = 'ANGLES'
+INS-1785601_FOV_SHAPE            = 'CIRCLE'
+INS-1785601_FOV_FRAME            = 'DRAGONFLY32_CAM601'
+INS-1785601_BORESIGHT            = ( 0, 0, 1 )
+INS-1785601_FOV_REF_VECTOR       = ( 1, 0, 0 )
+INS-1785601_FOV_REF_ANGLE        = 1.3962634015954636
+INS-1785601_FOV_ANGLE_UNITS      = 'RADIANS'
+\begintext
diff --git a/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Instruments/CAM601/Frames/CAM601.tf b/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Instruments/CAM601/Frames/CAM601.tf
@@ -0,0 +1,15 @@
+KPL/FK
+\begindata
+FRAME_DRAGONFLY32_CAM601             = -1785601
+FRAME_-1785601_NAME        = 'DRAGONFLY32_CAM601'
+FRAME_-1785601_CLASS       = 4
+FRAME_-1785601_CLASS_ID    = -1785601
+FRAME_-1785601_CENTER      = -1785
+TKFRAME_-1785601_SPEC      = 'ANGLES'
+TKFRAME_-1785601_RELATIVE  = 'DRAGONFLY32_SPACECRAFT'
+TKFRAME_-1785601_ANGLES    = ( -1.000000,-0.000000,-0.000000 )
+TKFRAME_-1785601_AXES      = ( 1,    2,   3   )
+TKFRAME_-1785601_UNITS     = 'RADIANS'
+NAIF_BODY_NAME              += 'DRAGONFLY32_CAM601'
+NAIF_BODY_CODE              += -1785601
+\begintext
diff --git a/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Instruments/CAM601/Kernels/CAM601.ti b/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Instruments/CAM601/Kernels/CAM601.ti
@@ -0,0 +1,10 @@
+KPL/IK
+\begindata
+INS-1785601_FOV_CLASS_SPEC       = 'ANGLES'
+INS-1785601_FOV_SHAPE            = 'CIRCLE'
+INS-1785601_FOV_FRAME            = 'DRAGONFLY32_CAM601'
+INS-1785601_BORESIGHT            = ( 0.000000, 0.000000, 1.000000 )
+INS-1785601_FOV_REF_VECTOR       = ( 1.000000, 0.000000, 0.000000 )
+INS-1785601_FOV_REF_ANGLE        = 0.698132
+INS-1785601_FOV_ANGLE_UNITS      = 'RADIANS'
+\begintext
diff --git a/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Orientation/DRAGONFLY32.ck b/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Orientation/DRAGONFLY32.ck
diff --git a/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Orientations/DRAGONFLY32.ck b/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Spacecrafts/DRAGONFLY32/Orientations/DRAGONFLY32.ck
diff --git a/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Stars/star2/star_1000000002.spk b/IO.Astrodynamics.Tests/Data/UserDataTest/scn100/Stars/star2/star_1000000002.spk
diff --git a/IO.Astrodynamics.Tests/IO.Astrodynamics.Tests.csproj b/IO.Astrodynamics.Tests/IO.Astrodynamics.Tests.csproj
@@ -24,10 +24,6 @@
       <ProjectReference Include="..\IO.Astrodynamics\IO.Astrodynamics.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Data\" />
-    </ItemGroup>
-
     <ItemGroup>
       <None Remove="Data\SolarSystem\de440s.bsp" />
       <Content Include="Data\SolarSystem\de440s.bsp">
@@ -112,6 +108,18 @@
       <Content Include="Data\SolarSystem\gm_de440.tpc">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>
+      <None Remove="Data\UserDataTest\scn100\Spacecrafts\DRAGONFLY32\Ephemeris\DRAGONFLY32.spk" />
+      <Content Include="Data\UserDataTest\scn100\Spacecrafts\DRAGONFLY32\Ephemeris\DRAGONFLY32.spk">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </Content>
+      <None Remove="Data\UserDataTest\scn100\Sites\MySite\Ephemeris\MySite.spk" />
+      <Content Include="Data\UserDataTest\scn100\Sites\MySite\Ephemeris\MySite.spk">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </Content>
+      <None Remove="Data\UserDataTest\scn100\Spacecrafts\DRAGONFLY32\Clocks\DRAGONFLY32.tsc" />
+      <Content Include="Data\UserDataTest\scn100\Spacecrafts\DRAGONFLY32\Clocks\DRAGONFLY32.tsc">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </Content>
     </ItemGroup>
 
 </Project>
diff --git a/IO.Astrodynamics/API.cs b/IO.Astrodynamics/API.cs
@@ -166,13 +166,20 @@ public IEnumerable<FileSystemInfo> GetLoadedKernels()
     public void LoadKernels(FileSystemInfo path)
     {
         if (path == null) throw new ArgumentNullException(nameof(path));
-        if (_kernels.Any(x => x.FullName == path.FullName))
-        {
-            return;
-        }
-
         lock (lockObject)
         {
+            if (_kernels.Any(x => path.FullName.Contains(x.FullName)))
+            {
+                foreach (var kernel in _kernels.Where(x => path.FullName.Contains(x.FullName)).ToArray())
+                {
+                    UnloadKernels(kernel);
+                    LoadKernels(kernel);
+                }
+
+                return;
+            }
+
+
             var existingKernels = _kernels.Where(x => x.FullName.Contains(path.FullName)).ToArray();
             foreach (var existingKernel in existingKernels)
             {
@@ -197,7 +204,7 @@ public void LoadKernels(FileSystemInfo path)
     /// <param name="path">Path where kernels are located. This could be a file path or a directory path</param>
     public void UnloadKernels(FileSystemInfo path)
     {
-        if (path == null) throw new ArgumentNullException(nameof(path));
+        if (path == null) return;
         lock (lockObject)
         {
             if (path.Exists)
@@ -207,7 +214,22 @@ public void UnloadKernels(FileSystemInfo path)
                     throw new InvalidOperationException($"Kernel {path.FullName} can't be unloaded. You can have more details on standard output");
                 }
 
-                _kernels.RemoveAll(x => x.FullName.Contains(path.FullName));
+                _kernels.RemoveAll(x => x.FullName == path.FullName);
+                foreach (var kernel in _kernels.Where(x => x.FullName.Contains(path.FullName)).ToArray())
+                {
+                    UnloadKernels(kernel);
+                }
+            }
+        }
+    }
+
+    public void ClearKernels()
+    {
+        lock (lockObject)
+        {
+            foreach (var kernel in _kernels.ToArray())
+            {
+                UnloadKernels(kernel);
             }
         }
     }
diff --git a/IO.Astrodynamics/IO.Astrodynamics.nuspec b/IO.Astrodynamics/IO.Astrodynamics.nuspec
@@ -4,7 +4,7 @@
         <id>IO.Astrodynamics</id>
         <authors>Sylvain Guillet</authors>
         <copyright>Sylvain Guillet</copyright>
-        <version>3.2.3</version>
+        <version>3.3.0</version>
         <title>Astrodynamics framework</title>
         <icon>images\dragonfly-dark-trans.png</icon>
         <readme>docs\README.md</readme>
