Merge branch 'main' into dev

Author: jstzwj

tabox/tests/test_adosc.py

@@ -39,7 +39,7 @@ def test_random_vector(self):
                 )
 
                 self.assertTrue(
-                    np.array_equal(this_ret, that_ret, equal_nan=True),
+                    np.allclose(this_ret, that_ret, equal_nan=True),
                     f"fast_period: {fast_period}, slow_period: {slow_period}, "
                     f"high: {high}, low: {low}, close: {close}, volume: {volume}, "
                     f"this_ret: {this_ret}, that_ret: {that_ret}",

tabox/tests/test_macdext.py

@@ -29,9 +29,9 @@ def test_random_vector(self):
                 signalmatype=0
             )
 
-            self.assertTrue(np.array_equal(this_macd, that_macd, equal_nan=True), f"{close}, {this_macd}, {that_macd}")
-            self.assertTrue(np.array_equal(this_signal, that_signal, equal_nan=True), f"{close}, {this_signal}, {that_signal}")
-            self.assertTrue(np.array_equal(this_hist, that_hist, equal_nan=True), f"{close}, {this_hist}, {that_hist}")
+            self.assertTrue(np.allclose(this_macd, that_macd, equal_nan=True), f"{close}, {this_macd}, {that_macd}")
+            self.assertTrue(np.allclose(this_signal, that_signal, equal_nan=True), f"{close}, {this_signal}, {that_signal}")
+            self.assertTrue(np.allclose(this_hist, that_hist, equal_nan=True), f"{close}, {this_hist}, {that_hist}")
 
     def test_custom_periods_and_types(self):
         close = np.random.random(1000)
@@ -54,9 +54,9 @@ def test_custom_periods_and_types(self):
             signalmatype=3
         )
 
-        self.assertTrue(np.array_equal(this_macd, that_macd, equal_nan=True))
-        self.assertTrue(np.array_equal(this_signal, that_signal, equal_nan=True))
-        self.assertTrue(np.array_equal(this_hist, that_hist, equal_nan=True))
+        self.assertTrue(np.allclose(this_macd, that_macd, equal_nan=True))
+        self.assertTrue(np.allclose(this_signal, that_signal, equal_nan=True))
+        self.assertTrue(np.allclose(this_hist, that_hist, equal_nan=True))
 
 if __name__ == '__main__':
     unittest.main()

tabox/tests/test_t3.py

@@ -12,14 +12,14 @@ def test_random_vector(self):
             this_t3 = this_T3(close)
             that_t3 = that_T3(close)
 
-            self.assertTrue(np.array_equal(this_t3, that_t3, equal_nan=True), f"{close}, {this_t3}, {that_t3}")
+            self.assertTrue(np.allclose(this_t3, that_t3, equal_nan=True), f"{close}, {this_t3}, {that_t3}")
 
     def test_custom_periods(self):
         close = np.random.random(1000)
         this_t3 = this_T3(close, timeperiod=10, vfactor=0.5)
         that_t3 = that_T3(close, timeperiod=10, vfactor=0.5)
 
-        self.assertTrue(np.array_equal(this_t3, that_t3, equal_nan=True))
+        self.assertTrue(np.allclose(this_t3, that_t3, equal_nan=True))
 
 if __name__ == '__main__':
     unittest.main() 

tabox/tests/test_tema.py

@@ -12,15 +12,15 @@ def test_random_vector(self):
             this_tema = this_TEMA(close)
             that_tema = that_TEMA(close)
 
-            self.assertTrue(np.array_equal(this_tema, that_tema, equal_nan=True), 
+            self.assertTrue(np.allclose(this_tema, that_tema, equal_nan=True), 
                           f"{close}, {this_tema}, {that_tema}")
 
     def test_custom_periods(self):
         close = np.random.random(1000)
         this_tema = this_TEMA(close, timeperiod=5)
         that_tema = that_TEMA(close, timeperiod=5)
 
-        self.assertTrue(np.array_equal(this_tema, that_tema, equal_nan=True))
+        self.assertTrue(np.allclose(this_tema, that_tema, equal_nan=True))
 
 if __name__ == '__main__':
     unittest.main() 

tabox/tests/test_wma.py

@@ -14,7 +14,7 @@ def test_random_vector(self):
                 this_ret = this_WMA(close, k)
                 that_ret = that_WMA(close, k)
 
-                self.assertTrue(np.array_equal(this_ret, that_ret, equal_nan=True))
+                self.assertTrue(np.allclose(this_ret, that_ret, equal_nan=True))
 
 if __name__ == '__main__':
     unittest.main()