Merge remote-tracking branch 'upstream/master' into feature/statistics_ui

# Conflicts:
#	shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
#	shadowsocks-csharp/Controller/Strategy/StatisticsStrategy.cs
#	shadowsocks-csharp/View/StatisticsStrategyConfigurationForm.cs
This commit is contained in:
icylogic
2016-02-29 20:56:01 +08:00
21 changed files with 459 additions and 156 deletions
@@ -20,7 +20,7 @@ namespace Shadowsocks.Controller.Strategy
private Statistics _filteredStatistics;
private AvailabilityStatistics Service => _controller.availabilityStatistics;
private int ChoiceKeptMilliseconds
=> (int) TimeSpan.FromMinutes(_controller.StatisticsConfiguration.ChoiceKeptMinutes).TotalMilliseconds;
=> (int)TimeSpan.FromMinutes(_controller.StatisticsConfiguration.ChoiceKeptMinutes).TotalMilliseconds;
public StatisticsStrategy(ShadowsocksController controller)
{
@@ -93,7 +93,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)