Skip to content

add mapi and slice in Vector.fs, add mapi and slice in Matrix.fs, add new tests #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Brulevich-Nikita wants to merge 1 commit into from
Closed

add mapi and slice in Vector.fs, add mapi and slice in Matrix.fs, add new tests #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
253 changes: 253 additions & 0 deletions QuadTree.Tests/Tests.Matrix.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,3 +415,256 @@ let ``Fold sum`` () =
let actual = foldAssociative op_add None m1 |> Option.get

Assert.Equal(expected, actual)

[<Fact>]
let ``fromCoordinateList with index out of range`` () =
let coo = CoordinateList (6UL<nrows>, 6UL<ncols>, [(9UL<rowindex>, 9UL<colindex>, 13)])
let matrix = fromCoordinateList coo
let result = toCoordinateList matrix
Assert.Equal(CoordinateList(6UL<nrows>, 6UL<ncols>, []), result)

[<Fact>]
let ``fromCoordinateList with unsorted coordinates works correctly`` () =
let coo = CoordinateList (7UL<nrows>, 7UL<ncols>, [(6UL<rowindex>, 6UL<colindex>, 10); (1UL<rowindex>, 2UL<colindex>, 8); (1UL<rowindex>, 1UL<colindex>, 100)])
let matrix = fromCoordinateList coo
let result = toCoordinateList matrix
Assert.Equal(CoordinateList (7UL<nrows>, 7UL<ncols>, [(1UL<rowindex>, 1UL<colindex>, 100); (1UL<rowindex>, 2UL<colindex>, 8); (6UL<rowindex>, 6UL<colindex>, 10)]), result)

[<Fact>]
let ``fromCoordinateList with zero length and some values returns empty matrix`` () =
let coo = CoordinateList (0UL<nrows>, 0UL<ncols>, [(33UL<rowindex>, 33UL<colindex>, 33); (39UL<rowindex>, 39UL<colindex>, 1)])
let matrix = fromCoordinateList coo
let result = toCoordinateList matrix
Assert.Equal(CoordinateList (0UL<nrows>, 0UL<ncols>, []), result)

[<Fact>]
let ``mapi works with row index and col index on square matrix`` () =
let coo = CoordinateList (4UL<nrows>, 4UL<ncols>, [(1UL<rowindex>, 1UL<colindex>, 12); (2UL<rowindex>, 3UL<colindex>, 13)])
let matrix = fromCoordinateList coo
let result = mapi matrix (fun i j (x: int option) ->
match x with
| Some v -> Some (v * i + j)
| None -> None
)
let actual = toCoordinateList result
Assert.Equal(CoordinateList (4UL<nrows>, 4UL<ncols>, [(1UL<rowindex>, 1UL<colindex>, 13); (2UL<rowindex>, 3UL<colindex>, 29)]), actual)

[<Fact>]
let ``mapi works with row index and col index on rectangular matrix`` () =
let coo = CoordinateList (3UL<nrows>, 5UL<ncols>, [(1UL<rowindex>, 2UL<colindex>, 15); (2UL<rowindex>, 2UL<colindex>, 13)])
let matrix = fromCoordinateList coo
let result = mapi matrix (fun i j (x: int option) ->
match x with
| Some v -> Some (v * j + i)
| None -> None
)
let actual = toCoordinateList result
Assert.Equal(CoordinateList (3UL<nrows>, 5UL<ncols>, [(1UL<rowindex>, 2UL<colindex>, 31); (2UL<rowindex>, 2UL<colindex>, 28)]), actual)

[<Fact>]
let ``mapi on empty matrix returns empty matrix`` () =
let matrix = fromCoordinateList (CoordinateList (0UL<nrows>, 0UL<ncols>, []))
let result = mapi matrix (fun i j (x: int option) ->
match x with
| Some v -> Some ((v + 1) * 3 + 2 * j)
| None -> None
)
let actual = toCoordinateList result
Assert.Equal(CoordinateList(0UL<nrows>, 0UL<ncols>, []), actual)

[<Fact>]
let ``mapi with special function returns empty matrix`` () =
let coo = CoordinateList (5UL<nrows>, 7UL<ncols>, [(1UL<rowindex>, 2UL<colindex>, 15); (4UL<rowindex>,5UL<colindex>, 13)])
let matrix = fromCoordinateList coo
let result = mapi matrix (fun i j (x: int option) ->
match x with
| Some v ->
match int (i + j) % 2 with
| 0 -> Some (v * 2)
| _ -> None
| None -> None
)
let actual = toCoordinateList result
Assert.Equal(CoordinateList(5UL<nrows>, 7UL<ncols>, []), actual)

