fix quotient /saturation for smodule (#835)

oscar-system · Oct 1, 2024 · 14c4df2 · 14c4df2
1 parent aa9bb52
commit 14c4df2
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 7 deletions.
diff --git a/deps/src/ideals.cpp b/deps/src/ideals.cpp
@@ -420,6 +420,14 @@ void singular_define_ideals(jlcxx::Module & Singular)
  return id;
  });
 
+ Singular.method("id_Quotient_M", [](ideal a, ideal b, bool c, ring d) {
+ const ring origin = currRing;
+ rChangeCurrRing(d);
+ ideal id = idQuot(a, b, c, FALSE);
+ rChangeCurrRing(origin);
+ return id;
+ });
+
  Singular.method("id_Intersection", [](ideal a, ideal b, ring c) {
  const ring origin = currRing;
  rChangeCurrRing(c);
@@ -580,6 +588,15 @@ void singular_define_ideals(jlcxx::Module & Singular)
  return std::make_tuple(res, d);
  });
 
+ Singular.method("id_Saturation_M", [](ideal I, ideal J, ring r) {
+ const ring origin = currRing;
+ rChangeCurrRing(r);
+ int d;
+ ideal res = idSaturate(I, J, d, FALSE);
+ rChangeCurrRing(origin);
+ return std::make_tuple(res, d);
+ });
+
  Singular.method("id_Array2Vector", [](void * p, int a, ring o) {
  return id_Array2Vector(reinterpret_cast<poly *>(p), a, o);
  });

diff --git a/src/module/module.jl b/src/module/module.jl
@@ -681,6 +681,13 @@ function quotient(I::smodule{spoly{T}}, J::smodule{spoly{T}}) where T <: Nemo.Fi
  R = base_ring(I)
  S = elem_type(R)
  ptr = GC.@preserve I J R libSingular.id_Quotient(I.ptr, J.ptr, I.isGB, R.ptr)
+ return sideal{S}(R, ptr)
+end
+
+function quotient(I::smodule{spoly{T}}, J::sideal{spoly{T}}) where T <: Nemo.FieldElem
+ R = base_ring(I)
+ S = elem_type(R)
+ ptr = GC.@preserve I J R libSingular.id_Quotient_M(I.ptr, J.ptr, I.isGB, R.ptr)
  return Module(smatrix{spoly{T}}(R, ptr))
 end
 
@@ -689,8 +696,10 @@ end
 # Saturation
 #
 ###############################################################################
-function saturation(I::smodule{spoly{T}}, J::smodule{spoly{T}}) where T <: Nemo.FieldElem
- check_parent(I, J)
+function saturation(I::smodule{spoly{T}}, J::sideal{spoly{T}}) where T <: Nemo.FieldElem
+ if I.base_ring != J.base_ring
+ error("different base_ring")
+ end
  has_global_ordering(base_ring(I)) || error("Must be over a ring with global ordering")
  if !I.isGB
  I = std(I)
@@ -706,10 +715,12 @@ function saturation(I::smodule{spoly{T}}, J::smodule{spoly{T}}) where T <: Nemo.
  return I, k - 1
 end
 
-function saturation2(I::smodule{spoly{T}}, J::smodule{spoly{T}}) where T <: Nemo.FieldElem
- check_parent(I, J)
+function saturation2(I::smodule{spoly{T}}, J::sideal{spoly{T}}) where T <: Nemo.FieldElem
+ if I.base_ring != J.base_ring
+ error("different base_ring")
+ end
  R = base_ring(I)
  has_global_ordering(R) || error("Must be over a ring with global ordering")
- ptr_res,k=libSingular.id_Saturation(I.ptr,J.ptr,R.ptr)
+ ptr_res,k=libSingular.id_Saturation_M(I.ptr,J.ptr,R.ptr)
  return (Module(smatrix{spoly{T}}(R,ptr_res))),k
 end
diff --git a/test/module/smodule-test.jl b/test/module/smodule-test.jl
@@ -348,7 +348,7 @@ end
  J = Singular.Module(R, vector(R,x*y^2 + x + 1), vector(R,2x*y + 1), vector(R,x*y + 1))
 
  A = quotient(I, J)
- B = Singular.Module(R, vector(R, 2*y^2+3), vector(R, x^2+x*y+1))
+ B = Singular.Ideal(R, 2*y^2+3, x^2+x*y+1)
  @test A[1] == B[1]
  @test A[2] == B[2]
 end
@@ -357,7 +357,7 @@ end
  R, (x, y) = polynomial_ring(QQ, ["x", "y"])
 
  I = Singular.Module(R, vector(R,(x^2 + x*y + 1)*(2y^2+1)^3), vector(R,(2y^2 + 3)*(2y^2+1)^2))
- J = Singular.Module(R, vector(R,2y^2 + 1))
+ J = Singular.Ideal(R, 2y^2 + 1)
 
  A,k = saturation(I, J)