Merge pull request #1469 from yutiansut/master

update to 1.9.6 and fix bug
yutiansut · Feb 23, 2020 · 7d2e98b · 7d2e98b
2 parents 73fab53 + 91bd625
commit 7d2e98b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/QUANTAXIS/QAData/QADataStruct.py b/QUANTAXIS/QAData/QADataStruct.py
@@ -128,13 +128,13 @@ def to_qfq(self):
                     data = self.data.join(adj)
                     for col in ['open', 'high', 'low', 'close']:
                         data[col] = data[col] * data['adj']
-                        data['volume'] = data['volume'] / \
-                            data['adj'] if 'volume' in data.columns else data['vol']/data['adj']
-                        try:
-                            data['high_limit'] = data['high_limit'] * data['adj']
-                            data['low_limit'] = data['high_limit'] * data['adj']
-                        except:
-                            pass
+                    data['volume'] = data['volume'] / \
+                        data['adj'] if 'volume' in data.columns else data['vol']/data['adj']
+                    try:
+                        data['high_limit'] = data['high_limit'] * data['adj']
+                        data['low_limit'] = data['high_limit'] * data['adj']
+                    except:
+                        pass
                     return self.new(data, self.type, 'qfq')
                 except Exception as e:
                     print(e)
@@ -284,13 +284,13 @@ def to_qfq(self):
 
                     for col in ['open', 'high', 'low', 'close']:
                         data[col] = data[col] * data['adj']
-                        data['volume'] = data['volume'] / \
-                            data['adj']
-                        try:
-                            data['high_limit'] = data['high_limit'] * data['adj']
-                            data['low_limit'] = data['high_limit'] * data['adj']
-                        except:
-                            pass
+                    data['volume'] = data['volume'] / \
+                        data['adj']
+                    try:
+                        data['high_limit'] = data['high_limit'] * data['adj']
+                        data['low_limit'] = data['high_limit'] * data['adj']
+                    except:
+                        pass
                     return self.new(data, self.type, 'qfq')
                 except Exception as e:
                     print(e)

diff --git a/QUANTAXIS/__init__.py b/QUANTAXIS/__init__.py
@@ -31,7 +31,7 @@
 2017/4/8
 """
 
-__version__ = '1.9.5'
+__version__ = '1.9.6'
 __author__ = 'yutiansut'
 
 import argparse