From bf0e6d7d59bd30d4cb5fdef0b30ac4d598deeaca Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@askmike.org>
Date: Sun, 22 Dec 2013 20:18:38 +0100
Subject: [PATCH] removed candle calculating modules outside the methods
 directory

---
 gekko-backtest.js                                            | 5 +----
 gekko.js                                                     | 5 +----
 ...istorical-candle-fetcher.js => historicalCandleFetcher.js | 2 +-
 methods/exponential-moving-averages.js                       | 4 ++--
 .../realtime-candle-fetcher.js => realtimeCandleFetcher.js   | 4 ++--
 5 files changed, 7 insertions(+), 13 deletions(-)
 rename methods/historical-candle-fetcher.js => historicalCandleFetcher.js (99%)
 rename methods/realtime-candle-fetcher.js => realtimeCandleFetcher.js (98%)

diff --git a/gekko-backtest.js b/gekko-backtest.js
index 381c3a920..014433cc9 100644
--- 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
index c5e124e82..819d8a76d 100644
--- 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 b/historicalCandleFetcher.js
similarity index 99%
rename from methods/historical-candle-fetcher.js
rename to historicalCandleFetcher.js
index 05f5a47d7..36f69c493 100644
--- a/methods/historical-candle-fetcher.js
+++ b/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
index fd137efd8..55ab4b1b5 100644
--- 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 b/realtimeCandleFetcher.js
similarity index 98%
rename from methods/realtime-candle-fetcher.js
rename to realtimeCandleFetcher.js
index ef321d74c..8bbf3631a 100644
--- a/methods/realtime-candle-fetcher.js
+++ b/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