INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-27 23:50:40 -05:00
Code Issues Releases Wiki Activity

Using Code from EFPerformanceBucket for references

Browse Source
This commit is contained in:
Ayymoss
2024-09-07 18:41:18 +01:00
parent 79bd6ca8e1
commit 98e2be8623
17 changed files with 154 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Plugins/Stats/Client/HitCalculator.cs
View File

@ -290,16 +290,16 @@ public class HitCalculator : IClientStatisticCalculator
var matchingLocation = await GetOrAddHitLocation(hitInfo.Location, hitInfo.Game);
var meansOfDeath = await GetOrAddMeansOfDeath(hitInfo.MeansOfDeath, hitInfo.Game);
var baseTasks = new[]
{
List<Task<EFClientHitStatistic>> baseTasks =
[
// just the client
GetOrAddClientHit(hitInfo.EntityId, null),
GetOrAddClientHit(hitInfo.EntityId),
// client and server
GetOrAddClientHit(hitInfo.EntityId, serverId),
// just the location
GetOrAddClientHit(hitInfo.EntityId, null, matchingLocation.HitLocationId),
GetOrAddClientHit(hitInfo.EntityId, hitLocationId: matchingLocation.HitLocationId),
// location and server
GetOrAddClientHit(hitInfo.EntityId, serverId, matchingLocation.HitLocationId),
GetOrAddClientHit(hitInfo.EntityId, serverId, hitLocationId: matchingLocation.HitLocationId),
// per weapon
GetOrAddClientHit(hitInfo.EntityId, null, null, weapon.WeaponId),
// per weapon and server
@ -309,7 +309,7 @@ public class HitCalculator : IClientStatisticCalculator
// means of death per server aggregate
GetOrAddClientHit(hitInfo.EntityId, serverId,
meansOfDeathId: meansOfDeath.MeansOfDeathId)
};
];
var allTasks = baseTasks.AsEnumerable();
@ -413,7 +413,7 @@ public class HitCalculator : IClientStatisticCalculator
}
}
private async Task<EFClientHitStatistic> GetOrAddClientHit(int clientId, long? serverId = null, string performanceBucket = null,
private async Task<EFClientHitStatistic> GetOrAddClientHit(int clientId, long? serverId = null, string performanceBucketCode = null,
int? hitLocationId = null, int? weaponId = null, int? attachmentComboId = null,
int? meansOfDeathId = null)
{
@ -425,7 +425,7 @@ public class HitCalculator : IClientStatisticCalculator
&& hit.WeaponId == weaponId
&& hit.WeaponAttachmentComboId == attachmentComboId
&& hit.MeansOfDeathId == meansOfDeathId
&& (performanceBucket is not null && performanceBucket == hit.Server.PerformanceBucket || (performanceBucket is null && hit.ServerId == serverId)));
&& (performanceBucketCode is not null && performanceBucketCode == hit.Server.PerformanceBucket.Code || (performanceBucketCode is null && hit.ServerId == serverId)));
if (hitStat != null)
{

25
Plugins/Stats/Client/ServerDistributionCalculator.cs
View File

@ -63,7 +63,7 @@ namespace Stats.Client
{
var bucketConfig =
_configuration.PerformanceBuckets.FirstOrDefault(bucket =>
bucket.Name == performanceBucket) ?? new PerformanceBucketConfiguration();
bucket.Code == performanceBucket) ?? new PerformanceBucketConfiguration();
var oldestPerf = DateTime.UtcNow - bucketConfig.RankingExpiration;
var performances = await iqPerformances.Where(s => s.ServerId == serverId)
@ -76,42 +76,43 @@ namespace Stats.Client
distributions.Add(serverId.ToString(), distributionParams);
}
foreach (var performanceBucketGroup in _appConfig.Servers.Select(server => server.PerformanceBucket).Distinct())
foreach (var performanceBucket in _appConfig.Servers.Select(server => server.PerformanceBucketCode).Distinct())
{
var performanceBucket = performanceBucketGroup ?? "null";
// TODO: ?
var performanceBucketCode = performanceBucket ?? "null";
var bucketConfig =
_configuration.PerformanceBuckets.FirstOrDefault(bucket =>
bucket.Name == performanceBucket) ?? new PerformanceBucketConfiguration();
bucket.Code == performanceBucketCode) ?? new PerformanceBucketConfiguration();
var oldestPerf = DateTime.UtcNow - bucketConfig.RankingExpiration;
var performances = await iqPerformances
.Where(perf => perf.Server.PerformanceBucket == performanceBucket)
.Where(perf => perf.Server.PerformanceBucket.Code == performanceBucketCode)
.Where(perf => perf.TimePlayed >= bucketConfig.ClientMinPlayTime.TotalSeconds)
.Where(perf => perf.UpdatedAt >= oldestPerf)
.Where(perf => perf.Skill < 999999)
.Select(s => s.EloRating * 1 / 3.0 + s.Skill * 2 / 3.0)
.ToListAsync(token);
var distributionParams = performances.GenerateDistributionParameters();
distributions.Add(performanceBucket, distributionParams);
distributions.Add(performanceBucketCode, distributionParams);
}
return distributions;
}, DistributionCacheKey, Utilities.IsDevelopment ? TimeSpan.FromMinutes(1) : TimeSpan.FromHours(1));
foreach (var performanceBucket in _appConfig.Servers.Select(s => s.PerformanceBucket).Distinct())
foreach (var performanceBucket in _appConfig.Servers.Select(s => s.PerformanceBucketCode).Distinct())
{
_maxZScoreCache.SetCacheItem(async (set, ids, token) =>
{
var validPlayTime = _configuration.TopPlayersMinPlayTime;
var oldestStat = DateTime.UtcNow - Extensions.FifteenDaysAgo();
var perfBucket = (string)ids.FirstOrDefault();
var localPerformanceBucket = (string)ids.FirstOrDefault();
if (!string.IsNullOrEmpty(perfBucket))
if (!string.IsNullOrEmpty(localPerformanceBucket))
{
var bucketConfig =
_configuration.PerformanceBuckets.FirstOrDefault(cfg =>
cfg.Name == perfBucket) ?? new PerformanceBucketConfiguration();
cfg.Code == localPerformanceBucket) ?? new PerformanceBucketConfiguration();
validPlayTime = (int)bucketConfig.ClientMinPlayTime.TotalSeconds;
oldestStat = bucketConfig.RankingExpiration;
@ -121,7 +122,7 @@ namespace Stats.Client
.Where(AdvancedClientStatsResourceQueryHelper.GetRankingFunc(validPlayTime, oldestStat))
.Where(s => s.Skill > 0)
.Where(s => s.EloRating >= 0)
.Where(stat => perfBucket == stat.Server.PerformanceBucket)
.Where(stat => localPerformanceBucket == stat.Server.PerformanceBucket.Code)
.GroupBy(stat => stat.ClientId)
.Select(group =>
group.Sum(stat => stat.ZScore * stat.TimePlayed) / group.Sum(stat => stat.TimePlayed))
@ -170,7 +171,7 @@ namespace Stats.Client
await using var context = _contextFactory.CreateContext(false);
_serverIds.AddRange(await context.Servers
.Where(s => s.EndPoint != null && s.HostName != null)
.Select(s => new Tuple<long, string>(s.ServerId, s.PerformanceBucket))
.Select(s => new Tuple<long, string>(s.ServerId, s.PerformanceBucket.Code))
.ToListAsync());
}
}