Skip to content

Commit

Permalink
yutiansut#535 Commit: bug fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
yutiansut committed Apr 20, 2017
1 parent 9a2d160 commit c403798
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions QUANTAXIS/QAARP/QAAccount.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ class QA_Account:
hold=0
def init(self):
#assets=1000
portfolio={'date':'', 'id':'N',' price':'', 'amount':0}
self.portfolio={'date':'', 'id':'N',' price':'', 'amount':0}

history_trade=[['date', 'id',' price', 'amount',' towards']]
self.history_trade=[['date', 'id',' price', 'amount',' towards']]

total_profit=[0]
total_cur_profit_present=[0]
assets_market_hold_value=0
assets_profit_total=[0]
cur_profit_present_total=[0]
cur_profit_present=0
self.total_profit=[0]
self.total_cur_profit_present=[0]
self.assets_market_hold_value=0
self.assets_profit_total=[0]
self.cur_profit_present_total=[0]
self.cur_profit_present=0
#date, id, price, amount, towards
account_cookie=str(random.random())
portfit=0
hold=0
self.account_cookie=str(random.random())
self.portfit=0
self.hold=0
self.total_assest=[self.assets]
self.assets_free=self.total_assest[-1]
self.total_assest_free=[self.assets_free]
Expand Down
2 changes: 1 addition & 1 deletion QUANTAXISWebkit/backend/routes/backtest.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ router.get('/history',function(req, res, next) {
mongodb.connect('mongodb://localhost:27017/quantaxis', function (err, conn) {
conn.collection('backtest_history', function (err, coll) {
coll.find({'cookie':cookie}).toArray(function (err, docs) {
console.log(docs.length)
//console.log(docs.length)
res.send(docs[docs.length-1])

})
Expand Down

0 comments on commit c403798

Please sign in to comment.