Fix #241, rename simulators->outputs in vscgpm.

Author: Feras A Saad

src/venturescript/vscgpm.py

@@ -63,8 +63,8 @@ def __init__(self, outputs, inputs, rng=None, sp=None, **kwargs):
         if not kwargs.get('supress', None):
             self.ripl.evaluate('(%s)' % ('make_cgpm' if sp is None else sp,))
         # Check correct outputs.
-        if len(outputs) != len(self.ripl.sample('simulators')):
-            raise ValueError('source.simulators list disagrees with outputs.')
+        if len(outputs) != len(self.ripl.sample('outputs')):
+            raise ValueError('source.outputs list disagrees with outputs.')
         self.outputs = outputs
         # Check correct inputs.
         if len(inputs) != self.ripl.evaluate('(size inputs)'):
@@ -171,7 +171,7 @@ def _predict_cell(self, rowid, target, inputs, label):
         sp_args = str.join(' ', map(str, [rowid] + inputs_list))
         i = self.outputs.index(target)
         return self.ripl.predict(
-            '((lookup simulators %i) %s)' % (i, sp_args), label=label)
+            '((lookup outputs %i) %s)' % (i, sp_args), label=label)
 
     def _observe_cell(self, rowid, query, value, inputs):
         inputs_list = [inputs[i] for i in self.inputs]

tests/test_vscgpm.py

@@ -50,8 +50,7 @@
       (mem (lambda (rowid w)
         (uniform_continuous (- w 10) (+ w 10)))))
 
-    (assume simulators (list simulate_m
-                             simulate_y))))]
+    (assume outputs (list simulate_m simulate_y))))]
 
 [define observe_m
   (lambda (rowid w value label)
@@ -90,7 +89,7 @@
         uniform_continuous(w - 10, w + 10)
     });
 
-    assume simulators = [simulate_m, simulate_y];
+    assume outputs = [simulate_m, simulate_y];
 };
 
 define observe_m = (rowid, w, value, label) -> {