fix: rand err's

Author: SauravMaheshkar

src/notation.rs

@@ -187,6 +187,7 @@ impl Clause {
 ///
 /// Contains a vector of [`Clause`]s, a vector of [`Literal`]s, a vector of variables, the number of clauses and the number of variables
 #[derive(Debug, Clone)]
+#[allow(dead_code)]
 pub struct Formula {
     pub clauses: Vec<Clause>,
     pub literals: Vec<Literal>,
@@ -225,7 +226,7 @@ impl Formula {
     ///
     /// # Examples
     /// Assuming the CNF file is in `/bin/problem.cnf` and contains the following:
-    /// ```;
+    /// ```custom,{class=language-bash}
     /// p cnf 3 1
     /// 1 -3 0
     /// 2 3 -1 0

src/solvers/gsat.rs

@@ -1,7 +1,7 @@
-use rand::seq::SliceRandom;
-
 use crate::notation::{Clause, Formula};
 use crate::solvers::utils::flip;
+use rand::prelude::IndexedRandom;
+use rand::Rng;
 use std::collections::HashMap;
 
 /// GSAT Algorithm for evaluation of propostional formulas
@@ -135,11 +135,11 @@ pub fn gsat_algorithm(
                         interpretation = flip(&mut interpretation, var_to_flip).clone();
                     } else {
                         // Randomly select a clause that is not satisfied by the interpretation
-                        let clause = unsatisfied_clauses.choose(&mut rand::thread_rng());
+                        let clause = unsatisfied_clauses.choose(&mut rand::rng());
                         let clausal_variables: Vec<i32> =
                             formula.get_clausal_variables(&clause.unwrap());
                         let random_var =
-                            clausal_variables[rand::random::<usize>() % clausal_variables.len()];
+                            clausal_variables[rand::rng().random_range(0..clausal_variables.len())];
                         interpretation = flip(&mut interpretation, random_var).clone();
                     }
                 }

src/solvers/wsat.rs

@@ -1,7 +1,7 @@
-use rand::seq::SliceRandom;
-
 use crate::notation::{Clause, Formula};
 use crate::solvers::utils::flip;
+use rand::prelude::IndexedRandom;
+use rand::Rng;
 use std::collections::HashMap;
 
 /// WSAT Algorithm for evaluation of propostional formulas
@@ -92,11 +92,12 @@ pub fn wsat_algorithm(formula: &mut Formula, max_tries: u32, max_flips: u32) ->
             for _ in 0..max_flips {
                 // Randomly select a clause that is not satisfied by the interpretation
                 let unsatisfied_clauses: Vec<Clause> = formula.get_unsatisfied_clauses();
-                let clause = unsatisfied_clauses.choose(&mut rand::thread_rng());
+                let clause = unsatisfied_clauses.choose(&mut rand::rng());
 
                 // Randomly select a variable from the clause
                 let clausal_variables: Vec<i32> = formula.get_clausal_variables(&clause.unwrap());
-                let variable = clausal_variables[rand::random::<usize>() % clausal_variables.len()];
+                let variable =
+                    clausal_variables[rand::rng().random_range(0..clausal_variables.len())];
 
                 interpretation = flip(&mut interpretation, variable).clone();