diff --git a/src/analysis/core.jl b/src/analysis/core.jl index 13c06b41..83f40cda 100644 --- a/src/analysis/core.jl +++ b/src/analysis/core.jl @@ -256,11 +256,7 @@ function mapToGigaSOM( tree = knnTreeFun(Array{Float64,2}(transpose(som.codes)), metric) - return dtransform( - dInfo, - (d) -> (vcat(knn(tree, transpose(d), 1)[1]...)), - output, - ) + return dtransform(dInfo, (d) -> (vcat(knn(tree, transpose(d), 1)[1]...)), output) end """ diff --git a/src/base/dataops.jl b/src/base/dataops.jl index 2919eb71..e9d8fee3 100644 --- a/src/base/dataops.jl +++ b/src/base/dataops.jl @@ -6,4 +6,3 @@ Transform columns of the dataset by asinh transformation with `cofactor`. function dtransform_asinh(dInfo::Dinfo, columns::Vector{Int}, cofactor = 5) dapply_cols(dInfo, (v, _) -> asinh.(v ./ cofactor), columns) end - diff --git a/src/base/trainutils.jl b/src/base/trainutils.jl index 4de316df..589d7ecf 100644 --- a/src/base/trainutils.jl +++ b/src/base/trainutils.jl @@ -50,7 +50,9 @@ function expRadius(steepness::Float64 = 0.0) adjust = finalRadius * (1 - 1.1^(-steepness)) if initRadius <= 0 || (initRadius - adjust) <= 0 || finalRadius <= 0 - error("Radii must be positive. (Possible alternative cause: steepness is too high.)") + error( + "Radii must be positive. (Possible alternative cause: steepness is too high.)", + ) end initRadius -= adjust diff --git a/src/io/input.jl b/src/io/input.jl index a198d396..e5d4be32 100644 --- a/src/io/input.jl +++ b/src/io/input.jl @@ -130,10 +130,12 @@ function loadFCSSet( :( begin $name = vcollectSlice( - (i) -> last($postLoad( - loadFCS($fns[i]; applyCompensation = $applyCompensation), - i, - )), + (i) -> last( + $postLoad( + loadFCS($fns[i]; applyCompensation = $applyCompensation), + i, + ), + ), $slice, ) nothing @@ -174,11 +176,7 @@ from `fns` the cell comes from. Useful for producing per-file statistics. The vector is saved on workers specified by `pids` as a distributed variable `name`. """ -function distributeFCSFileVector( - name::Symbol, - fns::Vector{String}, - pids = workers(), -)::Dinfo +function distributeFCSFileVector(name::Symbol, fns::Vector{String}, pids = workers())::Dinfo sizes = loadFCSSizes(fns) slices = slicesof(sizes, length(pids)) return distributeFileVector(name, sizes, slices, pids) diff --git a/src/io/splitting.jl b/src/io/splitting.jl index 62c1acdf..98dbdc22 100644 --- a/src/io/splitting.jl +++ b/src/io/splitting.jl @@ -79,14 +79,16 @@ function vcollectSlice( loadMtx, (startFile, startOff, finalFile, finalOff)::Tuple{Int,Int,Int,Int}, )::Matrix - vcat([ - begin - m = loadMtx(i) - beginIdx = i == startFile ? startOff : 1 - endIdx = i == finalFile ? finalOff : size(m, 1) - m[beginIdx:endIdx, :] - end for i = startFile:finalFile - ]...) + vcat( + [ + begin + m = loadMtx(i) + beginIdx = i == startFile ? startOff : 1 + endIdx = i == finalFile ? finalOff : size(m, 1) + m[beginIdx:endIdx, :] + end for i = startFile:finalFile + ]..., + ) end """ @@ -98,12 +100,14 @@ function collectSlice( loadVec, (startFile, startOff, finalFile, finalOff)::Tuple{Int,Int,Int,Int}, )::Vector - vcat([ - begin - v = loadVec(i) - beginIdx = i == startFile ? startOff : 1 - endIdx = i == finalFile ? finalOff : length(v) - v[beginIdx:endIdx] - end for i = startFile:finalFile - ]...) + vcat( + [ + begin + v = loadVec(i) + beginIdx = i == startFile ? startOff : 1 + endIdx = i == finalFile ? finalOff : length(v) + v[beginIdx:endIdx] + end for i = startFile:finalFile + ]..., + ) end