fix test

dwhswenson · May 28, 2015 · Apr 30, 2015 · Apr 30, 2015 · Apr 30, 2015 · Apr 30, 2015
commit dab42277af620ddc6d33b0500b0a5659b49b5bc5
diff --git a/openpathsampling/pathmover.py b/openpathsampling/pathmover.py
@@ -372,7 +372,7 @@ def _accept(self, trials):
 ###############################################################################
 
 class ShootGenerator(SampleGenerator):
-    def __init__(self, selector, ensembles, replicas=None):
+    def __init__(self, selector, ensembles=None, replicas=None):
         # TODO: Remove replicas
         super(ShootGenerator, self).__init__(ensembles)
         self.selector = selector
@@ -583,7 +583,7 @@ class RandomSubtrajectorySelectGenerator(SampleGenerator):
 
 
     '''
-    def __init__(self, subensemble, n_l, ensembles=None):
+    def __init__(self, subensemble, n_l=None, ensembles=None):
         super(RandomSubtrajectorySelectGenerator, self).__init__(
             ensembles
         )
@@ -613,22 +613,22 @@ def __call__(self, trial):
         if (self.n_l is None and len(subtrajs) > 0) or \
             (self.n_l is not None and len(subtrajs) == self.n_l):
             subtraj = self._choose(subtrajs)
-        else:
-            # return zero-length trajectory otherwise
-            subtraj = paths.Trajectory([])
 
-        bias = 1.0
+            bias = 1.0
 
-        trial = paths.Sample(
-            replica=replica,
-            trajectory=subtraj,
-            ensemble=self.subensemble,
-            parent=trial,
-            mover=self,
-            bias=bias
-        )
+            trial = paths.Sample(
+                replica=replica,
+                trajectory=subtraj,
+                ensemble=self.subensemble,
+                parent=trial,
+                mover=self,
+                bias=bias
+            )
+
+            trials = [trial]
+        else:
+            trials = []
 
-        trials = [trial]
         return trials
 
 @ops_object

diff --git a/openpathsampling/tests/testpathmover.py b/openpathsampling/tests/testpathmover.py
@@ -138,7 +138,7 @@ def setup(self):
 
 class testForwardShootMover(testShootingMover):
     def test_move(self):
-        mover = ForwardShootMover(UniformSelector(), ensemble=self.tps)
+        mover = ForwardShootMover(UniformSelector(), ensembles=self.tps)
         self.dyn.initialized = True
         change = mover.move(self.init_samp)
         newsamp = self.init_samp + change
@@ -149,7 +149,7 @@ def test_move(self):
 
 class testBackwardShootMover(testShootingMover):
     def test_move(self):
-        mover = BackwardShootMover(UniformSelector(), ensemble=self.tps)
+        mover = BackwardShootMover(UniformSelector(), ensembles=self.tps)
         self.dyn.initialized = True
         change = mover.move(self.init_samp)
         newsamp = self.init_samp + change
@@ -595,6 +595,7 @@ def test_nothing_allowed(self):
         change = mover.move(self.gs)
         samples = change.results
         assert_equal(len(samples), 0)
+        print change.samples
         assert_equal(len(change.samples), 0)
 
 class testFirstSubtrajectorySelectMover(SubtrajectorySelectTester):