Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt more experimental code to new conventions #2416

Merged
merged 1 commit into from
Jun 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/doc.main
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"Hecke/orders/frac_ideals.md",
],
"NumberTheory/abelian_closure.md",
"Experimental/galois.md",
"NumberTheory/galois.md",
],

"Polyhedral Geometry" => [
Expand Down
File renamed without changes.
9 changes: 2 additions & 7 deletions experimental/Experimental.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
const expdir = joinpath(@__DIR__, "../experimental")
const oldexppkgs = [
"ExteriorAlgebra",
"GaloisGrp",
"GITFans",
"GModule",
"JuLie",
"Matrix",
"ModStd",
"Rings",
Expand All @@ -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)
Expand All @@ -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")
Expand Down
1 change: 0 additions & 1 deletion experimental/GITFans.jl

This file was deleted.

File renamed without changes.
File renamed without changes.
2 changes: 0 additions & 2 deletions experimental/GaloisGrp.jl

This file was deleted.

2 changes: 2 additions & 0 deletions experimental/GaloisGrp/src/GaloisGrp.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include("Subfields.jl")
include("Solve.jl")
File renamed without changes.
7 changes: 7 additions & 0 deletions experimental/GaloisGrp/test/runtests.jl
Original file line number Diff line number Diff line change
@@ -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

6 changes: 3 additions & 3 deletions experimental/JuLie.jl → experimental/JuLie/src/JuLie.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions experimental/JuLie/test/runtests.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
include("tableaux.jl")
include("schur_polynomials.jl")
include("partitions.jl")
3 changes: 0 additions & 3 deletions src/Oscar.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 0 additions & 3 deletions test/Experimental/JuLie.jl

This file was deleted.

10 changes: 1 addition & 9 deletions test/Experimental/galois.jl → test/NumberTheory/galthy.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@testset "Experimental.galois_group" begin
@testset "galois_group" begin

Zx, x = ZZ["x"]
k, a = number_field(x^5-2)
Expand Down Expand Up @@ -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

7 changes: 1 addition & 6 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down