From 2754a622f7884ac75fde79a6a0559190cceffd22 Mon Sep 17 00:00:00 2001
From: Leonardo Lazzaro <lazzaroleonardo@gmail.com>
Date: Fri, 1 May 2015 00:37:53 -0300
Subject: [PATCH] fix some imports. add dependencies

---
 analyzer/backtest/stateSaver/sqlSaver.py               |  7 ++++---
 .../tickSubscriber/strategies/strategyFactory.py       | 10 +++++-----
 examples/backTester.py                                 |  2 +-
 setup.py                                               |  4 +++-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/analyzer/backtest/stateSaver/sqlSaver.py b/analyzer/backtest/stateSaver/sqlSaver.py
index f77dd4f..d5ca71a 100644
--- a/analyzer/backtest/stateSaver/sqlSaver.py
+++ b/analyzer/backtest/stateSaver/sqlSaver.py
@@ -3,11 +3,12 @@
 
 @author: ppa
 '''
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy import Table, Column, Integer, String, create_engine, MetaData, and_, select
+
+from pyStock.models import Order
 from analyzer.backtest.stateSaver import StateSaver
-from analyzer.model import Order
 
-from sqlalchemy import Table, Column, Integer, String, create_engine, MetaData, and_, select
-from sqlalchemy.ext.declarative import declarative_base
 
 from analyzer.backtest.constant import (
     STATE_SAVER_HOLDING_VALUE,
diff --git a/analyzer/backtest/tickSubscriber/strategies/strategyFactory.py b/analyzer/backtest/tickSubscriber/strategies/strategyFactory.py
index 1d883be..7c74e37 100644
--- a/analyzer/backtest/tickSubscriber/strategies/strategyFactory.py
+++ b/analyzer/backtest/tickSubscriber/strategies/strategyFactory.py
@@ -4,11 +4,11 @@
 @author: ppa
 '''
 
-from analyzer.backtest.tickSubscriber.strategies.periodStrategy import PeriodStrategy
-from analyzer.backtest.tickSubscriber.strategies.smaStrategy import SMAStrategy
-from analyzer.backtest.tickSubscriber.strategies.smaPortfolioStrategy import SMAPortfolioStrategy
-from analyzer.backtest.tickSubscriber.strategies.zscorePortfolioStrategy import ZscorePortfolioStrategy
-from analyzer.backtest.tickSubscriber.strategies.zscoreMomentumPortfolioStrategy import ZscoreMomentumPortfolioStrategy
+from analyzerstrategies.periodStrategy import PeriodStrategy
+from analyzerstrategies.smaStrategy import SMAStrategy
+from analyzerstrategies.smaPortfolioStrategy import SMAPortfolioStrategy
+from analyzerstrategies.zscorePortfolioStrategy import ZscorePortfolioStrategy
+from analyzerstrategies.zscoreMomentumPortfolioStrategy import ZscoreMomentumPortfolioStrategy
 
 from analyzer.lib.errors import Errors, UfException
 
diff --git a/examples/backTester.py b/examples/backTester.py
index efb66ee..1e8cc5a 100644
--- a/examples/backTester.py
+++ b/examples/backTester.py
@@ -3,7 +3,7 @@
 
 @author: ppa
 '''
-from analyzer.module.backTester import BackTester
+from analyzer.module.backtester import BackTester
 
 if __name__ == "__main__":
 
diff --git a/setup.py b/setup.py
index 4751c27..5d4124a 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,9 @@
           'pandas',
           'xlwt',
           'xlrd',
-          'matplotlib>=1.1.0'
+          'matplotlib>=1.1.0',
+          'analyzerdam>=0.1.0',
+          'analyzerstrategies>=0.1.0'
       ],
       packages=['analyzer'],
       include_package_data=True,