Commit2f5d047

PatrickMcDonald

authored and

latkin

committed

Array.chunkBySize does not return final chunk in some cases

An example case is Array.chunkBySize 3 [|1..4|], the code calculates thenumber of chunks to be 2, and then does not copy the final (partial) chunkas 4 mod 2 is 0. Similarly for Array.chunkBySize 5 [|1..12|], number ofchunks is 3 and 12 % 3 = 0Changing check to len % chunkSize fixes this.Fixesdotnet#501Closesdotnet#503

1 parentd02a425 commit2f5d047Copy full SHA for 2f5d047

File tree

2 files changed

-1

lines changed

src/fsharp
- FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections
  - ArrayModule.fs
- FSharp.Core
  - array.fs

2 files changed

-1

lines changed

`‎src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule.fs‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,8 @@ type ArrayModule() =`
`151`	`151`	`Assert.IsTrue([\|[\|1..4\|];[\|5..8\|]\|]= Array.chunkBySize4[\|1..8\|])`
`152`	`152`	`Assert.IsTrue([\|[\|1..4\|];[\|5..8\|];[\|9..10\|]\|]= Array.chunkBySize4[\|1..10\|])`
`153`	`153`	`Assert.IsTrue([\|[\|1\|];[\|2\|];[\|3\|];[\|4\|]\|]= Array.chunkBySize1[\|1..4\|])`
	`154`	`+ Assert.IsTrue([\|[\|1..3\|];[\|4\|]\|]= Array.chunkBySize3[\|1..4\|])`
	`155`	`+ Assert.IsTrue([\|[\|1..5\|];[\|6..10\|];[\|11..12\|]\|]= Array.chunkBySize5[\|1..12\|])`
`154`	`156`
`155`	`157`	`// string Seq`
`156`	`158`	`Assert.IsTrue([\|[\|"a";"b"\|];[\|"c";"d"\|];[\|"e"\|]\|]= Array.chunkBySize2[\|"a";"b";"c";"d";"e"\|])`

`‎src/fsharp/FSharp.Core/array.fs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -584,7 +584,7 @@ namespace Microsoft.FSharp.Collections`
`584`	`584`	`letres= Microsoft.FSharp.Primitives.Basics.Array.zeroCreateUnchecked chunkCount: 'T[][]`
`585`	`585`	`for i=0to len/ chunkSize-1do`
`586`	`586`	`res.[i]<- Microsoft.FSharp.Primitives.Basics.Array.subUnchecked(i* chunkSize) chunkSize array`
`587`		`-if len%chunkCount<>0then`
	`587`	`+if len%chunkSize<>0then`
`588`	`588`	`res.[chunkCount-1]<- Microsoft.FSharp.Primitives.Basics.Array.subUnchecked((chunkCount-1)* chunkSize)(len% chunkSize) array`
`589`	`589`	`res`
`590`	`590`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2f5d047

File tree

2 files changed

2 files changed

`‎src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule.fs‎`

`‎src/fsharp/FSharp.Core/array.fs‎`

0 commit comments