removed candle calculating modules outside the methods directory

sammchardy · Dec 22, 2013 · bf0e6d7 · bf0e6d7
1 parent 9f06654
commit bf0e6d7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 13 deletions.
diff --git a/gekko-backtest.js b/gekko-backtest.js
@@ -35,10 +35,7 @@ config.backtest.enabled = true;
 // set updated config
 util.setConfig(config);
 
-if(config.talib)
-  var Consultant = require('./methods/talib');
-else
-  var Consultant = require('./methods/' + config.tradingMethod.toLowerCase().split(' ').join('-'));
+var Consultant = require('./methods/' + config.tradingMethod.toLowerCase().split(' ').join('-'));
 
 log.info('I\'m gonna make you rich, Bud Fox.');
 log.info('Let me show you some ' + config.tradingMethod + '.\n\n');

diff --git a/gekko.js b/gekko.js
@@ -26,10 +26,7 @@ var Manager = require('./portfolioManager');
 var exchangeChecker = require('./exchangeChecker');
 
 var config = util.getConfig();
-if(config.talib)
-  var Consultant = require('./methods/talib');
-else
-  var Consultant = require('./methods/' + config.tradingMethod.toLowerCase().split(' ').join('-'));
+var Consultant = require('./methods/' + config.tradingMethod.toLowerCase().split(' ').join('-'));
 
 log.info('I\'m gonna make you rich, Bud Fox.');
 log.info('Let me show you some ' + config.tradingMethod + '.\n\n');

diff --git a/methods/historical-candle-fetcher.js → historicalCandleFetcher.js b/methods/historical-candle-fetcher.js → historicalCandleFetcher.js
@@ -3,7 +3,7 @@ var lineReader = require('line-reader');
 var Util = require('util');
 var EventEmitter = require('events').EventEmitter;
 var _ = require('lodash');
-var log = require('../log');
+var log = require('./log');
 
 // `abstract` constructor
 var CandleCalculator = function() {};

diff --git a/methods/exponential-moving-averages.js b/methods/exponential-moving-averages.js
@@ -42,9 +42,9 @@ var TradingMethod = function(watcher) {
 }
 
 if(backtesting)
-  var CandleMethod = require('./historical-candle-fetcher.js');
+  var CandleMethod = require('../historicalCandleFetcher.js');
 else
-  var CandleMethod = require('./realtime-candle-fetcher.js');
+  var CandleMethod = require('../realtimeCandleFetcher.js');
 Util.inherits(TradingMethod, CandleMethod);
 
 // first prepare this trading method, then

diff --git a/methods/realtime-candle-fetcher.js → realtimeCandleFetcher.js b/methods/realtime-candle-fetcher.js → realtimeCandleFetcher.js
@@ -9,9 +9,9 @@
 
 var moment = require('moment');
 var _ = require('lodash');
-var util = require('../util.js');
+var util = require('./util.js');
 var Util = require('util');
-var log = require('../log.js');
+var log = require('./log.js');
 var EventEmitter = require('events').EventEmitter;
 
 // `abstract` constructor