From a540a3f456f0d7926023096d9c0e6b477df4eff2 Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Tue, 24 Jan 2023 14:40:26 +0100
Subject: [PATCH] Update twotap-FIR example and test file
---
examples/twotapfirsfg.py | 25 +++++++++++--------------
test/test_gui/twotapfir.py | 25 +++++++++++--------------
2 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/examples/twotapfirsfg.py b/examples/twotapfirsfg.py
index bd80f242..97d76c32 100644
--- a/examples/twotapfirsfg.py
+++ b/examples/twotapfirsfg.py
@@ -2,34 +2,31 @@
"""
B-ASIC automatically generated SFG file.
Name: twotapfir
-Last saved: 2023-01-23 12:02:27.343483.
+Last saved: 2023-01-24 14:38:17.654639.
"""
-from b_asic import SFG, Signal, Input, Output, ConstantMultiplication, Addition, Delay, Input, Output
+from b_asic import SFG, Signal, Input, Output, ConstantMultiplication, Delay, Input, Output, Addition
# Inputs:
-in1 = Input(name="")
+in1 = Input(name="in1")
# Outputs:
out1 = Output(name="")
# Operations:
-cmul1 = ConstantMultiplication(value=0.5, name="cmul", latency_offsets={'in0': None, 'out0': None})
-in1 = Input(name="")
-add1 = Addition(name="", latency_offsets={'in0': None, 'in1': None, 'out0': None})
-cmul2 = ConstantMultiplication(value=0.5, name="cmul2", latency_offsets={'in0': None, 'out0': None})
-out1 = Output(name="")
t1 = Delay(initial_value=0, name="")
-in1 = Input(name="")
+cmul1 = ConstantMultiplication(value=0.5, name="cmul2", latency_offsets={'in0': None, 'out0': None})
+add1 = Addition(name="", latency_offsets={'in0': None, 'in1': None, 'out0': None})
+cmul2 = ConstantMultiplication(value=0.5, name="cmul", latency_offsets={'in0': None, 'out0': None})
# Signals:
-Signal(source=cmul1.output(0), destination=add1.input(1))
-Signal(source=in1.output(0), destination=cmul1.input(0))
+Signal(source=t1.output(0), destination=cmul1.input(0))
Signal(source=in1.output(0), destination=t1.input(0))
+Signal(source=in1.output(0), destination=cmul2.input(0))
+Signal(source=cmul1.output(0), destination=add1.input(0))
Signal(source=add1.output(0), destination=out1.input(0))
-Signal(source=cmul2.output(0), destination=add1.input(0))
-Signal(source=t1.output(0), destination=cmul2.input(0))
+Signal(source=cmul2.output(0), destination=add1.input(1))
twotapfir = SFG(inputs=[in1], outputs=[out1], name='twotapfir')
# SFG Properties:
prop = {'name':twotapfir}
-positions = {'cmul1': (-181, -67), 'in1': (-264, -202), 'add1': (91, 93), 'cmul2': (-27, -66), 'out1': (216, 92), 't1': (-135, -204)}
+positions = {'t1': (-209, 19), 'cmul1': (-95, 76), 'add1': (0, 95), 'cmul2': (-209, 114), 'out1': (76, 95), 'in1': (-323, 19)}
diff --git a/test/test_gui/twotapfir.py b/test/test_gui/twotapfir.py
index bd80f242..97d76c32 100644
--- a/test/test_gui/twotapfir.py
+++ b/test/test_gui/twotapfir.py
@@ -2,34 +2,31 @@
"""
B-ASIC automatically generated SFG file.
Name: twotapfir
-Last saved: 2023-01-23 12:02:27.343483.
+Last saved: 2023-01-24 14:38:17.654639.
"""
-from b_asic import SFG, Signal, Input, Output, ConstantMultiplication, Addition, Delay, Input, Output
+from b_asic import SFG, Signal, Input, Output, ConstantMultiplication, Delay, Input, Output, Addition
# Inputs:
-in1 = Input(name="")
+in1 = Input(name="in1")
# Outputs:
out1 = Output(name="")
# Operations:
-cmul1 = ConstantMultiplication(value=0.5, name="cmul", latency_offsets={'in0': None, 'out0': None})
-in1 = Input(name="")
-add1 = Addition(name="", latency_offsets={'in0': None, 'in1': None, 'out0': None})
-cmul2 = ConstantMultiplication(value=0.5, name="cmul2", latency_offsets={'in0': None, 'out0': None})
-out1 = Output(name="")
t1 = Delay(initial_value=0, name="")
-in1 = Input(name="")
+cmul1 = ConstantMultiplication(value=0.5, name="cmul2", latency_offsets={'in0': None, 'out0': None})
+add1 = Addition(name="", latency_offsets={'in0': None, 'in1': None, 'out0': None})
+cmul2 = ConstantMultiplication(value=0.5, name="cmul", latency_offsets={'in0': None, 'out0': None})
# Signals:
-Signal(source=cmul1.output(0), destination=add1.input(1))
-Signal(source=in1.output(0), destination=cmul1.input(0))
+Signal(source=t1.output(0), destination=cmul1.input(0))
Signal(source=in1.output(0), destination=t1.input(0))
+Signal(source=in1.output(0), destination=cmul2.input(0))
+Signal(source=cmul1.output(0), destination=add1.input(0))
Signal(source=add1.output(0), destination=out1.input(0))
-Signal(source=cmul2.output(0), destination=add1.input(0))
-Signal(source=t1.output(0), destination=cmul2.input(0))
+Signal(source=cmul2.output(0), destination=add1.input(1))
twotapfir = SFG(inputs=[in1], outputs=[out1], name='twotapfir')
# SFG Properties:
prop = {'name':twotapfir}
-positions = {'cmul1': (-181, -67), 'in1': (-264, -202), 'add1': (91, 93), 'cmul2': (-27, -66), 'out1': (216, 92), 't1': (-135, -204)}
+positions = {'t1': (-209, 19), 'cmul1': (-95, 76), 'add1': (0, 95), 'cmul2': (-209, 114), 'out1': (76, 95), 'in1': (-323, 19)}
--
GitLab