Skip to content

Add Bentley-Ottman Algorithm #1168

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
wants to merge 93 commits into from
Closed

Add Bentley-Ottman Algorithm #1168

Show file tree
Hide file tree
Changes from 90 commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
c5a3b90
add test segment. proper test later
souma4 Feb 11, 2025
e004810
Clean single commit for BentleyOttman algorithm. Essentially, it outp…
souma4 Feb 11, 2025
491a130
test for valid answer
souma4 Feb 11, 2025
840c1a5
moved sweepline algorithm to Intersections since it is dependent on i…
souma4 Feb 11, 2025
6f018a3
Update Doc for bentley ottman implementation to specify output
souma4 Feb 17, 2025
eb0d56b
update project.toml to include BinaryTrees dependency
souma4 Feb 17, 2025
b869b6e
major commit. Moved sweepline from intersections to utils along with …
souma4 Feb 24, 2025
6be63f1
new_type and new_geom didn't meet style, so fixed. Removed an unneede…
souma4 Feb 24, 2025
ed09d87
forgot to rename _intersection to _pushintersection
souma4 Feb 24, 2025
2b83b1a
small commits to improve compatibility and fix mixed up old names
souma4 Mar 4, 2025
7484dc1
small updates to License text, cases, variable and function names, cl…
souma4 Mar 6, 2025
16791eb
Merge branch 'JRC_add_BentleyOttman' of https://github.com/souma4/Mes…
souma4 Mar 6, 2025
ec4c593
Updated algorithm to be simpler, output is points and segment indices…
souma4 Mar 7, 2025
e18eb99
updated tests to reflect changed output type
souma4 Mar 8, 2025
e27d9f1
add compat for BinaryTrees
souma4 Mar 9, 2025
56018d3
fixed names of variables and helper functions. removed output type f…
souma4 Mar 9, 2025
442861b
updated utils include path and refactored if else to new function for…
souma4 Mar 10, 2025
0cc5d91
Minor adjustments before review
juliohm Mar 10, 2025
1c03947
More fixes
juliohm Mar 11, 2025
00e2151
changed S = Tuple{P, P} to V and changed the empty vectors of S to ca…
souma4 Mar 11, 2025
83093e4
the s iter variable was modified to segment using the same name, so …
souma4 Mar 12, 2025
76d8be3
Rename V -> S
juliohm Mar 13, 2025
1e36abe
More refactoring
juliohm Mar 13, 2025
d590d36
Rename \scrT to \scrR to match paper notation, and avoid confusion wi…
juliohm Mar 14, 2025
93ce4a6
Refactor _newevent to improve readability
juliohm Mar 14, 2025
9fdaf93
More refactoring to improve readability
juliohm Mar 14, 2025
353cf70
More refactoring to improve readability and performance
juliohm Mar 14, 2025
d136b6e
More refactoring to improve readability
juliohm Mar 14, 2025
602a579
More refactoring
juliohm Mar 14, 2025
36e2497
More refactoring
juliohm Mar 14, 2025
f5ff53e
More refactoring
juliohm Mar 14, 2025
0004c36
realigned more with original algorithm and reduced recomputation
souma4 Mar 14, 2025
dd88813
More refactoring
juliohm Mar 14, 2025
2fb7e10
More refactoring
juliohm Mar 14, 2025
8e618e0
More refactoring
juliohm Mar 14, 2025
2850538
More refactoring
juliohm Mar 14, 2025
7762044
Add more tests
juliohm Mar 14, 2025
3f42e7d
Merge branch 'JuliaGeometry:master' into JRC_add_BentleyOttman
souma4 Mar 14, 2025
e288e23
edited the processing of intersections to better reflect the original…
souma4 Mar 14, 2025
5a21d3a
More refactoring
juliohm Mar 15, 2025
165ddae
Refactor tests
juliohm Mar 15, 2025
3ed853d
Add more tests
juliohm Mar 15, 2025
859c846
Improve tests
juliohm Mar 15, 2025
9732322
Fix formatting
juliohm Mar 15, 2025
98f0786
More refactoring
juliohm Mar 15, 2025
042e690
Add test with infinite loop
juliohm Mar 15, 2025
c9d933f
Fix formatting
juliohm Mar 15, 2025
219add3
update to stop infinite loops, but has major TODOs to handle floating…
souma4 Mar 15, 2025
89a8d98
reverting prior to dictionary implementation
souma4 Mar 16, 2025
3078412
Merge branch 'JuliaGeometry:master' into JRC_add_BentleyOttman
souma4 Mar 17, 2025
fdb936b
fully functioning not infinitely looping bentleyottman algorithm all …
souma4 Mar 17, 2025
5ef6505
cleaned up test outputs and fixed tests to be T agnostic
souma4 Mar 17, 2025
33f2fba
hopefully fixed failing test on Float32 values
souma4 Mar 19, 2025
e933e9c
I think it's a precision issue, but T wasn't being handled how I thou…
souma4 Mar 19, 2025
5e972fc
shuffled to reduce redundant computations, particularly specifying th…
souma4 Mar 20, 2025
0ed8c5f
Minor adjustments
juliohm Mar 20, 2025
0a18865
removed commented out useless code
souma4 Mar 20, 2025
e38d203
Minor adjustments
juliohm Mar 21, 2025
893fafd
Int is default type for integer literals
souma4 Mar 22, 2025
a10680b
Set digits by default using exponent of absolute tolerance
juliohm Mar 22, 2025
20178a3
Decrease number of digits by one
juliohm Mar 22, 2025
01604f1
updated script to be simpler. updated tests. THIS FAILS THE GRID TEST…
souma4 Mar 23, 2025
8345d1e
WIP, With what little time I've had and will have for a bit, here's a…
souma4 Mar 28, 2025
562c778
complete functional Bentley Ottman Algorithm and passing all local te…
souma4 Apr 18, 2025
5557fbb
fix roundcoords to be coordround
souma4 Apr 18, 2025
5023a34
Merge remote-tracking branch 'origin/master' into JRC_add_BentleyOttman
souma4 Apr 18, 2025
701e8a9
fixed maxsearch and minsearch to not be exhaustive. findintersections…
souma4 Apr 20, 2025
5baeff2
fixed incorrect removal of end and midpoints
souma4 Apr 20, 2025
ee4d2b8
fixed type insecurity
souma4 Apr 20, 2025
fcdaa81
_findintersection appears to no longer exhaustively search the tree. …
souma4 Apr 20, 2025
f2bc9a2
Minor adjustments
juliohm Apr 21, 2025
27a0b17
removed unneeded search
souma4 Apr 21, 2025
d87d91e
updated to use intersect function
souma4 Apr 24, 2025
399aaf4
Major update to BO algorithm. I do not like the performance of handle…
souma4 Jun 1, 2025
d6a9e61
updated intersect method to get 3x speedup from improved type stabili…
souma4 Jun 16, 2025
dee44a4
reduced uneeded computations, there's still room to cut more but that…
souma4 Jun 17, 2025
28815e5
Merge branch 'master' into JRC_add_BentleyOttman
souma4 Jun 27, 2025
4a57da8
updated to use AdaptivePredicates (*NEW DEPENDENCY*) for more robust …
souma4 Jun 28, 2025
e125b9b
cleaned up comments, expanded detail on implementation quirks, built …
souma4 Jun 30, 2025
00f8fa3
simplified and corrected name for the initializing start and end poin…
souma4 Jun 30, 2025
c25247d
updated variable names to be more accurate/simple
souma4 Jul 1, 2025
314980d
removed AdaptivePredicates. Uneeded, didn't realize.
souma4 Jul 1, 2025
74cdbc0
Reorder imports
juliohm Jul 2, 2025
f2f80af
Merge branch 'master' into JRC_add_BentleyOttman
juliohm Jul 2, 2025
4728892
Fix missing end in test/utils.jl
juliohm Jul 2, 2025
03072a4
updated to only output intersection points because we are assuming th…
souma4 Jul 5, 2025
6d95fc4
Cleanup tests
juliohm Jul 7, 2025
d50c1b9
Cleanup implementation
juliohm Jul 7, 2025
a351b2d
updated code to align with style more. kept similar variable names th…
souma4 Jul 13, 2025
b108214
Cleanup tests further
juliohm Jul 15, 2025
82fbcec
More cleanup
juliohm Jul 15, 2025
3ddb02f
Fix formatting issue
juliohm Jul 15, 2025
88eab75
update to interface for more clarity. Created EventPoint in order mor…
souma4 Sep 6, 2025
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
14 changes: 8 additions & 6 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ version = "0.53.27"

