Add solver argument to translate in action rules.

Addresses #57.
nengo · Aug 20, 2017 · 087512b · 087512b
1 parent 5a5f119
commit 087512b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/nengo_spa/ast.py b/nengo_spa/ast.py
@@ -59,7 +59,8 @@
 Negative: '-' Source
 DotProduct: 'dot(' Source ',' Source ')'
 Reinterpret: 'reinterpret(' Source (',' VocabArg)? ')'
-Translate: 'translate(' Source (',' VocabArg)? ')'
+Translate: 'translate(' Source (',' TranslateArg)* ')'
+TranslateArg : <valid Python identifier> '=' <valid Python argument> | VocabArg
 VocabArg: 'vocab='? (Module | <valid Python identifier>)
 Sink: <valid Python identifier> | <valid Python identifier> '.' Sink
 Effect: Sink '=' Source
@@ -899,12 +900,13 @@ def __str__(self):
 
 
 class Translate(Source):
-    def __init__(self, source, vocab=None, populate=None):
+    def __init__(self, source, vocab=None, populate=None, solver=None):
         source = ensure_node(source)
         super(Translate, self).__init__(staticity=source.staticity)
         self.source = source
         self.vocab = vocab
         self.populate = populate
+        self.solver = solver
 
     def infer_types(self, root_network, context_type):
         if self.vocab is None:
@@ -926,7 +928,7 @@ def infer_types(self, root_network, context_type):
 
     def construct(self, context):
         tr = self.source.type.vocab.transform_to(
-            self.type.vocab, populate=self.populate)
+            self.type.vocab, populate=self.populate, solver=self.solver)
         artifacts = self.source.construct(context)
         return [a.add_transform(tr) for a in artifacts]
 

diff --git a/nengo_spa/tests/test_network.py b/nengo_spa/tests/test_network.py
@@ -151,7 +151,8 @@ def test_no_magic_vocab_transform():
     (16, 16, 'reinterpret(a, b)', 'v1'),
     (16, 32, 'translate(a, v2)', 'v2'),
     (16, 32, 'translate(a)', 'v2'),
-    (16, 32, 'translate(a, b)', 'v2')])
+    (16, 32, 'translate(a, b)', 'v2'),
+    (16, 32, 'translate(a, solver=nengo.solvers.Lstsq())', 'v2')])
 def test_casting_vocabs(d1, d2, method, lookup, Simulator, plt, rng):
     v1 = spa.Vocabulary(d1, rng=rng)
     v1.populate('A')