Skip to content

Commit

Permalink
updated to match arcle 0.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@dlqudwns
dlqudwns committed Nov 7, 2023
1 parent cbe587b commit 7837485
Show file tree
Hide file tree
Showing 5 changed files with 357 additions and 295 deletions.
161 changes: 68 additions & 93 deletions foarcle/actions/o2actions.pyx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,84 +10,99 @@ cimport cython
cpdef act(
np.ndarray[np.uint8_t, ndim=2] inp,
tuple[int, int] inp_dim,
np.ndarray[np.uint8_t, ndim=2] answer,
np.ndarray[np.uint8_t, ndim=2] grid,
tuple[int, int] grid_dim,
np.ndarray[np.npy_bool, ndim=2, cast=True] selected,
np.ndarray[np.uint8_t, ndim=2] clip,
tuple[int, int] clip_dim,
char terminated,
char objsel_active,
np.ndarray[np.uint8_t, ndim=2] objsel,
np.ndarray[np.uint8_t, ndim=2] objsel_area,
np.ndarray[np.uint8_t, ndim=2] objsel_bg,
tuple[int, int] objsel_coord,
char objsel_rot,
char trials_remain,
char active,
np.ndarray[np.uint8_t, ndim=2] object_,
np.ndarray[np.uint8_t, ndim=2] object_sel,
tuple[int, int] object_dim,
tuple[int, int] object_pos,
np.ndarray[np.uint8_t, ndim=2] background,
char rotation_parity,
np.ndarray[np.npy_bool, ndim=2, cast=True] selection,
char operation):

cdef int reward = 0

