Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve copy node rendering in dotstr #131

Merged
merged 1 commit into from
Jun 8, 2023
Merged

Improve copy node rendering in dotstr #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 42 additions & 30 deletions src/hugr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,43 +77,55 @@ impl Hugr {

/// Return dot string showing underlying graph and hierarchy side by side.
pub fn dot_string(&self) -> String {
let portgraph = self.graph.as_portgraph();
hier_graph_dot_string_with(
self.graph.as_portgraph(),
portgraph,
&self.hierarchy,
|n| {
format!(
"({ni}) {name}",
name = self.op_types[n].name(),
ni = n.index()
)
if !self.graph.contains_node(n) {
return "".into();
}
let name = self.op_types[n].name();
format!("({ni}) {name}", ni = n.index())
},
|p| {
let src = self.graph.port_node(p).unwrap();
let Some(tgt_port) = self.graph.port_link(p) else {
|mut p| {
let mut src = portgraph.port_node(p).unwrap();
let src_is_copy = !self.graph.contains_node(src);
let Some(tgt_port) = portgraph.port_link(p) else {
return ("".into(), DotEdgeStyle::None);
};
let tgt = self.graph.port_node(tgt_port).unwrap();
let style = if self.hierarchy.parent(src) != self.hierarchy.parent(tgt) {
DotEdgeStyle::Some("dashed".into())
} else if self
.get_optype(src.into())
.port_kind(self.graph.port_offset(p).unwrap())
== Some(EdgeKind::StateOrder)
{
DotEdgeStyle::Some("dotted".into())
} else {
DotEdgeStyle::None
};

let optype = self.op_types.get(src);
let tgt = portgraph.port_node(tgt_port).unwrap();
let tgt_is_copy = !self.graph.contains_node(tgt);
if src_is_copy {
p = portgraph.input_links(src).next().unwrap().unwrap();
src = portgraph.port_node(p).unwrap();
}

let style =
if !tgt_is_copy && self.hierarchy.parent(src) != self.hierarchy.parent(tgt) {
DotEdgeStyle::Some("dashed".into())
} else if !src_is_copy
&& self
.get_optype(src.into())
.port_kind(self.graph.port_offset(p).unwrap())
== Some(EdgeKind::StateOrder)
{
DotEdgeStyle::Some("dotted".into())
} else {
DotEdgeStyle::None
};

let mut label = String::new();
let offset = self.graph.port_offset(p).unwrap();
let type_string = match optype.port_kind(offset) {
Some(EdgeKind::Const(ty)) => format!("{}", ty),
Some(EdgeKind::Value(ty)) => format!("{}", ty),
_ => String::new(),
};
encode_text_to_string(type_string, &mut label);
if !src_is_copy {
let optype = self.op_types.get(src);
let offset = portgraph.port_offset(p).unwrap();
let type_string = match optype.port_kind(offset) {
Some(EdgeKind::Const(ty)) => format!("{}", ty),
Some(EdgeKind::Value(ty)) => format!("{}", ty),
_ => String::new(),
};
encode_text_to_string(type_string, &mut label);
}

(label, style)
},
Expand Down