rename Ideal.len to dimension

Author: pazz

src/downset.rs

@@ -344,7 +344,7 @@ impl DownSet {
                 continue;
             }
             processed.insert(flow.clone());
-            if Self::is_safe(ideal, edges, safe, ideal.len(), maximal_finite_value) {
+            if Self::is_safe(ideal, edges, safe, ideal.dimension(), maximal_finite_value) {
                 //println!("...safe");
                 result.insert(ideal);
             } else {
@@ -384,7 +384,7 @@ impl DownSet {
         }
         //println!("{} refined", candidate);
         let mut candidate_copy = candidate.clone();
-        for i in 0..candidate.len() {
+        for i in 0..candidate.dimension() {
             let ci = candidate.get(i);
             if ci == C0 || ci == OMEGA {
                 continue;
@@ -486,7 +486,7 @@ impl DownSet {
         max_finite_value: coef,
     ) -> DownSet {
         let mut downset = DownSet::new();
-        let choices = (0..dom.len())
+        let choices = (0..dom.dimension())
             .map(|index| get_choices(dim, dom.get(index), edges.get_successors(index)))
             .collect::<Vec<_>>();
         for im in choices

src/flow.rs

@@ -343,7 +343,7 @@ impl Flow {
         //debug!("domain\n{}", domain);
         //debug!("edges{}", edges);
 
-        let dim = domain.len();
+        let dim = domain.dimension();
         if edges.iter().any(|f| f.0 >= dim || f.1 >= dim) {
             panic!("Edge out of domain");
         }
@@ -389,7 +389,7 @@ impl Flow {
     }
 
     fn get_lines_vec(domain: &Ideal, edges: &Graph) -> Vec<Vec<Domain>> {
-        let dim = domain.len();
+        let dim = domain.dimension();
         domain
             .iter()
             .enumerate()

src/ideal.rs

@@ -25,7 +25,7 @@ impl Add for &Ideal {
     type Output = Ideal;
 
     fn add(self, other: Self) -> Self::Output {
-        debug_assert_eq!(self.len(), other.len());
+        debug_assert_eq!(self.dimension(), other.dimension());
         Ideal(
             self.0
                 .iter()
@@ -45,7 +45,7 @@ impl Add for Ideal {
 
 impl AddAssign for Ideal {
     fn add_assign(&mut self, other: Self) {
-        debug_assert_eq!(self.len(), other.len());
+        debug_assert_eq!(self.dimension(), other.dimension());
         for (i, x) in self.0.iter_mut().enumerate() {
             *x += other.0[i];
         }
@@ -100,7 +100,9 @@ impl Ideal {
         self.0.iter().enumerate().all(|(i, &x)| x <= other.0[i])
     }
 
-    pub fn len(&self) -> usize {
+    /// Returns the dimension of this ideal,
+    /// which for us is the number of states in the NFA
+    pub fn dimension(&self) -> usize {
         self.0.len()
     }
 
@@ -113,7 +115,7 @@ impl Ideal {
     }
 
     pub fn intersection(x: &Ideal, ideal: &Ideal) -> Ideal {
-        debug_assert_eq!(x.len(), ideal.len());
+        debug_assert_eq!(x.dimension(), ideal.dimension());
         Ideal(
             x.0.iter()
                 .zip(ideal.0.iter())
@@ -184,8 +186,8 @@ impl Ideal {
 
     //why AddAssign does not allow adding a reference !!??
     pub fn add_other(&mut self, x: &Ideal) {
-        debug_assert_eq!(self.len(), x.len());
-        for i in 0..self.len() {
+        debug_assert_eq!(self.dimension(), x.dimension());
+        for i in 0..self.dimension() {
             self.0[i] += x.0[i];
         }
     }