From 96b03311ceacbb864f7631053ca822579f92323e Mon Sep 17 00:00:00 2001 From: emikelsons Date: Mon, 7 Oct 2024 16:22:28 +0200 Subject: [PATCH] Fixed some bugs that were missed before Some small bug fixes that were missed in some recents pull requests relating to model indexes and other stuff. --- .../src/AbstractFTheoryModels/methods.jl | 2 +- .../Models/model1511_03209.json | 2 +- .../src/LiteratureModels/constructors.jl | 9 ++- .../src/LiteratureModels/create_index.jl | 2 +- .../src/LiteratureModels/model_indices.json | 72 +++++++++---------- .../FTheoryTools/src/TateModels/attributes.jl | 2 +- .../src/WeierstrassModels/attributes.jl | 2 +- 7 files changed, 48 insertions(+), 43 deletions(-) diff --git a/experimental/FTheoryTools/src/AbstractFTheoryModels/methods.jl b/experimental/FTheoryTools/src/AbstractFTheoryModels/methods.jl index 2b101c2d04fa..c001c91d1162 100644 --- a/experimental/FTheoryTools/src/AbstractFTheoryModels/methods.jl +++ b/experimental/FTheoryTools/src/AbstractFTheoryModels/methods.jl @@ -118,7 +118,7 @@ julia> x1, x2, x3, x4, x, y, z = gens(cox_ring(ambient_space(t))) julia> blowup_center = ideal_sheaf(ambient_space(t), ideal([x, y, x1])) Sheaf of ideals - on normal toric variety + on normal, simplicial toric variety with restrictions 1: Ideal (x_5_1, x_4_1, x_1_1) 2: Ideal (1) diff --git a/experimental/FTheoryTools/src/LiteratureModels/Models/model1511_03209.json b/experimental/FTheoryTools/src/LiteratureModels/Models/model1511_03209.json index 80ff80132f17..cac5eb8e8f72 100644 --- a/experimental/FTheoryTools/src/LiteratureModels/Models/model1511_03209.json +++ b/experimental/FTheoryTools/src/LiteratureModels/Models/model1511_03209.json @@ -48,7 +48,7 @@ [1, 2, 3, 4, 6] ], "zero_section_class": "z", - "zero_section": ["1", "1", "0"] + "zero_section": ["1", "1", "0"], "resolutions": [ [ [ diff --git a/experimental/FTheoryTools/src/LiteratureModels/constructors.jl b/experimental/FTheoryTools/src/LiteratureModels/constructors.jl index 720a7704d60e..9aa470fa4d07 100644 --- a/experimental/FTheoryTools/src/LiteratureModels/constructors.jl +++ b/experimental/FTheoryTools/src/LiteratureModels/constructors.jl @@ -203,7 +203,7 @@ function literature_model(model_dict::Dict{String, Any}; model_parameters::Dict{ if model_dict["arxiv_data"]["id"] == "1903.00009" # Read in the QSM-model form the database - model_dict["literature_identifier"] = "1903.00009" + model_dict["literature_identifier"] = "1903_00009" k = model_parameters["k"] qsmd_path = artifact"QSMDB" qsm_model = load(joinpath(qsmd_path, "$k.mrdi")) @@ -276,6 +276,11 @@ function literature_model(model_dict::Dict{String, Any}; model_parameters::Dict{ @req dim(base_space) == Int(model_dict["model_data"]["base_dim"]) "Model requires base dimension different from dimension of provided base" end + # Add additional information that is always known for weierstrass/tate + if (model_dict["model_descriptors"]["type"] == "weierstrass") || (model_dict["model_descriptors"]["type"] == "tate") + model_dict["model_data"]["zero_section_class"] = "z" + end + # Construct the model model = _construct_literature_model_over_concrete_base(model_dict, base_space, defining_classes_provided, completeness_check) @vprint :FTheoryModelPrinter 0 "Construction over concrete base may lead to singularity enhancement. Consider computing singular_loci. However, this may take time!\n\n" @@ -634,7 +639,7 @@ function _set_all_attributes(model::AbstractFTheoryModel, model_dict::Dict{Strin set_zero_section(model, string.(model_dict["model_data"]["zero_section"])) end - if haskey(model_dict["model_data"], "zero_section_class") + if haskey(model_dict["model_data"], "zero_section_class") && base_space(model) isa NormalToricVariety set_zero_section_class(model, string.(model_dict["model_data"]["zero_section_class"])) end diff --git a/experimental/FTheoryTools/src/LiteratureModels/create_index.jl b/experimental/FTheoryTools/src/LiteratureModels/create_index.jl index ed2d5f6534ea..c4a21a1d1435 100644 --- a/experimental/FTheoryTools/src/LiteratureModels/create_index.jl +++ b/experimental/FTheoryTools/src/LiteratureModels/create_index.jl @@ -95,6 +95,6 @@ function _create_literature_model_index() JSON.print(file, index) end open(joinpath(@__DIR__,"model_indices.json"), "w") do file - JSON.print(file, sort(model_indices), 2) + JSON.print(file, model_indices, 2) end end diff --git a/experimental/FTheoryTools/src/LiteratureModels/model_indices.json b/experimental/FTheoryTools/src/LiteratureModels/model_indices.json index 2e040a05df65..291595451dc6 100644 --- a/experimental/FTheoryTools/src/LiteratureModels/model_indices.json +++ b/experimental/FTheoryTools/src/LiteratureModels/model_indices.json @@ -1,48 +1,48 @@ { - "model1109_3454.json": "1", - "model1208_2695-1.json": "2", - "model1208_2695-2.json": "3", - "model1212_2949-1.json": "4", - "model1212_2949-2.json": "5", - "model1212_2949-3.json": "6", - "model1212_2949-4.json": "7", - "model1212_2949-5.json": "8", - "model1212_2949-6.json": "9", - "model1212_2949-7.json": "10", - "model1408_4808-1-WSF.json": "13", + "model1511_03209.json": "46", "model1408_4808-1.json": "14", - "model1408_4808-10-WSF.json": "31", - "model1408_4808-10.json": "32", - "model1408_4808-11-WSF.json": "33", - "model1408_4808-11.json": "34", + "model1408_4808-1-WSF.json": "13", + "model1212_2949-6.json": "9", + "model1408_4808-14.json": "40", "model1408_4808-12-WSF.json": "35", "model1408_4808-12.json": "36", - "model1408_4808-13-WSF.json": "37", - "model1408_4808-13.json": "38", - "model1408_4808-14-WSF.json": "39", - "model1408_4808-14.json": "40", "model1408_4808-15-WSF.json": "41", - "model1408_4808-15.json": "42", - "model1408_4808-16-WSF.json": "43", - "model1408_4808-16.json": "44", - "model1408_4808-2-WSF.json": "15", - "model1408_4808-2.json": "16", - "model1408_4808-3-WSF.json": "17", - "model1408_4808-3.json": "18", - "model1408_4808-4-WSF.json": "19", - "model1408_4808-4.json": "20", - "model1408_4808-5-WSF.json": "21", + "model1212_2949-2.json": "5", + "model1212_2949-7.json": "10", "model1408_4808-5.json": "22", - "model1408_4808-6-WSF.json": "23", - "model1408_4808-6.json": "24", + "model1212_2949-1.json": "4", "model1408_4808-7-WSF.json": "25", "model1408_4808-7.json": "26", - "model1408_4808-8-WSF.json": "27", - "model1408_4808-8.json": "28", + "model1208_2695-2.json": "3", + "model1408_4808-14-WSF.json": "39", + "model1903_00009.json": "45", + "model1408_4808-4-WSF.json": "19", "model1408_4808-9-WSF.json": "29", - "model1408_4808-9.json": "30", + "model1408_4808-6-WSF.json": "23", + "model1408_4808-13-WSF.json": "37", + "model1408_4808-11-WSF.json": "33", + "model1408_4808-10-WSF.json": "31", + "model1212_2949-3.json": "6", "model1507_05954-1.json": "11", + "model1212_2949-4.json": "7", + "model1408_4808-8.json": "28", "model1507_05954-2.json": "12", - "model1511_03209.json": "46", - "model1903_00009.json": "45" + "model1408_4808-4.json": "20", + "model1408_4808-13.json": "38", + "model1408_4808-6.json": "24", + "model1408_4808-15.json": "42", + "model1109_3454.json": "1", + "model1408_4808-5-WSF.json": "21", + "model1408_4808-11.json": "34", + "model1208_2695-1.json": "2", + "model1408_4808-8-WSF.json": "27", + "model1408_4808-10.json": "32", + "model1408_4808-9.json": "30", + "model1408_4808-16.json": "44", + "model1408_4808-3.json": "18", + "model1408_4808-2.json": "16", + "model1408_4808-3-WSF.json": "17", + "model1212_2949-5.json": "8", + "model1408_4808-2-WSF.json": "15", + "model1408_4808-16-WSF.json": "43" } diff --git a/experimental/FTheoryTools/src/TateModels/attributes.jl b/experimental/FTheoryTools/src/TateModels/attributes.jl index e14bcef4fbf2..c641e12bbe36 100644 --- a/experimental/FTheoryTools/src/TateModels/attributes.jl +++ b/experimental/FTheoryTools/src/TateModels/attributes.jl @@ -162,7 +162,7 @@ Global Tate model over a concrete base -- SU(5)xU(1) restricted Tate model based julia> tate_ideal_sheaf(t) Sheaf of ideals - on normal toric variety + on normal, simplicial toric variety with restrictions 1: Ideal with 1 generator 2: Ideal with 1 generator diff --git a/experimental/FTheoryTools/src/WeierstrassModels/attributes.jl b/experimental/FTheoryTools/src/WeierstrassModels/attributes.jl index b5b5da24912d..d1d0cc6f87bc 100644 --- a/experimental/FTheoryTools/src/WeierstrassModels/attributes.jl +++ b/experimental/FTheoryTools/src/WeierstrassModels/attributes.jl @@ -110,7 +110,7 @@ Weierstrass model over a concrete base -- SU(5)xU(1) restricted Tate model based julia> weierstrass_ideal_sheaf(w) Sheaf of ideals - on normal toric variety + on normal, simplicial toric variety with restrictions 1: Ideal with 1 generator 2: Ideal with 1 generator