From b703da9ff2b81ccaf0cf141dd09d66206408ae9e Mon Sep 17 00:00:00 2001
From: Martin <mautner@vrvis.at>
Date: Wed, 19 Jun 2024 12:13:37 +0200
Subject: [PATCH] [Tests] Reorganize files

---
 .../Aardvark.Base.FSharp.Benchmarks.fsproj    |  1 -
 .../Aardvark.Base.FSharp.Tests.fsproj         | 19 ++++++++++---------
 .../{ => Datastructures}/MapExt.fs            |  0
 .../OrderMaintenanceTrie.fs                   |  0
 .../Datastructures/RangeSetTests.fs}          |  2 +-
 .../{ => Datastructures}/SortedSetExt.fs      |  5 ++---
 .../{ => Math}/MathTests.fs                   |  0
 .../{ => Math}/SVDTests.fs                    |  0
 .../{ => Math}/TrafoTests.fs                  |  0
 .../{ => Tensors}/PixTests.fs                 |  0
 .../{ => Tensors}/TensorMathTests.fs          |  0
 .../{ => Tensors}/TensorTests.fs              |  0
 12 files changed, 13 insertions(+), 14 deletions(-)
 rename src/Tests/Aardvark.Base.FSharp.Tests/{ => Datastructures}/MapExt.fs (100%)
 rename src/Tests/Aardvark.Base.FSharp.Tests/{ => Datastructures}/OrderMaintenanceTrie.fs (100%)
 rename src/Tests/{Aardvark.Base.FSharp.Benchmarks/RangeSet.fs => Aardvark.Base.FSharp.Tests/Datastructures/RangeSetTests.fs} (99%)
 rename src/Tests/Aardvark.Base.FSharp.Tests/{ => Datastructures}/SortedSetExt.fs (94%)
 rename src/Tests/Aardvark.Base.FSharp.Tests/{ => Math}/MathTests.fs (100%)
 rename src/Tests/Aardvark.Base.FSharp.Tests/{ => Math}/SVDTests.fs (100%)
 rename src/Tests/Aardvark.Base.FSharp.Tests/{ => Math}/TrafoTests.fs (100%)
 rename src/Tests/Aardvark.Base.FSharp.Tests/{ => Tensors}/PixTests.fs (100%)
 rename src/Tests/Aardvark.Base.FSharp.Tests/{ => Tensors}/TensorMathTests.fs (100%)
 rename src/Tests/Aardvark.Base.FSharp.Tests/{ => Tensors}/TensorTests.fs (100%)

diff --git a/src/Tests/Aardvark.Base.FSharp.Benchmarks/Aardvark.Base.FSharp.Benchmarks.fsproj b/src/Tests/Aardvark.Base.FSharp.Benchmarks/Aardvark.Base.FSharp.Benchmarks.fsproj
index a5ede4d7a..4066b6ef5 100644
--- a/src/Tests/Aardvark.Base.FSharp.Benchmarks/Aardvark.Base.FSharp.Benchmarks.fsproj
+++ b/src/Tests/Aardvark.Base.FSharp.Benchmarks/Aardvark.Base.FSharp.Benchmarks.fsproj
@@ -22,7 +22,6 @@
   </PropertyGroup>
   <ItemGroup>
     <None Include="paket.references" />
-    <Compile Include="RangeSet.fs" />
     <None Include="Tuples_template.fs" />
     <Compile Include="Tuples_auto.fs" />
     <Compile Include="ActivePatterns.fs" />
diff --git a/src/Tests/Aardvark.Base.FSharp.Tests/Aardvark.Base.FSharp.Tests.fsproj b/src/Tests/Aardvark.Base.FSharp.Tests/Aardvark.Base.FSharp.Tests.fsproj
index 9378d6454..854a7c3fd 100644
--- a/src/Tests/Aardvark.Base.FSharp.Tests/Aardvark.Base.FSharp.Tests.fsproj
+++ b/src/Tests/Aardvark.Base.FSharp.Tests/Aardvark.Base.FSharp.Tests.fsproj
@@ -18,20 +18,21 @@
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="data\test.jpg" />
+    <Compile Include="Math\MathTests.fs" />
+    <Compile Include="Math\TrafoTests.fs" />
+    <Compile Include="Math\SVDTests.fs" />
+    <Compile Include="Tensors\TensorTests.fs" />
+    <Compile Include="Tensors\TensorMathTests.fs" />
+    <Compile Include="Tensors\PixTests.fs" />
+    <Compile Include="Datastructures\RangeSetTests.fs" />
+    <Compile Include="Datastructures\SortedSetExt.fs" />
+    <Compile Include="Datastructures\MapExt.fs" />
+    <Compile Include="Datastructures\OrderMaintenanceTrie.fs" />
     <Compile Include="EnumTests.fs" />
-    <Compile Include="MathTests.fs" />
-    <Compile Include="TrafoTests.fs" />
-    <Compile Include="TensorTests.fs" />
-    <Compile Include="TensorMathTests.fs" />
-    <Compile Include="PixTests.fs" />
-    <Compile Include="SVDTests.fs" />
     <Compile Include="CachesTest.fs" />
     <Compile Include="PureAgTests.fs" />
     <Compile Include="NativeMemory.fs" />
     <Compile Include="ControlTests.fs" />
-    <Compile Include="SortedSetExt.fs" />
-    <Compile Include="MapExt.fs" />
-    <Compile Include="OrderMaintenanceTrie.fs" />
     <Compile Include="SizeOfTests.fs" />
     <Compile Include="Program.fs" />
   </ItemGroup>
