Merge pull request #403 from SciML/trbasis2

Fixing the internal_ordering

Author: pogudingleb

Project.toml

@@ -40,7 +40,7 @@ IterTools = "1"
 LinearAlgebra = "1.10, 1.11"
 Logging = "1.10, 1.11"
 MacroTools = "0.5"
-ModelingToolkit = "9.33"
+ModelingToolkit = "9.50"
 Nemo = "0.46, 0.47, 0.48, 0.49"
 ParamPunPam = "0.5"
 Pkg = "1.10, 1.11"

src/RationalFunctionFields/IdealMQS.jl

@@ -53,7 +53,7 @@ mutable struct IdealMQS{T} <: AbstractBlackboxIdeal
         sat_varname = "t",
         sat_var_position = :first,
         ordering = :degrevlex,
-        extra_const_polys::Vector{PolyQQ}=Vector{PolyQQ}(),
+        extra_const_polys::Vector{PolyQQ} = Vector{PolyQQ}(),
     ) where {PolyQQ}
         # We are given polynomials of form
         # [[f1, f2, f3, ...], [g1, g2, g3, ...], ...]
@@ -207,7 +207,8 @@ function fractionfree_generators_raw(mqs::IdealMQS)
     nums_qq, dens_qq, const_polys = mqs.nums_qq, mqs.dens_qq, mqs.const_polys
     nums_y = map(num -> parent_ring_change(num, big_ring, matching = :byindex), nums_qq)
     dens_y = map(den -> parent_ring_change(den, big_ring, matching = :byindex), dens_qq)
-    const_polys_y = map(p -> parent_ring_change(p, big_ring, matching = :byindex), const_polys)
+    const_polys_y =
+        map(p -> parent_ring_change(p, big_ring, matching = :byindex), const_polys)
     nums_x = map(num -> parent_ring_change(num, big_ring, matching = :byname), nums_qq)
     dens_x = map(den -> parent_ring_change(den, big_ring, matching = :byname), dens_qq)
     polys = Vector{elem_type(big_ring)}(undef, length(nums_qq) + length(const_polys))
@@ -238,10 +239,16 @@ function ParamPunPam.reduce_mod_p!(
         return nothing
     end
     nums_qq, dens_qq, const_polys = mqs.nums_qq, mqs.dens_qq, mqs.const_polys
-    ring_ff, _ = Nemo.polynomial_ring(ff, map(var_to_str, gens(parent(first(const_polys)))))
+    ring_qq = parent(first(const_polys))
+    ring_ff, _ = Nemo.polynomial_ring(
+        ff,
+        map(var_to_str, gens(ring_qq)),
+        internal_ordering = Nemo.internal_ordering(ring_qq),
+    )
     nums_gf = map(poly -> map_coefficients(c -> ff(c), poly, parent = ring_ff), nums_qq)
     dens_gf = map(poly -> map_coefficients(c -> ff(c), poly, parent = ring_ff), dens_qq)
-    const_polys_gf = map(poly -> map_coefficients(c -> ff(c), poly, parent = ring_ff), const_polys)
+    const_polys_gf =
+        map(poly -> map_coefficients(c -> ff(c), poly, parent = ring_ff), const_polys)
     mqs.cached_nums_gf[ff] = nums_gf
     mqs.cached_dens_gf[ff] = dens_gf
     mqs.cached_const_polys_gf[ff] = const_polys_gf

test/identifiable_functions.jl

@@ -216,6 +216,7 @@ push!(test_cases, (ode = ode, ident_funcs = ident_funcs))
 
 # SLIQR
 # a^2 + 3*a*g - a*s + e*g*s + g^2 - 2*g*s ??
+# appears with internal_ordering being lex (or with strong simplification)
 ode = StructuralIdentifiability.@ODEmodel(
     S'(t) = -b * In(t) * S(t) * Ninv - S(t) * Ninv * u(t),
     In'(t) = -In(t) * g + s * Q(t) + a * L(t),