Reorganize Aardvark.Base.FSharp project

aardvark-platform · Oct 30, 2023 · 330c27d · 330c27d
1 parent 68c687f
commit 330c27d
Show file tree

Hide file tree

Showing 23 changed files with 28 additions and 27 deletions.
diff --git a/src/Aardvark.Base.FSharp/Aardvark.Base.FSharp.fsproj b/src/Aardvark.Base.FSharp/Aardvark.Base.FSharp.fsproj
@@ -15,23 +15,28 @@
     <OutputPath>..\..\bin\Release</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Prelude\Logging.fs" />
-    <Compile Include="Prelude\FSLibExtensions.fs" />
-    <Compile Include="Prelude\Math.fs" />
-    <Compile Include="Prelude\Measures.fs" />
-    <Compile Include="Prelude\Lens.fs" />
-    <Compile Include="Prelude\Monoid.fs" />
-    <Compile Include="Prelude\AverageWindow.fs" />
-    <Compile Include="Interop\Converters.fs" />
-    <Compile Include="Interop\Dictionary.fs" />
-    <Compile Include="Interop\Symbol.fs" />
-    <Compile Include="Interop\Vectors.fs" />
-    <Compile Include="Interop\Matrix.fs" />
-    <Compile Include="Interop\String.fs" />
-    <Compile Include="Interop\SortedSet.fs" />
-    <Compile Include="Interop\HashSet.fs" />
-    <Compile Include="Interop\CSharpList.fs" />
-    <Compile Include="Interop\ArraySegment.fs" />
+    <Compile Include="Utilities\Logging.fs" />
+    <Compile Include="Utilities\Interop\FSLibExtensions.fs" />
+    <Compile Include="Utilities\Interop\Dictionary.fs" />
+    <Compile Include="Utilities\Interop\Symbol.fs" />
+    <Compile Include="Utilities\Interop\String.fs" />
+    <Compile Include="Utilities\Interop\Strings.fs" />
+    <Compile Include="Utilities\Interop\SortedSet.fs" />
+    <Compile Include="Utilities\Interop\HashSet.fs" />
+    <Compile Include="Utilities\Interop\CSharpList.fs" />
+    <Compile Include="Utilities\Interop\ArraySegment.fs" />
+    <Compile Include="Utilities\Pickler\FsPicklerExtensions.fs" />
+    <Compile Include="Utilities\Pickler\AdaptivePicklers.fs" />
+    <Compile Include="Utilities\Measures.fs" />
+    <Compile Include="Utilities\Lens.fs" />
+    <Compile Include="Utilities\Monoid.fs" />
+    <Compile Include="Utilities\Monads.fs" />
+    <Compile Include="Math\Math.fs" />
+    <Compile Include="Math\Vectors.fs" />
+    <Compile Include="Math\Matrix.fs" />
+    <Compile Include="Math\SVDM33f.fs" />
+    <Compile Include="Math\AverageWindow.fs" />
+    <Compile Include="Math\Converters.fs" />
     <Compile Include="Datastructures\Mutable\FixedSizeArray.fs" />
     <Compile Include="Datastructures\Mutable\Order.fs" />
     <Compile Include="Datastructures\Mutable\OrderMaintenance.fs" />
@@ -69,23 +74,19 @@
     <Compile Include="Runtime\Fragments.fs" />
     <Compile Include="Runtime\CustomSchedulers.fs" />
     <Compile Include="Runtime\Caches.fs" />
-    <Compile Include="SVDM33f.fs" />
-    <Compile Include="String.fs" />
-    <Compile Include="Runtime.fs" />
-    <Compile Include="Control.fs" />
-    <Compile Include="FsPicklerExtensions.fs" />
-    <Compile Include="AdaptivePicklers.fs" />
-    <Compile Include="Ag.fs" />
-    <None Include="paket.references" />
     <Compile Include="Native\BlobStore.fs" />
     <Compile Include="Native\Pointer.fs" />
     <Compile Include="Native\Memory.fs" />
     <Compile Include="Native\FileTable.fs" />
     <Compile Include="Native\Manager.fs" />
     <Compile Include="Native\Store.fs" />
