Update packages to use new randomSubset in Core

Author: d-torrance

M2/Macaulay2/packages/AbstractSimplicialComplexes.m2

@@ -159,33 +159,10 @@ abstractSimplicialComplex(ZZ,ZZ) := AbstractSimplicialComplex => (n,r) -> (
 ----------------------------------------
 
 -- What follows are simple minded (yet still seemingly practical)
--- methods for producing random subsets and random simplicial complexes.
+-- methods for producing random simplicial complexes.
 -- In either case they are fairly efficient.
 -- In either case, what follows suffices for our purposes at present.
 
--- Make a random subset of {1,...,n}.
-
-randomSubset = method()
-
--- Make a random size random subset of [n] = {1,...,n}.
-
-randomSubset(ZZ) := List =>  (n) -> (
-     k := random(0,n); 
-     sort unique (for i from 1 to k list (random(1,n))))
-
--- Make a random size r subset.
-
-randomSubset(ZZ,ZZ) := List =>  (n,r) -> (
-     sort unique (for i from 1 to r list (random(1,n))))
-
- -- Make a random subset of a given set.
-
-randomSubset(List) := List =>  (L) -> (
-     n := #L;
-     k := random(0,n);
-     mySubset := subsets(L,k);
-     mySubset_(random(binomial(n,k))))
-
 --  A variant of the above method would yield a random k element subset of a given set.
 
 --  Make a "random" simplicial complex on {1,...,n}.
@@ -194,14 +171,16 @@ randomAbstractSimplicialComplex = method()
 
 randomAbstractSimplicialComplex(ZZ) := AbstractSimplicialComplex => (n) -> (
      listLength := 1 + random(2^n);
-     randomFaces := unique(for i from 1 to listLength list randomSubset(n));
+     x := toList(1..n);
+     randomFaces := unique(for i from 1 to listLength list randomSubset x);
      abstractSimplicialComplex randomFaces)
 
 --  Make a random simplicial complex on [n] with r-skeleton.
 
 randomAbstractSimplicialComplex(ZZ,ZZ) := AbstractSimplicialComplex => (n,r) -> (
      listLength := 1 + random(binomial(n,r));
-     randomFaces := unique(for i from 1 to listLength list randomSubset(n,r));
+     x := toList(1..n);
+     randomFaces := unique(for i from 1 to listLength list randomSubset(x,r));
      abstractSimplicialComplex randomFaces)
 
 --  Make the random complex Y_d(n,m) which has vertex set

M2/Macaulay2/packages/MultiplicitySequence.m2

@@ -58,11 +58,6 @@ export {
 
 -- installMinprimes() -- for MinimalPrimes.m2
 
-randomSubset := (L, k) -> (
-    i := random(#L);
-    if k == 1 then {L#i} else {L#i} | randomSubset(L_(delete(i, toList(0..<#L))), k-1)
-)
-
 getGenElts = method(Options => {symbol minTerms => -1, symbol numCandidates => 3})
 getGenElts (Ideal, ZZ) := List => opts -> (I, n) -> (
     G := flatten entries mingens I; -- I_*;

M2/Macaulay2/packages/RandomIdeals.m2

@@ -264,15 +264,6 @@ testNewSimplex(List, List) := (P, D) ->(
 
 intersectLists = (D',D) -> D - set(D-set D')
 
-randomSubset = (n,m) -> (
-    L := new MutableList from toList (0..m-1);
-    for i from m to n-1 do (
-	j := random(i+1);
-    	if j < m then L#j = i;
-	);
-    sort toList L
-    )
-
 randomAddition = method()
 randomAddition(ZZ,ZZ,List) := (n,m,P) ->(
     if #P == 0 then return {randomSubset(n,m+1)};

M2/Macaulay2/packages/TestIdeals/testIdeals.m2

@@ -66,15 +66,6 @@ testElement Ring := o -> R1 ->
     testEle % I1
 )
 
-randomSubset = method()
-
-randomSubset ( ZZ, ZZ ) := ( m, n ) ->
-(
-    L := toList( 0..m-1 );
-    scan( m-n, i -> L = delete( L#(random(0,m-1-i)), L ) );
-    L
-)
-
 --****************************
 --****************************
 --**New test ideal functions**