init

hts/BuySellChecker.py

@@ -124,38 +124,6 @@ class BuySellChecker:
         return False
 
 
-    def getBuyPriceAndWeight_252670(self, i, data):
-        buy, weight = -1, -1
-
-        if i > 50:
-            up, down = 0, 0
-            for idx in range(i, i - (300 + 1), -1):
-                if data['avg200'][idx-1] < data['avg200'][idx]:
-                    up += 1
-                if data['avg200'][idx-1] > data['avg200'][idx]:
-                    down += 1
-            if up < down:
-                if max(data['avg200'][i-20:i])+0.05 < data['avg200'][i]:
-                    buy = data['close'][i]
-                    weight = 0.3
-
-            up, down = 0, 0
-            for idx in range(i, i - (10 + 1), -1):
-                if data['close'][idx-1] < data['close'][idx]:
-                    up += 1
-                elif data['close'][idx - 1] > data['close'][idx]:
-                    down += 1
-            if down < up:
-                buy, weight = -1, -1
-
-            if data['close'][i] < data['avg200'][i] or data['avg200'][i] + 10 < data['close'][i]:
-                buy, weight = -1, -1
-
-            if 2 < data['macd'][i]:
-                buy, weight = -1, -1
-
-        return buy, weight
-
     def getBuyPriceAndWeight_122630(self, i, data):
         buy, weight = -1, -1
 
@@ -215,6 +183,39 @@ class BuySellChecker:
         return buy, weight
 
 
+    def getBuyPriceAndWeight_252670(self, i, data):
+        buy, weight = -1, -1
+
+        if i > 50:
+            up, down = 0, 0
+            for idx in range(i, i - (300 + 1), -1):
+                if data['avg200'][idx-1] < data['avg200'][idx]:
+                    up += 1
+                if data['avg200'][idx-1] > data['avg200'][idx]:
+                    down += 1
+            if up < down:
+                if max(data['avg200'][i-20:i])+0.05 < data['avg200'][i]:
+                    buy = data['close'][i]
+                    weight = 0.3
+
+            up, down = 0, 0
+            for idx in range(i, i - (10 + 1), -1):
+                if data['close'][idx-1] < data['close'][idx]:
+                    up += 1
+                elif data['close'][idx - 1] > data['close'][idx]:
+                    down += 1
+            if down < up:
+                buy, weight = -1, -1
+
+            if data['close'][i] < data['avg200'][i] or data['avg200'][i] + 10 < data['close'][i]:
+                buy, weight = -1, -1
+
+            if 2 < data['macd'][i]:
+                buy, weight = -1, -1
+
+        return buy, weight
+
+
     def getSellPriceAndWeight(self, i, data):
         sell, weight = -1, -1