From ebad7458b8959e34de43f878264270360ec35d0b Mon Sep 17 00:00:00 2001
From: angloth <angus.lothian@hotmail.com>
Date: Mon, 9 Mar 2020 11:31:32 +0100
Subject: [PATCH] Add fixes to pull request comments.
---
b_asic/abstract_operation.py | 1 +
b_asic/core_operations.py | 3 ---
b_asic/port.py | 6 ++----
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/b_asic/abstract_operation.py b/b_asic/abstract_operation.py
index 4f54c9b7..1403f7a9 100644
--- a/b_asic/abstract_operation.py
+++ b/b_asic/abstract_operation.py
@@ -15,6 +15,7 @@ from b_asic.utilities import breadth_first_search
from b_asic.abstract_graph_component import AbstractGraphComponent
from b_asic.graph_component import Name
+
class AbstractOperation(Operation, AbstractGraphComponent):
"""Generic abstract operation class which most implementations will derive from.
TODO: More info.
diff --git a/b_asic/core_operations.py b/b_asic/core_operations.py
index 28fd06fc..42867aa5 100644
--- a/b_asic/core_operations.py
+++ b/b_asic/core_operations.py
@@ -30,7 +30,6 @@ class Constant(AbstractOperation):
"""
def __init__(self, value: Number = 0, name: Name = ""):
- """Construct a Constant."""
super().__init__(name)
self._output_ports = [OutputPort(0, self)] # TODO: Generate appropriate ID for ports.
@@ -50,7 +49,6 @@ class Addition(AbstractOperation):
"""
def __init__(self, source1: OutputPort = None, source2: OutputPort = None, name: Name = ""):
- """Construct an Addition."""
super().__init__(name)
self._input_ports = [InputPort(0, self), InputPort(1, self)] # TODO: Generate appropriate ID for ports.
@@ -75,7 +73,6 @@ class ConstantMultiplication(AbstractOperation):
"""
def __init__(self, coefficient: Number, source1: OutputPort = None, name: Name = ""):
- """Construct a ConstantMultiplication."""
super().__init__(name)
self._input_ports = [InputPort(0, self)] # TODO: Generate appropriate ID for ports.
self._output_ports = [OutputPort(0, self)] # TODO: Generate appropriate ID for ports.
diff --git a/b_asic/port.py b/b_asic/port.py
index 2b83eafd..fe0b6aca 100644
--- a/b_asic/port.py
+++ b/b_asic/port.py
@@ -114,8 +114,7 @@ class InputPort(Port):
def connect_port(self, port: "OutputPort") -> Signal:
assert self._signal is None, "Connecting new port to already connected input port."
- Signal(port, self) # self._signal is set by the signal constructor
- return self._signal
+ return Signal(port, self) # self._signal is set by the signal constructor
def connect_signal(self, signal: Signal) -> None:
assert self._signal is None, "Connecting new port to already connected input port."
@@ -165,8 +164,7 @@ class OutputPort(Port):
return len(self._signals)
def connect_port(self, port: InputPort) -> Signal:
- signal = Signal(self, port) # Signal is added to self._signals in signal constructor
- return signal
+ return = Signal(self, port) # Signal is added to self._signals in signal constructor
def connect_signal(self, signal: Signal) -> None:
assert not self.is_connected_to_signal(signal), \
--
GitLab