update

Author: seto77

Crystallography.Native/Crystallography.Native.vcxproj

@@ -328,7 +328,7 @@
       <ConformanceMode>
       </ConformanceMode>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration>

Crystallography.OpenGL/Crystallography.OpenGL.csproj

@@ -33,7 +33,7 @@
     <PackageReference Include="MathNet.Numerics" Version="6.0.0-beta2" />
     <PackageReference Include="OpenTK" Version="4.9.4" />
     <PackageReference Include="SimdLinq" Version="1.3.2" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.10" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.7.0" />
     <PackageReference Include="System.Management" Version="10.0.0" />
     <PackageReference Include="ZLinq" Version="1.5.4" />
   </ItemGroup>

Crystallography/Crystal/CrystalMinimum.cs

@@ -53,6 +53,9 @@ public enum DataType { None = 0, AMCSD = 1, COD = 2, }
     #endregion
 
     #region プロパティ
+    [MemoryPackIgnore]
+    public static byte ID => 0;
+
     /// <summary>
     /// a,b,c,alpha,beta,gammaの順番. 単位はAと度. エラーは 「9.726|5|」のような形式で表現
     /// </summary>

Crystallography/ExtensionMethods.cs

@@ -2,6 +2,8 @@
 
 using MathNet.Numerics.LinearAlgebra;
 using MathNet.Numerics.LinearAlgebra.Double;
+using MemoryPack;
+using MemoryPack.Compression;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -363,6 +365,61 @@ public static class DoubleEx
 }
 #endregion
 
+
+public static class MemoryPackEx
+{
+
+    /// <summary>
+    /// 静的メソッド　MemoryPackでシリアライズしてbyte[]配列を返す
+    /// </summary>
+    /// <param name="val"></param>
+    /// <returns></returns>
+    public static byte[] Serialize<T>(T val, System.IO.Compression.CompressionLevel level= System.IO.Compression.CompressionLevel.Optimal, int window =22 )
+    {
+        using var compressor = new BrotliCompressor(level, window);
+        MemoryPackSerializer.Serialize(compressor, val);
+        return compressor.ToArray();
+    }
+
+    /// <summary>
+    /// 静的メソッド　MemoryPackでシリアライズしてbyte[]配列を返す  先頭に1バイトのヘッダーを付加する
+    /// </summary>
+    /// <param name="val"></param>
+    /// <returns></returns>
+    public static byte[] Serialize<T>(byte header, T val, System.IO.Compression.CompressionLevel level = System.IO.Compression.CompressionLevel.Optimal, int window = 22)
+    {
+        using var compressor = new BrotliCompressor(level, window);
+        MemoryPackSerializer.Serialize(compressor, val);
+        //return compressor.ToArray();
+
+        //先頭の4バイトはheaderを格納
+        var data = compressor.ToArray();
+        var buffer = new byte[data.Length + 1];
+        buffer[0] = header;
+        Buffer.BlockCopy(data, 0, buffer, 1, data.Length);
+        return buffer;
+    }
+
+    /// <summary>
+    /// MemoryPackでシリアライズされた byte[] 配列からTを返す. 不適切な入力値だった場合は default(T)) 返し。
+    /// </summary>
+    /// <param name="bytes"></param>
+    /// <returns></returns>
+    public static T Deserialize<T>(byte[] bytes)
+    {
+        try
+        {
+            using var decompressor = new BrotliDecompressor();// Decompression(require using)
+            return MemoryPackSerializer.Deserialize<T>(decompressor.Decompress(bytes));
+        }
+        catch { return default; }
+    }
+
+} 
+#region MemoryPackの拡張
+
+#endregion
+
 #region Graphicsクラス
 /// <summary>
 /// Graphics クラスの描画関数にdoubleを受けられるにようにした拡張メソッド

Crystallography/PointD.cs

@@ -1,3 +1,4 @@
+using MemoryPack;
 using System;
 using System.ComponentModel;
 using System.Drawing;
@@ -137,15 +138,28 @@ public SizeD(Size size) : this()
 [StructLayout(LayoutKind.Sequential)]
 [Serializable()]
 [TypeConverter(typeof(PointDConverter))]