if operation >= 0 and operation <= 9:
color(grid, selection, operation)
selected[:] = 0
objsel_active = False
active = False
elif operation <= 19:
floodfill(grid, grid_dim, selection, operation - 10)
selected[:] = 0
objsel_active = False
active = False
elif operation <= 23:
grid, selected, objsel, objsel_area, objsel_bg, objsel_coord, objsel_active, objsel_rot = move(
grid, grid_dim, selected, objsel, objsel_area, objsel_bg, objsel_coord, objsel_active, objsel_rot, selection, operation - 20
grid, selected, active, object_, object_sel, object_dim, object_pos, background, rotation_parity = move(
grid, grid_dim, selected, active, object_, object_sel, object_dim, object_pos, background, rotation_parity, selection, operation - 20
)
elif operation == 24:
grid, selected, objsel, objsel_area, objsel_bg, objsel_coord, objsel_active, objsel_rot = rotate(
grid, grid_dim, selected, objsel, objsel_area, objsel_bg, objsel_coord, objsel_active, objsel_rot, selection, 1
grid, selected, active, object_, object_sel, object_dim, object_pos, background, rotation_parity = rotate(
grid, grid_dim, selected, active, object_, object_sel, object_dim, object_pos, background, rotation_parity, selection, 1
)
elif operation == 25:
grid, selected, objsel, objsel_area, objsel_bg, objsel_coord, objsel_active, objsel_rot = rotate(
grid, grid_dim, selected, objsel, objsel_area, objsel_bg, objsel_coord, objsel_active, objsel_rot, selection, 3
grid, selected, active, object_, object_sel, object_dim, object_pos, background, rotation_parity = rotate(
grid, grid_dim, selected, active, object_, object_sel, object_dim, object_pos, background, rotation_parity, selection, 3
)
elif operation == 26:
grid, selected, objsel, objsel_area, objsel_bg, objsel_coord, objsel_active, objsel_rot = flip(
grid, grid_dim, selected, objsel, objsel_area, objsel_bg, objsel_coord, objsel_active, objsel_rot, selection, "H"
grid, selected, active, object_, object_sel, object_dim, object_pos, background, rotation_parity = flip(
grid, grid_dim, selected, active, object_, object_sel, object_dim, object_pos, background, rotation_parity, selection, "H"
)
elif operation == 27:
grid, selected, objsel, objsel_area, objsel_bg, objsel_coord, objsel_active, objsel_rot = flip(
grid, grid_dim, selected, objsel, objsel_area, objsel_bg, objsel_coord, objsel_active, objsel_rot, selection, "V"
grid, selected, active, object_, object_sel, object_dim, object_pos, background, rotation_parity = flip(
grid, grid_dim, selected, active, object_, object_sel, object_dim, object_pos, background, rotation_parity, selection, "V"
)
elif operation == 28:
clip_dim = copy(inp, inp_dim, grid, clip, clip_dim, selection, "I")
clip_dim = copy(inp, inp_dim, grid, grid_dim, clip, clip_dim, selection, "I")
selected[:] = 0
objsel_active = False
active = False
elif operation == 29:
clip_dim = copy(inp, inp_dim, grid, clip, clip_dim, selection, "O")
clip_dim = copy(inp, inp_dim, grid, grid_dim, clip, clip_dim, selection, "O")
selected[:] = 0
objsel_active = False
active = False
elif operation == 30:
paste(grid, clip, clip_dim, selection)
selected[:] = 0
objsel_active = False
active = False
elif operation == 31:
np.copyto(grid, inp)
grid_dim = inp_dim
selected[:] = 0
objsel_active = False
active = False
elif operation == 32:
grid[:] = 0
selected[:] = 0
objsel_active = False
active = False
elif operation == 33:
grid_dim = crop_grid(grid, grid_dim, selection)
selected[:] = 0
objsel_active = False
active = False
elif operation == 34:
terminated = 1
if trials_remain > 0:
trials_remain -= 1
if grid_dim[0] == answer.shape[0] and grid_dim[1] == answer.shape[1] and np.all(
grid[:grid_dim[0], :grid_dim[1]] == answer):
if trials_remain > 0:
terminated = 1
reward = 1
if trials_remain == 0:
terminated = 1
else:
assert False

return grid, grid_dim, selected, clip, clip_dim, terminated, objsel_active, objsel, objsel_area, objsel_bg, objsel_coord, objsel_rot
return (grid, grid_dim, selected, clip, clip_dim, terminated, trials_remain,
active, object_, object_sel, object_dim, object_pos, background, rotation_parity, reward)

cpdef batch_act(
b_inp, b_inp_dim,
b_grid, b_grid_dim, b_selected, b_clip, b_clip_dim, b_terminated, b_objsel_active, b_objsel, b_objsel_area, b_objsel_bg, b_objsel_coord, b_objsel_rot,
b_inp, b_inp_dim, b_answer,
b_grid, b_grid_dim, b_selected, b_clip, b_clip_dim, b_terminated, b_trials_remain,
b_active, b_object_, b_object_sel, b_object_dim, b_object_pos, b_background, b_rotation_parity,
b_selection, b_operation):

nb_grid = b_grid.copy()
Expand All @@ -96,73 +111,33 @@ cpdef batch_act(
nb_clip = b_clip.copy()
nb_clip_dim = b_clip_dim.copy()
nb_terminated = b_terminated.copy()
nb_objsel_active = b_objsel_active.copy()
nb_objsel = b_objsel.copy()
nb_objsel_area = b_objsel_area.copy()
nb_objsel_bg = b_objsel_bg.copy()
nb_objsel_coord = b_objsel_coord.copy()
nb_objsel_rot = b_objsel_rot.copy()
nb_trials_remain = b_trials_remain.copy()
nb_active = b_active.copy()
nb_object_ = b_object_.copy()
nb_object_sel = b_object_sel.copy()
nb_object_dim = b_object_dim.copy()
nb_object_pos = b_object_pos.copy()
nb_background = b_background.copy()
nb_rotation_parity = b_rotation_parity.copy()

for i, (
inp, inp_dim, grid, grid_dim, selected, clip, clip_dim, terminated, objsel_active, objsel, objsel_area, objsel_bg, objsel_coord, objsel_rot, selection, operation
inp, inp_dim, answer, grid, grid_dim, selected, clip, clip_dim, terminated, trials_remain,
active, object_, object_sel, object_dim, object_pos, background, rotation_parity,
selection, operation
) in enumerate(zip(
b_inp,
b_inp_dim,
b_grid,
b_grid_dim,
b_selected,
b_clip,
b_clip_dim,
b_terminated,
b_objsel_active,
b_objsel,
b_objsel_area,
b_objsel_bg,
b_objsel_coord,
b_objsel_rot,
b_selection,
b_operation)):
b_inp, b_inp_dim, b_answer, b_grid, b_grid_dim, b_selected, b_clip, b_clip_dim, b_terminated, b_trials_remain,
b_active, b_object_, b_object_sel, b_object_dim, b_object_pos, b_background, b_rotation_parity,
b_selection, b_operation)):

(nb_grid[i],
nb_grid_dim[i],
nb_selected[i],
nb_clip[i],
nb_clip_dim[i],
nb_terminated[i],
nb_objsel_active[i],
nb_objsel[i],
nb_objsel_area[i],
nb_objsel_bg[i],
nb_objsel_coord[i],
nb_objsel_rot[i]) = act(
inp,
inp_dim,
grid,
grid_dim,
selected,
clip,
clip_dim,
terminated,
objsel_active,
objsel,
objsel_area,
objsel_bg,
objsel_coord,
objsel_rot,
selection,
operation)
(nb_grid[i], nb_grid_dim[i], nb_selected[i], nb_clip[i], nb_clip_dim[i], nb_terminated[i], nb_trials_remain[i],
nb_active[i], nb_object_[i], nb_object_sel[i], nb_object_dim[i], nb_object_pos[i],
nb_background[i], nb_rotation_parity[i]) = act(
inp, inp_dim, answer, grid, grid_dim, selected, clip, clip_dim, terminated, trials_remain,
active, object_, object_sel, object_dim, object_pos, background, rotation_parity,
selection, operation)

return (
nb_grid,
nb_grid_dim,
nb_selected,
nb_clip,
nb_clip_dim,
nb_terminated,
nb_objsel_active,
nb_objsel,
nb_objsel_area,
nb_objsel_bg,
nb_objsel_coord,
nb_objsel_rot
nb_grid, nb_grid_dim, nb_selected, nb_clip, nb_clip_dim, nb_terminated, nb_trials_remain,
nb_active, nb_object_, nb_object_sel, nb_object_dim, nb_object_pos,
nb_background, nb_rotation_parity
)
72 changes: 43 additions & 29 deletions foarcle/actions/object.pxd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,43 +8,57 @@ cdef (int, int, int, int) _get_bbox(unsigned char[:, ::1] img) noexcept nogil
cdef rotate(
np.ndarray[np.uint8_t, ndim=2, mode='c'] grid,
tuple[int, int] grid_dim,
np.ndarray[np.npy_bool, ndim=2, cast=True] selected,
np.ndarray[np.uint8_t, ndim=2, mode='c'] objsel,
np.ndarray[np.uint8_t, ndim=2, mode='c'] objsel_area,
np.ndarray[np.uint8_t, ndim=2] objsel_bg,
tuple[int, int] objsel_coord,
char objsel_active,
char objsel_rot,
np.ndarray[np.npy_bool, ndim=2, cast=True] selection,
k)
np.ndarray[np.npy_bool, ndim=2, mode='c', cast=True] selected,
char active,
np.ndarray[np.uint8_t, ndim=2, mode='c'] object_,
np.ndarray[np.uint8_t, ndim=2, mode='c'] object_sel,
tuple[int, int] object_dim,
tuple[int, int] object_pos,
np.ndarray[np.uint8_t, ndim=2, mode='c'] background,
char rotation_parity,
np.ndarray[np.npy_bool, ndim=2, mode='c', cast=True] selection,
char k)

cdef move(
np.ndarray[np.uint8_t, ndim=2, mode='c'] grid,
tuple[int, int] grid_dim,
np.ndarray[np.npy_bool, ndim=2, cast=True] selected,
np.ndarray[np.uint8_t, ndim=2, mode='c'] objsel,
np.ndarray[np.uint8_t, ndim=2, mode='c'] objsel_area,
np.ndarray[np.uint8_t, ndim=2] objsel_bg,
tuple[int, int] objsel_coord,
char objsel_active,
char objsel_rot,
np.ndarray[np.npy_bool, ndim=2, cast=True] selection,
np.ndarray[np.npy_bool, ndim=2, mode='c', cast=True] selected,
char active,
np.ndarray[np.uint8_t, ndim=2, mode='c'] object_,
np.ndarray[np.uint8_t, ndim=2, mode='c'] object_sel,
tuple[int, int] object_dim,
tuple[int, int] object_pos,
np.ndarray[np.uint8_t, ndim=2, mode='c'] background,
char rotation_parity,
np.ndarray[np.npy_bool, ndim=2, mode='c', cast=True] selection,
char d)

cdef flip(
np.ndarray[np.uint8_t, ndim=2, mode='c'] grid,
tuple[int, int] grid_dim,
np.ndarray[np.npy_bool, ndim=2, cast=True] selected,
np.ndarray[np.uint8_t, ndim=2, mode='c'] objsel,
np.ndarray[np.uint8_t, ndim=2, mode='c'] objsel_area,
np.ndarray[np.uint8_t, ndim=2] objsel_bg,
tuple[int, int] objsel_coord,
char objsel_active,
char objsel_rot,
np.ndarray[np.npy_bool, ndim=2, cast=True] selection,
axis)
np.ndarray[np.npy_bool, ndim=2, mode='c', cast=True] selected,
char active,
np.ndarray[np.uint8_t, ndim=2, mode='c'] object_,
np.ndarray[np.uint8_t, ndim=2, mode='c'] object_sel,
tuple[int, int] object_dim,
tuple[int, int] object_pos,
np.ndarray[np.uint8_t, ndim=2, mode='c'] background,
char rotation_parity,
np.ndarray[np.npy_bool, ndim=2, mode='c', cast=True] selection,
char axis)

cdef copy(
np.ndarray[np.uint8_t, ndim=2, mode='c'] inp,
tuple[int, int] inp_dim,
np.ndarray[np.uint8_t, ndim=2, mode='c'] grid,
tuple[int, int] grid_dim,
np.ndarray[np.uint8_t, ndim=2, mode='c'] clip,
tuple[int, int] clip_dim,
np.ndarray[np.npy_bool, ndim=2, mode='c', cast=True] selection,
char source)

cdef copy(np.ndarray[np.uint8_t, ndim=2] inp, inp_dim, np.ndarray[np.uint8_t, ndim=2] grid, clip, clip_dim, np.ndarray[np.npy_bool, ndim=2, cast=True] selection, source)

cdef void paste(grid, np.ndarray[np.uint8_t, ndim=2] clip, clip_dim, np.ndarray[np.npy_bool, ndim=2, cast=True] selection)
cdef void paste(
np.ndarray[np.uint8_t, ndim=2, mode='c'] grid,
np.ndarray[np.uint8_t, ndim=2, mode='c'] clip,
tuple[int, int] clip_dim,
np.ndarray[np.npy_bool, ndim=2, mode='c', cast=True] selection)
Loading

0 comments on commit 7837485

Please sign in to comment.