From 7f7fa2f91467fdb2b11312be8562e7b51fdeb199 Mon Sep 17 00:00:00 2001
From: Sebastian Koslowski <sebastian.koslowski@gmail.com>
Date: Tue, 3 May 2016 17:13:08 +0200
Subject: grc: added yaml/mako support
Includes basic converter from XML/Cheetah to YAML/Mako based block format.
---
grc/core/Connection.py | 113 +++++++++++++++----------------------------------
1 file changed, 33 insertions(+), 80 deletions(-)
(limited to 'grc/core/Connection.py')
diff --git a/grc/core/Connection.py b/grc/core/Connection.py
index 066532149b..01baaaf8fc 100644
--- a/grc/core/Connection.py
+++ b/grc/core/Connection.py
@@ -19,26 +19,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
from __future__ import absolute_import
-import collections
-
-from six.moves import range
-
-from . import Constants
-from .Element import Element, lazy_property
+from .base import Element
+from .utils.descriptors import lazy_property
class Connection(Element):
is_connection = True
- def __init__(self, parent, porta, portb):
+ def __init__(self, parent, source, sink):
"""
Make a new connection given the parent and 2 ports.
Args:
flow_graph: the parent of this element
- porta: a port (any direction)
- portb: a port (any direction)
+ source: a port (any direction)
+ sink: a port (any direction)
@throws Error cannot make connection
Returns:
@@ -46,37 +42,31 @@ class Connection(Element):
"""
Element.__init__(self, parent)
- source, sink = self._get_sink_source(porta, portb)
+ if not source.is_source:
+ source, sink = sink, source
+ if not source.is_source:
+ raise ValueError('Connection could not isolate source')
+ if not sink.is_sink:
+ raise ValueError('Connection could not isolate sink')
self.source_port = source
self.sink_port = sink
- # Ensure that this connection (source -> sink) is unique
- if self in self.parent_flowgraph.connections:
- raise LookupError('This connection between source and sink is not unique.')
-
- if self.is_bus():
- self._make_bus_connect()
+ def __str__(self):
+ return 'Connection (\n\t{}\n\t\t{}\n\t{}\n\t\t{}\n)'.format(
+ self.source_block, self.source_port, self.sink_block, self.sink_port,
+ )
def __eq__(self, other):
if not isinstance(other, self.__class__):
return NotImplemented
return self.source_port == other.source_port and self.sink_port == other.sink_port
- @staticmethod
- def _get_sink_source(porta, portb):
- source = sink = None
- # Separate the source and sink
- for port in (porta, portb):
- if port.is_source:
- source = port
- if port.is_sink:
- sink = port
- if not source:
- raise ValueError('Connection could not isolate source')
- if not sink:
- raise ValueError('Connection could not isolate sink')
- return source, sink
+ def __hash__(self):
+ return hash((self.source_port, self.sink_port))
+
+ def __iter__(self):
+ return iter((self.source_port, self.sink_port))
@lazy_property
def source_block(self):
@@ -86,6 +76,10 @@ class Connection(Element):
def sink_block(self):
return self.sink_port.parent_block
+ @lazy_property
+ def type(self):
+ return self.source_port.domain, self.sink_port.domain
+
@property
def enabled(self):
"""
@@ -96,14 +90,6 @@ class Connection(Element):
"""
return self.source_block.enabled and self.sink_block.enabled
- def __str__(self):
- return 'Connection (\n\t{}\n\t\t{}\n\t{}\n\t\t{}\n)'.format(
- self.source_block, self.source_port, self.sink_block, self.sink_port,
- )
-
- def is_bus(self):
- return self.source_port.get_type() == 'bus'
-
def validate(self):
"""
Validate the connections.
@@ -112,29 +98,12 @@ class Connection(Element):
Element.validate(self)
platform = self.parent_platform
- source_domain = self.source_port.domain
- sink_domain = self.sink_port.domain
+ if self.type not in platform.connection_templates:
+ self.add_error_message('No connection known between domains "{}" and "{}"'
+ ''.format(*self.type))
- if (source_domain, sink_domain) not in platform.connection_templates:
- self.add_error_message('No connection known for domains "{}", "{}"'.format(
- source_domain, sink_domain))
- too_many_other_sinks = (
- not platform.domains.get(source_domain, []).get('multiple_sinks', False) and
- len(self.source_port.get_enabled_connections()) > 1
- )
- too_many_other_sources = (
- not platform.domains.get(sink_domain, []).get('multiple_sources', False) and
- len(self.sink_port.get_enabled_connections()) > 1
- )
- if too_many_other_sinks:
- self.add_error_message(
- 'Domain "{}" can have only one downstream block'.format(source_domain))
- if too_many_other_sources:
- self.add_error_message(
- 'Domain "{}" can have only one upstream block'.format(sink_domain))
-
- source_size = Constants.TYPE_TO_SIZEOF[self.source_port.get_type()] * self.source_port.get_vlen()
- sink_size = Constants.TYPE_TO_SIZEOF[self.sink_port.get_type()] * self.sink_port.get_vlen()
+ source_size = self.source_port.item_size
+ sink_size = self.sink_port.item_size
if source_size != sink_size:
self.add_error_message('Source IO size "{}" does not match sink IO size "{}".'.format(source_size, sink_size))
@@ -148,23 +117,7 @@ class Connection(Element):
Returns:
a nested data odict
"""
- n = collections.OrderedDict()
- n['source_block_id'] = self.source_block.get_id()
- n['sink_block_id'] = self.sink_block.get_id()
- n['source_key'] = self.source_port.key
- n['sink_key'] = self.sink_port.key
- return n
-
- def _make_bus_connect(self):
- source, sink = self.source_port, self.sink_port
-
- if source.get_type() == sink.get_type() == 'bus':
- raise ValueError('busses must get with busses')
-
- sources = source.get_associated_ports()
- sinks = sink.get_associated_ports()
- if len(sources) != len(sinks):
- raise ValueError('port connections must have same cardinality')
-
- for ports in zip(sources, sinks):
- self.parent_flowgraph.connect(*ports)
+ return (
+ self.source_block.name, self.source_port.key,
+ self.sink_block.name, self.sink_port.key
+ )
--
cgit v1.2.3