minor cleanup

Author: SaltyPeppermint

examples/blocking.rs

@@ -24,8 +24,7 @@ fn main() {
     println!("{}", runner_1.report());
 
     let root_mm = runner_1.egraph.find(runner_1.roots[0]);
-    let split_guide_sketch = rise::sketchify(SPLIT_GUIDE, true);
-    println!("Sketch:\n{}", split_guide_sketch.pretty(50));
+    let split_guide_sketch = rise::sketchify(SPLIT_GUIDE, false);
     let (_, sketch_extracted_split_guide) =
         sketch::eclass_extract(&split_guide_sketch, AstSize, &runner_1.egraph, root_mm).unwrap();
 

src/rewrite_system/rise/func.rs

@@ -1,9 +1,7 @@
 use egg::{Applier, EGraph, Id, Language, Pattern, PatternAst, RecExpr, Subst, Symbol, Var};
 use hashbrown::HashSet;
 
-use crate::rewrite_system::rise::kind::Kindable;
-
-use super::{Index, Kind, Rise, RiseAnalysis};
+use super::{Index, Kind, Kindable, Rise, RiseAnalysis};
 
 pub fn pat(pat: &str) -> impl Applier<Rise, RiseAnalysis> {
     pat.parse::<Pattern<Rise>>().unwrap()

src/rewrite_system/rise/mod.rs

@@ -15,7 +15,6 @@ use kind::{Kind, Kindable};
 
 pub use analysis::RiseAnalysis;
 pub use lang::Rise;
-use num::Integer;
 pub use pp::PrettyPrint;
 
 use crate::sketch::{Sketch, SketchLang};

src/rewrite_system/rise/nat/mod.rs

@@ -35,16 +35,16 @@ fn check_equivalence<'a, 'b: 'a>(
     if cache.check_cache_equiv(lhs, rhs) {
         return true;
     }
-    println!();
-    println!("{lhs}");
-    println!("{rhs}");
+    // println!();
+    // println!("{lhs}");
+    // println!("{rhs}");
 
     let rf_lhs: RationalFunction = lhs.try_into().unwrap();
     let rf_rhs: RationalFunction = rhs.try_into().unwrap();
 
-    println!("{rf_lhs}");
-    println!("{rf_rhs}");
-    println!("{}", rf_lhs == rf_rhs);
+    // println!("{rf_lhs}");
+    // println!("{rf_rhs}");
+    // println!("{}", rf_lhs == rf_rhs);
 
     if rf_lhs == rf_rhs {
         cache.add_pair_to_cache(lhs, rhs);

src/rewrite_system/rise/pp.rs

@@ -66,7 +66,7 @@ fn get_rise_style(node: &Rise) -> (ColoredString, bool) {
         | Rise::ReduceSeqUnroll
         | Rise::Float(_) => (node.to_string().yellow(), false),
 
-        Rise::Integer(i) => (format!("{i}i").cyan(), false),
+        Rise::Integer(i) => (format!("{i}int").cyan(), false),
     }
 }
 
@@ -96,7 +96,7 @@ fn fmt_ty_node(node: &Rise, children: &[String], fn_brackets: bool) -> ColoredSt
         Rise::NatMul(_) => format!("({} * {})", children[0], children[1]).white(),
         Rise::NatDiv(_) => format!("({} / {})", children[0], children[1]).white(),
         Rise::NatPow(_) => format!("({} ^ {})", children[0], children[1]).white(),
-        Rise::Integer(i) => format!("{i}i").cyan(),
+        Rise::Integer(i) => format!("{i}int").cyan(),
 
         _ => panic!("Expected type node but found {node}"),
     }

src/rewrite_system/rise/shifted.rs

@@ -85,12 +85,10 @@ impl<A: Applier<Rise, RiseAnalysis>> Applier<Rise, RiseAnalysis> for ShiftedChec
         searcher_ast: Option<&PatternAst<Rise>>,
         rule_name: Symbol,
     ) -> Vec<Id> {
+        let expected = &egraph[subst[self.new_var]].data.beta_extract;
         let extract = &egraph[subst[self.var]].data.beta_extract;
-        // dbg!(extract);
         let shifted = shift_copy(extract, self.shift, self.cutoff);
 
-        // dbg!(&shifted);
-        let expected = &egraph[subst[self.new_var]].data.beta_extract;
         if shifted == *expected {
             self.applier
                 .apply_one(egraph, eclass, subst, searcher_ast, rule_name)