Skip to content

Commit fa5ae9a

Browse files
kMutagenekMutagene
committed
use .net 8, update fsdocs, adapt exisiting docs
1 parent 789223f commit fa5ae9a

33 files changed

+246
-14062
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@
22
"version": 1,
33
"isRoot": true,
44
"tools": {
5-
"fsdocs-tool": {
6-
"version": "16.1.1",
7-
"commands": [
8-
"fsdocs"
9-
]
10-
},
115
"fantomas": {
126
"version": "6.1.1",
137
"commands": [
148
"fantomas"
15-
]
9+
],
10+
"rollForward": false
11+
},
12+
"fsdocs-tool": {
13+
"version": "20.0.1",
14+
"commands": [
15+
"fsdocs"
16+
],
17+
"rollForward": false
1618
}
1719
}
1820
}

‎FSharp.Stats.sln‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,22 @@ 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
5861
docs\Normalization.fsx = docs\Normalization.fsx
5962
docs\NuGet.config = docs\NuGet.config
6063
docs\Optimization.fsx = docs\Optimization.fsx
6164
docs\Quantiles.fsx = docs\Quantiles.fsx
6265
docs\Rank.fsx = docs\Rank.fsx
6366
docs\Signal.fsx = docs\Signal.fsx
6467
docs\Testing.fsx = docs\Testing.fsx
65-
docs\_template.html = docs\_template.html
66-
docs\_template.ipynb = docs\_template.ipynb
68+
docs\_head.html = docs\_head.html
6769
EndProjectSection
6870
EndProject
6971
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{50E3E339-AA4D-4FD2-8791-DEBD2EBF0504}"
7072
ProjectSection(SolutionItems) = preProject
71-
docs\content\fsdocs-custom.css = docs\content\fsdocs-custom.css
73+
docs\content\fsdocs-theme.css = docs\content\fsdocs-theme.css
7274
EndProjectSection
7375
EndProject
7476
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Stats.Interactive", "src\FSharp.Stats.Interactive\FSharp.Stats.Interactive.fsproj", "{D7BCF5C0-9E2B-4170-9390-607B0B65A8CD}"

‎build/PackageTasks.fs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ open TestTasks
88

99
open BlackFox.Fake
1010
open Fake.Core
11+
open Fake.DotNet
1112
open Fake.IO.Globbing.Operators
1213

1314
let pack = BuildTask.create "Pack" [clean; build; runTests] {
@@ -23,12 +24,14 @@ let pack = BuildTask.create "Pack" [clean; build; runTests] {
2324
"Version",stableVersionTag
2425
"PackageReleaseNotes", (release.Notes |> String.concat "\r\n")
2526
] @ p.MSBuildParams.Properties)
27+
DisableInternalBinLog = true
2628
}
2729
{
2830
p with
2931
MSBuildParams = msBuildParams
3032
OutputPath = Some pkgDir
3133
}
34+
|> DotNet.Options.withCustomParams (Some "--no-dependencies -tl")
3235
))
3336
else failwith "aborted"
3437
}
@@ -46,13 +49,15 @@ let packPrerelease = BuildTask.create "PackPrerelease" [setPrereleaseTag; clean;
4649
"Version", prereleaseTag
4750
"PackageReleaseNotes", (release.Notes |> String.toLines )
4851
] @ p.MSBuildParams.Properties)
52+
DisableInternalBinLog = true
4953
}
5054
{
5155
p with
5256
VersionSuffix = Some prereleaseSuffix
5357
OutputPath = Some pkgDir
5458
MSBuildParams = msBuildParams
5559
}
60+
|> DotNet.Options.withCustomParams (Some "--no-dependencies -tl")
5661
))
5762
else
5863
failwith "aborted"

‎build/TestTasks.fs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ open ProjectInfo
77
open BasicTasks
88

99
let runTests = BuildTask.create "RunTests" [clean; build] {
10-
testProject
11-
|> Fake.DotNet.DotNet.test (fun testParams ->
12-
{ testParams with
13-
Logger = Some "console;verbosity=detailed"
14-
Configuration = DotNet.BuildConfiguration.fromString configuration
15-
NoBuild = true
16-
MSBuildParams = { testParams.MSBuildParams with DisableInternalBinLog = true }
10+
Fake.DotNet.DotNet.test(fun testParams ->
11+
{
12+
testParams with
13+
Logger = Some "console;verbosity=detailed"
14+
Configuration = DotNet.BuildConfiguration.fromString configuration
15+
NoBuild = true
16+
MSBuildParams = { testParams.MSBuildParams with DisableInternalBinLog = true }
1717
}
1818
|> DotNet.Options.withCustomParams (Some "-tl")
19-
)
19+
) testProject
2020
}
2121

2222
// to do: use this once we have actual tests
@@ -27,12 +27,12 @@ let runTestsWithCodeCov = BuildTask.create "RunTestsWithCodeCov" [clean; build]
2727
testParams with
2828
MSBuildParams = {
2929
standardParams with
30-
DisableInternalBinLog = true
3130
Properties = [
3231
"AltCover","true"
3332
"AltCoverCobertura","../../codeCov.xml"
3433
"AltCoverForce","true"
3534
]
35+
DisableInternalBinLog = true
3636
};
3737
Logger = Some "console;verbosity=detailed"
3838
}

‎build/build.fsproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@
3333

