From 6f42e512ea85aaea57390644a948282ab7abfeb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2024 03:49:11 +0000 Subject: [PATCH 1/3] Bump Plotly.NET and Plotly.NET.ImageExport Bumps [Plotly.NET](https://github.com/plotly/Plotly.NET) and [Plotly.NET.ImageExport](https://github.com/plotly/Plotly.NET). These dependencies needed to be updated together. Updates `Plotly.NET` from 4.2.0 to 5.0.0 - [Release notes](https://github.com/plotly/Plotly.NET/releases) - [Changelog](https://github.com/plotly/Plotly.NET/blob/dev/RELEASE_NOTES.md) - [Commits](https://github.com/plotly/Plotly.NET/compare/4.2.0...5.0.0) Updates `Plotly.NET.ImageExport` from 5.0.1 to 6.1.0 - [Release notes](https://github.com/plotly/Plotly.NET/releases) - [Changelog](https://github.com/plotly/Plotly.NET/blob/dev/RELEASE_NOTES.md) - [Commits](https://github.com/plotly/Plotly.NET/commits) --- updated-dependencies: - dependency-name: Plotly.NET dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Plotly.NET.ImageExport dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../BitFaster.Caching.HitRateAnalysis.csproj | 2 +- .../BitFaster.Caching.ThroughputAnalysis.csproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BitFaster.Caching.HitRateAnalysis/BitFaster.Caching.HitRateAnalysis.csproj b/BitFaster.Caching.HitRateAnalysis/BitFaster.Caching.HitRateAnalysis.csproj index 3e398a9f..403206b3 100644 --- a/BitFaster.Caching.HitRateAnalysis/BitFaster.Caching.HitRateAnalysis.csproj +++ b/BitFaster.Caching.HitRateAnalysis/BitFaster.Caching.HitRateAnalysis.csproj @@ -30,7 +30,7 @@ - + diff --git a/BitFaster.Caching.ThroughputAnalysis/BitFaster.Caching.ThroughputAnalysis.csproj b/BitFaster.Caching.ThroughputAnalysis/BitFaster.Caching.ThroughputAnalysis.csproj index e5cc9329..11a0de36 100644 --- a/BitFaster.Caching.ThroughputAnalysis/BitFaster.Caching.ThroughputAnalysis.csproj +++ b/BitFaster.Caching.ThroughputAnalysis/BitFaster.Caching.ThroughputAnalysis.csproj @@ -27,8 +27,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - + + From 430f6b46e8cb575f8255a02f840ca314910d5433 Mon Sep 17 00:00:00 2001 From: Alex Peck Date: Sat, 16 Nov 2024 20:00:17 -0800 Subject: [PATCH 2/3] update --- .../BitFaster.Caching.HitRateAnalysis.csproj | 2 +- BitFaster.Caching.HitRateAnalysis/PlotExt.cs | 10 +++++----- .../BitFaster.Caching.ThroughputAnalysis.csproj | 2 +- BitFaster.Caching.ThroughputAnalysis/Exporter.cs | 12 ++++++------ BitFaster.Caching.ThroughputAnalysis/Runner.cs | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/BitFaster.Caching.HitRateAnalysis/BitFaster.Caching.HitRateAnalysis.csproj b/BitFaster.Caching.HitRateAnalysis/BitFaster.Caching.HitRateAnalysis.csproj index 403206b3..1d760e08 100644 --- a/BitFaster.Caching.HitRateAnalysis/BitFaster.Caching.HitRateAnalysis.csproj +++ b/BitFaster.Caching.HitRateAnalysis/BitFaster.Caching.HitRateAnalysis.csproj @@ -29,7 +29,7 @@ - + diff --git a/BitFaster.Caching.HitRateAnalysis/PlotExt.cs b/BitFaster.Caching.HitRateAnalysis/PlotExt.cs index da0b5447..cfa13e19 100644 --- a/BitFaster.Caching.HitRateAnalysis/PlotExt.cs +++ b/BitFaster.Caching.HitRateAnalysis/PlotExt.cs @@ -8,7 +8,7 @@ namespace BitFaster.Caching.HitRateAnalysis { public static class PlotExt { - public static GenericChart.GenericChart WithAxisTitles(this GenericChart.GenericChart chart, string xTitle, string yTitle) + public static GenericChart WithAxisTitles(this GenericChart chart, string xTitle, string yTitle) { var font = new FSharpOption(Font.init(Size: new FSharpOption(16))); FSharpOption xt = new FSharpOption(xTitle); @@ -16,18 +16,18 @@ public static GenericChart.GenericChart WithAxisTitles(this GenericChart.Generic return chart.WithXAxisStyle(Title.init(xt, Font: font)).WithYAxisStyle(Title.init(yt, Font: font)); } - public static GenericChart.GenericChart WithoutVerticalGridlines(this GenericChart.GenericChart chart) + public static GenericChart WithoutVerticalGridlines(this GenericChart chart) { var gridColor = new FSharpOption(Color.fromKeyword(ColorKeyword.Gainsboro)); - var yaxis = LinearAxis.init( + var yaxis = LinearAxis.init( GridColor: gridColor, ZeroLineColor: gridColor); - var axis = LinearAxis.init(ShowGrid: new FSharpOption(false)); + var axis = LinearAxis.init(ShowGrid: new FSharpOption(false)); return chart.WithXAxis(axis).WithYAxis(yaxis); } - public static GenericChart.GenericChart WithLayout(this GenericChart.GenericChart chart, string title) + public static GenericChart WithLayout(this GenericChart chart, string title) { var font = new FSharpOption(Font.init(Size: new FSharpOption(24))); FSharpOption t = Title.init(Text: title, X: 0.5, Font: font); diff --git a/BitFaster.Caching.ThroughputAnalysis/BitFaster.Caching.ThroughputAnalysis.csproj b/BitFaster.Caching.ThroughputAnalysis/BitFaster.Caching.ThroughputAnalysis.csproj index 11a0de36..f1f31f1c 100644 --- a/BitFaster.Caching.ThroughputAnalysis/BitFaster.Caching.ThroughputAnalysis.csproj +++ b/BitFaster.Caching.ThroughputAnalysis/BitFaster.Caching.ThroughputAnalysis.csproj @@ -27,7 +27,7 @@ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" /> - <PackageReference Include="Plotly.NET" Version="5.0.0" /> + <PackageReference Include="Plotly.NET" Version="5.1.0" /> <PackageReference Include="Plotly.NET.ImageExport" Version="6.1.0" /> </ItemGroup> diff --git a/BitFaster.Caching.ThroughputAnalysis/Exporter.cs b/BitFaster.Caching.ThroughputAnalysis/Exporter.cs index 0c3456a6..ea36663d 100644 --- a/BitFaster.Caching.ThroughputAnalysis/Exporter.cs +++ b/BitFaster.Caching.ThroughputAnalysis/Exporter.cs @@ -80,7 +80,7 @@ public void ExportPlot(Mode mode, int cacheSize) columns.Add(int.Parse(resultTable.Columns[i].ColumnName)); } - List<GenericChart.GenericChart> charts = new List<GenericChart.GenericChart>(); + List<GenericChart> charts = new List<GenericChart>(); foreach (DataRow row in resultTable.Rows) { @@ -165,7 +165,7 @@ public Color MapColor(string name) public static class PlotExt { - public static GenericChart.GenericChart WithAxisTitles(this GenericChart.GenericChart chart, string xTitle, string yTitle) + public static GenericChart WithAxisTitles(this GenericChart chart, string xTitle, string yTitle) { var font = new FSharpOption<Font>(Font.init(Size: new FSharpOption<double>(16))); FSharpOption<string> xt = new FSharpOption<string>(xTitle); @@ -173,18 +173,18 @@ public static GenericChart.GenericChart WithAxisTitles(this GenericChart.Generic return chart.WithXAxisStyle(Title.init(xt, Font: font)).WithYAxisStyle(Title.init(yt, Font: font)); } - public static GenericChart.GenericChart WithoutVerticalGridlines(this GenericChart.GenericChart chart) + public static GenericChart WithoutVerticalGridlines(this GenericChart chart) { var gridColor = new FSharpOption<Color>(Color.fromKeyword(ColorKeyword.Gainsboro)); - var yaxis = LinearAxis.init<IConvertible, IConvertible, IConvertible, IConvertible, IConvertible, IConvertible>( + var yaxis = LinearAxis.init<IConvertible, IConvertible, IConvertible, IConvertible, IConvertible, IConvertible, IConvertible, IConvertible>( GridColor: gridColor, ZeroLineColor: gridColor); - var axis = LinearAxis.init<IConvertible, IConvertible, IConvertible, IConvertible, IConvertible, IConvertible>(ShowGrid: new FSharpOption<bool>(false)); + var axis = LinearAxis.init<IConvertible, IConvertible, IConvertible, IConvertible, IConvertible, IConvertible, IConvertible, IConvertible>(ShowGrid: new FSharpOption<bool>(false)); return chart.WithXAxis(axis).WithYAxis(yaxis); } - public static GenericChart.GenericChart WithLayout(this GenericChart.GenericChart chart, string title) + public static GenericChart WithLayout(this GenericChart chart, string title) { var font = new FSharpOption<Font>(Font.init(Size: new FSharpOption<double>(24))); FSharpOption<Title> t = Title.init(Text: title, X: 0.5, Font: font); diff --git a/BitFaster.Caching.ThroughputAnalysis/Runner.cs b/BitFaster.Caching.ThroughputAnalysis/Runner.cs index f6caa276..b57f8e99 100644 --- a/BitFaster.Caching.ThroughputAnalysis/Runner.cs +++ b/BitFaster.Caching.ThroughputAnalysis/Runner.cs @@ -33,10 +33,10 @@ private static void RunTest(Mode mode, int cacheSize) var cachesToTest = new List<ICacheFactory> { - new ClassicLruFactory(capacity), - new MemoryCacheFactory(capacity), - new FastConcurrentLruFactory(capacity), - new ConcurrentLruFactory(capacity), + //new ClassicLruFactory(capacity), + //new MemoryCacheFactory(capacity), + //new FastConcurrentLruFactory(capacity), + //new ConcurrentLruFactory(capacity), new ConcurrentLfuFactory(capacity) }; From 98ffcfdc6a54f37c8bc58e9e3a076b6bf9027154 Mon Sep 17 00:00:00 2001 From: Alex Peck <alexpeck@microsoft.com> Date: Sat, 16 Nov 2024 20:01:37 -0800 Subject: [PATCH 3/3] revert runner --- BitFaster.Caching.ThroughputAnalysis/Runner.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BitFaster.Caching.ThroughputAnalysis/Runner.cs b/BitFaster.Caching.ThroughputAnalysis/Runner.cs index b57f8e99..f6caa276 100644 --- a/BitFaster.Caching.ThroughputAnalysis/Runner.cs +++ b/BitFaster.Caching.ThroughputAnalysis/Runner.cs @@ -33,10 +33,10 @@ private static void RunTest(Mode mode, int cacheSize) var cachesToTest = new List<ICacheFactory> { - //new ClassicLruFactory(capacity), - //new MemoryCacheFactory(capacity), - //new FastConcurrentLruFactory(capacity), - //new ConcurrentLruFactory(capacity), + new ClassicLruFactory(capacity), + new MemoryCacheFactory(capacity), + new FastConcurrentLruFactory(capacity), + new ConcurrentLruFactory(capacity), new ConcurrentLfuFactory(capacity) };