diff --git a/M2/Macaulay2/packages/NormalToricVarieties/ToricVarieties.m2 b/M2/Macaulay2/packages/NormalToricVarieties/ToricVarieties.m2 index 6822e747512..325f8997621 100644 --- a/M2/Macaulay2/packages/NormalToricVarieties/ToricVarieties.m2 +++ b/M2/Macaulay2/packages/NormalToricVarieties/ToricVarieties.m2 @@ -673,8 +673,10 @@ makePrimitive List := List => w -> ( apply(w, i -> i // g) ); -toricBlowup = method () -toricBlowup (List, NormalToricVariety, List) := NormalToricVariety => (s, X, v) -> ( +toricBlowup = method(Options => { WeilToClass => null }) +toricBlowup(List, NormalToricVariety) := NormalToricVariety => opts -> (s, X) -> ( + toricBlowup(s, X, makePrimitive sum ((rays X)_s), opts)) +toricBlowup(List, NormalToricVariety, List) := NormalToricVariety => opts -> (s, X, v) -> ( coneList := max X; starIndex := positions (coneList, t -> all (s, i -> member (i,t))); star := coneList_starIndex; @@ -693,7 +695,10 @@ toricBlowup (List, NormalToricVariety, List) := NormalToricVariety => (s, X, v) if member (s#0,t) then continue else sort (t | s) ); - Z := normalToricVariety (rays X, coneList | coneList', CoefficientRing => X.cache.CoefficientRing, Variable => X.cache.Variable); + Z := normalToricVariety(rays X, coneList | coneList', + CoefficientRing => X.cache.CoefficientRing, + Variable => X.cache.Variable, + WeilToClass => opts.WeilToClass); Z.cache.toricBlowup = X; return Z ); @@ -701,16 +706,14 @@ toricBlowup (List, NormalToricVariety, List) := NormalToricVariety => (s, X, v) if all (s, i -> member (i,t)) then continue else t | {n} ); - Z = normalToricVariety (rays X | {v}, coneList | coneList', CoefficientRing => X.cache.CoefficientRing, Variable => X.cache.Variable); + Z = normalToricVariety(rays X | {v}, coneList | coneList', + CoefficientRing => X.cache.CoefficientRing, + Variable => X.cache.Variable, + WeilToClass => opts.WeilToClass); Z.cache.toricBlowup = X; Z ); -toricBlowup (List, NormalToricVariety) := NormalToricVariety => (s,X) -> ( - v := makePrimitive sum ((rays X)_s); - toricBlowup (s,X,v) - ); - makeSmooth = method( TypicalValue => NormalToricVariety, Options => {Strategy => 0} diff --git a/M2/Macaulay2/packages/Varieties.m2 b/M2/Macaulay2/packages/Varieties.m2 index 0242364e44d..ccdfe025ff6 100644 --- a/M2/Macaulay2/packages/Varieties.m2 +++ b/M2/Macaulay2/packages/Varieties.m2 @@ -71,7 +71,6 @@ export { -- Functors "hh", -- TODO: should this be defined in Core? "OO", - "RHom", -- Symbols "GlobalSectionLimit", "SaturationMap", diff --git a/M2/Macaulay2/packages/Varieties/SheafComplexes.m2 b/M2/Macaulay2/packages/Varieties/SheafComplexes.m2 index ed66cc116a3..5a2b10121e3 100644 --- a/M2/Macaulay2/packages/Varieties/SheafComplexes.m2 +++ b/M2/Macaulay2/packages/Varieties/SheafComplexes.m2 @@ -1,4 +1,5 @@ export { + "RHom", } ----------------------------------------------------------------------------- diff --git a/M2/Macaulay2/packages/Varieties/SheafMaps.m2 b/M2/Macaulay2/packages/Varieties/SheafMaps.m2 index 7a13111422e..187b813f17a 100644 --- a/M2/Macaulay2/packages/Varieties/SheafMaps.m2 +++ b/M2/Macaulay2/packages/Varieties/SheafMaps.m2 @@ -2,15 +2,14 @@ export { -- Types "SheafMap", -- Methods - "sheafMap", -- "isLiftable", - "yonedaSheafExtension", +-- "yonedaSheafExtension", -- "yonedaSheafExtension'", - "cotangentSurjection", - "eulerSequence", - "idealSheafSequence", - "embeddedToAbstract", - "ExtLongExactSequence", +-- "cotangentSurjection", +-- "eulerSequence", +-- "idealSheafSequence", +-- "embeddedToAbstract", +-- "ExtLongExactSequence", } ----------------------------------------------------------------------------- @@ -89,10 +88,6 @@ sheaf(Variety, Matrix) := SheafMap => (X, phi) -> map(sheaf_X target phi, sheaf(Variety, Matrix, ZZ) := SheafMap => (X, phi, d) -> map(sheaf_X target phi, sheaf_X source phi, truncate(d, phi, MinimalGenerators => false), d) --- TODO: remove by M2 1.25 -sheafMapWarn = true -sheafMap = x -> (if sheafMapWarn then (sheafMapWarn = false; printerr "Note: sheafMap is deprecated; use sheaf instead."); sheaf x) - random(CoherentSheaf, CoherentSheaf) := SheafMap => o -> (F, G) -> map(F, G, random(F.module, G.module, o)) isWellDefined SheafMap := f -> ( diff --git a/M2/Macaulay2/packages/Varieties/doc-functors.m2 b/M2/Macaulay2/packages/Varieties/doc-functors.m2 index e37ea81f21a..4a88d857ee4 100644 --- a/M2/Macaulay2/packages/Varieties/doc-functors.m2 +++ b/M2/Macaulay2/packages/Varieties/doc-functors.m2 @@ -411,7 +411,7 @@ Node Hom HH sheafExt - yonedaSheafExtension +-- yonedaSheafExtension Node Key @@ -549,14 +549,14 @@ Node HH sheafExt -Node - Key - ExtLongExactSequence +-- Node +-- Key +-- ExtLongExactSequence -- (ExtLongExactSequence, CoherentSheaf, SheafMap) -- (ExtLongExactSequence, CoherentSheaf, SheafMap, SheafMap) -- [ExtLongExactSequence, Concentration] - Headline - the long exact sequence of the Ext functor +-- Headline +-- the long exact sequence of the Ext functor ----------------------------------------------------------------------------- -- sheafExt diff --git a/M2/Macaulay2/packages/Varieties/doc-maps.m2 b/M2/Macaulay2/packages/Varieties/doc-maps.m2 index ee2a80bc6c7..600b65a8705 100644 --- a/M2/Macaulay2/packages/Varieties/doc-maps.m2 +++ b/M2/Macaulay2/packages/Varieties/doc-maps.m2 @@ -1,5 +1,4 @@ undocumented { - sheafMap, -- deprecated -- TODO: document some of these (symbol SPACE, SheafMap, ZZ), (symbol +, SheafMap, SheafMap), @@ -92,14 +91,14 @@ Node Headline induced maps on coherent sheaves -Node - Key - cotangentSurjection +-- Node +-- Key +-- cotangentSurjection -- (cotangentSurjection, ProjectiveVariety) -Node - Key - embeddedToAbstract +-- Node +-- Key +-- embeddedToAbstract -- (embeddedToAbstract, ProjectiveVariety) ----------------------------------------------------------------------------- diff --git a/M2/Macaulay2/packages/Varieties/doc-sheaves.m2 b/M2/Macaulay2/packages/Varieties/doc-sheaves.m2 index 3c82199ec21..d734c4ffd48 100644 --- a/M2/Macaulay2/packages/Varieties/doc-sheaves.m2 +++ b/M2/Macaulay2/packages/Varieties/doc-sheaves.m2 @@ -426,7 +426,7 @@ Node SeeAlso idealSheaf tangentSheaf - cotangentSurjection +-- cotangentSurjection -- (cotangentSheaf, ZZ, ProjectiveVariety) ProjectiveVariety