Skip to content
Snippets Groups Projects
Commit 32b9b41f authored by Udo Eisenbarth's avatar Udo Eisenbarth :speech_balloon:
Browse files

Code cleanups

parent a55c59fb
No related branches found
No related tags found
1 merge request!7Draft: Resolve "Implement rudimental serialization of OpticScenery"
Pipeline #7492 passed
......@@ -22,7 +22,7 @@ fn main() -> Result<(), OpossumError> {
}),
));
let mut group = NodeGroup::new();
let mut group = NodeGroup::default();
group.expand_view(true);
let g_n1 = group.add_node(Dummy::new("node1"));
let g_n2 = group.add_node(Dummy::new("node2"));
......
......@@ -7,14 +7,14 @@ fn main() -> Result<(), OpossumError> {
let mut scenery = OpticScenery::new();
scenery.set_description("Node Group test section".into());
let mut group1 = NodeGroup::new();
let mut group1 = NodeGroup::default();
group1.expand_view(true);
let g1_n1 = group1.add_node(Dummy::new("node1"));
let g1_n2 = group1.add_node(BeamSplitter::default());
group1.map_output_port(g1_n2, "out1_trans1_refl2", "out1")?;
group1.connect_nodes(g1_n1, "rear", g1_n2, "input1")?;
let mut nested_group = NodeGroup::new();
let mut nested_group = NodeGroup::default();
let nested_g_n1 = nested_group.add_node(Dummy::new("node1_1"));
let nested_g_n2 = nested_group.add_node(Dummy::new("node1_2"));
nested_group.expand_view(true);
......@@ -28,7 +28,7 @@ fn main() -> Result<(), OpossumError> {
let nested_group_index = group1.add_node(nested_group);
group1.connect_nodes(nested_group_index, "out1", g1_n1, "front")?;
let mut group2: NodeGroup = NodeGroup::new();
let mut group2: NodeGroup = NodeGroup::default();
group2.expand_view(true);
let g2_n1 = group2.add_node(Dummy::new("node2_1"));
let g2_n2 = group2.add_node(Dummy::new("node2_2"));
......
......@@ -89,10 +89,11 @@ impl Default for NodeGroup {
}
impl NodeGroup {
/// Creates a new [`NodeGroup`].
pub fn new() -> Self {
pub fn new(name: &str) -> Self {
let mut props= create_default_props();
props.set("name", Property { prop: Proptype::String(name.into()) });
Self {
expand_view: false,
props: create_default_props(),
props,
..Default::default()
}
}
......@@ -723,7 +724,7 @@ mod test {
};
#[test]
fn new() {
let og = NodeGroup::new();
let og = NodeGroup::default();
assert_eq!(og.g.0.node_count(), 0);
assert_eq!(og.g.0.edge_count(), 0);
assert!(og.input_port_map.is_empty());
......@@ -731,13 +732,13 @@ mod test {
}
#[test]
fn add_node() {
let mut og = NodeGroup::new();
let mut og = NodeGroup::default();
og.add_node(Dummy::new("n1"));
assert_eq!(og.g.0.node_count(), 1);
}
#[test]
fn connect_nodes() {
let mut og = NodeGroup::new();
let mut og = NodeGroup::default();
let sn1_i = og.add_node(Dummy::new("n1"));
let sn2_i = og.add_node(Dummy::new("n2"));
// wrong port names
......@@ -756,7 +757,7 @@ mod test {
}
#[test]
fn connect_nodes_update_port_mapping() {
let mut og = NodeGroup::new();
let mut og = NodeGroup::default();
let sn1_i = og.add_node(Dummy::new("n1"));
let sn2_i = og.add_node(Dummy::new("n2"));
......@@ -771,7 +772,7 @@ mod test {
}
#[test]
fn input_nodes() {
let mut og = NodeGroup::new();
let mut og = NodeGroup::default();
let sn1_i = og.add_node(Dummy::new("n1"));
let sn2_i = og.add_node(Dummy::new("n2"));
let sub_node3 = BeamSplitter::new(0.5).unwrap();
......@@ -782,7 +783,7 @@ mod test {
}
#[test]
fn output_nodes() {
let mut og = NodeGroup::new();
let mut og = NodeGroup::default();
let sn1_i = og.add_node(Dummy::new("n1"));
let sub_node1 = BeamSplitter::new(0.5).unwrap();
let sn2_i = og.add_node(sub_node1);
......@@ -794,7 +795,7 @@ mod test {
}
#[test]
fn map_input_port() {
let mut og = NodeGroup::new();
let mut og = NodeGroup::default();
let sn1_i = og.add_node(Dummy::new("n1"));
let sn2_i = og.add_node(Dummy::new("n2"));
og.connect_nodes(sn1_i, "rear", sn2_i, "front").unwrap();
......@@ -817,7 +818,7 @@ mod test {
}
#[test]
fn map_input_port_half_connected_nodes() {
let mut og = NodeGroup::new();
let mut og = NodeGroup::default();
let sn1_i = og.add_node(Dummy::new("n1"));
let sn2_i = og.add_node(BeamSplitter::default());
og.connect_nodes(sn1_i, "rear", sn2_i, "input1").unwrap();
......@@ -832,7 +833,7 @@ mod test {
}
#[test]
fn map_output_port() {
let mut og = NodeGroup::new();
let mut og = NodeGroup::default();
let sn1_i = og.add_node(Dummy::new("n1"));
let sn2_i = og.add_node(Dummy::new("n2"));
og.connect_nodes(sn1_i, "rear", sn2_i, "front").unwrap();
......@@ -855,7 +856,7 @@ mod test {
}
#[test]
fn map_output_port_half_connected_nodes() {
let mut og = NodeGroup::new();
let mut og = NodeGroup::default();
let sn1_i = og.add_node(BeamSplitter::default());
let sn2_i = og.add_node(Dummy::new("n2"));
og.connect_nodes(sn1_i, "out1_trans1_refl2", sn2_i, "front")
......@@ -875,7 +876,7 @@ mod test {
}
#[test]
fn ports() {
let mut og = NodeGroup::new();
let mut og = NodeGroup::default();
let sn1_i = og.add_node(Dummy::new("n1"));
let sn2_i = og.add_node(Dummy::new("n2"));
og.connect_nodes(sn1_i, "rear", sn2_i, "front").unwrap();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment