diff --git a/Bithumb_minute.py b/Bithumb_minute.py index 951c36e..1950fd2 100644 --- a/Bithumb_minute.py +++ b/Bithumb_minute.py @@ -78,6 +78,7 @@ class Bithumb_minute(HTS): "avg10": -1, "avg12": -1, "avg20": -1, + "avg30": -1, "avg36": -1, "avg40": -1, "avg48": -1, @@ -139,6 +140,7 @@ class Bithumb_minute(HTS): "avg10": [], "avg12": [], "avg20": [], + "avg30": [], "avg36": [], "avg40": [], "avg48": [], @@ -178,6 +180,7 @@ class Bithumb_minute(HTS): result["avg10"].append(item['avg10']) result["avg12"].append(item['avg12']) result["avg20"].append(item['avg20']) + result["avg30"].append(item['avg30']) result["avg36"].append(item['avg36']) result["avg40"].append(item['avg40']) result["avg48"].append(item['avg48']) @@ -228,6 +231,7 @@ class Bithumb_minute(HTS): 'avg10': 'float', 'avg12': 'float', 'avg20': 'float', + 'avg30': 'float', 'avg36': 'float', 'avg40': 'float', 'avg48': 'float', diff --git a/stock/analysis/AnalyzerSqlite.py b/stock/analysis/AnalyzerSqlite.py index 7a6a925..68f1b16 100644 --- a/stock/analysis/AnalyzerSqlite.py +++ b/stock/analysis/AnalyzerSqlite.py @@ -527,6 +527,7 @@ class AnalyzerSqlite: q_10 = MovingAverage(10) q_12 = MovingAverage(12) q_20 = MovingAverage(20) + q_30 = MovingAverage(30) q_36 = MovingAverage(36) q_40 = MovingAverage(40) q_48 = MovingAverage(48) @@ -544,6 +545,7 @@ class AnalyzerSqlite: q_10.enqueue(stock[i]['close']) q_12.enqueue(stock[i]['close']) q_20.enqueue(stock[i]['close']) + q_30.enqueue(stock[i]['close']) q_36.enqueue(stock[i]['close']) q_40.enqueue(stock[i]['close']) q_48.enqueue(stock[i]['close']) @@ -560,6 +562,7 @@ class AnalyzerSqlite: stock[i]['avg10'] = q_10.avg() stock[i]['avg12'] = q_12.avg() stock[i]['avg20'] = q_20.avg() + stock[i]['avg30'] = q_30.avg() stock[i]['avg36'] = q_36.avg() stock[i]['avg40'] = q_40.avg() stock[i]['avg48'] = q_48.avg() @@ -601,6 +604,7 @@ class AnalyzerSqlite: "avg10": -1, "avg12": -1, "avg20": -1, + "avg20": -1, "avg36": -1, "avg40": -1, "avg48": -1,