11from paths_cli .parsing .core import (
2- InstanceBuilder , Parser , Builder , Parameter
2+ Parser , Builder , Parameter
33)
44from paths_cli .parsing .shooting import shooting_selector_parser
55from paths_cli .parsing .engines import engine_parser
6+ from paths_cli .parsing .plugins import StrategyParserPlugin , ParserPlugin
67
78def _strategy_name (class_name ):
89 return f"openpathsampling.strategies.{ class_name } "
@@ -27,17 +28,18 @@ def _group_parameter(group_name):
2728
2829
2930
30- build_one_way_shooting_strategy = InstanceBuilder (
31+ build_one_way_shooting_strategy = StrategyParserPlugin (
3132 builder = Builder (_strategy_name ("OneWayShootingStrategy" )),
3233 parameters = [
3334 SP_SELECTOR_PARAMETER ,
3435 ENGINE_PARAMETER ,
3536 SHOOTING_GROUP_PARAMETER ,
3637 Parameter ('replace' , bool , default = True )
3738 ],
39+ name = 'one-way-shooting' ,
3840)
3941
40- build_two_way_shooting_strategy = InstanceBuilder (
42+ build_two_way_shooting_strategy = StrategyParserPlugin (
4143 builder = Builder (_strategy_name ("TwoWayShootingStrategy" )),
4244 parameters = [
4345 Parameter ('modifier' , ...),
@@ -46,50 +48,57 @@ def _group_parameter(group_name):
4648 SHOOTING_GROUP_PARAMETER ,
4749 REPLACE_TRUE_PARAMETER ,
4850 ],
51+ name = 'two-way-shooting' ,
4952)
5053
51- build_nearest_neighbor_repex_strategy = InstanceBuilder (
54+ build_nearest_neighbor_repex_strategy = StrategyParserPlugin (
5255 builder = Builder (_strategy_name ("NearestNeighborRepExStrategy" )),
5356 parameters = [
5457 REPEX_GROUP_PARAMETER ,
5558 REPLACE_TRUE_PARAMETER
5659 ],
60+ name = 'nearest-neighbor=repex' ,
5761)
5862
59- build_all_set_repex_strategy = InstanceBuilder (
63+ build_all_set_repex_strategy = StrategyParserPlugin (
6064 builder = Builder (_strategy_name ("AllSetRepExStrategy" )),
6165 parameters = [
6266 REPEX_GROUP_PARAMETER ,
6367 REPLACE_TRUE_PARAMETER
6468 ],
69+ name = 'all-set-repex' ,
6570)
6671
67- build_path_reversal_strategy = InstanceBuilder (
72+ build_path_reversal_strategy = StrategyParserPlugin (
6873 builder = Builder (_strategy_name ("PathReversalStrategy" )),
6974 parameters = [
7075 _group_parameter ('pathreversal' ),
7176 REPLACE_TRUE_PARAMETER ,
72- ]
77+ ],
78+ name = 'path-reversal' ,
7379)
7480
75- build_minus_move_strategy = InstanceBuilder (
81+ build_minus_move_strategy = StrategyParserPlugin (
7682 builder = Builder (_strategy_name ("MinusMoveStrategy" )),
7783 parameters = [
7884 ENGINE_PARAMETER ,
7985 MINUS_GROUP_PARAMETER ,
8086 REPLACE_TRUE_PARAMETER ,
8187 ],
88+ name = 'minus' ,
8289)
8390
84- build_single_replica_minus_move_strategy = InstanceBuilder (
91+ build_single_replica_minus_move_strategy = StrategyParserPlugin (
8592 builder = Builder (_strategy_name ("SingleReplicaMinusMoveStrategy" )),
8693 parameters = [
8794 ENGINE_PARAMETER ,
8895 MINUS_GROUP_PARAMETER ,
8996 REPLACE_TRUE_PARAMETER ,
9097 ],
98+ name = 'single-replica-minus' ,
9199)
92100
101+ STRATEGY_PARSER = ParserPlugin (StrategyParserPlugin , aliases = ['strategies' ])
93102strategy_parser = Parser (
94103 type_dispatch = {
95104 'one-way-shooting' : build_one_way_shooting_strategy ,
0 commit comments