Now with tests for the basic algorithms.

This commit is contained in:
2018-09-28 17:48:35 -05:00
parent 3b68363b49
commit 304d009a67
95 changed files with 271012 additions and 270361 deletions

View File

@@ -1,13 +1,13 @@
use unsigned::add::unsafe_addition;
pub fn subtract(res: &mut [u64], spare: &mut [u64], other: &[u64])
pub fn subtract(res: &mut [u64], spare: &mut [u64], other: &mut [u64])
{
for i in 0..res.len() {
res[i] = !res[i];
other[i] = !other[i];
}
spare[0] = 1;
unsafe_addition(res, &spare);
unsafe_addition(res, &other);
unsafe_addition(other, &spare, true);
unsafe_addition(res, &other, true);
}
macro_rules! subtraction_impls
@@ -16,14 +16,14 @@ macro_rules! subtraction_impls
impl SubAssign for $name {
fn sub_assign(&mut self, rhs: $name) {
let mut temp = [0; $size];
subtract(&mut self.value, &mut temp, &rhs.value);
subtract(&mut self.value, &mut temp, &mut rhs.value.clone());
}
}
impl<'a> SubAssign<&'a $name> for $name {
fn sub_assign(&mut self, rhs: &$name) {
let mut temp = [0; $size];
subtract(&mut self.value, &mut temp, &rhs.value);
subtract(&mut self.value, &mut temp, &mut rhs.value.clone());
}
}
@@ -31,9 +31,9 @@ macro_rules! subtraction_impls
type Output = $name;
fn sub(self, rhs: $name) -> $name {
let mut res = $name::zero();
let mut res = self.clone();
let mut temp = [0; $size];
subtract(&mut res.value, &mut temp, &rhs.value);
subtract(&mut res.value, &mut temp, &mut rhs.value.clone());
res
}
}
@@ -42,9 +42,9 @@ macro_rules! subtraction_impls
type Output = $name;
fn sub(self, rhs: $name) -> $name {
let mut res = $name::zero();
let mut res = self.clone();
let mut temp = [0; $size];
subtract(&mut res.value, &mut temp, &rhs.value);
subtract(&mut res.value, &mut temp, &mut rhs.value.clone());
res
}
}
@@ -53,9 +53,9 @@ macro_rules! subtraction_impls
type Output = $name;
fn sub(self, rhs: &$name) -> $name {
let mut res = $name::zero();
let mut res = self.clone();
let mut temp = [0; $size];
subtract(&mut res.value, &mut temp, &rhs.value);
subtract(&mut res.value, &mut temp, &mut rhs.value.clone());
res
}
}
@@ -64,13 +64,32 @@ macro_rules! subtraction_impls
type Output = $name;
fn sub(self, rhs: &$name) -> $name {
let mut res = $name::zero();
let mut res = self.clone();
let mut temp = [0; $size];
subtract(&mut res.value, &mut temp, &rhs.value);
subtract(&mut res.value, &mut temp, &mut rhs.value.clone());
res
}
}
}
}
//subtraction_impls!(U192, 3);
#[cfg(test)]
macro_rules! generate_sub_tests {
($name: ident, $lname: ident) => {
#[test]
fn $lname() {
let fname = format!("testdata/sub/{}.tests", stringify!($name));
run_test(fname.to_string(), 3, |case| {
let (neg0, abytes) = case.get("a").unwrap();
let (neg1, bbytes) = case.get("b").unwrap();
let (neg2, cbytes) = case.get("c").unwrap();
assert!(!neg0 && !neg1 && !neg2);
let a = $name::from_bytes(abytes);
let b = $name::from_bytes(bbytes);
let c = $name::from_bytes(cbytes);
assert_eq!(c, a - b);
});
}
};
}