Win7/PowerShell7
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Add -Shuffle switch to Get-Random command (#11093)

Browse Source
This commit is contained in:
Eugene Samoylov 2020-04-15 22:23:25 +05:00 committed by GitHub
parent 8b3937ecfe
commit 07620b4b79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRandomCommand.cs
View File

@ -28,6 +28,7 @@ namespace Microsoft.PowerShell.Commands
private const string RandomNumberParameterSet = "RandomNumberParameterSet";
private const string RandomListItemParameterSet = "RandomListItemParameterSet";
private const string ShuffleParameterSet = "ShuffleParameterSet";
private static readonly object[] _nullInArray = new object[] { null };
private enum MyParameterSet
@ -50,7 +51,8 @@ namespace Microsoft.PowerShell.Commands
{
_effectiveParameterSet = MyParameterSet.RandomListItem;
}
else if (ParameterSetName.Equals(GetRandomCommand.RandomListItemParameterSet, StringComparison.OrdinalIgnoreCase))
else if (ParameterSetName == GetRandomCommand.RandomListItemParameterSet
|| ParameterSetName == GetRandomCommand.ShuffleParameterSet)
{
_effectiveParameterSet = MyParameterSet.RandomListItem;
}
@ -276,6 +278,7 @@ namespace Microsoft.PowerShell.Commands
/// List from which random elements are chosen.
/// </summary>
[Parameter(ParameterSetName = RandomListItemParameterSet, ValueFromPipeline = true, Position = 0, Mandatory = true)]
[Parameter(ParameterSetName = ShuffleParameterSet, ValueFromPipeline = true, Position = 0, Mandatory = true)]
[System.Management.Automation.AllowNull]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public object[] InputObject { get; set; }
@ -283,12 +286,23 @@ namespace Microsoft.PowerShell.Commands
/// <summary>
/// Number of items to output (number of list items or of numbers).
/// </summary>
[Parameter]
[Parameter(ParameterSetName = RandomNumberParameterSet)]
[Parameter(ParameterSetName = RandomListItemParameterSet)]
[ValidateRange(1, int.MaxValue)]
public int Count { get; set; } = 1;
#endregion
#region Shuffle parameter
/// <summary>
/// Gets or sets whether the command should return all input objects in randomized order.
/// </summary>
[Parameter(ParameterSetName = ShuffleParameterSet, Mandatory = true)]
public SwitchParameter Shuffle { get; set; }
#endregion
#region Cmdlet processing methods
private double GetRandomDouble(double minValue, double maxValue)
@ -492,29 +506,39 @@ namespace Microsoft.PowerShell.Commands
{
if (EffectiveParameterSet == MyParameterSet.RandomListItem)
{
// this allows for $null to be in an array passed to InputObject
foreach (object item in InputObject ?? _nullInArray)
if (ParameterSetName == ShuffleParameterSet)
{
// (3)
if (_numberOfProcessedListItems < Count)
// this allows for $null to be in an array passed to InputObject
foreach (object item in InputObject ?? _nullInArray)
{
Debug.Assert(_chosenListItems.Count == _numberOfProcessedListItems, "Initial K elements should all be included in chosenListItems");
_chosenListItems.Add(item);
}
else
}
else
{
foreach (object item in InputObject ?? _nullInArray)
{
Debug.Assert(_chosenListItems.Count == Count, "After processing K initial elements, the length of chosenItems should stay equal to K");
// (1)
if (Generator.Next(_numberOfProcessedListItems + 1) < Count)
// (3)
if (_numberOfProcessedListItems < Count)
{
// (2)
int indexToReplace = Generator.Next(_chosenListItems.Count);
_chosenListItems[indexToReplace] = item;
Debug.Assert(_chosenListItems.Count == _numberOfProcessedListItems, "Initial K elements should all be included in chosenListItems");
_chosenListItems.Add(item);
}
}
else
{
Debug.Assert(_chosenListItems.Count == Count, "After processing K initial elements, the length of chosenItems should stay equal to K");
_numberOfProcessedListItems++;
// (1)
if (Generator.Next(_numberOfProcessedListItems + 1) < Count)
{
// (2)
int indexToReplace = Generator.Next(_chosenListItems.Count);
_chosenListItems[indexToReplace] = item;
}
}
_numberOfProcessedListItems++;
}
}
}
}

8
test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Random.Tests.ps1
View File

@ -156,6 +156,12 @@ Describe "Get-Random" -Tags "CI" {
$randomNumber[6] | Should -BeNullOrEmpty
}
It "Should return all the numbers for array of 1,2,3,5,8,13 in randomized order when the Shuffle switch is used" {
$randomNumber = Get-Random -InputObject 1, 2, 3, 5, 8, 13 -Shuffle
$randomNumber.Count | Should -Be 6
$randomNumber | Should -BeIn 1, 2, 3, 5, 8, 13
}
It "Should return for a string collection " {
$randomNumber = Get-Random -InputObject "red", "yellow", "blue"
$randomNumber | Should -Be ("red" -or "yellow" -or "blue")
@ -173,7 +179,7 @@ Describe "Get-Random" -Tags "CI" {
$firstRandomNumber | Should -Not -Be $secondRandomNumber
}
It "Should return the same number for hexadecimal number and regular number when the switch SetSeed it used " {
It "Should return the same number for hexadecimal number and regular number when the switch SetSeed is used " {
$firstRandomNumber = Get-Random 0x07FFFFFFFF -SetSeed 20
$secondRandomNumber = Get-Random 34359738367 -SetSeed 20
$firstRandomNumber | Should -Be @secondRandomNumber