diff options
author | Jovansonlee Cesar <ivanceras@gmail.com> | 2018-09-01 03:47:21 +0800 |
---|---|---|
committer | Jovansonlee Cesar <ivanceras@gmail.com> | 2018-09-01 03:47:21 +0800 |
commit | 7f3eb34c0352802000f90005bcbd59b31e15f1b2 (patch) | |
tree | d1eb51b8f12ce8f14e058a58fab46b1a0153cdc4 /svgbob | |
parent | 415446f09c0e678c0f557d5e802b44785372a999 (diff) |
Removed unused methods
Diffstat (limited to 'svgbob')
-rw-r--r-- | svgbob/src/grid.rs | 2 | ||||
-rw-r--r-- | svgbob/src/optimizer.rs | 53 | ||||
-rw-r--r-- | svgbob/src/properties.rs | 2 |
3 files changed, 4 insertions, 53 deletions
diff --git a/svgbob/src/grid.rs b/svgbob/src/grid.rs index 155a8f9..bcf3513 100644 --- a/svgbob/src/grid.rs +++ b/svgbob/src/grid.rs @@ -194,7 +194,7 @@ impl Grid { let text_elm = self.get_escaped_text_elements(); elements.push(vec![text_elm]); let optimizer = Optimizer::new(elements); - let optimized_elements = optimizer.optimize(&self.settings); + let optimized_elements:Vec<Vec<Element>> = optimizer.optimize(&self.settings); for group in optimized_elements { let mut svg_group = vec![]; for elem in group{ diff --git a/svgbob/src/optimizer.rs b/svgbob/src/optimizer.rs index 091849c..9a5b732 100644 --- a/svgbob/src/optimizer.rs +++ b/svgbob/src/optimizer.rs @@ -103,54 +103,6 @@ impl Optimizer { } } - fn reduce_all_elements(&self, all_elements: &Vec<Vec<Vec<Element>>>) -> Vec<Vec<Vec<Element>>> { - let mut all_reduced:Vec<Vec<Vec<Element>>> = vec![]; - for row in all_elements{ - let mut row_reduced:Vec<Vec<Element>> = vec![]; - for cell in row{ - let reduced:Vec<Element> = self.reduce_cell_elements(&cell); - row_reduced.push(reduced); - } - all_reduced.push(row_reduced); - } - all_reduced - } - - /// try to reduce the elements at this cell - fn reduce_cell_elements(&self, elements: &Vec<Element>)->Vec<Element>{ - let mut consumed = vec![]; - let mut all_reduced = vec![]; - for (i, elm) in elements.iter().enumerate(){ - let mut cell_reduced = vec![]; - for (j, elm2) in elements.iter().enumerate(){ - if i != j { - if !consumed.contains(&j){ - if let Some(reduced) = elm.reduce(elm2){ - cell_reduced.push(reduced); - consumed.push(j); - } - } - } - } - if cell_reduced.len() > 0 { - all_reduced.extend(cell_reduced); - } - else{ - all_reduced.push(elm.clone()); - } - } - if consumed.len() > 0 { - //println!("original elements: {}", elements.len()); - //println!("total consumed: {}", consumed.len()); - //println!("all_reduced: {}", all_reduced.len()); - } - all_reduced.sort(); - all_reduced.dedup(); - if elements.len() != all_reduced.len(){ - //println!("reduced from {} to {}", elements.len(), all_reduced.len()); - } - all_reduced - } /// grouped elements together that shares some end_points fn group_elements<'e>(&self, elements: Vec<Element>) -> Vec<Vec<Element>> { @@ -184,7 +136,6 @@ impl Optimizer { for (y, line) in self.elements.iter().enumerate() { for (x, cell) in line.iter().enumerate() { let loc = &Loc::new(x as i32, y as i32); - //let reduced = self.reduce_cell_elements(&cell); for (elm_index, elm) in cell.iter().enumerate() { if !tracing_consumed_locs.contains(&(loc.clone(),elm_index)){ let (traced, consumed) = self.trace_elements(elm, loc); @@ -196,8 +147,8 @@ impl Optimizer { } optimized.sort(); optimized.dedup(); - let grouped = self.group_elements(optimized); - //let arranged = self.arrange_elements(grouped); + let arranged = self.arrange_elements(optimized); + let grouped = self.group_elements(arranged); grouped } diff --git a/svgbob/src/properties.rs b/svgbob/src/properties.rs index b417169..6c16684 100644 --- a/svgbob/src/properties.rs +++ b/svgbob/src/properties.rs @@ -1411,7 +1411,7 @@ impl Properties for char { } //////////////////////// // - // ^ carret + // ^ carret, arrow up // /////////////////////// else if self.any("^▲▴") { |