3434
<ItemGroup>
3535
<PackageReference Update="FSharp.Core" Version="9.0.202" />
36+
<PackageReference Include="Fake.Api.Github" Version="6.0.0" />
37+
<PackageReference Include="Fake.Core.Process" Version="6.0.0" />
38+
<PackageReference Include="Fake.Core.ReleaseNotes" Version="6.0.0" />
39+
<PackageReference Include="Fake.Core.Target" Version="6.0.0" />
40+
<PackageReference Include="Fake.DotNet.Cli" Version="6.0.0" />
41+
<PackageReference Include="Fake.DotNet.MSBuild" Version="6.0.0" />
42+
<PackageReference Include="Fake.Extensions.Release" Version="0.2.0" />
43+
<PackageReference Include="Fake.IO.FileSystem" Version="6.0.0" />
44+
<PackageReference Include="Fake.Tools.Git" Version="6.0.0" />
3645
</ItemGroup>
3746

3847
</Project>

‎docs/BasicStats.fsx‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@ categoryindex: 0
1010
(*** hide ***)
1111

1212
(*** condition: prepare ***)
13-
#r "../src/FSharp.Stats/bin/Release/netstandard2.0/FSharp.Stats.dll"
14-
#r "nuget: FsMath, 0.0.1"
15-
open FsMath
13+
#r "nuget: FSharpAux.Core, 2.0.0"
14+
#r "nuget: FSharpAux, 2.0.0"
15+
#r "nuget: FSharpAux.IO, 2.0.0"
16+
#r "nuget: OptimizedPriorityQueue, 5.1.0"
17+
#I "../src/FSharp.Stats/bin/Release/netstandard2.0/"
18+
#r "FSharp.Stats.dll"
19+
1620
(*** condition: ipynb ***)
1721
#if IPYNB
1822
#r "nuget: FSharp.Stats"
@@ -27,19 +31,6 @@ open FsMath
2731
2832
_Summary:_ this tutorial gives an overview over how to do some of the basic statistical measurements with FSharp.Stats.
2933
30-
### Table of contents
31-
32-
- [Central tendency](#Central-tendency)
33-
- [Mean](#Mean)
34-
- [Truncated mean](#Truncated-mean)
35-
- [Median](#Median)
36-
- [Harmonic mean](#Harmonic-mean)
37-
- [Geometric mean](#Geometric-mean)
38-
- [Dispersion](#Dispersion)
39-
- [Range](#Range)
40-
- [Variance and Standard Deviation](#Variance-and-standard-deviation)
41-
- [Coefficient of variation](#Coefficient-of-variation)
42-
4334
## Central tendency
4435
4536
A [central tendency](https://en.wikipedia.org/wiki/Central_tendency) (or measure of central tendency) is a central or typical value for a probability distribution.

‎docs/Clustering.fsx‎

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,23 @@ categoryindex: 0
1010
(*** hide ***)
1111

1212
(*** condition: prepare ***)
13+
#r "nuget: FSharpAux.Core, 2.0.0"
14+
#r "nuget: FSharpAux, 2.0.0"
15+
#r "nuget: FSharpAux.IO, 2.0.0"
16+
#r "nuget: OptimizedPriorityQueue, 5.1.0"
1317
#I "../src/FSharp.Stats/bin/Release/netstandard2.0/"
1418
#r "FSharp.Stats.dll"
1519
#r "nuget: Plotly.NET, 4.0.0"
16-
#r "nuget: FSharpAux, 1.0.0"
1720
#r "nuget: Cyjs.NET"
18-
#r "nuget: OptimizedPriorityQueue, 5.1.0"
19-
#r "nuget: FsMath, 0.0.1"
20-
open FsMath
21+
2122

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

2526
(*** condition: ipynb ***)
2627
#if IPYNB
27-
#r "nuget: Plotly.NET, 4.0.0"
28-
#r "nuget: Plotly.NET.Interactive, 4.0.0"
29-
#r "nuget: OptimizedPriorityQueue, 5.1.0"
30-
#r "nuget: FSharpAux, 1.0.0"
3128
#r "nuget: FSharp.Stats"
29+
#r "nuget: Plotly.NET, 4.0.0"
3230
#r "nuget: Cyjs.NET"
3331
#endif // IPYNB
3432

@@ -40,22 +38,6 @@ Plotly.NET.Defaults.DefaultDisplayOptions <-
4038
4139
_Summary:_ this tutorial demonstrates several clustering methods in FSharp.Stats and how to visualize the results with Plotly.NET.
4240
43-
### Table of contents
44-
45-
- [Iterative Clustering](#Iterative-Clustering)
46-
- [k-means clustering](#k-means-clustering)
47-
- [Density based clustering](#Density-based-clustering)
48-
- [DBSCAN](#DBSCAN)
49-
- [Hierarchical clustering](#Hierarchical-Clustering)
50-
- [Distance measures](#Distance-measures)
51-
- [Linkages](#Linkages)
52-
- [Determining the optimal number of clusters](#Determining-the-optimal-number-of-clusters)
53-
- [Rule of thumb](#Rule-of-thumb)
54-
- [Elbow criterion](#Elbow-criterion)
55-
- [AIC](#AIC)
56-
- [Silhouette coefficient](#Silhouette-coefficient)
57-
- [GapStatistics](#GapStatistics)
58-
5941
Clustering methods can be used to group elements of a huge data set based on their similarity. Elements sharing similar properties cluster together and can be reported as coherent group.
6042
6143
**Column wise standardization**

0 commit comments

Comments
 (0)