From c117d89ae4de0b27bb97154da554f2076391aaf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivar=20H=C3=A4rnqvist?= <ivarhar@outlook.com>
Date: Mon, 18 May 2020 16:30:15 +0200
Subject: [PATCH] fix merge
---
b_asic/signal_flow_graph.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/b_asic/signal_flow_graph.py b/b_asic/signal_flow_graph.py
index 15d37add..3abe54b6 100644
--- a/b_asic/signal_flow_graph.py
+++ b/b_asic/signal_flow_graph.py
@@ -353,7 +353,6 @@ class SFG(AbstractOperation):
"""
return self._components_by_name.get(name, [])
-<<<<<<< HEAD
def find_result_keys_by_name(self, name: Name, output_index: int = 0) -> Sequence[ResultKey]:
"""Find all graph components with the specified name and
return a sequence of the keys to use when fetching their results
@@ -368,7 +367,7 @@ class SFG(AbstractOperation):
if isinstance(comp, Operation):
keys.append(comp.key(output_index, comp.graph_id))
return keys
-=======
+
def replace_component(self, component: Operation, _id: GraphID):
"""Find and replace all components matching either on GraphID, Type or both.
Then return a new deepcopy of the sfg with the replaced component.
@@ -647,7 +646,6 @@ class SFG(AbstractOperation):
"""TODO: docstring"""
for op in self.get_components_with_type_name(type_name):
op.set_latency_offsets(latency_offsets)
->>>>>>> d2ae5743259f581c116bb3772d17c3b2023ed9e0
def _add_component_unconnected_copy(self, original_component: GraphComponent) -> GraphComponent:
assert original_component not in self._original_components_to_new, "Tried to add duplicate SFG component"
--
GitLab