akkartik/sokoban.love - Change YR62G4PUZEC2PMXMLTPUKFYTSQ3YTCAXXFGLZOIQTUOM2FABPNFQC

this just might be done

1 more bugfix in this commit: running a BFS over BFSs was not traversing the paths from shortest to longest, because it was implicitly counting the number of crate pushes and not including moves in between crate pushes. Now things seem a lot more natural.

Created by akkartik on March 13, 2024

YR62G4PUZEC2PMXMLTPUKFYTSQ3YTCAXXFGLZOIQTUOM2FABPNFQC

Dependencies

In channels

main

Change contents

Replacement in screens/solve at line 9 [4.30]

∅:D[2.12] → [3.1439:1526]

B:BD[3.1439] → [3.1439:1526]

  table.insert(cands, {crate={x=crate.x, y=crate.y}, player={x=player.x, y=player.y}})

[2.12]

[5.0]

  table.insert(cands, {crate={x=crate.x, y=crate.y}, player={x=player.x, y=player.y}, path_length=0})

Replacement in screens/solve at line 12 [4.30]

B:BD[3.1548] → [3.1548:1588]

    local cand = table.remove(cands, 1)

[3.1548]

[2.13]

    local min_index = shortest_path(cands)
    local cand = table.remove(cands, min_index)

Replacement in screens/solve at line 15 [4.30]

B:BD[2.25] → [2.25:88]

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

[2.25]

[2.88]

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

Insertion in screens/solve at line 19 [4.30]
[3.1687]
[3.1687]
```
    Real_print('aaa', c.y, c.x, done[c.y][c.x])
```

Replacement in screens/solve at line 23 [4.30]

B:BD[3.1835] → [2.109:169]

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

[3.1835]

[2.169]

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

Replacement in screens/solve at line 30 [4.30]

∅:D[2.364] → [3.2266:2381]

B:BD[3.2266] → [3.2266:2381]

          table.insert(cands, {player={x=c.x, y=c.y}, crate={x=c.x-1, y=c.y}, dir='left', moves=moves, prev=cand})

[2.364]

[3.2381]

          table.insert(cands, {player={x=c.x, y=c.y}, crate={x=c.x-1, y=c.y}, dir='left', moves=moves, prev=cand, path_length=cand.path_length+moves.path_length})

Replacement in screens/solve at line 36 [4.30]

∅:D[2.400] → [3.2560:2676]

B:BD[3.2560] → [3.2560:2676]

          table.insert(cands, {player={x=c.x, y=c.y}, crate={x=c.x+1, y=c.y}, dir='right', moves=moves, prev=cand})

[2.400]

[3.2676]

          table.insert(cands, {player={x=c.x, y=c.y}, crate={x=c.x+1, y=c.y}, dir='right', moves=moves, prev=cand, path_length=cand.path_length+moves.path_length})

Replacement in screens/solve at line 42 [4.30]

∅:D[2.433] → [3.2858:2971]

B:BD[3.2858] → [3.2858:2971]

          table.insert(cands, {player={x=c.x, y=c.y}, crate={x=c.x, y=c.y-1}, dir='up', moves=moves, prev=cand})

[2.433]

[3.2971]

          table.insert(cands, {player={x=c.x, y=c.y}, crate={x=c.x, y=c.y-1}, dir='up', moves=moves, prev=cand, path_length=cand.path_length+moves.path_length})

Replacement in screens/solve at line 48 [4.30]

∅:D[2.468] → [3.3149:3264]

B:BD[3.3149] → [3.3149:3264]

          table.insert(cands, {player={x=c.x, y=c.y}, crate={x=c.x, y=c.y+1}, dir='down', moves=moves, prev=cand})

[2.468]

[3.3264]

          table.insert(cands, {player={x=c.x, y=c.y}, crate={x=c.x, y=c.y+1}, dir='down', moves=moves, prev=cand, path_length=cand.path_length+moves.path_length})

Replacement in screens/solve at line 56 [4.30]

B:BD[3.3419] → [3.3419:3461]

  table.insert(cands, {x=src.x, y=src.y})

[3.3419]

[3.3461]

  table.insert(cands, {x=src.x, y=src.y, path_length=0})

Replacement in screens/solve at line 59 [4.30]
B:BD[3.3523] → [3.3523:3554]
```
    local x,y = cand.x, cand.y
```
[3.3523]
[3.3554]
```
    local x,y, p = cand.x, cand.y, cand.path_length
```

Replacement in screens/solve at line 64 [4.30]

∅:D[5.119] → [3.3878:4137]

∅:D[6.804] → [3.3878:4137]

B:BD[3.3878] → [3.3878:4137]

        table.insert(cands, {x=x-1, y=y, dir='left', prev=cand})
        table.insert(cands, {x=x+1, y=y, dir='right', prev=cand})
        table.insert(cands, {x=x, y=y-1, dir='up', prev=cand})
        table.insert(cands, {x=x, y=y+1, dir='down', prev=cand})

[5.119]

[3.4137]

        table.insert(cands, {x=x-1, y=y, dir='left', prev=cand, path_length=p+1})
        table.insert(cands, {x=x+1, y=y, dir='right', prev=cand, path_length=p+1})
        table.insert(cands, {x=x, y=y-1, dir='up', prev=cand, path_length=p+1})
        table.insert(cands, {x=x, y=y+1, dir='down', prev=cand, path_length=p+1})

Insertion in screens/solve at line 195 [4.30]

[4.1357]


function shortest_path(cands)
  Real_print('', #cands)
  local min, minscore = 1, cands[1].path_length
  for i=2,#cands do
    local iscore = cands[i].path_length
    Real_print('', i, iscore, '<=>', min,minscore)
    if iscore < minscore then
      min, minscore = i, iscore
    end
  end
  return min
end