From 859474b5775d3881249fb93d26920813ba208b6e Mon Sep 17 00:00:00 2001 From: Licshee Date: Thu, 4 Feb 2016 17:30:04 +0800 Subject: [PATCH] misc improve --- .../Controller/Service/GfwListUpdater.cs | 4 ++-- .../Controller/ShadowsocksController.cs | 2 +- .../Controller/Strategy/StatisticsStrategy.cs | 18 +++++++++--------- .../StatisticsStrategyConfigurationForm.cs | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/shadowsocks-csharp/Controller/Service/GfwListUpdater.cs b/shadowsocks-csharp/Controller/Service/GfwListUpdater.cs index 2497090d..42dc70ca 100644 --- a/shadowsocks-csharp/Controller/Service/GfwListUpdater.cs +++ b/shadowsocks-csharp/Controller/Service/GfwListUpdater.cs @@ -42,7 +42,7 @@ namespace Shadowsocks.Controller string[] rules = local.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); foreach (string rule in rules) { - if (rule.StartsWith("!") || rule.StartsWith("[")) + if (rule[0] == '!' || rule[0] == '[') continue; lines.Add(rule); } @@ -97,7 +97,7 @@ namespace Shadowsocks.Controller List valid_lines = new List(lines.Length); foreach (string line in lines) { - if (line.StartsWith("!") || line.StartsWith("[")) + if (line[0] == '!' || line[0] == '[') continue; valid_lines.Add(line); } diff --git a/shadowsocks-csharp/Controller/ShadowsocksController.cs b/shadowsocks-csharp/Controller/ShadowsocksController.cs index f7d50bd3..0950c2d9 100755 --- a/shadowsocks-csharp/Controller/ShadowsocksController.cs +++ b/shadowsocks-csharp/Controller/ShadowsocksController.cs @@ -457,7 +457,7 @@ namespace Shadowsocks.Controller string[] rules = local.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); foreach (string rule in rules) { - if (rule.StartsWith("!") || rule.StartsWith("[")) + if (rule[0] == '!' || rule[0] == '[') continue; lines.Add(rule); } diff --git a/shadowsocks-csharp/Controller/Strategy/StatisticsStrategy.cs b/shadowsocks-csharp/Controller/Strategy/StatisticsStrategy.cs index df34c994..70da0ac8 100644 --- a/shadowsocks-csharp/Controller/Strategy/StatisticsStrategy.cs +++ b/shadowsocks-csharp/Controller/Strategy/StatisticsStrategy.cs @@ -18,7 +18,7 @@ namespace Shadowsocks.Controller.Strategy private readonly Timer _timer; private Dictionary> _filteredStatistics; private int ChoiceKeptMilliseconds - => (int) TimeSpan.FromMinutes(_controller.StatisticsConfiguration.ChoiceKeptMinutes).TotalMilliseconds; + => (int)TimeSpan.FromMinutes(_controller.StatisticsConfiguration.ChoiceKeptMinutes).TotalMilliseconds; public StatisticsStrategy(ShadowsocksController controller) { @@ -49,11 +49,11 @@ namespace Shadowsocks.Controller.Strategy var config = _controller.StatisticsConfiguration; List dataList; if (_filteredStatistics == null || !_filteredStatistics.TryGetValue(serverName, out dataList)) return 0; - var successTimes = (float) dataList.Count(data => data.ICMPStatus.Equals(IPStatus.Success.ToString())); - var timedOutTimes = (float) dataList.Count(data => data.ICMPStatus.Equals(IPStatus.TimedOut.ToString())); + var successTimes = (float)dataList.Count(data => data.ICMPStatus == IPStatus.Success.ToString()); + var timedOutTimes = (float)dataList.Count(data => data.ICMPStatus == IPStatus.TimedOut.ToString()); var statisticsData = new AvailabilityStatistics.StatisticsData { - PackageLoss = timedOutTimes/(successTimes + timedOutTimes)*100, + PackageLoss = timedOutTimes / (successTimes + timedOutTimes) * 100, AverageResponse = Convert.ToInt32(dataList.Average(data => data.RoundtripTime)), MinResponse = dataList.Min(data => data.RoundtripTime), MaxResponse = dataList.Max(data => data.RoundtripTime) @@ -61,13 +61,13 @@ namespace Shadowsocks.Controller.Strategy float factor; float score = 0; if (!config.Calculations.TryGetValue("PackageLoss", out factor)) factor = 0; - score += statisticsData.PackageLoss*factor; + score += statisticsData.PackageLoss * factor; if (!config.Calculations.TryGetValue("AverageResponse", out factor)) factor = 0; - score += statisticsData.AverageResponse*factor; + score += statisticsData.AverageResponse * factor; if (!config.Calculations.TryGetValue("MinResponse", out factor)) factor = 0; - score += statisticsData.MinResponse*factor; + score += statisticsData.MinResponse * factor; if (!config.Calculations.TryGetValue("MaxResponse", out factor)) factor = 0; - score += statisticsData.MaxResponse*factor; + score += statisticsData.MaxResponse * factor; Logging.Debug($"{serverName} {JsonConvert.SerializeObject(statisticsData)}"); return score; } @@ -90,7 +90,7 @@ namespace Shadowsocks.Controller.Strategy } ).Aggregate((result1, result2) => result1.score > result2.score ? result1 : result2); - LogWhenEnabled($"Switch to server: {bestResult.server.FriendlyName()} by statistics: score {bestResult.score}"); + LogWhenEnabled($"Switch to server: {bestResult.server.FriendlyName()} by statistics: score {bestResult.score}"); _currentServer = bestResult.server; } catch (Exception e) diff --git a/shadowsocks-csharp/View/StatisticsStrategyConfigurationForm.cs b/shadowsocks-csharp/View/StatisticsStrategyConfigurationForm.cs index aae33546..02b57cd4 100644 --- a/shadowsocks-csharp/View/StatisticsStrategyConfigurationForm.cs +++ b/shadowsocks-csharp/View/StatisticsStrategyConfigurationForm.cs @@ -108,7 +108,7 @@ namespace Shadowsocks.View Timestamp = dataGroup.First().Timestamp, Ping = (int)dataGroup.Average(data => data.RoundtripTime), PackageLoss = (int) - (dataGroup.Count(data => data.ICMPStatus.Equals(IPStatus.TimedOut.ToString())) + (dataGroup.Count(data => data.ICMPStatus == IPStatus.TimedOut.ToString()) / (float)dataGroup.Count() * 100) }; foreach (var data in finalData)