Skip to content

Remove unused code #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rikhuijzer wants to merge 6 commits into from
Closed

Remove unused code #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4db53ff
Remove unused code in src/table
rikhuijzer Dec 23, 2020
2ea9d58
Add another occurence
rikhuijzer Dec 23, 2020
fd80677
Fix only typo
rikhuijzer Dec 27, 2020
7841fda
Revert more
rikhuijzer Dec 27, 2020
1d5c750
Small change
rikhuijzer Dec 27, 2020
3967f76
Use warn macro
rikhuijzer Dec 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/table-jump.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ function realize(tbl::Table, drawctx::ParentDrawContext)
for i in 1:m, j in 1:n
if length(tbl.children[i, j]) == 1
ctx = copy(tbl.children[i, j][1])
feasible == feasible && issatisfied(ctx, w_solution[j], h_solution[i])
feasible = feasible && issatisfied(ctx, w_solution[j], h_solution[i])
ctx.box = BoundingBox(
x_solution[j]*mm, y_solution[i]*mm,
w_solution[j]*mm, h_solution[i]*mm)
Expand All @@ -159,7 +159,7 @@ function realize(tbl::Table, drawctx::ParentDrawContext)
for (l, (i, j, k)) in enumerate(c_indexes)
if round(c_solution[l]) == 1
ctx = copy(tbl.children[i, j][k])
feasible == feasible && issatisfied(ctx, w_solution[j], h_solution[i])
feasible = feasible && issatisfied(ctx, w_solution[j], h_solution[i])
ctx.box = BoundingBox(
x_solution[j]*mm, y_solution[i]*mm,
w_solution[j]*mm, h_solution[i]*mm)
Expand Down
4 changes: 2 additions & 2 deletions src/table.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,14 +330,14 @@ function realize_brute_force(tbl::Table, drawctx::ParentDrawContext)
idx = optimal_choice[(j-1)*m + i]
ctx = copy(tbl.children[i, j][idx])
end
feasible == feasible && issatisfied(ctx, w_solution[j], h_solution[i])
feasible = feasible && issatisfied(ctx, w_solution[j], h_solution[i])
ctx.box = BoundingBox(
x_solution[j]*mm, y_solution[i]*mm,
w_solution[j]*mm, h_solution[i]*mm)
compose!(root, ctx)
end

feasible || warn("Graphic may not be drawn correctly at the given size.")
feasible || @warn "Graphic may not be drawn correctly at the given size."

return root
end
Expand Down