rogermt commited on
Commit
d573f24
·
verified ·
1 Parent(s): 3849c9c

Update solver_registry.py to include Wave 2 solvers (17 new analytical solvers)

Browse files
own-solver/neurogolf_solver/solvers/solver_registry.py CHANGED
@@ -14,6 +14,11 @@ from .edge import s_edge_detect
14
  from .mode import s_mode_fill
15
  from .wave1 import (s_downsample_stride, s_symmetry_complete, s_extract_inner,
16
  s_add_border, s_sparse_fill, s_channel_filter)
 
 
 
 
 
17
  from .conv import solve_conv_fixed, solve_conv_variable, solve_conv_diffshape, solve_conv_var_diff
18
  from ..data_loader import get_exs, fixed_shapes
19
  from ..validators import validate
@@ -45,12 +50,31 @@ ANALYTICAL_SOLVERS = [
45
  ('gravity_unrolled', s_gravity_unrolled),
46
  ('edge_detect', s_edge_detect),
47
  ('mode_fill', s_mode_fill),
 
48
  ('downsample_stride', s_downsample_stride),
49
  ('symmetry_complete', s_symmetry_complete),
50
  ('extract_inner', s_extract_inner),
51
  ('add_border', s_add_border),
52
  ('sparse_fill', s_sparse_fill),
53
  ('channel_filter', s_channel_filter),
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
54
  ]
55
 
56
 
 
14
  from .mode import s_mode_fill
15
  from .wave1 import (s_downsample_stride, s_symmetry_complete, s_extract_inner,
16
  s_add_border, s_sparse_fill, s_channel_filter)
17
+ from .wave2 import (s_overlay_constant, s_bbox_crop, s_row_mode_fill, s_col_mode_fill,
18
+ s_fill_bg_with_mode, s_pad_align, s_multi_stamp, s_diagonal_flip,
19
+ s_invert_colors, s_majority_color_fill, s_border_extract,
20
+ s_interior_fill, s_repeat_row, s_repeat_col, s_swap_two_colors,
21
+ s_max_pool_downsample, s_crop_paste)
22
  from .conv import solve_conv_fixed, solve_conv_variable, solve_conv_diffshape, solve_conv_var_diff
23
  from ..data_loader import get_exs, fixed_shapes
24
  from ..validators import validate
 
50
  ('gravity_unrolled', s_gravity_unrolled),
51
  ('edge_detect', s_edge_detect),
52
  ('mode_fill', s_mode_fill),
53
+ # Wave 1 solvers
54
  ('downsample_stride', s_downsample_stride),
55
  ('symmetry_complete', s_symmetry_complete),
56
  ('extract_inner', s_extract_inner),
57
  ('add_border', s_add_border),
58
  ('sparse_fill', s_sparse_fill),
59
  ('channel_filter', s_channel_filter),
60
+ # Wave 2 solvers (new)
61
+ ('swap_two_colors', s_swap_two_colors),
62
+ ('invert_colors', s_invert_colors),
63
+ ('diagonal_flip', s_diagonal_flip),
64
+ ('overlay_constant', s_overlay_constant),
65
+ ('bbox_crop', s_bbox_crop),
66
+ ('row_mode_fill', s_row_mode_fill),
67
+ ('col_mode_fill', s_col_mode_fill),
68
+ ('fill_bg_with_mode', s_fill_bg_with_mode),
69
+ ('pad_align', s_pad_align),
70
+ ('repeat_row', s_repeat_row),
71
+ ('repeat_col', s_repeat_col),
72
+ ('border_extract', s_border_extract),
73
+ ('interior_fill', s_interior_fill),
74
+ ('majority_color_fill', s_majority_color_fill),
75
+ ('max_pool_downsample', s_max_pool_downsample),
76
+ ('crop_paste', s_crop_paste),
77
+ ('multi_stamp', s_multi_stamp),
78
  ]
79
 
80