+    <Compile Include="Runtime.fs" />
+    <Compile Include="Ag.fs" />
+    <None Include="paket.references" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aardvark.Base\Aardvark.Base.csproj" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/...vark.Base.FSharp/Prelude/AverageWindow.fs → ...ardvark.Base.FSharp/Math/AverageWindow.fs b/...vark.Base.FSharp/Prelude/AverageWindow.fs → ...ardvark.Base.FSharp/Math/AverageWindow.fs
diff --git a/...ardvark.Base.FSharp/Interop/Converters.fs → src/Aardvark.Base.FSharp/Math/Converters.fs b/...ardvark.Base.FSharp/Interop/Converters.fs → src/Aardvark.Base.FSharp/Math/Converters.fs
diff --git a/src/Aardvark.Base.FSharp/Prelude/Math.fs → src/Aardvark.Base.FSharp/Math/Math.fs b/src/Aardvark.Base.FSharp/Prelude/Math.fs → src/Aardvark.Base.FSharp/Math/Math.fs
diff --git a/src/Aardvark.Base.FSharp/Interop/Matrix.fs → src/Aardvark.Base.FSharp/Math/Matrix.fs b/src/Aardvark.Base.FSharp/Interop/Matrix.fs → src/Aardvark.Base.FSharp/Math/Matrix.fs
diff --git a/src/Aardvark.Base.FSharp/SVDM33f.fs → src/Aardvark.Base.FSharp/Math/SVDM33f.fs b/src/Aardvark.Base.FSharp/SVDM33f.fs → src/Aardvark.Base.FSharp/Math/SVDM33f.fs
diff --git a/src/Aardvark.Base.FSharp/Interop/Vectors.fs → src/Aardvark.Base.FSharp/Math/Vectors.fs b/src/Aardvark.Base.FSharp/Interop/Vectors.fs → src/Aardvark.Base.FSharp/Math/Vectors.fs
diff --git a/...dvark.Base.FSharp/Interop/ArraySegment.fs → ....FSharp/Utilities/Interop/ArraySegment.fs b/...dvark.Base.FSharp/Interop/ArraySegment.fs → ....FSharp/Utilities/Interop/ArraySegment.fs
diff --git a/...ardvark.Base.FSharp/Interop/CSharpList.fs → ...se.FSharp/Utilities/Interop/CSharpList.fs b/...ardvark.Base.FSharp/Interop/CSharpList.fs → ...se.FSharp/Utilities/Interop/CSharpList.fs
diff --git a/...ardvark.Base.FSharp/Interop/Dictionary.fs → ...se.FSharp/Utilities/Interop/Dictionary.fs b/...ardvark.Base.FSharp/Interop/Dictionary.fs → ...se.FSharp/Utilities/Interop/Dictionary.fs
diff --git a/...rk.Base.FSharp/Prelude/FSLibExtensions.fs → ...harp/Utilities/Interop/FSLibExtensions.fs b/...rk.Base.FSharp/Prelude/FSLibExtensions.fs → ...harp/Utilities/Interop/FSLibExtensions.fs
diff --git a/src/Aardvark.Base.FSharp/Interop/HashSet.fs → ....Base.FSharp/Utilities/Interop/HashSet.fs b/src/Aardvark.Base.FSharp/Interop/HashSet.fs → ....Base.FSharp/Utilities/Interop/HashSet.fs
diff --git a/...Aardvark.Base.FSharp/Interop/SortedSet.fs → ...ase.FSharp/Utilities/Interop/SortedSet.fs b/...Aardvark.Base.FSharp/Interop/SortedSet.fs → ...ase.FSharp/Utilities/Interop/SortedSet.fs
diff --git a/src/Aardvark.Base.FSharp/String.fs → ...k.Base.FSharp/Utilities/Interop/String.fs b/src/Aardvark.Base.FSharp/String.fs → ...k.Base.FSharp/Utilities/Interop/String.fs
diff --git a/src/Aardvark.Base.FSharp/Interop/String.fs → ....Base.FSharp/Utilities/Interop/Strings.fs b/src/Aardvark.Base.FSharp/Interop/String.fs → ....Base.FSharp/Utilities/Interop/Strings.fs
diff --git a/src/Aardvark.Base.FSharp/Interop/Symbol.fs → ...k.Base.FSharp/Utilities/Interop/Symbol.fs b/src/Aardvark.Base.FSharp/Interop/Symbol.fs → ...k.Base.FSharp/Utilities/Interop/Symbol.fs
diff --git a/src/Aardvark.Base.FSharp/Prelude/Lens.fs → src/Aardvark.Base.FSharp/Utilities/Lens.fs b/src/Aardvark.Base.FSharp/Prelude/Lens.fs → src/Aardvark.Base.FSharp/Utilities/Lens.fs
diff --git a/src/Aardvark.Base.FSharp/Prelude/Logging.fs → ...Aardvark.Base.FSharp/Utilities/Logging.fs b/src/Aardvark.Base.FSharp/Prelude/Logging.fs → ...Aardvark.Base.FSharp/Utilities/Logging.fs
diff --git a/src/Aardvark.Base.FSharp/Prelude/Measures.fs → ...ardvark.Base.FSharp/Utilities/Measures.fs b/src/Aardvark.Base.FSharp/Prelude/Measures.fs → ...ardvark.Base.FSharp/Utilities/Measures.fs
@@ -135,8 +135,8 @@ type MicroTime =
         new (ts : TimeSpan) = { TotalNanoseconds = ts.Ticks * (1000000000L / TimeSpan.TicksPerSecond) }
         new (ns : float) =
             { TotalNanoseconds =
-                if isFinite ns then int64 ns
-                elif isPositiveInfinity ns then Int64.MaxValue
+                if Fun.IsFinite ns then int64 ns
+                elif Fun.IsPositiveInfinity ns then Int64.MaxValue
                 else Int64.MinValue
             }
 

diff --git a/src/Aardvark.Base.FSharp/Control.fs → src/Aardvark.Base.FSharp/Utilities/Monads.fs b/src/Aardvark.Base.FSharp/Control.fs → src/Aardvark.Base.FSharp/Utilities/Monads.fs
diff --git a/src/Aardvark.Base.FSharp/Prelude/Monoid.fs → src/Aardvark.Base.FSharp/Utilities/Monoid.fs b/src/Aardvark.Base.FSharp/Prelude/Monoid.fs → src/Aardvark.Base.FSharp/Utilities/Monoid.fs
diff --git a/src/Aardvark.Base.FSharp/AdaptivePicklers.fs → ...arp/Utilities/Pickler/AdaptivePicklers.fs b/src/Aardvark.Base.FSharp/AdaptivePicklers.fs → ...arp/Utilities/Pickler/AdaptivePicklers.fs
diff --git a/...rdvark.Base.FSharp/FsPicklerExtensions.fs → .../Utilities/Pickler/FsPicklerExtensions.fs b/...rdvark.Base.FSharp/FsPicklerExtensions.fs → .../Utilities/Pickler/FsPicklerExtensions.fs