diff --git a/src/Tests/Aardvark.Base.FSharp.Tests/MapExt.fs b/src/Tests/Aardvark.Base.FSharp.Tests/Datastructures/MapExt.fs
similarity index 100%
rename from src/Tests/Aardvark.Base.FSharp.Tests/MapExt.fs
rename to src/Tests/Aardvark.Base.FSharp.Tests/Datastructures/MapExt.fs
diff --git a/src/Tests/Aardvark.Base.FSharp.Tests/OrderMaintenanceTrie.fs b/src/Tests/Aardvark.Base.FSharp.Tests/Datastructures/OrderMaintenanceTrie.fs
similarity index 100%
rename from src/Tests/Aardvark.Base.FSharp.Tests/OrderMaintenanceTrie.fs
rename to src/Tests/Aardvark.Base.FSharp.Tests/Datastructures/OrderMaintenanceTrie.fs
diff --git a/src/Tests/Aardvark.Base.FSharp.Benchmarks/RangeSet.fs b/src/Tests/Aardvark.Base.FSharp.Tests/Datastructures/RangeSetTests.fs
similarity index 99%
rename from src/Tests/Aardvark.Base.FSharp.Benchmarks/RangeSet.fs
rename to src/Tests/Aardvark.Base.FSharp.Tests/Datastructures/RangeSetTests.fs
index 35310b925..46e5e0586 100644
--- a/src/Tests/Aardvark.Base.FSharp.Benchmarks/RangeSet.fs
+++ b/src/Tests/Aardvark.Base.FSharp.Tests/Datastructures/RangeSetTests.fs
@@ -1,4 +1,4 @@
-namespace Aardvark.Base.FSharp.Benchmarks
+namespace Aardvark.Base.FSharp.Tests
 
 open System
 open Aardvark.Base
diff --git a/src/Tests/Aardvark.Base.FSharp.Tests/SortedSetExt.fs b/src/Tests/Aardvark.Base.FSharp.Tests/Datastructures/SortedSetExt.fs
similarity index 94%
rename from src/Tests/Aardvark.Base.FSharp.Tests/SortedSetExt.fs
rename to src/Tests/Aardvark.Base.FSharp.Tests/Datastructures/SortedSetExt.fs
index 5a84de97c..ed1f84a70 100644
--- a/src/Tests/Aardvark.Base.FSharp.Tests/SortedSetExt.fs
+++ b/src/Tests/Aardvark.Base.FSharp.Tests/Datastructures/SortedSetExt.fs
@@ -1,5 +1,4 @@
 namespace Aardvark.Base.FSharp.Tests
-#nowarn "44"
 
 open System
 open Aardvark.Base
@@ -48,7 +47,7 @@ module SortedSetNeighbours =
             Console.WriteLine("iteration {0}: {1}", i, d.Count)
 
             if remove && i > 200 then
-                let kvp = d |> Seq.nth (r.Next(d.Count))
+                let kvp = d |> Seq.item (r.Next(d.Count))
                 d.Remove kvp.Key |> should be True
                 values.Add kvp.Key |> should be True
                 content.Remove kvp.Key |> should be True
@@ -63,7 +62,7 @@ module SortedSetNeighbours =
 
                 ()
             else
-                let v = values |> Seq.nth (r.Next values.Count)
+                let v = values |> Seq.item (r.Next values.Count)
                 values.Remove v |> should be True
 
                 let l,s,r = d |> SortedDictionary.neighbourhood v
diff --git a/src/Tests/Aardvark.Base.FSharp.Tests/MathTests.fs b/src/Tests/Aardvark.Base.FSharp.Tests/Math/MathTests.fs
similarity index 100%
rename from src/Tests/Aardvark.Base.FSharp.Tests/MathTests.fs
rename to src/Tests/Aardvark.Base.FSharp.Tests/Math/MathTests.fs
diff --git a/src/Tests/Aardvark.Base.FSharp.Tests/SVDTests.fs b/src/Tests/Aardvark.Base.FSharp.Tests/Math/SVDTests.fs
similarity index 100%
rename from src/Tests/Aardvark.Base.FSharp.Tests/SVDTests.fs
rename to src/Tests/Aardvark.Base.FSharp.Tests/Math/SVDTests.fs
diff --git a/src/Tests/Aardvark.Base.FSharp.Tests/TrafoTests.fs b/src/Tests/Aardvark.Base.FSharp.Tests/Math/TrafoTests.fs
similarity index 100%
rename from src/Tests/Aardvark.Base.FSharp.Tests/TrafoTests.fs
rename to src/Tests/Aardvark.Base.FSharp.Tests/Math/TrafoTests.fs
diff --git a/src/Tests/Aardvark.Base.FSharp.Tests/PixTests.fs b/src/Tests/Aardvark.Base.FSharp.Tests/Tensors/PixTests.fs
similarity index 100%
rename from src/Tests/Aardvark.Base.FSharp.Tests/PixTests.fs
rename to src/Tests/Aardvark.Base.FSharp.Tests/Tensors/PixTests.fs
diff --git a/src/Tests/Aardvark.Base.FSharp.Tests/TensorMathTests.fs b/src/Tests/Aardvark.Base.FSharp.Tests/Tensors/TensorMathTests.fs
similarity index 100%
rename from src/Tests/Aardvark.Base.FSharp.Tests/TensorMathTests.fs
rename to src/Tests/Aardvark.Base.FSharp.Tests/Tensors/TensorMathTests.fs
diff --git a/src/Tests/Aardvark.Base.FSharp.Tests/TensorTests.fs b/src/Tests/Aardvark.Base.FSharp.Tests/Tensors/TensorTests.fs
similarity index 100%
rename from src/Tests/Aardvark.Base.FSharp.Tests/TensorTests.fs
rename to src/Tests/Aardvark.Base.FSharp.Tests/Tensors/TensorTests.fs