1.3.0 (#6)

* change to FastLZMA2 Data compression

* 1.3.0

* add icon

* update package info

.editorconfig

@@ -0,0 +1,200 @@
+[*.*]
+charset = utf-8
+
+# editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Default settings:
+# A newline ending every file
+# Use 4 spaces as indentation
+[*]
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+# Generated code
+[*{_AssemblyInfo.cs,.notsupported.cs,AsmOffsets.cs}]
+generated_code = true
+end_of_line = crlf
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+tab_width = 4
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+
+# C# files
+[*.cs]
+# New line preferences
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+
+# Indentation preferences
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = one_less_than_current
+
+# Modifier preferences
+csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async:suggestion
+
+# avoid this. unless absolutely necessary
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+
+# Types: use keywords instead of BCL types, and permit var only when the type is clear
+csharp_style_var_for_built_in_types = false:suggestion
+csharp_style_var_when_type_is_apparent = false:none
+csharp_style_var_elsewhere = false:suggestion
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+# name all constant fields using PascalCase
+dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = error
+dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
+dotnet_naming_symbols.constant_fields.applicable_kinds   = field
+dotnet_naming_symbols.constant_fields.required_modifiers = const
+dotnet_naming_style.pascal_case_style.capitalization = pascal_case
+
+# static fields should have s_ prefix
+dotnet_naming_rule.static_fields_should_have_prefix.severity = error
+dotnet_naming_rule.static_fields_should_have_prefix.symbols  = static_fields
+dotnet_naming_rule.static_fields_should_have_prefix.style = static_prefix_style
+dotnet_naming_symbols.static_fields.applicable_kinds   = field
+dotnet_naming_symbols.static_fields.required_modifiers = static
+dotnet_naming_symbols.static_fields.applicable_accessibilities = private, internal, private_protected
+dotnet_naming_style.static_prefix_style.required_prefix = s_
+dotnet_naming_style.static_prefix_style.capitalization = camel_case
+
+# internal and private fields should be _camelCase
+dotnet_naming_rule.camel_case_for_private_internal_fields.severity = error
+dotnet_naming_rule.camel_case_for_private_internal_fields.symbols  = private_internal_fields
+dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style
+dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
+dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
+dotnet_naming_style.camel_case_underscore_style.required_prefix = _
+dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
+
+# Code style defaults
+csharp_using_directive_placement = outside_namespace:suggestion
+dotnet_sort_system_directives_first = true
+csharp_prefer_braces = true:silent
+csharp_preserve_single_line_blocks = true:none
+csharp_preserve_single_line_statements = false:none
+csharp_prefer_static_local_function = true:suggestion
+csharp_prefer_simple_using_statement = false:none
+csharp_style_prefer_switch_expression = true:suggestion
+dotnet_style_readonly_field = true:suggestion
+
+# Expression-level preferences
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_prefer_collection_expression = when_types_exactly_match
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_auto_properties = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+csharp_prefer_simple_default_expression = true:suggestion
+
+# Expression-bodied members
+csharp_style_expression_bodied_methods = true:silent
+csharp_style_expression_bodied_constructors = true:silent
+csharp_style_expression_bodied_operators = true:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = true:silent
+
+# Pattern matching
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+
+# Null checking preferences
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+
+# Other features
+csharp_style_prefer_index_operator = false:none
+csharp_style_prefer_range_operator = false:none
+csharp_style_pattern_local_over_anonymous_function = false:none
+
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = do_not_ignore
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+
+# License header
+file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.
+
+# C++ Files
+[*.{cpp,h,in}]
+curly_bracket_next_line = true
+indent_brace_style = Allman
+
+# Xml project files
+[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
+indent_size = 2
+
+[*.{csproj,vbproj,proj,nativeproj,locproj}]
+charset = utf-8
+
+# Xml build files
+[*.builds]
+indent_size = 2
+
+# Xml files
+[*.{xml,stylecop,resx,ruleset}]
+indent_size = 2
+
+# Xml config files
+[*.{props,targets,config,nuspec}]
+indent_size = 2
+
+# YAML config files
+[*.{yml,yaml}]
+indent_size = 2
+
+# Shell scripts
+[*.sh]
+end_of_line = lf
+[*.{cmd,bat}]
+end_of_line = crlf

DataConverter/DataConverter.csproj

@@ -1,32 +1,33 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PlatformTarget>x64</PlatformTarget>
     <Platforms>x64</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
-	  <EmbeddedResource Include="Resources\README.pdf" />
-	  <EmbeddedResource Include="Resources\VSOP2013.ctl" />
-	  <EmbeddedResource Include="Resources\VSOP2013.f" />
-	  <EmbeddedResource Include="Resources\VSOP2013-secular.dat" />
-	  <EmbeddedResource Include="Resources\VSOP2013p1.dat" />
-	  <EmbeddedResource Include="Resources\VSOP2013p2.dat" />
-	  <EmbeddedResource Include="Resources\VSOP2013p3.dat" />
-	  <EmbeddedResource Include="Resources\VSOP2013p4.dat" />
-	  <EmbeddedResource Include="Resources\VSOP2013p5.dat" />
-	  <EmbeddedResource Include="Resources\VSOP2013p6.dat" />
-	  <EmbeddedResource Include="Resources\VSOP2013p7.dat" />
-	  <EmbeddedResource Include="Resources\VSOP2013p8.dat" />
-	  <EmbeddedResource Include="Resources\VSOP2013p9.dat" />
+    <EmbeddedResource Include="Resources\README.pdf" />
+    <EmbeddedResource Include="Resources\VSOP2013.ctl" />
+    <EmbeddedResource Include="Resources\VSOP2013.f" />
+    <EmbeddedResource Include="Resources\VSOP2013-secular.dat" />
+    <EmbeddedResource Include="Resources\VSOP2013p1.dat" />
+    <EmbeddedResource Include="Resources\VSOP2013p2.dat" />
+    <EmbeddedResource Include="Resources\VSOP2013p3.dat" />
+    <EmbeddedResource Include="Resources\VSOP2013p4.dat" />
+    <EmbeddedResource Include="Resources\VSOP2013p5.dat" />
+    <EmbeddedResource Include="Resources\VSOP2013p6.dat" />
+    <EmbeddedResource Include="Resources\VSOP2013p7.dat" />
+    <EmbeddedResource Include="Resources\VSOP2013p8.dat" />
+    <EmbeddedResource Include="Resources\VSOP2013p9.dat" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MessagePack" Version="2.5.140" />
+    <PackageReference Include="FastLZMA2Net" Version="0.6.0-beta" />
+    <PackageReference Include="MemoryPack" Version="1.21.1" />
   </ItemGroup>
 
   <ItemGroup>

DataConverter/DataReader.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 
 namespace VSOP2013.DataConverter
 {
@@ -7,7 +7,7 @@ public static class DataReader
         /// <summary>
         /// Mean Longitude J2000 (radian)
         /// </summary>
-        private static readonly double[] ci0 =
+        private static readonly double[] s_ci0 =
         {
             0.4402608631669000e1d,
             0.3176134461576000e1d,
@@ -29,9 +29,9 @@ public static class DataReader
         };
 
         /// <summary>
-        /// //Mean Motions in longitude (radian/cy)
+        /// Mean Motions in longitude (radian/cy)
         /// </summary>
-        private static readonly double[] ci1 =
+        private static readonly double[] s_ci1 =
         {
             0.2608790314068555e5d,
             0.1021328554743445e5d,
@@ -214,8 +214,8 @@ private static Term ReadTerm(string line, ref Term T)
 
             for (int j = 0; j < 17; j++)
             {
-                T.aa += Bufferiphi[j] * ci0[j];
-                T.bb += Bufferiphi[j] * ci1[j];
+                T.aa += Bufferiphi[j] * s_ci0[j];
+                T.bb += Bufferiphi[j] * s_ci1[j];
             }
             return T;
         }
@@ -235,4 +235,4 @@ private static PowerTable[] DataPruning(PowerTable[] tables)
             return tables;
         }
     }
-}
+}

