Merged

Macaulay2 · Dec 7, 2023 · ad4522f · ad4522f
2 parents ac8301f + 536af0a
commit ad4522f
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/Valuations/Valuations.m2 b/Valuations/Valuations.m2
@@ -76,14 +76,12 @@ internalValuation (Function, Thing, Thing) := (v, S, T) -> (
         }
     )
 
+-- Concerns with subrings and local rings, will need testing.
 Valuation Thing := (v,t) -> (
-    if (v#"domain" === null) then
-        --(ring t) === v#"domain" then
-        -- Concerns with comparing things like ZZ and QQ
-        -- Concerns with subrings and local rings, will need testing.
-        (v#"function" promote(t,v#"domain"))
-    else
-        (error "Input in wrong domain");
+    if (v#"domain" === null) or (ring t) === v#"domain" then
+        v#"function" t
+    else if (isMember(ring t, v#"domain".baseRings)) then
+        v#"function" promote(t, v#"domain")
     )
 
 --------------------------------------------------------------------------------