Merge pull request #31 from JuliaGeometry/GeometryBasics

Geometry basics

Author: robertdj

.github/workflows/ci.yml

@@ -15,7 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.5'
+          - '1.6'
+          - '1.7'
         os:
           - ubuntu-latest
         arch:

Project.toml

@@ -1,7 +1,7 @@
 name = "VoronoiCells"
 uuid = "e3e34ffb-84e9-5012-9490-92c94d0c60a4"
 authors = ["Robert Dahl Jacobsen <[email protected]>"]
-version = "0.2.2"
+version = "0.3.0"
 
 [deps]
 GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
@@ -10,10 +10,10 @@ VoronoiDelaunay = "72f80fcb-8c52-57d9-aff0-40c1a3526986"
 
 [compat]
 Deldir = "1.3"
-GeometryBasics = "0.3.5"
-RecipesBase = "1.1"
-VoronoiDelaunay = "0.4.0"
-julia = "1.5"
+GeometryBasics = "0.4"
+RecipesBase = "1.2"
+VoronoiDelaunay = "0.4"
+julia = "^1.5"
 
 [extras]
 Deldir = "64db5801-a3ae-51a7-b7d2-a0a5f0813e47"

README.jmd

@@ -34,12 +34,12 @@ using Random
 pyplot()
 ```
 
-First make a vector of points and a rectangle that contains the points:
+First make a vector of points and a rectangle that contains the points (this README was first made when `MersenneTwister` was the default random number generator; I stick with this to make the results reproducible):
 
 ```julia
-Random.seed!(1337)
+rng = Random.MersenneTwister(1337)
 rect = Rectangle(Point2(0, 0), Point2(1, 1))
-points = [Point2(rand(), rand()) for _ in 1:10]
+points = [Point2(rand(rng), rand(rng)) for _ in 1:10]
 ```
 
 The main function of *VoronoiCells* is `voronoicells` that computes the cell of each generator point.

README.md

@@ -39,13 +39,13 @@ using Random
 First make a vector of points and a rectangle that contains the points:
 
 ```julia
-Random.seed!(1337)
+rng = Random.MersenneTwister(1337)
 rect = Rectangle(Point2(0, 0), Point2(1, 1))
-points = [Point2(rand(), rand()) for _ in 1:10]
+points = [Point2(rand(rng), rand(rng)) for _ in 1:10]
 ```
 
 ```
-10-element Array{GeometryBasics.Point{2,Float64},1}:
+10-element Vector{Point2{Float64}}:
  [0.22658190197881312, 0.5046291972412908]
  [0.9333724636943255, 0.5221721267193593]
  [0.5052080505550971, 0.09978246027514359]
@@ -80,10 +80,10 @@ tess.Cells[1]
 ```
 
 ```
-5-element Array{GeometryBasics.Point{2,Float64},1}:
+5-element Vector{Point2{Float64}}:
  [0.0, 0.5006658246439761]
  [0.0, 0.2909467571782577]
- [0.22132548929287787, 0.24066681274894675]
+ [0.2213254892928772, 0.24066681274894675]
  [0.3041376415938776, 0.3046324682958502]
  [0.30224294454977085, 0.7530369438246255]
 ```
@@ -112,17 +112,17 @@ voronoiarea(tess)
 ```
 
 ```
-10-element Array{Float64,1}:
+10-element Vector{Float64}:
  0.10905486942527855
  0.07490860886924389
  0.05461848195251296
- 0.1295227626242153
+ 0.12952276262421533
  0.0943320987129441
- 0.07231514118679619
- 0.14583818637774296
+ 0.07231514118679612
+ 0.14583818637774282
  0.06295556177551635
- 0.17457664323539532
- 0.08187764584035444
+ 0.1745766432353954
+ 0.08187764584035451
 ```
 
 

test/Cells.jl

@@ -6,8 +6,8 @@ using Test
 
 @testset "Cells" begin
     @testset "PointCollection from GeometryBasics" begin
-        Random.seed!(2)
-        points = [Point2(rand(), rand()) for _ in 1:5]
+        rng = Random.MersenneTwister(2)
+        points = [Point2(rand(rng), rand(rng)) for _ in 1:5]
         rect = Rectangle(Point2(0, 0), Point2(1, 1))
 
         pc = VoronoiCells.PointCollection(points, rect)
@@ -16,8 +16,8 @@ using Test
     end
 
     @testset "PointCollection from VoronoiDelaunay" begin
-        Random.seed!(2)
-        points = [VoronoiDelaunay.Point2D(1 + rand(), 1 + rand()) for _ in 1:5]
+        rng = Random.MersenneTwister(2)
+        points = [VoronoiDelaunay.Point2D(1 + rand(rng), 1 + rand(rng)) for _ in 1:5]
         rect = Rectangle(VoronoiDelaunay.Point2D(1.1, 1.1), VoronoiDelaunay.Point2D(1.9, 1.9))
 
         pc = VoronoiCells.PointCollection(points, rect)
@@ -26,8 +26,8 @@ using Test
     end
 
     @testset "Error making PointCollection with mix of VoronoiDelaunay and GeometryBasics" begin
-        Random.seed!(2)
-        points = [VoronoiDelaunay.Point2D(1 + rand(), 1 + rand()) for _ in 1:5]
+        rng = Random.MersenneTwister(2)
+        points = [VoronoiDelaunay.Point2D(1 + rand(rng), 1 + rand(rng)) for _ in 1:5]
         rect = Rectangle(Point2(1, 1), Point2(2, 2))
 
         @test_throws MethodError VoronoiCells.PointCollection(points, rect)
@@ -68,8 +68,8 @@ using Test
     end
 
     @testset "Random point set" begin
-        Random.seed!(1)
-        points = [Point2(rand(), rand()) for _ in 1:5]
+        rng = Random.MersenneTwister(1)
+        points = [Point2(rand(rng), rand(rng)) for _ in 1:5]
 
         rect = Rectangle(Point2(0, 0), Point2(1, 1))
 

test/Rectangle.jl

@@ -16,7 +16,7 @@ using Test
             @test isa(rect, Rectangle{Point{2, Float64}})
         end
 
-        @testset "Construct with with VoronoiDelaunay points" begin
+        @testset "Construct with VoronoiDelaunay points" begin
             rect = Rectangle(VoronoiDelaunay.Point2D(1.1, 1.1), VoronoiDelaunay.Point2D(1.6, 1.7))
             @test isa(rect, Rectangle{VoronoiDelaunay.Point2D})
         end
@@ -70,12 +70,13 @@ using Test
         @test_throws ErrorException VoronoiCells.map_rectangle(points, from_rect, to_rect)
     end
 
+
     @testset "Find points nearest to each rectangle corner" begin
         rect = Rectangle(GeometryBasics.Point2(0, 0), GeometryBasics.Point2(1, 1))
 
         @testset "Unique nearest neighbors" begin
-            Random.seed!(1)
-            points = [Point2(rand(), rand()) for _ in 1:5]
+            rng = Random.MersenneTwister(1)
+            points = [Point2(rand(rng), rand(rng)) for _ in 1:5]
 
             corner_neighbors = VoronoiCells.corner_nearest_neighbor(points, rect)