DataConverter/Program.cs

@@ -1,6 +1,6 @@
-using MessagePack;
 using System.Diagnostics;
-using System.IO.Compression;
+using FastLZMA2Net;
+using MemoryPack;
 
 namespace VSOP2013.DataConverter
 {
@@ -34,20 +34,19 @@ private static void Main(string[] args)
             DirectoryInfo OutputDir = new(Directory.GetCurrentDirectory() + @"\Data");
 
             sw.Restart();
-
-            ParallelLoopResult result = Parallel.For(0, 9, ip =>
+            Compressor compressor = new Compressor(0, 10) { HighCompressLevel = 10 };
+            string filename = Path.Combine(OutputDir.FullName, "VSOP2013.BIN");
+            if (File.Exists(filename))
             {
-                string filename = Path.Combine(OutputDir.FullName, string.Format("VSOP2013_{0}.BIN", VSOP2013DATA[ip].body.ToString()));
-                if (File.Exists(filename))
-                {
-                    File.Delete(filename);
-                }
-                using FileStream fs = new(filename, FileMode.OpenOrCreate);
-                using BrotliStream bs = new(fs, CompressionLevel.SmallestSize);
-                MessagePackSerializer.Serialize(bs, VSOP2013DATA[ip]);
-                Console.WriteLine($"{VSOP2013DATA[ip].body}: \n{filename}.");
-                Console.WriteLine();
-            });
+                File.Delete(filename);
+            }
+            using (FileStream fs = new FileStream(filename, FileMode.CreateNew))
+            {
+                var compressed = compressor.Compress(MemoryPackSerializer.Serialize(VSOP2013DATA));
+                fs.Write(compressed.AsSpan());
+            }
+            Console.WriteLine($"VSOP2013DATA: \n{filename}");
+            Console.WriteLine();
 
             sw.Stop();
             ticks = sw.ElapsedTicks;
@@ -60,13 +59,9 @@ private static void Main(string[] args)
 
             sw.Restart();
             VSOP2013DATA.Clear();
-            result = Parallel.For(0, 9, ip =>
-            {
-                string filename = Path.Combine(OutputDir.FullName, string.Format("VSOP2013_{0}.BIN", ((VSOPBody)ip).ToString()));
-                using FileStream fs = new(filename, FileMode.OpenOrCreate);
-                using BrotliStream bs = new(fs, CompressionMode.Decompress);
-                VSOP2013DATA.Add(MessagePackSerializer.Deserialize<PlanetTable>(bs));
-            });
+            Decompressor decompressor = new Decompressor(0);
+            var decompressed = decompressor.Decompress(File.ReadAllBytes(filename));//critical bug
+            VSOP2013DATA = MemoryPackSerializer.Deserialize<List<PlanetTable>>(decompressed);
 
             sw.Stop();
             ticks = sw.ElapsedTicks;

Demo/Demo.csproj

@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-    <Platforms>x64</Platforms>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFrameworks>net8.0</TargetFrameworks>
+		<Platforms>x64</Platforms>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\VSOP2013.NET\VSOP2013.NET.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\VSOP2013.NET\VSOP2013.NET.csproj" />
+	</ItemGroup>
 
 </Project>