trading
/
PTMagic
mirror of https://github.com/PTMagicians/PTMagic.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Ignore Ouliers

This commit is contained in:
HojouFotytu 2021-01-31 01:32:36 +09:00
parent 8e7bd96970
commit c2bbc274b5
4 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/DataObjects/PTMagicData.cs
View File

@ -146,6 +146,9 @@ namespace Core.Main.DataObjects.PTMagicData
[DefaultValue("")] [DefaultValue("")]
public string AllowedMarkets { get; set; } = ""; public string AllowedMarkets { get; set; } = "";
[DefaultValue(0)]
public int IgnoreOutlier { get; set; } = 0;
[DefaultValue(true)] [DefaultValue(true)]
public bool ExcludeMainCurrency { get; set; } = true; public bool ExcludeMainCurrency { get; set; } = true;
} }

2
Core/Main/PTMagic.cs
View File

@ -1310,7 +1310,7 @@ namespace Core.Main
// CoinMarketCap // CoinMarketCap
this.GlobalMarketTrendChanges = BaseAnalyzer.BuildMarketTrends("CoinMarketCap", this.LastRuntimeSummary.MainMarket, new List<string>(), "", true, this.GlobalMarketTrendChanges, this.PTMagicConfiguration, this.Log); this.GlobalMarketTrendChanges = BaseAnalyzer.BuildMarketTrends("CoinMarketCap", this.LastRuntimeSummary.MainMarket, new List<string>(), "", true, this.GlobalMarketTrendChanges, this.PTMagicConfiguration, this.Log);
// Bittrex // Exchange
foreach (MarketTrend marketTrend in this.PTMagicConfiguration.AnalyzerSettings.MarketAnalyzer.MarketTrends.FindAll(mt => mt.Platform.Equals("Exchange", StringComparison.InvariantCultureIgnoreCase))) foreach (MarketTrend marketTrend in this.PTMagicConfiguration.AnalyzerSettings.MarketAnalyzer.MarketTrends.FindAll(mt => mt.Platform.Equals("Exchange", StringComparison.InvariantCultureIgnoreCase)))
{ {
if (this.SingleMarketTrendChanges.ContainsKey(marketTrend.Name)) if (this.SingleMarketTrendChanges.ContainsKey(marketTrend.Name))

24
Core/MarketAnalyzer/BaseAnalyzer.cs
View File

@ -429,7 +429,29 @@ namespace Core.MarketAnalyzer
if (marketTrendChanges != null && marketTrendChanges.Count > 0) if (marketTrendChanges != null && marketTrendChanges.Count > 0)
{ {
double averageTrendChange = marketTrendChanges.Average(mtc => mtc.TrendChange);
double totalTrendChange = 0;
foreach (MarketTrendChange marketTrendChange in marketTrendChanges)
{
if (marketTrend.IgnoreOutlier != 0)
{
if ((marketTrendChange.TrendChange > marketTrend.IgnoreOutlier) || (marketTrendChange.TrendChange < (marketTrend.IgnoreOutlier * -1)))
{
log.DoLogWarn("Market trend '" + marketTrend.Name + "' is ignoring the outlier '" + marketTrendChange.Market + ".");
}
else
{
totalTrendChange += marketTrendChange.TrendChange;
}
}
else
{
totalTrendChange += marketTrendChange.TrendChange;
}
}
double averageTrendChange = totalTrendChange / marketTrendChanges.Count;
result.Add(marketTrend.Name, averageTrendChange); result.Add(marketTrend.Name, averageTrendChange);

1
Monitor/Pages/SettingsAnalyzer.cshtml.cs
View File

@ -77,6 +77,7 @@ namespace Monitor.Pages
mt.TrendCurrency = HttpContext.Request.Form[mtFormKey + "TrendCurrency"]; mt.TrendCurrency = HttpContext.Request.Form[mtFormKey + "TrendCurrency"];
mt.IgnoredMarkets = HttpContext.Request.Form[mtFormKey + "IgnoredMarkets"]; mt.IgnoredMarkets = HttpContext.Request.Form[mtFormKey + "IgnoredMarkets"];
mt.AllowedMarkets = HttpContext.Request.Form[mtFormKey + "AllowedMarkets"]; mt.AllowedMarkets = HttpContext.Request.Form[mtFormKey + "AllowedMarkets"];
mt.IgnoreOutlier = SystemHelper.TextToInteger(HttpContext.Request.Form[mtFormKey + "IgnoreOutlier"], mt.IgnoreOutlier);
mt.DisplayGraph = HttpContext.Request.Form[mtFormKey + "DisplayGraph"].Equals("on"); mt.DisplayGraph = HttpContext.Request.Form[mtFormKey + "DisplayGraph"].Equals("on");
mt.ExcludeMainCurrency = HttpContext.Request.Form[mtFormKey + "ExcludeMainCurrency"].Equals("on"); mt.ExcludeMainCurrency = HttpContext.Request.Form[mtFormKey + "ExcludeMainCurrency"].Equals("on");