Move compute_l() from test to stern module and use stern algorithm in…

…stead of prange in main
gwafotapa · Aug 16, 2020 · a0c9fdb · a0c9fdb
1 parent 259ab57
commit a0c9fdb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -2,7 +2,7 @@ use log::debug;
 use main_error::MainError;
 use std::env;
 
-use information_set_decoding::{instance::Instance, prange};
+use information_set_decoding::{instance::Instance, stern};
 
 // type Result<T> = std::result::Result<T, Box<dyn Error>>;
 
@@ -22,7 +22,10 @@ fn main() -> std::result::Result<(), MainError> {
         inst.h(),
         inst.s()
     );
-    let e = prange::prange(&inst, None).unwrap();
+    let k = inst.n() - inst.h().rows();
+    let p = 2;
+    let l = stern::compute_l(k, p);
+    let e = stern::stern(&inst, p, l, None).unwrap();
     for i in 0..e.rows() {
         print!("{}", e[i]);
     }

diff --git a/src/stern/mod.rs b/src/stern/mod.rs
@@ -120,3 +120,14 @@ pub fn stern_list_weighted_vectors(n: usize, w: usize) -> Vec<WeightedVector> {
     }
     list
 }
+
+pub fn compute_l(k: usize, p: usize) -> usize {
+    let mut l = 0;
+    let mut tmp = num_integer::binomial(k - k / 2, p);
+    tmp >>= 1;
+    while tmp != 0 {
+        l += 1;
+        tmp >>= 1;
+    }
+    l
+}
diff --git a/tests/stern.rs b/tests/stern.rs
@@ -14,23 +14,12 @@ fn list_weighted_vectors() {
     println!("{:?}", l);
 }
 
-fn compute_l(k: usize, p: usize) -> usize {
-    let mut l = 0;
-    let mut tmp = num_integer::binomial(k - k / 2, p);
-    tmp >>= 1;
-    while tmp != 0 {
-        l += 1;
-        tmp >>= 1;
-    }
-    l
-}
-
 #[test]
 fn stern_10_0() {
     let inst = Instance::read_instance("instances/SD_10_0").unwrap();
     let k = inst.h().cols() - inst.h().rows();
     let p = 2;
-    let l = compute_l(k, p);
+    let l = stern::compute_l(k, p);
     let e = stern::stern(&inst, p, l, None).unwrap();
     assert_eq!(inst.h() * e, *inst.s());
 }
@@ -40,7 +29,7 @@ fn stern_20_0() {
     let inst = Instance::read_instance("instances/SD_20_0").unwrap();
     let k = inst.h().cols() - inst.h().rows();
     let p = 2;
-    let l = compute_l(k, p);
+    let l = stern::compute_l(k, p);
     let e = stern::stern(&inst, p, l, None).unwrap();
     assert_eq!(inst.h() * e, *inst.s());
 }
@@ -50,7 +39,7 @@ fn stern_100_0() {
     let inst = Instance::read_instance("instances/SD_100_0").unwrap();
     let k = inst.h().cols() - inst.h().rows();
     let p = 2;
-    let l = compute_l(k, p);
+    let l = stern::compute_l(k, p);
     let e = stern::stern(&inst, p, l, None).unwrap();
     assert_eq!(inst.h() * e, *inst.s());
 }
@@ -61,7 +50,7 @@ fn stern_200_0() {
     let inst = Instance::read_instance("instances/SD_200_0").unwrap();
     let k = inst.h().cols() - inst.h().rows();
     let p = 2;
-    let l = compute_l(k, p);
+    let l = stern::compute_l(k, p);
     let e = stern::stern(&inst, p, l, None).unwrap();
     assert_eq!(inst.h() * e, *inst.s());
 }
@@ -72,7 +61,7 @@ fn stern_300_0() {
     let inst = Instance::read_instance("instances/SD_300_0").unwrap();
     let k = inst.h().cols() - inst.h().rows();
     let p = 2;
-    let l = compute_l(k, p);
+    let l = stern::compute_l(k, p);
     let e = stern::stern(&inst, p, l, None).unwrap();
     assert_eq!(inst.h() * e, *inst.s());
 }
@@ -83,7 +72,7 @@ fn stern_300_0() {
 //     let inst = Instance::read_instance("instances/stern_10").unwrap();
 //     let k = inst.h().cols() - inst.h().rows();
 //     let p = 2;
-//     let l = compute_l(k, p);
+//     let l = stern::compute_l(k, p);
 //     debug!(
 //         "n={}   k={}   w={}   p={}   l={}\n",
 //         inst.n(),
@@ -101,7 +90,7 @@ fn stern_with_solution_10() {
     common::log_setup();
     let (n, w, p) = (10, 4, 2);
     let k = n / 2;
-    let l = compute_l(k, p);
+    let l = stern::compute_l(k, p);
     let (inst, x) = generate_instance_with_solution(n, w, p, l);
     assert!(x.weight() == w);
     assert_eq!(inst.h() * &x, *inst.s());