From 1a242270c917186dfe1b1ac216484c5b3e9086f1 Mon Sep 17 00:00:00 2001 From: Luca Mondada Date: Mon, 24 Feb 2025 21:54:10 +0100 Subject: [PATCH] rename from_pg_index to to_node --- hugr-core/src/hugr/hugrmut.rs | 8 ++++---- hugr-core/src/hugr/internal.rs | 16 ++++++++-------- hugr-core/src/hugr/views.rs | 2 +- hugr-core/src/hugr/views/descendants.rs | 16 +++++++--------- hugr-core/src/hugr/views/petgraph.rs | 2 +- hugr-core/src/hugr/views/render.rs | 6 +++--- hugr-core/src/hugr/views/root_checked.rs | 2 +- hugr-core/src/hugr/views/sibling.rs | 18 +++++++++--------- hugr-core/src/hugr/views/sibling_subgraph.rs | 2 +- 9 files changed, 35 insertions(+), 37 deletions(-) diff --git a/hugr-core/src/hugr/hugrmut.rs b/hugr-core/src/hugr/hugrmut.rs index 490bf936b..c8acdc2bf 100644 --- a/hugr-core/src/hugr/hugrmut.rs +++ b/hugr-core/src/hugr/hugrmut.rs @@ -408,7 +408,7 @@ impl + AsMut> HugrMut for T // // No need to compute each node's extensions here, as we merge `other.extensions` directly. for (&node, &new_node) in node_map.iter() { - let nodetype = other.get_optype(other.from_pg_index(node)); + let nodetype = other.get_optype(other.to_node(node)); self.as_mut().op_types.set(new_node, nodetype.clone()); let meta = other.base_hugr().metadata.get(node); self.as_mut().metadata.set(new_node, meta.clone()); @@ -439,7 +439,7 @@ impl + AsMut> HugrMut for T let node_map = insert_subgraph_internal(self.as_mut(), root, other, &portgraph); // Update the optypes and metadata, copying them from the other graph. for (&node, &new_node) in node_map.iter() { - let nodetype = other.get_optype(other.from_pg_index(node)); + let nodetype = other.get_optype(other.to_node(node)); self.as_mut().op_types.set(new_node, nodetype.clone()); let meta = other.base_hugr().metadata.get(node); self.as_mut().metadata.set(new_node, meta.clone()); @@ -476,7 +476,7 @@ fn insert_hugr_internal( .push_child(other_root, root.pg_index()) .expect("Inserting a newly-created node into the hierarchy should never fail."); for (&node, &new_node) in node_map.iter() { - other.children(other.from_pg_index(node)).for_each(|child| { + other.children(other.to_node(node)).for_each(|child| { hugr.hierarchy .push_child(node_map[&other.to_pg_index(child)], new_node) .expect("Inserting a newly-created node into the hierarchy should never fail."); @@ -516,7 +516,7 @@ fn insert_subgraph_internal( // update the hierarchy with their new id. for (&node, &new_node) in node_map.iter() { let new_parent = other - .get_parent(other.from_pg_index(node)) + .get_parent(other.to_node(node)) .and_then(|parent| node_map.get(&other.to_pg_index(parent)).copied()) .unwrap_or(root.pg_index()); hugr.hierarchy diff --git a/hugr-core/src/hugr/internal.rs b/hugr-core/src/hugr/internal.rs index 8583fa0b7..93512b852 100644 --- a/hugr-core/src/hugr/internal.rs +++ b/hugr-core/src/hugr/internal.rs @@ -42,7 +42,7 @@ pub trait HugrInternals { fn to_pg_index(&self, node: Self::Node) -> portgraph::NodeIndex; /// Convert a portgraph node index to a node. - fn from_pg_index(&self, index: portgraph::NodeIndex) -> Self::Node; + fn to_node(&self, index: portgraph::NodeIndex) -> Self::Node; } impl HugrInternals for Hugr { @@ -72,7 +72,7 @@ impl HugrInternals for Hugr { node.pg_index() } - fn from_pg_index(&self, index: portgraph::NodeIndex) -> Self::Node { + fn to_node(&self, index: portgraph::NodeIndex) -> Self::Node { index.into() } } @@ -90,7 +90,7 @@ impl HugrInternals for &T { fn base_hugr(&self) -> &Hugr; fn root_node(&self) -> Self::Node; fn to_pg_index(&self, node: Self::Node) -> portgraph::NodeIndex; - fn from_pg_index(&self, index: portgraph::NodeIndex) -> Self::Node; + fn to_node(&self, index: portgraph::NodeIndex) -> Self::Node; } } } @@ -108,7 +108,7 @@ impl HugrInternals for &mut T { fn base_hugr(&self) -> &Hugr; fn root_node(&self) -> Self::Node; fn to_pg_index(&self, node: Self::Node) -> portgraph::NodeIndex; - fn from_pg_index(&self, index: portgraph::NodeIndex) -> Self::Node; + fn to_node(&self, index: portgraph::NodeIndex) -> Self::Node; } } } @@ -126,7 +126,7 @@ impl HugrInternals for Rc { fn base_hugr(&self) -> &Hugr; fn root_node(&self) -> Self::Node; fn to_pg_index(&self, node: Self::Node) -> portgraph::NodeIndex; - fn from_pg_index(&self, index: portgraph::NodeIndex) -> Self::Node; + fn to_node(&self, index: portgraph::NodeIndex) -> Self::Node; } } } @@ -144,7 +144,7 @@ impl HugrInternals for Arc { fn base_hugr(&self) -> &Hugr; fn root_node(&self) -> Self::Node; fn to_pg_index(&self, node: Self::Node) -> portgraph::NodeIndex; - fn from_pg_index(&self, index: portgraph::NodeIndex) -> Self::Node; + fn to_node(&self, index: portgraph::NodeIndex) -> Self::Node; } } } @@ -162,7 +162,7 @@ impl HugrInternals for Box { fn base_hugr(&self) -> &Hugr; fn root_node(&self) -> Self::Node; fn to_pg_index(&self, node: Self::Node) -> portgraph::NodeIndex; - fn from_pg_index(&self, index: portgraph::NodeIndex) -> Self::Node; + fn to_node(&self, index: portgraph::NodeIndex) -> Self::Node; } } } @@ -180,7 +180,7 @@ impl HugrInternals for Cow<'_, T> { fn base_hugr(&self) -> &Hugr; fn root_node(&self) -> Self::Node; fn to_pg_index(&self, node: Self::Node) -> portgraph::NodeIndex; - fn from_pg_index(&self, index: portgraph::NodeIndex) -> Self::Node; + fn to_node(&self, index: portgraph::NodeIndex) -> Self::Node; } } } diff --git a/hugr-core/src/hugr/views.rs b/hugr-core/src/hugr/views.rs index 40537c072..eab9ec273 100644 --- a/hugr-core/src/hugr/views.rs +++ b/hugr-core/src/hugr/views.rs @@ -81,7 +81,7 @@ pub trait HugrView: HugrInternals { self.base_hugr() .hierarchy .parent(self.to_pg_index(node)) - .map(|index| self.from_pg_index(index)) + .map(|index| self.to_node(index)) } /// Returns the operation type of a node. diff --git a/hugr-core/src/hugr/views/descendants.rs b/hugr-core/src/hugr/views/descendants.rs index 5cb35e906..170d6424f 100644 --- a/hugr-core/src/hugr/views/descendants.rs +++ b/hugr-core/src/hugr/views/descendants.rs @@ -58,9 +58,7 @@ impl HugrView for DescendantsGraph<'_, Root> { #[inline] fn nodes(&self) -> impl Iterator + Clone { - self.graph - .nodes_iter() - .map(|index| self.from_pg_index(index)) + self.graph.nodes_iter().map(|index| self.to_node(index)) } #[inline] @@ -90,7 +88,7 @@ impl HugrView for DescendantsGraph<'_, Root> { let port: PortIndex = link.into(); let node = self.graph.port_node(port).unwrap(); let offset = self.graph.port_offset(port).unwrap(); - (self.from_pg_index(node), offset.into()) + (self.to_node(node), offset.into()) }) } @@ -116,21 +114,21 @@ impl HugrView for DescendantsGraph<'_, Root> { true => self.base_hugr().hierarchy.children(self.to_pg_index(node)), false => portgraph::hierarchy::Children::default(), }; - children.map(|index| self.from_pg_index(index)) + children.map(|index| self.to_node(index)) } #[inline] fn neighbours(&self, node: Node, dir: Direction) -> impl Iterator + Clone { self.graph .neighbours(self.to_pg_index(node), dir) - .map(|index| self.from_pg_index(index)) + .map(|index| self.to_node(index)) } #[inline] fn all_neighbours(&self, node: Node) -> impl Iterator + Clone { self.graph .all_neighbours(self.to_pg_index(node)) - .map(|index| self.from_pg_index(index)) + .map(|index| self.to_node(index)) } } impl RootTagged for DescendantsGraph<'_, Root> { @@ -187,8 +185,8 @@ where } #[inline] - fn from_pg_index(&self, index: portgraph::NodeIndex) -> Node { - self.hugr.from_pg_index(index) + fn to_node(&self, index: portgraph::NodeIndex) -> Node { + self.hugr.to_node(index) } } diff --git a/hugr-core/src/hugr/views/petgraph.rs b/hugr-core/src/hugr/views/petgraph.rs index 7023475c9..5f8cdcc10 100644 --- a/hugr-core/src/hugr/views/petgraph.rs +++ b/hugr-core/src/hugr/views/petgraph.rs @@ -72,7 +72,7 @@ where } fn from_index(&self, ix: usize) -> Self::NodeId { - self.hugr.from_pg_index(portgraph::NodeIndex::new(ix)) + self.hugr.to_node(portgraph::NodeIndex::new(ix)) } } diff --git a/hugr-core/src/hugr/views/render.rs b/hugr-core/src/hugr/views/render.rs index 97207dc6d..7c6c09eef 100644 --- a/hugr-core/src/hugr/views/render.rs +++ b/hugr-core/src/hugr/views/render.rs @@ -36,7 +36,7 @@ pub(super) fn node_style( config: RenderConfig, ) -> Box NodeStyle + '_> { fn node_name(h: &H, n: NodeIndex) -> String { - match h.get_optype(h.from_pg_index(n)) { + match h.get_optype(h.to_node(n)) { OpType::FuncDecl(f) => format!("FuncDecl: \"{}\"", f.name), OpType::FuncDefn(f) => format!("FuncDefn: \"{}\"", f.name), op => op.name().to_string(), @@ -64,7 +64,7 @@ pub(super) fn port_style( let graph = h.portgraph(); Box::new(move |port| { let node = graph.port_node(port).unwrap(); - let optype = h.get_optype(h.from_pg_index(node)); + let optype = h.get_optype(h.to_node(node)); let offset = graph.port_offset(port).unwrap(); match optype.port_kind(offset).unwrap() { EdgeKind::Function(pf) => PortStyle::new(html_escape::encode_text(&format!("{}", pf))), @@ -95,7 +95,7 @@ pub(super) fn edge_style( let graph = h.portgraph(); Box::new(move |src, tgt| { let src_node = graph.port_node(src).unwrap(); - let src_optype = h.get_optype(h.from_pg_index(src_node)); + let src_optype = h.get_optype(h.to_node(src_node)); let src_offset = graph.port_offset(src).unwrap(); let tgt_offset = graph.port_offset(tgt).unwrap(); diff --git a/hugr-core/src/hugr/views/root_checked.rs b/hugr-core/src/hugr/views/root_checked.rs index 510753a6b..8cf012a29 100644 --- a/hugr-core/src/hugr/views/root_checked.rs +++ b/hugr-core/src/hugr/views/root_checked.rs @@ -61,7 +61,7 @@ impl, Root> HugrInternals for RootChecked { fn base_hugr(&self) -> &Hugr; fn root_node(&self) -> Node; fn to_pg_index(&self, node: Node) -> portgraph::NodeIndex; - fn from_pg_index(&self, index: portgraph::NodeIndex) -> Node; + fn to_node(&self, index: portgraph::NodeIndex) -> Node; } } } diff --git a/hugr-core/src/hugr/views/sibling.rs b/hugr-core/src/hugr/views/sibling.rs index 18f527416..5e9ed306b 100644 --- a/hugr-core/src/hugr/views/sibling.rs +++ b/hugr-core/src/hugr/views/sibling.rs @@ -72,7 +72,7 @@ macro_rules! impl_base_members { .base_hugr() .hierarchy .children(self.to_pg_index(self.root)) - .map(|n| self.from_pg_index(n)); + .map(|n| self.to_node(n)); iter::once(self.root).chain(children) } @@ -85,7 +85,7 @@ macro_rules! impl_base_members { true => self.base_hugr().hierarchy.children(self.to_pg_index(node)), false => portgraph::hierarchy::Children::default(), }; - children.map(|n| self.from_pg_index(n)) + children.map(|n| self.to_node(n)) } }; } @@ -124,7 +124,7 @@ impl HugrView for SiblingGraph<'_, Root> { self.graph.port_links(port).map(|(_, link)| { let node = self.graph.port_node(link).unwrap(); let offset = self.graph.port_offset(link).unwrap(); - (self.from_pg_index(node), offset.into()) + (self.to_node(node), offset.into()) }) } @@ -143,14 +143,14 @@ impl HugrView for SiblingGraph<'_, Root> { fn neighbours(&self, node: Node, dir: Direction) -> impl Iterator + Clone { self.graph .neighbours(self.to_pg_index(node), dir) - .map(|n| self.from_pg_index(n)) + .map(|n| self.to_node(n)) } #[inline] fn all_neighbours(&self, node: Node) -> impl Iterator + Clone { self.graph .all_neighbours(self.to_pg_index(node)) - .map(|n| self.from_pg_index(n)) + .map(|n| self.to_node(n)) } } impl RootTagged for SiblingGraph<'_, Root> { @@ -217,8 +217,8 @@ where } #[inline] - fn from_pg_index(&self, index: portgraph::NodeIndex) -> Node { - self.hugr.from_pg_index(index) + fn to_node(&self, index: portgraph::NodeIndex) -> Node { + self.hugr.to_node(index) } } @@ -295,8 +295,8 @@ impl<'g, Root: NodeHandle> HugrInternals for SiblingMut<'g, Root> { } #[inline] - fn from_pg_index(&self, index: portgraph::NodeIndex) -> Node { - self.hugr.from_pg_index(index) + fn to_node(&self, index: portgraph::NodeIndex) -> Node { + self.hugr.to_node(index) } } diff --git a/hugr-core/src/hugr/views/sibling_subgraph.rs b/hugr-core/src/hugr/views/sibling_subgraph.rs index f10c79ec4..e498dedb2 100644 --- a/hugr-core/src/hugr/views/sibling_subgraph.rs +++ b/hugr-core/src/hugr/views/sibling_subgraph.rs @@ -185,7 +185,7 @@ impl SiblingSubgraph { let subpg = Subgraph::new_subgraph(pg.clone(), make_boundary(hugr, &inputs, &outputs)); let nodes = subpg .nodes_iter() - .map(|index| hugr.from_pg_index(index)) + .map(|index| hugr.to_node(index)) .collect_vec(); validate_subgraph(hugr, &nodes, &inputs, &outputs)?;