fix some imports. add dependencies

llazzaro · May 1, 2015 · 2754a62 · 2754a62
1 parent 6db59d2
commit 2754a62
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,