Skip to content

Commit 4a71736

Browse files
committed
Refactoring towards FsMath dependency
1 parent 2e6f9c6 commit 4a71736

File tree

90 files changed

+134
-7739
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+134
-7739
lines changed

FSharp.Stats.sln

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{23F9FB2E-6
5555
docs\Integration.fsx = docs\Integration.fsx
5656
docs\Interpolation.fsx = docs\Interpolation.fsx
5757
docs\Intervals.fsx = docs\Intervals.fsx
58-
docs\LinearAlgebra.fsx = docs\LinearAlgebra.fsx
59-
docs\Matrix_Vector.fsx = docs\Matrix_Vector.fsx
60-
docs\ML.fsx = docs\ML.fsx
6158
docs\Normalization.fsx = docs\Normalization.fsx
6259
docs\NuGet.config = docs\NuGet.config
6360
docs\Optimization.fsx = docs\Optimization.fsx

benchmarks/FSharp.Stats.Benchmarks/Matrix.fs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ open System
44
open BenchmarkDotNet.Attributes
55
open BenchmarkDotNet.Running
66
open FSharp.Stats
7+
open FsMath
8+
open FsMath.Algebra
79

810
[<MemoryDiagnoser>]
911
type MatrixBenchmarks() =

benchmarks/FSharp.Stats.Benchmarks/TriangularSolver.fs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ open System
44
open BenchmarkDotNet.Attributes
55
open BenchmarkDotNet.Running
66
open FSharp.Stats
7-
open FSharp.Stats.Algebra
7+
open FsMath
8+
open FsMath.Algebra
89

910
[<MemoryDiagnoser>]
1011
type TriangularBenchmark() =

benchmarks/FSharp.Stats.Benchmarks/Vector.fs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ open System
55
open BenchmarkDotNet.Attributes
66
open BenchmarkDotNet.Running
77
open FSharp.Stats
8+
open FsMath
9+
810

911
[<MemoryDiagnoser>]
1012
type VectorBenchmarks() =
@@ -36,11 +38,6 @@ type VectorBenchmarks() =
3638
let result = Vector.dot vector1 vector2
3739
GC.KeepAlive(result) // Prevents the result from being optimized away
3840

39-
[<Benchmark>]
40-
member _.CrossProduct() =
41-
let result = Vector.cross vector1 vector2
42-
GC.KeepAlive(result) // Prevents the result from being optimized away
43-
4441
[<Benchmark>]
4542
member _.Norm() =
4643
let result = Vector.norm vector1

docs/BasicStats.fsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ categoryindex: 0
1111

1212
(*** condition: prepare ***)
1313
#r "../src/FSharp.Stats/bin/Release/netstandard2.0/FSharp.Stats.dll"
14-
14+
#r "nuget: FsMath, 0.0.1"
15+
open FsMath
1516
(*** condition: ipynb ***)
1617
#if IPYNB
1718
#r "nuget: FSharp.Stats"

docs/Clustering.fsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ categoryindex: 0
1616
#r "nuget: FSharpAux, 1.0.0"
1717
#r "nuget: Cyjs.NET"
1818
#r "nuget: OptimizedPriorityQueue, 5.1.0"
19-
19+
#r "nuget: FsMath, 0.0.1"
20+
open FsMath
2021

2122
Plotly.NET.Defaults.DefaultDisplayOptions <-
2223
Plotly.NET.DisplayOptions.init (PlotlyJSReference = Plotly.NET.PlotlyJSReference.NoReference)

docs/ComparisonMetrics.fsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ categoryindex: 0
1313
#I "../src/FSharp.Stats/bin/Release/netstandard2.0/"
1414
#r "FSharp.Stats.dll"
1515
#r "nuget: Plotly.NET, 4.0.0"
16+
#r "nuget: FsMath, 0.0.1"
17+
open FsMath
1618

1719
Plotly.NET.Defaults.DefaultDisplayOptions <-
1820
Plotly.NET.DisplayOptions.init (PlotlyJSReference = Plotly.NET.PlotlyJSReference.NoReference)

docs/Correlation.fsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ categoryindex: 0
1313
#I "../src/FSharp.Stats/bin/Release/netstandard2.0/"
1414
#r "FSharp.Stats.dll"
1515
#r "nuget: Plotly.NET, 4.0.0"
16+
#r "nuget: FsMath, 0.0.1"
17+
open FsMath
1618

1719
Plotly.NET.Defaults.DefaultDisplayOptions <-
1820
Plotly.NET.DisplayOptions.init (PlotlyJSReference = Plotly.NET.PlotlyJSReference.NoReference)

docs/Covariance.fsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ categoryindex: 0
1313
#I "../src/FSharp.Stats/bin/Release/netstandard2.0/"
1414
#r "FSharp.Stats.dll"
1515
#r "nuget: Plotly.NET, 4.0.0"
16+
#r "nuget: FsMath, 0.0.1"
17+
open FsMath
1618

1719
Plotly.NET.Defaults.DefaultDisplayOptions <-
1820
Plotly.NET.DisplayOptions.init (PlotlyJSReference = Plotly.NET.PlotlyJSReference.NoReference)

docs/CrossValidation.fsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ categoryindex: 0
1414
#I "../src/FSharp.Stats/bin/Release/netstandard2.0/"
1515
#r "FSharp.Stats.dll"
1616
#r "nuget: Plotly.NET, 4.0.0"
17+
#r "nuget: FsMath, 0.0.1"
18+
open FsMath
1719

1820
Plotly.NET.Defaults.DefaultDisplayOptions <-
1921
Plotly.NET.DisplayOptions.init (PlotlyJSReference = Plotly.NET.PlotlyJSReference.NoReference)

0 commit comments

Comments
 (0)