akkartik/sokoban.love - Change U32AYLUP4N32MVWH5WFCKP64CW4XO3CCV2AVQ357CMCY7CUBSYJQC

one more bugfix: check for occupied destination

Hopefully these names are better.. but it's worrying that they're so unwieldy-sounding. I might be deep down a local optimum, and missing a much more elegant solution.

Created by akkartik on March 13, 2024

U32AYLUP4N32MVWH5WFCKP64CW4XO3CCV2AVQ357CMCY7CUBSYJQC

Dependencies

In channels

main

Change contents

Insertion in screens/solve at line 14 [4.30]
[2.194]
[3.13]
```
    local p, c = cand.player, cand.crate
```

Replacement in screens/solve at line 16 [4.30]

B:BD[3.25] → [2.195:307]

    io.stdout:write(tostring(i)..' '..tostring(min_index)..' '..tostring(#cands)..' '..tostring(crate.id)..' ')

[3.25]

[3.88]

    io.stdout:write(tostring(i)..' '..tostring(crate.x)..','..tostring(crate.y)..' '..tostring(crate.id)..' '..tostring(p.x)..','..tostring(p.y)..' '..tostring(c.x)..','..tostring(c.y)..' ')

Deletion in screens/solve at line 18 [4.30]
∅:D[5.56] → [6.1588:1629]
∅:D[3.108] → [6.1588:1629]
B:BD[6.1588] → [6.1588:1629]
```
    local p, c = cand.player, cand.crate
```

Replacement in screens/solve at line 19 [4.30]

B:BD[6.1687] → [2.308:356]

    Real_print('aaa', c.y, c.x, done[c.y][c.x])

[6.1687]

--?     Real_print('aaa', c.y, c.x, done[c.y][c.x])

Replacement in screens/solve at line 23 [4.30]

B:BD[6.1835] → [2.357:417]

      Real_print('bbb', crate.id, curr, crate_id[c.y][c.x])

[6.1835]

[3.169]

--?       Real_print('bbb', crate.id, curr, crate_id[c.y][c.x])

Replacement in screens/solve at line 26 [4.30]

B:BD[6.2066] → [7.0:110]

        local moves = find_almost_empty_path(level, p, {x=c.x+1, y=c.y}, --[[empty]] crate, --[[occupied]] c)

[6.2066]

[6.2149]

        local moves = find_assumed_empty_path_to_empty_cell(level, p, {x=c.x+1, y=c.y}, --[[empty]] crate, --[[occupied]] c)

Replacement in screens/solve at line 33 [4.30]

B:BD[6.2428] → [7.111:188]

        moves = find_almost_empty_path(level, p, {x=c.x-1, y=c.y}, crate, c)

[6.2428]

[6.2505]

        moves = find_assumed_empty_path_to_empty_cell(level, p, {x=c.x-1, y=c.y}, crate, c)

Replacement in screens/solve at line 39 [4.30]

B:BD[6.2720] → [7.189:272]

        local moves = find_almost_empty_path(level, p, {x=c.x, y=c.y+1}, crate, c)

[6.2720]

[6.2803]

        Real_print('aaa move down')
        local moves = find_assumed_empty_path_to_empty_cell(level, p, {x=c.x, y=c.y+1}, crate, c)
        Real_print('aaa end move down')

Replacement in screens/solve at line 47 [4.30]

B:BD[6.3017] → [7.273:350]

        moves = find_almost_empty_path(level, p, {x=c.x, y=c.y-1}, crate, c)

[6.3017]

[6.3094]

        moves = find_assumed_empty_path_to_empty_cell(level, p, {x=c.x, y=c.y-1}, crate, c)

Insertion in screens/solve at line 54 [4.30]
[8.9460]
[7.351]

Replacement in screens/solve at line 56 [4.30]

B:BD[7.493] → [7.493:569]

function find_almost_empty_path(level, src, dst, empty_cell, occupied_cell)

[7.493]

[6.3353]

function find_assumed_empty_path_to_empty_cell(level, src, dst, empty_cell, occupied_cell)
  if not is_assumed_empty(level, dst.x, dst.y, empty_cell, occupied_cell) then
    return
  end

Insertion in screens/solve at line 62 [4.30]

[6.3419]

[2.1073]

  Real_print('find', src.x, src.y, '-', dst.x, dst.y, '-', empty_cell.x, empty_cell.y, '-', occupied_cell.x, occupied_cell.y)

Replacement in screens/solve at line 70 [4.30]

B:BD[6.3705] → [5.57:119]

      if is_empty(level, x,y, empty_cell, occupied_cell) then

[6.3705]

[2.1184]

      if is_assumed_empty(level, x,y, empty_cell, occupied_cell) then

Replacement in screens/solve at line 77 [4.30]

B:BD[6.4160] → [5.120:167]

function is_empty(level, x,y, empty, occupied)

[6.4160]

[5.231]

function is_assumed_empty(level, x,y, empty, occupied)

Replacement in screens/solve at line 86 [4.30]

B:BD[5.492] → [5.492:602]

  local curr = level[y][x]
  return curr ~= CELL_WALL and curr ~= CELL_CRATE and curr ~= CELL_CRATE_ON_TARGET

[5.492]

[5.602]

  return is_empty(level, x,y)

Insertion in screens/solve at line 146 [4.30]

[9.97]

[4.67]

  if not is_empty(level, dst.x, dst.y) then
    return
  end

Insertion in screens/solve at line 166 [4.30]

[4.773]

function is_empty(level, x,y)
  local curr = level[y][x]
  return curr ~= CELL_WALL and curr ~= CELL_CRATE and curr ~= CELL_CRATE_ON_TARGET
end

Replacement in screens/solve at line 211 [4.30]
B:BD[2.1543] → [2.1543:1568]
```
  Real_print('', #cands)
```
[2.1543]
[2.1568]
```
--?   Real_print('', #cands)
```

Replacement in screens/solve at line 215 [4.30]

B:BD[2.1676] → [2.1676:1727]

    Real_print('', i, iscore, '<=>', min,minscore)

[2.1676]

[2.1727]

--?     Real_print('', i, iscore, '<=>', min,minscore)