修复部分vn.strategy的bug

.gitignore

@@ -28,4 +28,8 @@ Release/
 *.opensdf
 
 # 本地持久化文件
-*.vn
+*.vn
+
+# word文档
+*.doc
+*.docx

vn.strategy/strategydemo/demoStrategy.py

@@ -234,14 +234,11 @@ class SimpleEmaStrategy(StrategyTemplate):
                     self.short(self.currentTick.lowerLimit, 1)
         
             # 记录日志
-            log = self.name + u'当前时间：' + str(time) + \
+            log = self.name + u'，K线时间：' + str(time) + '\n' + \
                 u'，快速EMA：' + str(self.fastEMA) + u'，慢速EMA：' + \
                 str(self.slowEMA)
             self.engine.writeLog(log)
             
-        print 'onBar', o, h, l, c, time
-        print 'fastEMA:', self.fastEMA, '|slowEMA:', self.slowEMA
-            
     #----------------------------------------------------------------------
     def strToTime(self, t, ms):
         """从字符串时间转化为time格式的时间"""
@@ -278,7 +275,7 @@ def main():
     me.login(userid, password, brokerid, mdAddress, tdAddress)
     
     # 等待10秒钟（初始化合约数据等）
-    sleep(10)
+    sleep(5)
     
     # 创建策略引擎对象
     se = StrategyEngine(me.ee, me)

vn.strategy/strategydemo/strategyEngine.py

@@ -360,10 +360,8 @@ class StrategyEngine(object):
     #----------------------------------------------------------------------
     def __updateTrade(self, event):
         """成交更新"""
-        print 'updateTrade'
         data = event.dict_['data']
         orderRef = data['OrderRef']
-        print 'trade:', orderRef
         
         if orderRef in self.__dictOrderRefStrategy:
             
@@ -405,8 +403,6 @@ class StrategyEngine(object):
                                             offset)
             
         self.__dictOrderRefStrategy[ref] = strategy
-        print 'ref:', ref
-        print 'strategy:', strategy.name
         
         return ref
 
@@ -585,7 +581,7 @@ class StrategyTemplate(object):
             return None
     
     #----------------------------------------------------------------------
-    def cover(self, price, volume, StopOrder=False):
+    def cover(self, price, volume, stopOrder=False):
         """买入平仓"""
         if self.trading:
             if stopOrder: