Skip to content
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
12 changes: 6 additions & 6 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@ jobs:
fail-fast: false
matrix:
julia-version:
- '1.9'
- '1.11'
- 'nightly'
os:
- ubuntu-latest
include:
- os: macOS-latest
julia-version: '1.9'
julia-version: '1.11'

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
# For Codecov, we must also fetch the parent of the HEAD commit to
# be able to properly deal with PRs / merges
fetch-depth: 2
- name: "Set up Julia"
uses: julia-actions/setup-julia@v2
uses: julia-actions/setup-julia@v3
with:
version: ${{ matrix.julia-version }}
- name: Cache artifacts
uses: actions/cache@v4
uses: actions/cache@v3
env:
cache-name: cache-artifacts
with:
Expand All @@ -59,4 +59,4 @@ jobs:
uses: julia-actions/julia-processcoverage@v1
- name: "Upload coverage data to Codecov"
continue-on-error: true
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v6
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "GenericDecMats"
uuid = "a98d1166-8d3f-4eaf-b2a4-26e52ad22d9c"
authors = ["ThomasBreuer <sam@math.rwth-aachen.de>"]
version = "0.1.2"
version = "0.1.3"

[deps]
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
Expand All @@ -10,7 +10,7 @@ Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"

[compat]
JSON = "0.21"
JSON = "1.6"
Requires = "1.2"
julia = "1.6"

Expand Down
10 changes: 5 additions & 5 deletions src/for_oscar.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# in the Oscar context
function _decomposition_matrix_from_list_Oscar(list::Vector, indets::Vector{String}, m::Int, n::Int)
if length(indets) > 0
R, vars = Oscar.PolynomialRing(Oscar.ZZ, indets)
R, vars = Oscar.polynomial_ring(Oscar.ZZ, indets)
else
R, vars = (Oscar.ZZ, Oscar.fmpz[])
R, vars = (Oscar.ZZ, Oscar.ZZRingElem[])
end

# Construct the decomposition matrix.
Expand Down Expand Up @@ -40,8 +40,8 @@ end

function load_references()
file = joinpath(@__DIR__, "..", "doc", "References.bib.xml")
prs = Oscar.GAP.Globals.ParseBibXMLextFiles(Oscar.GAP.julia_to_gap(file))::Oscar.GAP.GapObj
txt = Oscar.GAP.julia_to_gap("Text")::Oscar.GAP.GapObj
prs = Oscar.GAP.Globals.ParseBibXMLextFiles(Oscar.GAP.GapObj(file))::Oscar.GAP.GapObj
txt = Oscar.GAP.GapObj("Text")::Oscar.GAP.GapObj
for e in prs.entries
r = Oscar.GAP.Globals.RecBibXMLEntry(e, txt, prs.strings)::Oscar.GAP.GapObj
gdm_references[Oscar.GAP.gap_to_julia(r.Label)] = e
Expand All @@ -50,7 +50,7 @@ end
load_references()

function formatted_reference(label::AbstractString)
txt = Oscar.GAP.julia_to_gap("Text")
txt = Oscar.GAP.GapObj("Text")
Globals = Oscar.GAP.Globals
r = gdm_references[label]::Oscar.GAP.GapObj
origin = Globals.StringBibXMLEntry(r, txt)
Expand Down
10 changes: 6 additions & 4 deletions test/testcons.jl
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,12 @@

# The dimension of the matrix must fit.
l1 = length(Chevie.charnames(Chevie.UnipotentCharacters(R), TeX = true))
obj = GenericDecMats.generic_decomposition_matrix(nam)
l2 = length(obj.ordinary)
if l1 != l2 && obj.is_complete == true
error("$nam: ordinary has length $l2 (should be $l1)")
for context in keys(GenericDecMats._decomposition_matrix_from_list)
obj = GenericDecMats.generic_decomposition_matrix(nam, context)
l2 = length(obj.ordinary)
if l1 != l2 && obj.is_complete == true
error("$nam: ordinary has length $l2 (should be $l1)")
end
end

# Let Chevie interpret the matrix.
Expand Down
Loading