Merge pull request #18 from jlapeyre/gjl-set-verbose-in-config

Support setting verbose from config_from_theta_epsilon

Author: jlapeyre

examples/interface.rs

@@ -17,7 +17,8 @@ fn main() {
     let theta = pi / 8.0;
     let epsilon = 1e-10;
     let seed = 1234;
-    let mut gridsynth_config = config_from_theta_epsilon(theta, epsilon, seed);
+    let verbose = false;
+    let mut gridsynth_config = config_from_theta_epsilon(theta, epsilon, seed, verbose);
     let gates = gridsynth_gates(&mut gridsynth_config);
     println!("{}", gates);
 }

src/config.rs

@@ -69,7 +69,13 @@ pub fn parse_decimal_with_exponent(input: &str) -> Option<(IBig, IBig)> {
 }
 
 /// Creates the default config to easily call the code from other rust packages.
-pub fn config_from_theta_epsilon(theta: f64, epsilon: f64, seed: u64) -> GridSynthConfig {
+/// `seed` is used to set single RNG that is used through the call to `gridsynth`.
+pub fn config_from_theta_epsilon(
+    theta: f64,
+    epsilon: f64,
+    seed: u64,
+    verbose: bool,
+) -> GridSynthConfig {
     let (theta_num, theta_den) = parse_decimal_with_exponent(&theta.to_string()).unwrap();
     let theta = ib_to_bf_prec(theta_num) / ib_to_bf_prec(theta_den);
     let (epsilon_num, epsilon_den) = parse_decimal_with_exponent(&epsilon.to_string()).unwrap();
@@ -81,7 +87,6 @@ pub fn config_from_theta_epsilon(theta: f64, epsilon: f64, seed: u64) -> GridSyn
     let epsilon = ib_to_bf_prec(epsilon_num) / ib_to_bf_prec(epsilon_den);
     let diophantine_timeout = 200u128;
     let factoring_timeout = 50u128;
-    let verbose = false;
     let time = false;
 
     let rng: StdRng = SeedableRng::seed_from_u64(seed);

tests/integration_test.rs

@@ -8,7 +8,8 @@ fn simple_test() {
     let theta = pi / 8.0; // ≈ 0.39269908169872414
     let epsilon = 1e-10;
     let seed = 1234;
-    let mut gridsynth_config = config_from_theta_epsilon(theta, epsilon, seed);
+    let verbose = false;
+    let mut gridsynth_config = config_from_theta_epsilon(theta, epsilon, seed, verbose);
     let gates = gridsynth_gates(&mut gridsynth_config);
     let expected_gates = "HTHTSHTSHTHTSHTHTSHTHTHTSHTSHTHTHTHTHTHTSHTSHTHTSHTSHTSHTSHTHTSHTSHTSHTHTHTHTHTHTSHTSHTHTSHTSHTSHTHTHTSHTSHTSHTSHTSHTSHTSHTHTHTHTHTSHTSHTSHTSHTSHTSHTHTHTHTHTSHTHTSHTHTHTSHTSHTSHTHTSHTSHTHTSHTHTSHTSHTHTSHTHTHTSHTSHTSHTSHTHTHTHTSHTHTHTSHTHTSHTHTHTSHTHTSHTHTSHTXSSWWW";
     assert_eq!(gates, expected_gates);
@@ -25,8 +26,9 @@ fn simple_test2() {
 
     let test_inputs = vec![(1234, gates1), (101, gates1), (1, gates1)];
 
+    let verbose = false;
     for (seed, expected_gates) in test_inputs {
-        let mut gridsynth_config = config_from_theta_epsilon(theta, epsilon, seed);
+        let mut gridsynth_config = config_from_theta_epsilon(theta, epsilon, seed, verbose);
         let gates = gridsynth_gates(&mut gridsynth_config);
         assert_eq!(gates, expected_gates, "Test failed for seed: {}", seed);
     }
@@ -40,10 +42,11 @@ fn pi_over_two_test() {
 
     let epsilons = vec![1e-2, 1e-3, 1e-10];
 
+    let verbose = false;
     for epsilon in epsilons {
         let seeds = 100..300;
         for seed in seeds {
-            let mut gridsynth_config = config_from_theta_epsilon(theta, epsilon, seed);
+            let mut gridsynth_config = config_from_theta_epsilon(theta, epsilon, seed, verbose);
             let gates = gridsynth_gates(&mut gridsynth_config);
             let expected_gates = "SWWWWWWW";
             assert_eq!(gates, expected_gates);