From a79b237ceaa86c675ff2f537cc5f64ccd89f5864 Mon Sep 17 00:00:00 2001 From: Simon Schulze Date: Sun, 25 Feb 2024 23:17:07 +0100 Subject: [PATCH] Fix typos and syntax --- src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj | 2 +- src/iRLeagueApiCore.Server/iRLeagueApiCore.Server.csproj | 2 +- .../ResultService/Calculation/FormulaParameters.cs | 4 ++-- .../ResultService/Calculation/FormulaPointRule.cs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj b/src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj index 382c9ee9..67e27445 100644 --- a/src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj +++ b/src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj @@ -13,7 +13,7 @@ Library net6.0 iRLeagueApiCore.Client - 0.11.2 + 0.11.3-dev.1 Simon Schulze Simon Schulze This package contains shared objects for all members of the iRLeagueDatabase-iRLeagueApi stack diff --git a/src/iRLeagueApiCore.Server/iRLeagueApiCore.Server.csproj b/src/iRLeagueApiCore.Server/iRLeagueApiCore.Server.csproj index 4e4f85c7..8038048b 100644 --- a/src/iRLeagueApiCore.Server/iRLeagueApiCore.Server.csproj +++ b/src/iRLeagueApiCore.Server/iRLeagueApiCore.Server.csproj @@ -72,7 +72,7 @@ true - 0.11.2 + 0.11.3-dev.1 enable diff --git a/src/iRLeagueApiCore.Services/ResultService/Calculation/FormulaParameters.cs b/src/iRLeagueApiCore.Services/ResultService/Calculation/FormulaParameters.cs index d3ee8c2d..81d670fa 100644 --- a/src/iRLeagueApiCore.Services/ResultService/Calculation/FormulaParameters.cs +++ b/src/iRLeagueApiCore.Services/ResultService/Calculation/FormulaParameters.cs @@ -1,7 +1,7 @@ using iRLeagueApiCore.Services.ResultService.Models; namespace iRLeagueApiCore.Services.ResultService.Calculation; -internal record FormulaParameter(string[] Aliases, string Description, Func valueFunc); +internal record FormulaParameter(string[] Aliases, string Description, Func valueFunc); public static class FormulaParameters { @@ -16,7 +16,7 @@ public static class FormulaParameters new(["qlap", "qualy_lap"], "Personal qualy lap", (_, row) => row.QualifyingTime.TotalSeconds), new(["avglap", "avg_lap"], "Personal avg. lap", (_, row) => row.AvgLapTime.TotalSeconds), new(["flapsession", "session_fastest_lap"], "Fastest lap in the session", (session, _) => session.FastestLap.TotalSeconds), - new(["qlapsession", "session_fastest_qualy_lap"], "Fastest qaly lap in the session", (session, _) => session.FastestQualyLap.TotalSeconds), + new(["qlapsession", "session_fastest_qualy_lap"], "Fastest qualy lap in the session", (session, _) => session.FastestQualyLap.TotalSeconds), new(["avglapsession", "session_fastest_avg_lap"], "Fastest avg. lap in the session", (session, _) => session.FastestAvgLap.TotalSeconds), }; diff --git a/src/iRLeagueApiCore.Services/ResultService/Calculation/FormulaPointRule.cs b/src/iRLeagueApiCore.Services/ResultService/Calculation/FormulaPointRule.cs index 1268bd2a..ae3582e2 100644 --- a/src/iRLeagueApiCore.Services/ResultService/Calculation/FormulaPointRule.cs +++ b/src/iRLeagueApiCore.Services/ResultService/Calculation/FormulaPointRule.cs @@ -20,9 +20,9 @@ public override IReadOnlyList ApplyPoints(SessionCalculationData session, { // prepare parameters var e = new NCalc.Expression(Formula, EvaluateOptions.IterateParameters); - foreach (var parameter in _parameters) + foreach (var (key, parameter) in _parameters) { - e.Parameters[parameter.Key] = rows.Select(row => parameter.Value.valueFunc.Invoke(session, row)).ToArray(); + e.Parameters[key] = rows.Select(row => parameter.valueFunc.Invoke(session, row)).ToArray(); } // calculate if (e.Evaluate() is not IList points)