Avoid type promotion in increment/decrement

.gitignore

@@ -1,6 +1,7 @@
 # Files generated by invoking Julia with --code-coverage
 *.jl.cov
 *.jl.*.cov
+lcov.info
 
 # Files generated by invoking Julia with --track-allocation
 *.jl.mem
@@ -22,3 +23,7 @@ docs/site/
 # committed for packages, but should be committed for applications that require a static
 # environment.
 Manifest.toml
+Manifest-v*.toml
+
+# Directory used by VScode for local settings
+.vscode/

Project.toml

@@ -17,11 +17,17 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
 
 [compat]
-CategoricalArrays = "0.9"
+CategoricalArrays = "0.9,0.10"
 CompressHashDisplace = "0.1.2"
 OrderedCollections = "1.6"
 DataFrames = "0.22, 1"
 FileIO = "1.6"
 HDF5 = "0.16 - 0.99, 1"
 StructArrays = "0.6.4"
 julia = "1.5"
+
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test"]

src/hdf5_io.jl

@@ -44,7 +44,7 @@ function read_matrix(f::HDF5.Dataset; kwargs...)
  haskey(attributes(categories), "ordered") &&
  read_attribute(categories, "ordered") == true
  cats = read(categories)
- mat = mat .+ 0x1
+ mat .+= 1
  mat = compress(
  CategoricalArray{eltype(cats), ndims(mat)}(
  mat,
@@ -66,8 +66,8 @@ function read_matrix(f::HDF5.Group; kwargs...)
  indices = read(f, "indices")
  data = read(f, "data")
 
- indptr .+= eltype(indptr)(1)
- indices .+= eltype(indptr)(1)
+ indptr .+= 1
+ indices .+= 1
 
  # the row indices in every column need to be sorted
  @views for (colstart, colend) in zip(indptr[1:(end - 1)], indptr[2:end])
@@ -82,7 +82,7 @@ function read_matrix(f::HDF5.Group; kwargs...)
  elseif enctype == "categorical"
  ordered = read_attribute(f, "ordered") > 0
  categories = read(f, "categories")
- codes = read(f, "codes") .+ 1
+ codes = read(f, "codes") .+ true
 
  T = any(codes .== 0) ? Union{Missing, eltype(categories)} : eltype(categories)
  mat = CategoricalVector{T}(
@@ -218,7 +218,7 @@ function write_impl(
  attrs["encoding-version"] = "0.2.0"
  _write_attribute(g, "ordered", isordered(data))
  write_impl(g, "categories", levels(data); kwargs...)
- write_impl(g, "codes", data.refs .- 1; kwargs...)
+ write_impl(g, "codes", data.refs .- true; kwargs...)
 end
 
 function write_impl(
@@ -388,8 +388,8 @@ function write_impl(
  shape = collect(size(data))
  transposed && reverse!(shape)
  attrs["shape"] = shape
- write_impl(g, "indptr", data.colptr .- 1, extensible=true)
- write_impl(g, "indices", data.rowval .- 1, extensible=true)
+ write_impl(g, "indptr", data.colptr .- true, extensible=true)
+ write_impl(g, "indices", data.rowval .- true, extensible=true)
  write_impl(g, "data", data.nzval, extensible=true)
 end
 

src/index.jl

@@ -122,13 +122,13 @@ function _delete!(idx::Index, oldkeyindex::Integer)
  idx.indices[oldkeyindex:(lastidx - 0x2)] .=
  @view idx.indices[(oldkeyindex + 0x1):(lastidx - 0x1)]
  idx.probepositions[oldkeyindex:(lastidx - 0x2)] .=
- @view(idx.probepositions[(oldkeyindex + 0x1):(lastidx - 0x1)]) .- 0x1
- idx.indices[lastidx - 0x1] = idx.probepositions[lastidx - 0x1] = 0x0
+ @view(idx.probepositions[(oldkeyindex + 0x1):(lastidx - 0x1)]) .- true
+ idx.indices[lastidx - 0x1] = idx.probepositions[lastidx - 0x1] = false
  else
  if oldkeyindex < _length(idx)
  idx.indices[oldkeyindex:(end - 0x1)] .= @view idx.indices[(oldkeyindex + 0x1):end]
  idx.probepositions[oldkeyindex:(end - 0x1)] .=
- @view(idx.probepositions[(oldkeyindex + 0x1):end]) .- 0x1
+ @view(idx.probepositions[(oldkeyindex + 0x1):end]) .- true
  end
  if idx.probepositions[1] > 0x1
  idx.indices[end] = idx.indices[1]
@@ -140,7 +140,7 @@ function _delete!(idx::Index, oldkeyindex::Integer)
  end
  idx.indices[0x1:(lastidx - 0x2)] .= @view idx.indices[0x2:(lastidx - 0x1)]
  idx.probepositions[0x1:(lastidx - 0x2)] .=
- @view(idx.probepositions[0x2:(lastidx - 0x1)]) .- 0x1
+ @view(idx.probepositions[0x2:(lastidx - 0x1)]) .- true
  idx.indices[lastidx - 0x1] = idx.probepositions[lastidx - 0x1] = 0x0
  else
  idx.indices[end] = idx.probepositions[end] = 0x0

src/sparsedataset.jl

@@ -91,15 +91,15 @@ function Base.getindex(dset::SparseDataset, I::AbstractUnitRange, J::AbstractUni
  newdata = Vector{eltype(dset)}()
  for (nc, c) in enumerate(J)
  c1, c2 = colptr[c] + 1, colptr[c + 1]
- currrows = rows[c1:c2] .+ convert(eltype(rows), 1)
+ currrows = rows[c1:c2] .+ true
  rowidx = findall(x -> x ∈ I, currrows)
  newcols[nc + 1] = newcols[nc] + length(rowidx)
 
  if length(rowidx) > 0
  currdata = data[c1:c2][rowidx]
  currrows = currrows[rowidx]
  sort!(rowidx, currdata, currrows)
- append!(newrows, currrows .- convert(eltype(newrows), first(I)) .+ convert(eltype(newrows), 1))
+ append!(newrows, currrows .- convert(eltype(newrows), first(I)) .+ true)
  append!(newdata, currdata)
  end
  end
@@ -124,7 +124,7 @@ Base.getindex(dset::SparseDataset, ::Colon, J::AbstractUnitRange) = dset[1:size(
 function _getindex(dset, i::Integer, J::AbstractUnitRange)
  colptr = getcolptr(dset)
  c1, c2 = colptr[first(J)] + 1, colptr[last(J) + 1]
- rows = rowvals(dset)[c1:c2] .+ 1
+ rows = rowvals(dset)[c1:c2] .+ true
  rowidx = findall(x -> x == i, rows)
 
  if length(rowidx) == 0
@@ -152,12 +152,12 @@ end
 function _getindex(dset, I::AbstractUnitRange, j::Integer)
  colptr = getcolptr(dset)
  c1, c2 = colptr[j] + 1, colptr[j + 1]
- rows = rowvals(dset)[c1:c2] .+ 1
+ rows = rowvals(dset)[c1:c2] .+ true
  rowidx = findall(x -> x ∈ I, rows)
  data = nonzeros(dset)[c1:c2][rowidx]
 
  sort!(rowidx, data)
- return SparseVector(length(I), rows[rowidx] .- first(I) .+ 1, data)
+ return SparseVector(length(I), rows[rowidx] .- first(I) .+ true, data)
 end
 
 function _getindex(dset, i::Integer, ::Colon)
@@ -186,7 +186,7 @@ function _getindex(dset, ::Colon, j::Integer)
  colptr = getcolptr(dset)
  rows = read(rowvals(dset))
  c1, c2 = colptr[j] + 1, colptr[j + 1]
- rowidx = rows[c1:c2] .+ 1
+ rowidx = rows[c1:c2] .+ true
  data = nonzeros(dset)[c1:c2]
 
  sort!(rowidx, data)
@@ -233,13 +233,13 @@ function Base.setindex!(
  dsetidx = Int[]
  for (ic, c) in enumerate(J)
  c1, c2 = cols[c] + 1, cols[c + 1]
- crows = rows[c1:c2] .+ 1
+ crows = rows[c1:c2] .+ true
  rowidx = findall(x -> x ∈ I, crows)
- xvals = x[I[I .∉ ((@view crows[rowidx]),)] .- first(I) .+ 1, ic]
+ xvals = x[I[I .∉ ((@view crows[rowidx]),)] .- first(I) .+ true, ic]
  if length(rowidx) != length(I) && any(xvals .!= 0)
  throw(KeyError("changing the sparsity structure of a SparseDataset is not supported"))
  end
- append!(xidx, linxidx[crows[rowidx] .- first(I) .+ 1, ic])
+ append!(xidx, linxidx[crows[rowidx] .- first(I) .+ true, ic])
  append!(dsetidx, c1 - 1 .+ rowidx)
  end
  # HDF5 doesn't support assignment using Arrays as indices, so we have to loop

test/index.jl

@@ -2,14 +2,7 @@ using Random
 Random.seed!(42)
 _size = rand(100:200)
 
-function make_testvalues(_size::Integer)
- testvalues = Vector{String}(undef, _size)
- for i in 1:_size
- length = rand(50:200)
- testvalues[i] = randstring(length)
- end
- return testvalues
-end
+make_testvalues(_size::Integer) = [randstring(rand(50:200)) for _ in 1:_size]
 
 testvalues = make_testvalues(_size)
 idx = Muon.Index(testvalues)