Merge pull request #74 from tushushu/wip-remove-bool-replace

remove replace method of `BooleanList`

Author: tushushu

tests/test_base.py

@@ -102,12 +102,6 @@ def test_methods_no_arg(
         ('get', 'float', [1.0, 2.0, 3.0], 2.0, {'index': 1}),
         ('get', 'int', [1, 2, 3], 1, {'index': 0}),
 
-        ('replace', 'bool', [True, False, True], [
-         False, False, False], {'old': True, 'new': False}),
-        ('replace', 'float', [1.0, 0.0, 1.0], [
-         0.0, 0.0, 0.0], {'old': 1.0, 'new': 0.0}),
-        ('replace', 'int', [1, 0, 1], [0, 0, 0], {'old': 1, 'new': 0}),
-
         ('var', 'bool', [True, False], 0.25, {}),
         ('var', 'bool', [True, True, True, False], 0.25, {"ddof": 1}),
         ('var', 'float', [1.0, 2.0, 3.0, 4.0], 1.25, {}),

tests/test_numerical.py

@@ -47,6 +47,10 @@ def test_statistics_methods(
 @pytest.mark.parametrize(
     "test_method, dtype, nums, expected_value, kwargs",
     [
+        ('replace', 'float', [1.0, 0.0, 1.0], [
+         0.0, 0.0, 0.0], {'old': 1.0, 'new': 0.0}),
+        ('replace', 'int', [1, 0, 1], [0, 0, 0], {'old': 1, 'new': 0}),
+
         (
             'sort',
             'float',

ulist/python/ulist/core.py

@@ -293,6 +293,7 @@ def pow_scala(self, num: int) -> "UltraFastList":
 
     def replace(self, old: ELEM, new: ELEM) -> "UltraFastList":
         """Replace the old elements of self with the new one."""
+        assert not isinstance(self._values, BooleanList)
         return UltraFastList(self._values.replace(old, new))
 
     def set(self, index: int, num: ELEM) -> None:

ulist/python/ulist/ulist.pyi

@@ -22,7 +22,6 @@ class BooleanList:
     def pop(self): ...
     @staticmethod
     def repeat(num: bool, size: int) -> BooleanList: ...
-    def replace(self, old: ELEM, new: ELEM) -> BooleanList: ...
     def set(self, index: int, num: ELEM): ...
     def size(self) -> int: ...
     def sum(self) -> int: ...

ulist/src/base.rs

@@ -54,15 +54,6 @@ where
         List::_new(vec)
     }
 
-    fn replace(&self, old: T, new: T) -> Self {
-        let vec = self
-            .values()
-            .iter()
-            .map(|&x| if x == old { new } else { x })
-            .collect();
-        List::_new(vec)
-    }
-
     fn size(&self) -> usize {
         self.values().len()
     }

ulist/src/boolean.rs

@@ -79,10 +79,6 @@ impl BooleanList {
         List::repeat(num, size)
     }
 
-    pub fn replace(&self, old: bool, new: bool) -> Self {
-        List::replace(self, old, new)
-    }
-
     pub unsafe fn set(&self, index: usize, num: bool) {
         List::set(self, index, num)
     }

ulist/src/float.rs

@@ -133,7 +133,7 @@ impl FloatList {
     }
 
     pub fn replace(&self, old: f32, new: f32) -> Self {
-        List::replace(self, old, new)
+        NumericalList::replace(self, old, new)
     }
 
     pub unsafe fn set(&self, index: usize, num: f32) {

ulist/src/integer.rs

@@ -137,7 +137,7 @@ impl IntegerList {
     }
 
     pub fn replace(&self, old: i32, new: i32) -> Self {
-        List::replace(self, old, new)
+        NumericalList::replace(self, old, new)
     }
 
     pub fn size(&self) -> usize {

ulist/src/numerical.rs

@@ -95,6 +95,15 @@ where
 
     fn pow_scala(&self, num: V) -> Self;
 
+    fn replace(&self, old: T, new: T) -> Self {
+        let vec = self
+            .values()
+            .iter()
+            .map(|&x| if x == old { new } else { x })
+            .collect();
+        List::_new(vec)
+    }
+
     fn sort(&self, ascending: bool) -> Self {
         let mut vec = self.to_list();
         let mut _vec = &mut vec;