Skip to content

Commit

Permalink
addendum. removing unnecessary temp file from emacs... again
Browse files Browse the repository at this point in the history
  • Loading branch information
jw2249a committed Mar 4, 2024
1 parent ecc6a94 commit 075d7fc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
5 changes: 0 additions & 5 deletions src/gammas/.#gammaCKpar.jl

This file was deleted.

8 changes: 4 additions & 4 deletions src/gammas/gammaCKpar.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
function score_value2(dist::Float64,indices_x::Vector{R},indices_y::Vector{R}, cut_a::Float64, cut_b::Float64, results::DiBitMatrix) where {R <: Integer}
function score_value2(dist::Float64,indices_x::Vector{<:Integer},indices_y::Vector{<:Integer}, cut_a::Float64, cut_b::Float64, results::DiBitMatrix)
# if matches at a threshold, go through result vector and assign new value
if dist >= cut_a
for ix in indices_x,iy in indices_y
for ix in indices_x, iy in indices_y
results[ix,iy] = match2
end
elseif dist >= cut_b
Expand All @@ -12,7 +12,7 @@ function score_value2(dist::Float64,indices_x::Vector{R},indices_y::Vector{R}, c
return nothing
end

function score_value(dist,indices_x::Vector{R},indices_y::Vector{R}, cut_a::Float64, cut_b::Float64, results::DiBitMatrix) where {R <: Integer}
function score_value(dist::Float64,indices_x::Vector{<:Integer},indices_y::Vector{<:Integer}, cut_a::Float64, cut_b::Float64, results::DiBitMatrix)
# if matches at a threshold, go through result vector and assign new value
if dist >= cut_a
for ix in indices_x,iy in indices_y
Expand Down Expand Up @@ -66,7 +66,6 @@ function gammaCKpar!(vecA::PooledVector,vecB::PooledVector,

# Form match matrices based on differing levels of matches
Threads.@threads for x in iter_x

indices_x = findall(vecA.refs .=== x)
for y in iter_y
indices_y = findall(vecB.refs .=== y)
Expand All @@ -84,6 +83,7 @@ function gammaCKpar!(vecA::PooledVector,vecB::PooledVector,
end
end
end

# set all to missing where y is missing
if !isnothing(missingvals_y)
missingindices = findall(vecB.refs .== missingvals_y)
Expand Down

0 comments on commit 075d7fc

Please sign in to comment.