Skip to content

Commit 13f7108

Browse files
committed
fix up tests
1 parent 42aa3c9 commit 13f7108

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

‎paths_cli/wizard/shooting.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from functools import partial
2+
13
from paths_cli.wizard.core import get_missing_object
24
from paths_cli.wizard.engines import engines
35
from paths_cli.wizard.cvs import cvs
@@ -71,7 +73,7 @@ def one_way_shooting(wizard, selectors=None, engine=None):
7173
# pass
7274

7375
def spring_shooting(wizard, engine=None):
74-
from openpathsampling import strategies
76+
import openpathsampling as paths
7577
if engine is None:
7678
engine = get_missing_object(wizard, wizard.engines, 'engine',
7779
engines)
@@ -81,9 +83,10 @@ def spring_shooting(wizard, engine=None):
8183
)
8284
k_spring = wizard.ask_custom_eval("What is the spring constant k?",
8385
type_=float)
84-
strat = strategies.SpringShootingMoveScheme(
85-
delta_max=delta_max, k_spring=k_spring, engine=engine
86-
)
86+
strat = partial(paths.SpringShootingMoveScheme,
87+
delta_max=delta_max,
88+
k_spring=k_spring,
89+
engine=engine)
8790
return strat
8891

8992

‎paths_cli/wizard/tps.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ def tps_scheme(wizard, network=None):
1313

1414
shooting_strategy = shooting(wizard, network)
1515

16-
if isinstance(shooting_strategy, paths.MoveScheme):
16+
if not isinstance(shooting_strategy, paths.MoveStrategy):
1717
# this means we got a fixed scheme and can't do strategies
18-
return shooting_strategy
18+
return shooting_strategy(network=network)
1919

2020
# TODO: add an option for shifting maybe?
2121
global_strategy = strategies.OrganizeByMoveGroupStrategy()

0 commit comments

Comments
 (0)