StreetLight
/
wired
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove visited buffer from circuit fill 

Looks like this could have been done sooner. Wonder why I bothered with
a visited buffer in the first place.
master
Louis Pearson 2022-08-09 00:33:58 -06:00
parent 8fc64bcae4
commit 26c59d7b06
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/circuit.zig
View File

@ -299,17 +299,13 @@ const Queue = util.Queue(Cell);
pub fn fill(this: *@This(), alloc: std.mem.Allocator) !usize { pub fn fill(this: *@This(), alloc: std.mem.Allocator) !usize {
var count: usize = 0; var count: usize = 0;
var items = try alloc.alloc(usize, MAXCELLS);
defer alloc.free(items);
var visited = util.Buffer(usize).init(items);
var q_buf = try alloc.alloc(Cell, MAXCELLS); var q_buf = try alloc.alloc(Cell, MAXCELLS);
var q = Queue.init(q_buf); var q = Queue.init(q_buf);
for (this.sources.items) |source| { for (this.sources.items) |source| {
try q.insert(source); try q.insert(source);
} }
while (q.remove()) |cell| { while (q.remove()) |cell| {
const tile = this.get_cell(cell) orelse { const tile = this.get_cell(cell) orelse {
for (this.doors.items) |*d| { for (this.doors.items) |*d| {
@ -320,10 +316,9 @@ pub fn fill(this: *@This(), alloc: std.mem.Allocator) !usize {
continue; continue;
}; };
const index = this.indexOf(cell) orelse continue; const index = this.indexOf(cell) orelse continue;
const hasVisited = this.levels[index] != 0;
this.enable(cell); this.enable(cell);
const hasVisited = std.mem.containsAtLeast(usize, visited.items, 1, &.{index});
if (hasVisited and !T.is_logic(tile)) continue; if (hasVisited and !T.is_logic(tile)) continue;
visited.append(index);
count += 1; count += 1;
if (get_logic(tile)) |logic| { if (get_logic(tile)) |logic| {
// TODO: implement other logic (though I'm pretty sure that requires a graph...) // TODO: implement other logic (though I'm pretty sure that requires a graph...)