[<Fact>]
let ``mapi works with function does not depend on the indexes`` () =
let coo = CoordinateList (5UL<nrows>, 7UL<ncols>, [(1UL<rowindex>, 2UL<colindex>, 15); (4UL<rowindex>,5UL<colindex>, 13)])
let matrix = fromCoordinateList coo
let result = mapi matrix (fun i j (x: int option) ->
match x with
| Some v -> Some (v * 2)
| None -> None
)
let actual = toCoordinateList result
Assert.Equal(CoordinateList (5UL<nrows>, 7UL<ncols>, [(1UL<rowindex>, 2UL<colindex>, 30); (4UL<rowindex>,5UL<colindex>, 26)]), actual)

[<Fact>]
let ``slice returns error when row start is negative`` () =
let matrix = fromCoordinateList (CoordinateList(5UL<nrows>, 6UL<ncols>, [(2UL<rowindex>, 2UL<colindex>, 3); (3UL<rowindex>, 4UL<colindex>, 17)]))
match slice matrix -1 4 2 3 with
| Result.Success _ -> failwith "Expected Error"
| Result.Failure msg -> Assert.Equal("Start row should be >= 0", msg)

[<Fact>]
let ``slice returns error when row end is negative`` () =
let matrix = fromCoordinateList (CoordinateList(5UL<nrows>, 6UL<ncols>, [(2UL<rowindex>, 2UL<colindex>, 3); (3UL<rowindex>, 4UL<colindex>, 17)]))
match slice matrix 1 -4 2 3 with
| Result.Success _ -> failwith "Expected Error"
| Result.Failure msg -> Assert.Equal("End row should be >= 0", msg)

[<Fact>]
let ``slice returns error when col start is negative`` () =
let matrix = fromCoordinateList (CoordinateList(5UL<nrows>, 6UL<ncols>, [(2UL<rowindex>, 2UL<colindex>, 3); (3UL<rowindex>, 4UL<colindex>, 17)]))
match slice matrix 1 4 -2 3 with
| Result.Success _ -> failwith "Expected Error"
| Result.Failure msg -> Assert.Equal("Start column should be >= 0", msg)

[<Fact>]
let ``slice returns error when col end is negative`` () =
let matrix = fromCoordinateList (CoordinateList(5UL<nrows>, 6UL<ncols>, [(2UL<rowindex>, 2UL<colindex>, 3); (3UL<rowindex>, 4UL<colindex>, 17)]))
match slice matrix 1 4 2 -3 with
| Result.Success _ -> failwith "Expected Error"
| Result.Failure msg -> Assert.Equal("End column should be >= 0", msg)

[<Fact>]
let ``slice returns error when row start is out of range`` () =
let matrix = fromCoordinateList (CoordinateList(5UL<nrows>, 6UL<ncols>, [(2UL<rowindex>, 2UL<colindex>, 3); (3UL<rowindex>, 4UL<colindex>, 17)]))
match slice matrix 6 4 2 3 with
| Result.Success _ -> failwith "Expected Error"
| Result.Failure msg -> Assert.Equal("Start row is out of matrix length", msg)

[<Fact>]
let ``slice returns error when row end is out of range`` () =
let matrix = fromCoordinateList (CoordinateList(5UL<nrows>, 6UL<ncols>, [(2UL<rowindex>, 2UL<colindex>, 3); (3UL<rowindex>, 4UL<colindex>, 17)]))
match slice matrix 1 10 2 3 with
| Result.Success _ -> failwith "Expected Error"
| Result.Failure msg -> Assert.Equal("End row is out of matrix length", msg)

[<Fact>]
let ``slice returns error when col start is out of range`` () =
let matrix = fromCoordinateList (CoordinateList(5UL<nrows>, 6UL<ncols>, [(2UL<rowindex>, 2UL<colindex>, 3); (3UL<rowindex>, 4UL<colindex>, 17)]))
match slice matrix 1 4 10 3 with
| Result.Success _ -> failwith "Expected Error"
| Result.Failure msg -> Assert.Equal("Start column is out of matrix length", msg)

