From f415fc2a9aedf67f48a0199ea4bfefd3300cd11a Mon Sep 17 00:00:00 2001 From: Alfred Wong Date: Wed, 12 May 2021 10:13:17 +0100 Subject: [PATCH 1/2] generateray(sources, k) -> sources[k] fixes #166 --- src/Optical/OpticalSystem.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Optical/OpticalSystem.jl b/src/Optical/OpticalSystem.jl index 6c4481d65..fb03d4c82 100644 --- a/src/Optical/OpticalSystem.jl +++ b/src/Optical/OpticalSystem.jl @@ -426,14 +426,14 @@ function traceMT(system::CSGOpticalSystem{T,S}, raygenerator::OpticalRayGenerato print("\rTraced: ~ $t / $(length(sources)) Elapsed: $(dif)s Left: $(left)s ") end end - trace(system, generateray(sources, k), test = test) + trace(system, sources[k]; test) end else for k in f:l if k % update_timesteps == 0 Threads.atomic_add!(total_traced, update_timesteps) end - trace(system, generateray(sources, k), test = test) + trace(system, sources[k]; test) end end end @@ -533,7 +533,7 @@ function tracehitsMT(system::CSGOpticalSystem{T}, raygenerator::OpticalRayGenera print("\rTraced: ~ $t / $(length(sources)) Elapsed: $(dif)s Left: $(left)s ") end end - lt = trace(system, generateray(sources, k), test = test) + lt = trace(system, sources[k]; test) if lt !== nothing push!(results[i], lt) end @@ -543,7 +543,7 @@ function tracehitsMT(system::CSGOpticalSystem{T}, raygenerator::OpticalRayGenera if k % update_timesteps == 0 Threads.atomic_add!(total_traced, update_timesteps) end - lt = trace(system, generateray(sources, k), test = test) + lt = trace(system, sources[k]; test) if lt !== nothing push!(results[i], lt) end From 8455a2c087e4c89b3b0f188ec2e4581f3733459e Mon Sep 17 00:00:00 2001 From: Alfred Wong Date: Wed, 12 May 2021 11:32:47 +0100 Subject: [PATCH 2/2] v0.5.0-DEV -> v0.5.0 (release ready) --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 30a0eff2d..9296ef23a 100644 --- a/Project.toml +++ b/Project.toml @@ -2,7 +2,7 @@ name = "OpticSim" uuid = "24114763-4efb-45e7-af0e-cde916beb153" authors = ["Brian Guenter", "Charlie Hewitt", "Ran Gal", "Alfred Wong"] repository = "https://github.com/microsoft/OpticSim.jl" -version = "0.5.0-DEV" +version = "0.5.0" [deps] CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"