Merge remote-tracking branch 'origin/master'

VertigoRay · Sep 12, 2017 · d7b37b0 · d7b37b0
2 parents 3040a6d + de65ad0
commit d7b37b0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/config/default.yaml b/config/default.yaml
@@ -42,20 +42,21 @@ BTC-USD:
   interval: 1000
   buy:
     amount: 0.01
-    only_when_trend_is_full: true
+    only_when_trend_is_full: false
     post_only: true
     cancel_after: min
-    below_midmarket: 0.01
+    below_midmarket: 0.01   
     spread_n: 3
     spread_v: 0.50
   sell:
     post_only: true
     above_buy: 0.01
-  strategy: StdDev
+  strategy: TrendLines
   strategies:
     StdDev:
       trades_n: 1000
     TrendLines:
+      trades_n: 1000
       trendlines_n: 2
       trades_n: 1000
       trend_1_buy_on_up: true
@@ -69,7 +70,7 @@ ETH-USD:
   interval: 1000
   buy:
     amount: 0.01
-    only_when_trend_is_full: true
+    only_when_trend_is_full: false
     post_only: true
     cancel_after: min
     below_midmarket: 0.005
@@ -78,7 +79,7 @@ ETH-USD:
   sell:
     post_only: true
     above_buy: 0.01
-  strategy: StdDev
+  strategy: TrendLines
   strategies:
     StdDev:
       trades_n: 1000
@@ -96,7 +97,7 @@ LTC-USD:
   interval: 1000
   buy:
     amount: 0.01
-    only_when_trend_is_full: true
+    only_when_trend_is_full: false
     post_only: true
     cancel_after: min
     below_midmarket: 0.001
@@ -105,7 +106,7 @@ LTC-USD:
   sell:
     post_only: true
     above_buy: 0.01
-  strategy: StdDev
+  strategy: TrendLines
   strategies:
     StdDev:
       trades_n: 1000

diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
     "gdax": "~0.4.2",
     "glob": "^7.1.2",
     "js-yaml": "^3.9.0",
+    "lodash": "^4.17.4",
     "log": "^1.4.0",
     "os-utils": "0.0.14",
     "path": "^0.12.7",

diff --git a/strategies/trendlines.js b/strategies/trendlines.js
@@ -27,7 +27,7 @@ class TrendLines {
 			for (let i=0; i < this.trend_lines.length; i++) {
 				this.trend_lines[i].push(parseFloat(trades[trade].toString()));
 
-				settings.get(`${this.product_id}.strategies.TrendLines.trendlines_n`)
+				settings.get(`${this.product_id}.strategies.TrendLines.trendlines_n`);
 
 				while (this.trend_lines[i].length > this.trades_n[i] + 1)
 					this.trend_lines[i].shift();
@@ -51,10 +51,13 @@ class TrendLines {
 		switch (this.product_id) {
 			case 'BTC-USD':
 				starting_price = Math.random() * 10000;
+				break;
 			case 'ETH-USD':
 				starting_price = Math.random() * 1000;
+				break;
 			case 'LTC-USD':
 				starting_price = Math.random() * 100;
+				break;
 		}
 
 		for (let i = 0; i < count; i++)
@@ -69,7 +72,7 @@ class TrendLines {
 		let strategy = {
 			trendlines_n: settings.get(`${this.product_id}.strategies.TrendLines.trendlines_n`),
 			last_trade_price: this.trend_lines[0][this.trend_lines[0].length - 1],
-		}
+		};
 
 		var is_trending_up = [];
 		var should_buy = [];
@@ -114,7 +117,7 @@ class TrendLines {
 				throw new Error(`The parameter 'set.product_id' is not valid (${set.product_id}); should be one of: ${settings.get('general.product_ids')}.`);
 
 
-			this.product_id = set.product_id
+			this.product_id = set.product_id;
 
 			for (let i=0; i < settings.get(`${this.product_id}.strategies.TrendLines.trendlines_n`); i++) {
 				this.trend_lines[i] = [];