[<Fact>]
let ``slice returns error when col end is out of range`` () =
let matrix = fromCoordinateList (CoordinateList(5UL<nrows>, 6UL<ncols>, [(2UL<rowindex>, 2UL<colindex>, 3); (3UL<rowindex>, 4UL<colindex>, 17)]))
match slice matrix 1 2 2 10 with
| Result.Success _ -> failwith "Expected Error"
| Result.Failure msg -> Assert.Equal("End column is out of matrix length", msg)

[<Fact>]
let ``slice returns error when row end is less than row start`` () =
let matrix = fromCoordinateList (CoordinateList(5UL<nrows>, 6UL<ncols>, [(2UL<rowindex>, 2UL<colindex>, 3); (3UL<rowindex>, 4UL<colindex>, 17)]))
match slice matrix 2 1 2 3 with
| Result.Success _ -> failwith "Expected Error"
| Result.Failure msg -> Assert.Equal("Start row should be <= end row", msg)

[<Fact>]
let ``slice returns error when col end is less than col start`` () =
let matrix = fromCoordinateList (CoordinateList(5UL<nrows>, 6UL<ncols>, [(2UL<rowindex>, 2UL<colindex>, 3); (3UL<rowindex>, 4UL<colindex>, 17)]))
match slice matrix 1 2 3 2 with
| Result.Success _ -> failwith "Expected Error"
| Result.Failure msg -> Assert.Equal("Start column should be <= end column", msg)

[<Fact>]
let ``slice returns correct square submatrix`` () =
let matrix = fromCoordinateList (CoordinateList(7UL<nrows>, 7UL<ncols>, [(2UL<rowindex>, 2UL<colindex>, 33); (5UL<rowindex>, 5UL<colindex>, 28)]))
match slice matrix 1 3 1 3 with
| Result.Success result ->
let coo = toCoordinateList result
Assert.Equal(CoordinateList(3UL<nrows>, 3UL<ncols>, [(1UL<rowindex>, 1UL<colindex>, 33)]), coo)
| Result.Failure msg -> failwith msg

[<Fact>]
let ``slice returns correct rectangular submatrix`` () =
let matrix = fromCoordinateList (CoordinateList(5UL<nrows>, 9UL<ncols>, [(3UL<rowindex>, 7UL<colindex>, 33); (1UL<rowindex>, 2UL<colindex>, 28)]))
match slice matrix 2 4 5 8 with
| Result.Success result ->
let coo = toCoordinateList result
Assert.Equal(CoordinateList(3UL<nrows>, 4UL<ncols>, [(1UL<rowindex>, 2UL<colindex>, 33)]), coo)
| Result.Failure msg -> failwith msg

[<Fact>]
let ``slice returns empty matrix`` () =
let matrix = fromCoordinateList (CoordinateList(7UL<nrows>, 9UL<ncols>, [(3UL<rowindex>, 3UL<colindex>, 33); (1UL<rowindex>, 2UL<colindex>, 28)]))
match slice matrix 4 6 5 8 with
| Result.Success result ->
let coo = toCoordinateList result
Assert.Equal(CoordinateList(3UL<nrows>, 4UL<ncols>, []), coo)
| Result.Failure msg -> failwith msg

[<Fact>]
let ``slice returns single submatrix`` () =
let matrix = fromCoordinateList (CoordinateList(7UL<nrows>, 9UL<ncols>, [(3UL<rowindex>, 3UL<colindex>, 33); (1UL<rowindex>, 2UL<colindex>, 28)]))
match slice matrix 1 1 2 2 with
| Result.Success result ->
let coo = toCoordinateList result
Assert.Equal(CoordinateList(1UL<nrows>, 1UL<ncols>, [(0UL<rowindex>, 0UL<colindex>, 28)]), coo)
| Result.Failure msg -> failwith msg

[<Fact>]
let ``slice returns correct submatrix equals to matrix`` () =
let matrix = fromCoordinateList (CoordinateList(7UL<nrows>, 9UL<ncols>, [(3UL<rowindex>, 3UL<colindex>, 33); (1UL<rowindex>, 2UL<colindex>, 28)]))
match slice matrix 0 6 0 8 with
| Result.Success result ->
let coo = toCoordinateList result
printfn "Actual data: %A" coo.list
Assert.Equal(CoordinateList(7UL<nrows>, 9UL<ncols>, [(1UL<rowindex>, 2UL<colindex>, 28); (3UL<rowindex>, 3UL<colindex>, 33)]), coo)
| Result.Failure msg -> failwith msg

