diff --git a/BitFaster.Caching.HitRateAnalysis/BitFaster.Caching.HitRateAnalysis.csproj b/BitFaster.Caching.HitRateAnalysis/BitFaster.Caching.HitRateAnalysis.csproj index 3e398a9f..1d760e08 100644 --- a/BitFaster.Caching.HitRateAnalysis/BitFaster.Caching.HitRateAnalysis.csproj +++ b/BitFaster.Caching.HitRateAnalysis/BitFaster.Caching.HitRateAnalysis.csproj @@ -29,8 +29,8 @@ - - + + 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 e5cc9329..f1f31f1c 100644 --- a/BitFaster.Caching.ThroughputAnalysis/BitFaster.Caching.ThroughputAnalysis.csproj +++ b/BitFaster.Caching.ThroughputAnalysis/BitFaster.Caching.ThroughputAnalysis.csproj @@ -27,8 +27,8 @@ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" /> - <PackageReference Include="Plotly.NET" Version="4.2.0" /> - <PackageReference Include="Plotly.NET.ImageExport" Version="5.0.1" /> + <PackageReference Include="Plotly.NET" Version="5.1.0" /> + <PackageReference Include="Plotly.NET.ImageExport" Version="6.1.0" /> </ItemGroup> <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);