-public struct PointD : IComparable, IEquatable<PointD>
+[MemoryPackable]
+public partial struct PointD : IComparable, IEquatable<PointD>
 {
     public double X { get; set; }
     public double Y { get; set; }
+
+    [MemoryPackIgnore]
     public object Tag { get; set; }
+
+    [MemoryPackIgnore]
     public readonly bool IsNaN => double.IsNaN(X) || double.IsNaN(Y);
+
+    [MemoryPackIgnore]
     public readonly double Length2 => X * X + Y * Y;
+
+    [MemoryPackIgnore]
     public readonly double Length => Math.Sqrt(X * X + Y * Y);
 
+    [MemoryPackConstructor]
+    public PointD()
+    { X = 0;Y = 0;Tag = null; }
+    
     public PointD(in double x, in double y)
     {
         X = x;

Crystallography/Profile.cs

@@ -1,4 +1,5 @@
 using MathNet.Numerics.LinearAlgebra.Double;
+using MemoryPack;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -9,27 +10,35 @@
 namespace Crystallography;
 
 [Serializable]
-public class Profile : ICloneable
+[MemoryPackable]
+public partial class Profile : ICloneable
 {
     #region プロパティ、フィールド
     public string text;
 
-    public List<PointD> Pt;
-    public List<PointD> Err;
+    public List<PointD> Pt=[];
+    public List<PointD> Err=[];
 
+    [MemoryPackIgnore]
     public Color Color = Color.Blue;
 
     public float LineWidth = 1f;
 
+    [MemoryPackIgnore]
     public RectangleD Range => new(new PointD(Pt.Min(p => p.X), Pt.Min(p => p.Y)), new PointD(Pt.Max(p => p.X), Pt.Max(p => p.Y)));
+    [MemoryPackIgnore]
     public double MaxX => Pt.Max(p => p.X);
+    [MemoryPackIgnore]
     public double MinX => Pt.Min(p => p.X);
+    [MemoryPackIgnore]
     public double MaxY => Pt.Max(p => p.Y);
+    [MemoryPackIgnore]
     public double MinY => Pt.Min(p => p.Y);
 
     #endregion
 
     #region コンストラクタ
+    [MemoryPackConstructor]
     public Profile()
     {
         Pt = [];
@@ -423,29 +432,37 @@ public enum BackgroundMode { BSplineCurve, ReferrenceProfile }
 
 #endregion
 
-[Serializable]
-public class DiffractionProfile2 : ICloneable
+//[Serializable]
+[MemoryPackable]
+public partial class DiffractionProfile2 : ICloneable
 {
+    public static byte ID => 2;
+
     #region マスク関連ここから
     [Serializable]
-    public class MaskingRange
+    [MemoryPackable]
+    public partial class MaskingRange
     {
         public double[] X = new double[2];
 
+        [MemoryPackConstructor]
         public MaskingRange() => X[0] = X[1] = 0;
 
         public MaskingRange(double x1, double x2)
         {
             X[0] = x1;
             X[1] = x2;
         }
-
+        
+        [MemoryPackIgnore]
         public double Maximum => Math.Max(X[0], X[1]);
-
+        
+        [MemoryPackIgnore]
         public double Minimum => Math.Min(X[0], X[1]);
-
+        
         public override string ToString()
             => X[0] < X[1] ? $"{X[0]:g8} - {X[1]:g8}" : $"{X[1]:g8} - {X[0]:g8}";
+
     }
 
     public List<MaskingRange> maskingRanges = [];
@@ -534,12 +551,13 @@ public object Clone()
     #region プロパティ
 
     #region プロファイル
+
     /// <summary>
     /// ソースプロファイル ()
     /// </summary>
     public Profile SourceProfile;
 
-    public PointD[] BgPoints;
+    public PointD[] BgPoints = [];
 
     /// <summary>
     /// 軸変換後のプロファイル. SetConvertedProfile()を呼び出すことで生成される.
@@ -1257,7 +1275,8 @@ public PointD[] ConvertDestToSrc(PointD[] pt)
 #region HorizontalAxisProperty プロファイルの性質を表す構造体
 
 [Serializable]
-public record struct HorizontalAxisProperty
+[MemoryPackable]
+public partial record struct HorizontalAxisProperty
 {
     #region プロパティ
     /// <summary>
@@ -2222,7 +2241,7 @@ public DiffractionProfile()
 
         ElectronAccVolatage = 200;
 
-        ColorARGB = null;
+        ColorARGB = Color.Blue.ToArgb();
     }
 
 

ReciPro/FormMain.Designer.cs

@@ -75,8 +75,11 @@ protected override void WndProc(ref System.Windows.Forms.Message msg)
                 if (Clipboard.GetDataObject().GetDataPresent(typeof(byte[])))
                 {
                     var bytes = (byte[])Clipboard.GetDataObject().GetData(typeof(byte[]));
-                    var c2 = Crystal2.Deserialize(bytes);
-                    crystalControl.Crystal = Crystal2.GetCrystal(c2);
+                    if (bytes[0] == Crystal2.ID)
+                    {
+                        var c2 = Crystal2.Deserialize(bytes[1..]);
+                        crystalControl.Crystal = Crystal2.GetCrystal(c2);
+                    }
                 }
 
                 if ((int)NextHandle != 0)

ReciPro/FormMain.cs

@@ -95,7 +95,7 @@
     <PackageReference Include="MathNet.Numerics.MKL.Win-x64" Version="3.0.0" />
     <PackageReference Include="OpenTK" Version="4.9.4" />
     <PackageReference Include="SimdLinq" Version="1.3.2" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.10" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.7.0" />
     <PackageReference Include="ZLinq" Version="1.5.4" />
   </ItemGroup>
 

ReciPro/ReciPro.csproj

@@ -7,6 +7,7 @@ internal static class Version
 
     public const string History =
         "History" +
+        "\r\n ver4.910(2025/11/26)  Updated: .Net Desktop Runtime 9 to 10. Fixed minor bugs." +
         "\r\n ver4.909(2025/10/29)  Fixed a minor bug." +
         "\r\n ver4.907(2025/10/28)  Fixed a minor bug." +
         "\r\n ver4.906(2025/09/26)  Fixed a minor bug. Renewed the Eigen library." +