diff options
author | Jovansonlee Cesar <ivanceras@gmail.com> | 2022-09-24 00:48:59 +0800 |
---|---|---|
committer | Jovansonlee Cesar <ivanceras@gmail.com> | 2022-09-24 00:48:59 +0800 |
commit | 0cada86c73f51d993329f66b6364ac886e654a0d (patch) | |
tree | 542eac01f2d603b5273ae1d1cd07d49f37db65e4 | |
parent | 5ee9d09afcac70a3be2f71ebf91943da95b7642d (diff) |
feat: remove re_endorse first, as it needs to be rethinked
-rw-r--r-- | packages/svgbob/src/buffer/cell_buffer.rs | 26 | ||||
-rw-r--r-- | packages/svgbob/src/buffer/cell_buffer/span.rs | 33 |
2 files changed, 1 insertions, 58 deletions
diff --git a/packages/svgbob/src/buffer/cell_buffer.rs b/packages/svgbob/src/buffer/cell_buffer.rs index d7f9553..f77adf6 100644 --- a/packages/svgbob/src/buffer/cell_buffer.rs +++ b/packages/svgbob/src/buffer/cell_buffer.rs @@ -197,32 +197,6 @@ impl CellBuffer { .chain(single_member_fragments.into_iter()) .collect(); Endorse { accepted, rejects } - - /* - log::info!("rejects: {:#?}", rejects); - let re_endorsed = Span::re_endorse(rejects); - log::info!("re_endorsed: {:#?}", re_endorsed); - log::info!( - "got some accepted re_endorsed: {}", - re_endorsed.accepted.len() - ); - - let accepted: Vec<FragmentSpan> = endorsed_fragments - .into_iter() - .flatten() - .chain(single_member_fragments.into_iter()) - .chain(re_endorsed.accepted.into_iter()) - .collect(); - - Endorse { - accepted, - rejects: re_endorsed - .rejects - .into_iter() - .map(|contacts| contacts.0) - .collect(), - } - */ } /// group nodes that can be group and the rest will be fragments diff --git a/packages/svgbob/src/buffer/cell_buffer/span.rs b/packages/svgbob/src/buffer/cell_buffer/span.rs index 56a3e50..12a6646 100644 --- a/packages/svgbob/src/buffer/cell_buffer/span.rs +++ b/packages/svgbob/src/buffer/cell_buffer/span.rs @@ -1,5 +1,6 @@ use crate::buffer::cell_buffer::Endorse; use crate::buffer::fragment_buffer::FragmentSpan; +use crate::fragment::Circle; use crate::{ buffer::{ cell_buffer::Contacts, FragmentBuffer, Property, PropertyBuffer, @@ -181,38 +182,6 @@ impl Span { pub fn hit_cell(&self, needle: Cell) -> bool { self.iter().any(|(cell, ch)| *cell == needle) } - - /// Convert a group of fragment span - /// that didn't make it into an endorsed single shape fragment - /// We try it again for endorsing to circle - pub fn re_endorse( - grouped: Vec<Vec<FragmentSpan>>, - ) -> Endorse<FragmentSpan, Contacts> { - let spans: Vec<Span> = Self::extract_spans(grouped); - log::info!("spans: {:#?}", spans); - let merge_spans = Span::merge_recursive(spans); - log::info!("merg_spans: {:#?}", merge_spans); - - let (accepted, rejects): (Vec<Vec<FragmentSpan>>, Vec<Vec<Contacts>>) = - merge_spans - .into_iter() - .map(|span| span.endorse()) - .map(|endorse| (endorse.accepted, endorse.rejects)) - .unzip(); - - Endorse { - accepted: accepted.into_iter().flatten().collect(), - rejects: rejects.into_iter().flatten().collect(), - } - } - - //TODO: The absolute position is wrong here - fn extract_spans(grouped: Vec<Vec<FragmentSpan>>) -> Vec<Span> { - grouped - .into_iter() - .flat_map(|group| group.into_iter().map(|frag_span| frag_span.span)) - .collect() - } } impl Merge for Span { |