Skip to content

Commit

Permalink
Merge branch 'master' into lr/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Lax202 committed Sep 18, 2024
2 parents bcb3223 + 91cb5d4 commit 68015e3
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 47 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
- 'release-*'
tags: '*'
pull_request:
schedule:
# Every day at 3:00 AM UTC (Tutorial tests initiated at 2:00AM)
- cron: '0 3 * * *'

concurrency:
# group by workflow and ref; the last slightly strange component ensures that for pull
Expand Down
42 changes: 0 additions & 42 deletions .github/workflows/Invalidations.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .github/workflows/oscar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
pull_request:
branches:
- master
schedule:
# Every day at 3:00 AM UTC (Tutorial tests initiated at 2:00AM)
- cron: '0 3 * * *'

concurrency:
# group by workflow and ref; the last slightly strange component ensures that for pull
Expand Down
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Singular"
uuid = "bcd08a7b-43d2-5ff7-b6d4-c458787f915c"
version = "0.23.4"
version = "0.23.5"

[deps]
AbstractAlgebra = "c3fe647b-3220-5bb0-a1ea-a7954cac585d"
Expand Down Expand Up @@ -29,8 +29,8 @@ Pidfile = "1.3"
Pkg = "1.6"
Random = "1.6"
RandomExtensions = "0.4.2"
Singular_jll = "~404.000.100"
Singular_jll = "~404.000.504"
Statistics = "1.6"
julia = "1.6"
lib4ti2_jll = "1.6.10"
libsingular_julia_jll = "~0.45.2"
libsingular_julia_jll = "~0.45.4"
22 changes: 20 additions & 2 deletions src/map/alghom.jl
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,26 @@ function map_ideal(f::Map(SAlgHom), I::sideal)
algebra homomorphism.")
end

GC.@preserve I f return Ideal(f.codomain, libSingular.maMapIdeal(I.ptr, f.domain.ptr,
f.ptr, f.codomain.ptr, libSingular.ndCopyMap()))
ptr = GC.@preserve I f libSingular.maMapIdeal(I.ptr, f.domain.ptr,
f.ptr, f.codomain.ptr, libSingular.ndCopyMap())

J = Ideal(f.codomain,ptr)
# compare the orderings of f.domain.ptr and f.codomain.ptr
domain_ord=Cint[]
libSingular.rOrdering_helper(domain_ord, f.domain.ptr)
codomain_ord=Cint[]
libSingular.rOrdering_helper(codomain_ord, f.codomain.ptr)
equal_ordering=true
for i in 1:size(domain_ord,1)
if domain_ord[i] != codomain_ord[i]
equal_ordering=false
break
end
end
if equal_ordering
J.isGB = I.isGB
end
return J
end

function map_poly(f::Map(SAlgHom), p::spoly)
Expand Down

0 comments on commit 68015e3

Please sign in to comment.