[Tests] Reorganize files

aardvark-platform · Jun 19, 2024 · b703da9 · b703da9
1 parent bb6bfd8
commit b703da9
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 14 deletions.
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
@@ -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
@@ -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/...ests/Aardvark.Base.FSharp.Tests/MapExt.fs → ...ase.FSharp.Tests/Datastructures/MapExt.fs b/...ests/Aardvark.Base.FSharp.Tests/MapExt.fs → ...ase.FSharp.Tests/Datastructures/MapExt.fs
diff --git a/...Base.FSharp.Tests/OrderMaintenanceTrie.fs → ...ts/Datastructures/OrderMaintenanceTrie.fs b/...Base.FSharp.Tests/OrderMaintenanceTrie.fs → ...ts/Datastructures/OrderMaintenanceTrie.fs
diff --git a/...rdvark.Base.FSharp.Benchmarks/RangeSet.fs → ...arp.Tests/Datastructures/RangeSetTests.fs b/...rdvark.Base.FSharp.Benchmarks/RangeSet.fs → ...arp.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/...ardvark.Base.FSharp.Tests/SortedSetExt.fs → ...harp.Tests/Datastructures/SortedSetExt.fs b/...ardvark.Base.FSharp.Tests/SortedSetExt.fs → ...harp.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/...s/Aardvark.Base.FSharp.Tests/MathTests.fs → ...dvark.Base.FSharp.Tests/Math/MathTests.fs b/...s/Aardvark.Base.FSharp.Tests/MathTests.fs → ...dvark.Base.FSharp.Tests/Math/MathTests.fs
diff --git a/...ts/Aardvark.Base.FSharp.Tests/SVDTests.fs → ...rdvark.Base.FSharp.Tests/Math/SVDTests.fs b/...ts/Aardvark.Base.FSharp.Tests/SVDTests.fs → ...rdvark.Base.FSharp.Tests/Math/SVDTests.fs
diff --git a/.../Aardvark.Base.FSharp.Tests/TrafoTests.fs → ...vark.Base.FSharp.Tests/Math/TrafoTests.fs b/.../Aardvark.Base.FSharp.Tests/TrafoTests.fs → ...vark.Base.FSharp.Tests/Math/TrafoTests.fs
diff --git a/...ts/Aardvark.Base.FSharp.Tests/PixTests.fs → ...ark.Base.FSharp.Tests/Tensors/PixTests.fs b/...ts/Aardvark.Base.FSharp.Tests/PixTests.fs → ...ark.Base.FSharp.Tests/Tensors/PixTests.fs
diff --git a/...vark.Base.FSharp.Tests/TensorMathTests.fs → ...e.FSharp.Tests/Tensors/TensorMathTests.fs b/...vark.Base.FSharp.Tests/TensorMathTests.fs → ...e.FSharp.Tests/Tensors/TensorMathTests.fs
diff --git a/...Aardvark.Base.FSharp.Tests/TensorTests.fs → ....Base.FSharp.Tests/Tensors/TensorTests.fs b/...Aardvark.Base.FSharp.Tests/TensorTests.fs → ....Base.FSharp.Tests/Tensors/TensorTests.fs