Removed the symplectic arrays.

JuliaGNI · Dec 20, 2023 · 2aa6919 · 2aa6919
1 parent 882fa04
commit 2aa6919
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/test/arrays/array_tests.jl b/test/arrays/array_tests.jl
@@ -53,6 +53,7 @@ function skew_mat_mul_test2(n, T=Float64)
     AS2 = A*Matrix{T}(S)
     @test isapprox(AS1, AS2)
 end
+
 # test Stiefel manifold projection test 
 function stiefel_proj_test(N,n)
     In = I(n)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -3,6 +3,7 @@ using SafeTestsets
 
 @safetestset "Check parameterlength                                                           " begin include("parameterlength/check_parameterlengths.jl") end
 @safetestset "Arrays #1                                                                       " begin include("arrays/array_tests.jl") end
+<<<<<<< HEAD
 @safetestset "Sampling of arrays                                                              " begin include("arrays/random_generation_of_custom_arrays.jl") end
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -15,6 +16,9 @@ using SafeTestsets
 =======
 @safetestset "Test constructors for custom arrays                                             " begin include("arrays/constructor_tests_for_custom_arrays.jl") end
 >>>>>>> 4e6f264 (Resolved merge conflict.)
+=======
+@safetestset "Test constructors for custom arrays                                             " begin include("arrays/constructor_tests_for_custom_arrays.jl") end
+>>>>>>> b05c66c (Removed the symplectic arrays.)
 @safetestset "Manifolds (Grassmann):                                                          " begin include("manifolds/grassmann_manifold.jl") end
 @safetestset "Gradient Layer                                                                  " begin include("layers/gradient_layer_tests.jl") end
 @safetestset "Test symplecticity of upscaling layer                                           " begin include("layers/sympnet_layers_test.jl") end