Skip to content

Commit 84f54a6

Browse files
committed
Fix tests. Tricks made redundant by openpathsampling#242.
Now all test trajs in testensemble are passed through make_1d_traj. Before, we added this on the trajs for BackwardPrepended tests. Advanced in openpathsampling#242 make that redundant.
1 parent 9cd3ebc commit 84f54a6

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

‎openpathsampling/tests/testensemble.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,7 +1419,7 @@ def setUp(self):
14191419
self.outX = AllOutXEnsemble(vol)
14201420

14211421
def test_bad_end_traj(self):
1422-
traj = make_1d_traj(ttraj['upper_in_in_in_out'])
1422+
traj = ttraj['upper_in_in_in_out']
14231423
ens = BackwardPrependedTrajectoryEnsemble(
14241424
SequentialEnsemble([self.inX]),
14251425
traj[-2:]
@@ -1428,7 +1428,7 @@ def test_bad_end_traj(self):
14281428
assert_equal(ens(traj[-3:2]), False)
14291429

14301430
def test_good_end_traj(self):
1431-
traj = make_1d_traj(ttraj['upper_out_in_in_in'])
1431+
traj = ttraj['upper_out_in_in_in']
14321432
ens = BackwardPrependedTrajectoryEnsemble(
14331433
SequentialEnsemble([self.inX]),
14341434
traj[-2:]
@@ -1447,8 +1447,7 @@ def test_caching_in_bkwdprep_seq(self):
14471447
self.outX,
14481448
self.inX & length1
14491449
])
1450-
traj = make_1d_traj(ttraj['upper_in_out_in_in_out_in'],
1451-
velocities=[1.0]*6)
1450+
traj = ttraj['upper_in_out_in_in_out_in']
14521451

14531452
# sanity checks before running the suffixed version
14541453
assert_equal(pseudo_minus(traj), True)

0 commit comments

Comments
 (0)