[<Fact>]
let ``slice returns correct submatrix when row start of submatrix equals to row start of matrix`` () =
let matrix = fromCoordinateList (CoordinateList(7UL<nrows>, 7UL<ncols>, [(0UL<rowindex>, 0UL<colindex>, 10); (3UL<rowindex>, 3UL<colindex>, 33); (6UL<rowindex>, 6UL<colindex>, 6)]))
match slice matrix 0 4 0 4 with
| Result.Success result ->
let coo = toCoordinateList result
Assert.Equal(CoordinateList(5UL<nrows>, 5UL<ncols>, [(0UL<rowindex>, 0UL<colindex>, 10); (3UL<rowindex>, 3UL<colindex>, 33)]), coo)
| Result.Failure msg -> failwith msg

[<Fact>]
let ``slice returns correct submatrix when row end of submatrix equals to row end of matrix`` () =
let matrix = fromCoordinateList (CoordinateList(7UL<nrows>, 7UL<ncols>, [(0UL<rowindex>, 0UL<colindex>, 10); (3UL<rowindex>, 3UL<colindex>, 33); (6UL<rowindex>, 6UL<colindex>, 6)]))
match slice matrix 2 6 2 4 with
| Result.Success result ->
let coo = toCoordinateList result
Assert.Equal(CoordinateList(5UL<nrows>, 3UL<ncols>, [(1UL<rowindex>, 1UL<colindex>, 33)]), coo)
| Result.Failure msg -> failwith msg

[<Fact>]
let ``slice returns correct submatrix when col start of submatrix equals to col start of matrix`` () =
let matrix = fromCoordinateList (CoordinateList(7UL<nrows>, 7UL<ncols>, [(0UL<rowindex>, 0UL<colindex>, 10); (3UL<rowindex>, 3UL<colindex>, 33); (6UL<rowindex>, 6UL<colindex>, 6)]))
match slice matrix 2 5 0 6 with
| Result.Success result ->
let coo = toCoordinateList result
Assert.Equal(CoordinateList(4UL<nrows>, 7UL<ncols>, [(1UL<rowindex>, 3UL<colindex>, 33)]), coo)
| Result.Failure msg -> failwith msg

[<Fact>]
let ``slice returns correct submatrix when col end of submatrix equals to col end of matrix`` () =
let matrix = fromCoordinateList (CoordinateList(7UL<nrows>, 7UL<ncols>, [(0UL<rowindex>, 0UL<colindex>, 10); (3UL<rowindex>, 3UL<colindex>, 33); (6UL<rowindex>, 6UL<colindex>, 6)]))
match slice matrix 2 4 2 6 with
| Result.Success result ->
let coo = toCoordinateList result
Assert.Equal(CoordinateList(3UL<nrows>, 5UL<ncols>, [(1UL<rowindex>, 1UL<colindex>, 33)]), coo)
| Result.Failure msg -> failwith msg

[<Fact>]
let ``slice returns single column`` () =
let matrix = fromCoordinateList (CoordinateList(10UL<nrows>, 10UL<ncols>, [(1UL<rowindex>, 3UL<colindex>, 1); (2UL<rowindex>, 2UL<colindex>, 2); (5UL<rowindex>, 7UL<colindex>, 3)]))
match slice matrix 1 6 2 2 with
| Result.Success result ->
let coo = toCoordinateList result
Assert.Equal(CoordinateList(6UL<nrows>, 1UL<ncols>, [(1UL<rowindex>, 0UL<colindex>, 2)]), coo)
| Result.Failure msg -> failwith msg

[<Fact>]
let ``slice returns single row`` () =
let matrix = fromCoordinateList (CoordinateList(10UL<nrows>, 10UL<ncols>, [(1UL<rowindex>, 3UL<colindex>, 1); (2UL<rowindex>, 2UL<colindex>, 2); (5UL<rowindex>, 7UL<colindex>, 3)]))
match slice matrix 5 5 3 9 with
| Result.Success result ->
let coo = toCoordinateList result
Assert.Equal(CoordinateList(1UL<nrows>, 7UL<ncols>, [(0UL<rowindex>, 4UL<colindex>, 3)]), coo)
| Result.Failure msg -> failwith msg
Loading
Loading