Skip to content

Commit

Permalink
furhter tests
Browse files Browse the repository at this point in the history
  • Loading branch information
flexatone committed Mar 18, 2024
1 parent 2f8e7c1 commit d66ed49
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 9 deletions.
30 changes: 21 additions & 9 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ impl Sieve {
self.s.contains(v as i128)
}

//--------------------------------------------------------------------------
fn __invert__(&self) -> Self {
let new: SieveRS = !self.s.clone();
Self { s: new }
Expand All @@ -33,16 +34,18 @@ impl Sieve {
Self { s: new }
}

// fn __or__(&self, other: &Self) -> Self {
// let new: SieveRS = self.s | other.s;
// Self{s: new}
// }
fn __or__(&self, other: &Self) -> Self {
let new: SieveRS = self.s.clone() | other.s.clone();
Self{s: new}
}

fn __and__(&self, other: &Self) -> Self {
let new: SieveRS = self.s.clone() & other.s.clone();
Self{s: new}
}

//--------------------------------------------------------------------------

// NOTE: this works but should be implemented on xensieve_rs
// fn __and__(&self, other: &Self) -> Self {
// let new: SieveRS = self.s.clone() & other.s.clone();
// Self{s: new}
// }
}

/// A Python module implemented in Rust.
Expand Down Expand Up @@ -77,4 +80,13 @@ mod tests {
let s2 = s1.__invert__();
assert_eq!(s2.__repr__(), "Sieve{!(3@2)}");
}

#[test]
fn test_sieve_xor_a() {
let s1 = Sieve::new("3@2".to_string());
let s2 = Sieve::new("5@1".to_string());

let s3 = s1.__xor__(&s2);
assert_eq!(s3.__repr__(), "Sieve{3@2^5@1}");
}
}
8 changes: 8 additions & 0 deletions tests/test_sieve.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,12 @@ def test_sieve_a() -> None:
assert str(s) == "Sieve{3@2}"


def test_sieve_b() -> None:
s1 = Sieve("3@2")
s2 = Sieve("5@1")
s3 = s1 ^ s2
assert str(s3) == "Sieve{3@2^5@1}"




0 comments on commit d66ed49

Please sign in to comment.