Skip to content

add slice in Vector.fs and Matrix.fs, add reduceRows and reduceCols in Matrix.fs, add tests #18

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

Open
Brulevich-Nikita wants to merge 3 commits into
base: main
Choose a base branch
from
Open

add slice in Vector.fs and Matrix.fs, add reduceRows and reduceCols in Matrix.fs, add tests #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1e8b9c
add slice in Vector.fs and Matrix.fs, add reduceRows and reduceCols i…
Brulevich-Nikita May 8, 2026
c0ba718
add Kronecker product to Matrix.fs with tests, fix tests, duplicate h…
Brulevich-Nikita May 18, 2026
ad3ccbf
change fromCoordinateList signature, fix failwith, fix boruvka and te…
Brulevich-Nikita May 28, 2026
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
13 changes: 10 additions & 3 deletions QuadTree.Benchmark/BFS.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,25 @@ type Benchmark() =

let mutable matrix = Unchecked.defaultof<Matrix.SparseMatrix<double>>


[<Params("494_bus.mtx", "arc130.mtx")>]
member val MatrixName = "" with get, set

[<GlobalSetup>]
member this.LoadMatrix() =
matrix <- readMtx (System.IO.Path.Combine(DIR_WITH_MATRICES, this.MatrixName)) false
matrix <-
match readMtx (System.IO.Path.Combine(DIR_WITH_MATRICES, this.MatrixName)) false with
| Ok m -> m
| Error _ -> Matrix.empty 0UL<Matrix.nrows> 0UL<Matrix.ncols>
Copy link
Copy Markdown
Member

@gsvgit gsvgit May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Думаю, что если что-то пошло не так в бенчмарке, то лучше ронять бенчмарк.


[<Benchmark>]
member this.BFS() =
let startVertices =
let startVerticesResult =
Vector.CoordinateList((uint64 matrix.ncols) * 1UL<Vector.dataLength>, [ 0UL<Vector.index>, 1UL ])
|> Vector.fromCoordinateList

let startVertices =
match startVerticesResult with
| Ok v -> v
| Error _ -> Vector.empty ((uint64 matrix.ncols) * 1UL<Vector.dataLength>)

Graph.BFS.bfs_level matrix startVertices
6 changes: 4 additions & 2 deletions QuadTree.Benchmark/SSSP.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ open QuadTree.Benchmarks.Utils
type Benchmark() =
let mutable matrix = Unchecked.defaultof<Matrix.SparseMatrix<double>>


[<Params("494_bus.mtx", "arc130.mtx")>]
member val MatrixName = "" with get, set

[<GlobalSetup>]
member this.LoadMatrix() =
matrix <- readMtx (System.IO.Path.Combine(DIR_WITH_MATRICES, this.MatrixName)) false
matrix <-
match readMtx (System.IO.Path.Combine(DIR_WITH_MATRICES, this.MatrixName)) false with
| Ok m -> m
Copy link
Copy Markdown
Member

@gsvgit gsvgit May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ну и так про все бенчи. Тут уже лучше ронять, чтобы было видно, что что-то пошло не так.

| Error _ -> Matrix.empty 0UL<Matrix.nrows> 0UL<Matrix.ncols>

[<Benchmark>]
member this.SSSP() = Graph.SSSP.sssp matrix 0UL
5 changes: 4 additions & 1 deletion QuadTree.Benchmark/Triangles.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ type Benchmark() =

[<GlobalSetup>]
member this.LoadMatrix() =
matrix <- readMtx (System.IO.Path.Combine(DIR_WITH_MATRICES, this.MatrixName)) false
matrix <-
match readMtx (System.IO.Path.Combine(DIR_WITH_MATRICES, this.MatrixName)) false with
| Ok m -> m
| Error _ -> Matrix.empty 0UL<Matrix.nrows> 0UL<Matrix.ncols>

[<Benchmark>]
member this.TriangleCount() =
Expand Down
Loading
Loading