[deps]
Bessels = "0e736298-9ec6-45e8-9647-e4fc86a2fe38"
BinaryTrees = "289e92be-c05a-437b-9e67-5b0c799891f8"
CircularArrays = "7a955b69-7140-5f4e-a0ed-f168c5e2e749"
Colorfy = "03fe91ce-8ec6-4610-8e8d-e7491ccca690"
CoordRefSystems = "b46f11dc-f210-4604-bfba-323c1ec968cb"
Expand All @@ -22,8 +23,15 @@ TiledIteration = "06e1c1a7-607b-532d-9fad-de7d9aa2abac"
TransformsBase = "28dd2a49-a57a-4bfb-84ca-1a49db9b96b8"
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"

[weakdeps]
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"

[extensions]
MeshesMakieExt = "Makie"

[compat]
Bessels = "0.2"
BinaryTrees = "0.1.2"
CircularArrays = "1.3"
Colorfy = "1.1"
CoordRefSystems = "0.18"
Expand All @@ -42,9 +50,3 @@ TiledIteration = "0.5"
TransformsBase = "1.6"
Unitful = "1.17"
julia = "1.9"

[extensions]
MeshesMakieExt = "Makie"

[weakdeps]
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
1 change: 1 addition & 0 deletions src/Meshes.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ using CoordRefSystems
using StaticArrays
using SparseArrays
using CircularArrays
using BinaryTrees
using LinearAlgebra
using Unitful
using Random
Expand Down
1 change: 1 addition & 0 deletions src/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ include("utils/cmp.jl")
include("utils/units.jl")
include("utils/crs.jl")
include("utils/misc.jl")
include("utils/intersect.jl")
Loading
Loading