Adapt more experimental code to new conventions (#2416)

Also move the Galois group documentation out of experimental, as the code it documents is no longer experimental.
oscar-system · Jun 1, 2023 · 1d0b766 · 1d0b766
1 parent 7c212d4
commit 1d0b766
Show file tree

Hide file tree

Showing 24 changed files with 20 additions and 35 deletions.
diff --git a/docs/doc.main b/docs/doc.main
@@ -99,7 +99,7 @@
         "Hecke/orders/frac_ideals.md",
      ],
      "NumberTheory/abelian_closure.md",
-     "Experimental/galois.md",
+     "NumberTheory/galois.md",
   ],
 
   "Polyhedral Geometry" => [

diff --git a/docs/src/Experimental/galois.md → docs/src/NumberTheory/galois.md b/docs/src/Experimental/galois.md → docs/src/NumberTheory/galois.md
diff --git a/experimental/Experimental.jl b/experimental/Experimental.jl
@@ -5,10 +5,7 @@
 const expdir = joinpath(@__DIR__, "../experimental")
 const oldexppkgs = [
   "ExteriorAlgebra",
-  "GaloisGrp",
-  "GITFans",
   "GModule",
-  "JuLie",
   "Matrix",
   "ModStd",
   "Rings",
@@ -21,6 +18,8 @@ const oldexppkgs = [
 const orderedpkgs = [
   "ToricSchemes",
   "FTheoryTools",
+  "JuLie",
+  "IntersectionTheory",
 ]
 exppkgs = filter(x->isdir(joinpath(expdir, x)) && !(x in oldexppkgs) && !(x in orderedpkgs), readdir(expdir))
 append!(exppkgs, orderedpkgs)
@@ -38,16 +37,12 @@ end
 # force trigger recompile when folder changes
 include_dependency(".")
 
-include("JuLie.jl")
-
 for pkg in Oscar.exppkgs
   include("$pkg/src/$pkg.jl")
 end
 
-include("GaloisGrp.jl")
 include("Rings.jl")
 include("ModStd.jl")
-include("GITFans.jl")
 include("GModule.jl")
 
 include("Schemes/Types.jl")

diff --git a/experimental/GITFans.jl b/experimental/GITFans.jl
diff --git a/experimental/GITFans/GITFans.jl → experimental/GITFans/src/GITFans.jl b/experimental/GITFans/GITFans.jl → experimental/GITFans/src/GITFans.jl
diff --git a/test/Experimental/GITFans.jl → experimental/GITFans/test/runtests.jl b/test/Experimental/GITFans.jl → experimental/GITFans/test/runtests.jl
diff --git a/experimental/GaloisGrp.jl b/experimental/GaloisGrp.jl
diff --git a/experimental/GaloisGrp/src/GaloisGrp.jl b/experimental/GaloisGrp/src/GaloisGrp.jl
@@ -0,0 +1,2 @@
+include("Subfields.jl")
+include("Solve.jl")
diff --git a/experimental/GaloisGrp/Solve.jl → experimental/GaloisGrp/src/Solve.jl b/experimental/GaloisGrp/Solve.jl → experimental/GaloisGrp/src/Solve.jl
diff --git a/experimental/GaloisGrp/Subfields.jl → experimental/GaloisGrp/src/Subfields.jl b/experimental/GaloisGrp/Subfields.jl → experimental/GaloisGrp/src/Subfields.jl
diff --git a/experimental/GaloisGrp/test/runtests.jl b/experimental/GaloisGrp/test/runtests.jl
@@ -0,0 +1,7 @@
+@testset "SolveByRadicals" begin
+  Qx, x = QQ["x"]
+  K, r = solve(x^3+3*x+5)
+  @test absolute_degree(K) == 12
+  @test length(r) == 3
+end
+
diff --git a/experimental/JuLie.jl → experimental/JuLie/src/JuLie.jl b/experimental/JuLie.jl → experimental/JuLie/src/JuLie.jl
@@ -3,9 +3,9 @@ module JuLie
 using ..Oscar
 import Oscar: IntegerUnion
 
-include("JuLie/partitions.jl")
-include("JuLie/schur_polynomials.jl")
-include("JuLie/tableaux.jl")
+include("partitions.jl")
+include("schur_polynomials.jl")
+include("tableaux.jl")
 
 end
 

diff --git a/experimental/JuLie/partitions.jl → experimental/JuLie/src/partitions.jl b/experimental/JuLie/partitions.jl → experimental/JuLie/src/partitions.jl
diff --git a/experimental/JuLie/schur_polynomials.jl → experimental/JuLie/src/schur_polynomials.jl b/experimental/JuLie/schur_polynomials.jl → experimental/JuLie/src/schur_polynomials.jl
diff --git a/experimental/JuLie/tableaux.jl → experimental/JuLie/src/tableaux.jl b/experimental/JuLie/tableaux.jl → experimental/JuLie/src/tableaux.jl
diff --git a/test/Experimental/JuLie/partitions.jl → experimental/JuLie/test/partitions.jl b/test/Experimental/JuLie/partitions.jl → experimental/JuLie/test/partitions.jl
diff --git a/experimental/JuLie/test/runtests.jl b/experimental/JuLie/test/runtests.jl
@@ -0,0 +1,3 @@
+include("tableaux.jl")
+include("schur_polynomials.jl")
+include("partitions.jl")
diff --git a/test/Experimental/JuLie/schur_polynomials.jl → experimental/JuLie/test/schur_polynomials.jl b/test/Experimental/JuLie/schur_polynomials.jl → experimental/JuLie/test/schur_polynomials.jl
diff --git a/test/Experimental/JuLie/tableaux.jl → experimental/JuLie/test/tableaux.jl b/test/Experimental/JuLie/tableaux.jl → experimental/JuLie/test/tableaux.jl
diff --git a/...tal/SymmetricIntersections/docs/docs.main → ...ntal/SymmetricIntersections/docs/doc.main b/...tal/SymmetricIntersections/docs/docs.main → ...ntal/SymmetricIntersections/docs/doc.main
diff --git a/src/Oscar.jl b/src/Oscar.jl
@@ -205,9 +205,6 @@ if is_dev
 #  include("../examples/ModStdQ.jl")
 #  include("../examples/ModStdQt.jl")
   include("../examples/PrimDec.jl")
-#  include("../examples/GaloisGrp.jl")
-
-#  include("../examples/PlaneCurve.jl")
 end
 
 include("Serialization/main.jl")

diff --git a/test/Experimental/JuLie.jl b/test/Experimental/JuLie.jl
diff --git a/test/Experimental/galois.jl → test/NumberTheory/galthy.jl b/test/Experimental/galois.jl → test/NumberTheory/galthy.jl
@@ -1,4 +1,4 @@
-@testset "Experimental.galois_group" begin
+@testset "galois_group" begin
 
   Zx, x = ZZ["x"]
   k, a = number_field(x^5-2)
@@ -64,11 +64,3 @@ sample_cycle_structures(G::PermGroup) = Set(cycle_structure(rand_pseudo(G)) for
   end
 
 end
-
-@testset "SolveByRadicals" begin
-  Qx, x = QQ["x"]
-  K, r = solve(x^3+3*x+5)
-  @test absolute_degree(K) == 12
-  @test length(r) == 3
-end
-
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -96,21 +96,16 @@ include("Groups/runtests.jl")
 include("Rings/runtests.jl")
 
 include("NumberTheory/nmbthy.jl")
-
-if Oscar.is_dev
-  include("Experimental/GITFans.jl")
-end
+include("NumberTheory/galthy.jl")
 
 # Will automatically include all experimental packages following our
 # guidelines.
 include("../experimental/runtests.jl")
 
-include("Experimental/galois.jl")
 include("Experimental/gmodule.jl")
 include("Experimental/ModStdQt.jl")
 include("Experimental/ModStdNF.jl")
 include("Experimental/MatrixGroups.jl")
-include("Experimental/JuLie.jl")
 include("Experimental/ExteriorAlgebra.jl")
 
 include("Rings/ReesAlgebra.jl")