Revert "fixed directSum so X^1 doesn't clear the cache"

This reverts commit a029b77.
mahrud · Jan 13, 2024 · b8f464b · b8f464b
1 parent a029b77
commit b8f464b
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 20 deletions.
diff --git a/M2/Macaulay2/m2/chaincomplexes.m2 b/M2/Macaulay2/m2/chaincomplexes.m2
@@ -580,7 +580,6 @@ formation ChainComplex := M -> if M.cache.?formation then M.cache.formation
 
 directSum ChainComplex := C -> directSum(1 : C)
 ChainComplex.directSum = args -> (
-    if #args === 1 then return args#0;
      C := new ChainComplex;
      C.ring = ring args#0;
      scan(args,D -> (complete D; complete D.dd;));

diff --git a/M2/Macaulay2/m2/gradedmodules.m2 b/M2/Macaulay2/m2/gradedmodules.m2
@@ -221,7 +221,6 @@ formation GradedModule := M -> if M.cache.?formation then M.cache.formation
 
 directSum GradedModule := GradedModule => M -> directSum(1 : M)
 GradedModule.directSum = v -> (
-    if #v === 1 then return v#0;
      E := new GradedModule;
      rings := apply(v, ring);
      if not same rings

diff --git a/M2/Macaulay2/m2/matrix.m2 b/M2/Macaulay2/m2/matrix.m2
@@ -267,7 +267,6 @@ sameringMatrices = mats -> (
 
 directSum Matrix := f -> Matrix.directSum (1 : f)
 Matrix.directSum = args -> (
-    if #args === 1 then return args#0;
      args = sameringMatrices args;
      R := ring args#0;
      if not all(args, f -> ring f === R) then error "expected matrices all over the same ring";
@@ -293,9 +292,7 @@ Module.directSum = args -> (
 	  R := ring args#0;
 	  if not all(args, f -> ring f === R) 
 	  then error "expected modules all over the same ring";
-    -- this ensures that trivial direct sums don't clear the cache
-    N := if #args == 1 then args#0
-    else if all(args, M -> not M.?generators)
+	  N := if all(args, M -> not M.?generators) 
 	  then (
 	       if all(args, M -> not M.?relations) 
 	       then R ^ (- join toSequence apply(args, degrees))

diff --git a/M2/Macaulay2/packages/Complexes/ChainComplex.m2 b/M2/Macaulay2/packages/Complexes/ChainComplex.m2
@@ -333,7 +333,6 @@ sum ComplexMap := Matrix => f -> (
 
 Complex.directSum = args -> (
     assert(#args > 0);
-    if #args === 1 then return args#0;
     R := ring args#0;
     if not all(args, C -> ring C === R) then error "expected all complexes to be over the same ring";
     concentrations := for C in args list C.concentration;

diff --git a/M2/Macaulay2/packages/Complexes/ChainComplexMap.m2 b/M2/Macaulay2/packages/Complexes/ChainComplexMap.m2
@@ -403,7 +403,6 @@ ComplexMap.directSum = args -> (
     -- args: sequence of ComplexMap's
     -- args: f_i : C_i --> D_i, having same degree deg
     -- result : sum(C_i) --> sum(D_i)
-    if #args === 1 then return args#0;
     R := ring args#0;
     deg := degree args#0;
     if not all(args, f -> ring f === R) then 

diff --git a/M2/Macaulay2/packages/Varieties/SheafMaps.m2 b/M2/Macaulay2/packages/Varieties/SheafMaps.m2
@@ -175,7 +175,6 @@ inducedMap(CoherentSheaf, CoherentSheaf) := SheafMap => opts -> (G, F) -> map(G,
 --WARNING: the current direct sum of sheaves does not cache components
 SheafMap.directSum = args -> (
     assert(#args>0);
-    if #args === 1 then return args#0;
     X := variety args#0;
     if not same apply(args, variety) then error "expected maps of sheaves over the same variety";
     DS := map(

diff --git a/M2/Macaulay2/packages/Varieties/tests.m2 b/M2/Macaulay2/packages/Varieties/tests.m2
@@ -11,17 +11,6 @@ TEST /// -- twisted global section module
   assert(module Omega(1) === coker matrix(ring Cubic, {{-x_3, -x_2, -x_1}, {x_2, x_1, x_0}}))
 ///
 
-TEST ///
-  S = QQ[a..d];
-  I = monomialCurveIdeal(S,{1,3,4})
-  R = S/I
-  X = Proj R
-  F = prune sheaf (module I ** R)
-  assert F.cache.?pruningMap
-  -- making sure that trivial direct sums don't clear cache
-  assert(F^1).cache.?pruningMap
-///
-
 end
 
 -- multigraded Proj