rm luxurysparse dep (#23)

* rm luxurysparse dep

* fix tests

* fix tests, update project.toml

* Update Project.toml

Co-authored-by: Rogerluo <[email protected]>

Author: GiggleLiu

Project.toml

@@ -1,14 +1,12 @@
 name = "BitBasis"
 uuid = "50ba71b6-fa0f-514d-ae9a-0916efc90dcf"
-version = "0.6.2"
+version = "0.7.0"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-LuxurySparse = "d05aeea4-b7d4-55ac-b691-9e7fabb07ba2"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 
 [compat]
-LuxurySparse = "0.5, 0.6"
 StaticArrays = "0.12"
 julia = "1"
 

src/bit_str.jl

@@ -313,7 +313,7 @@ julia> bit_literal(1, 0, 1, 0, 1, 1)
 110101 ₍₂₎
 ```
 """
-bit_literal(xs...) = bit_literal(xs)
+bit_literal(xs::Int...) = bit_literal(xs)
 function bit_literal(xs::NTuple{N,T}) where {N,T<:Integer}
     val = T(0)
     for k in 1:N

src/operations.jl

@@ -1,6 +1,7 @@
 export bitarray, basis, packbits, bfloat, bfloat_r, bint, bint_r, flip
 export anyone, allone, bmask, baddrs, readbit, setbit, controller
 export swapbits, ismatch, neg, breflect, btruncate
+export rand_bitstr64
 
 """
     bitarray(v::Vector, [nbits::Int]) -> BitArray
@@ -335,3 +336,10 @@ function controller(cbits::IntIterator{Int}, cvals::IntIterator{Int})
         mapreduce(xy -> (xy[2] == 1 ? 1 << (xy[1] - 1) : 0), |, zip(cbits, cvals))
     return b -> ismatch(b, do_mask, target)
 end
+
+function rand_bitstr64(nbit::Int)
+    T = BitStr64{nbit}
+    rand(typemin(T):typemax(T))
+end
+Base.rand(::Type{T}) where T<:BitStr = rand(typemin(T):typemax(T))
+

src/reorder.jl

@@ -1,6 +1,6 @@
 export ReorderedBasis, reorder, invorder
 
-using LuxurySparse, LinearAlgebra
+using LinearAlgebra
 
 """
     ReorderedBasis{N, T}
@@ -78,25 +78,6 @@ function unsafe_reorder(A::AbstractMatrix, orders::NTuple{N,<:Integer}) where {N
     return A[od, od]
 end
 
-unsafe_reorder(A::IMatrix, orders::NTuple{N,<:Integer}) where {N} = A
-
-function unsafe_reorder(A::PermMatrix, orders::NTuple{N,<:Integer}) where {N}
-    od = Vector{Int}(undef, 1 << length(orders))
-    for (i, b) in enumerate(ReorderedBasis(orders))
-        @inbounds od[i] = 1 + b
-    end
-
-    perm = similar(A.perm)
-    vals = similar(A.vals)
-
-    @simd for i in 1:length(perm)
-        @inbounds perm[od[i]] = od[A.perm[i]]
-        @inbounds vals[od[i]] = A.vals[i]
-    end
-
-    return PermMatrix(perm, vals)
-end
-
 function unsafe_reorder(A::Diagonal, orders::NTuple{N,<:Integer}) where {N}
     diag = similar(A.diag)
     for (i, b) in enumerate(ReorderedBasis(orders))

test/iterate_control.jl

@@ -1,4 +1,4 @@
-using Test, BitBasis, LuxurySparse
+using Test, BitBasis
 
 function swaprows!(v::AbstractVector, i::Int, j::Int)
     temp = v[i]
@@ -7,6 +7,14 @@ function swaprows!(v::AbstractVector, i::Int, j::Int)
     v
 end
 
+function eye(b::Int)
+    res = zeros(b, b)
+    for i=1:b
+        res[i,i] = 1
+    end
+    res
+end
+
 mulrow!(v::AbstractVector, i::Int, f) = (v[i] *= f; v)
 
 @testset "test group_shift! and lmove" begin
@@ -43,15 +51,15 @@ end
         rrr = copy(v)
         controldo(x -> mulrow!(rrr, x + 1, -1.0), it4)
         M =
-            kron(P1, IMatrix(2), P1, Z) +
-            kron(P0, IMatrix(2), P0, IMatrix(2)) +
-            kron(P1, IMatrix(2), P0, IMatrix(2)) +
-            kron(P0, IMatrix(2), P1, IMatrix(2))
+            kron(P1, eye(2), P1, Z) +
+            kron(P0, eye(2), P0, eye(2)) +
+            kron(P1, eye(2), P0, eye(2)) +
+            kron(P0, eye(2), P1, eye(2))
         @test rrr ≈ M * v
 
         it = itercontrol(8, [3], [1])
         V = randn(ComplexF64, 1 << 8)
-        res = kron(IMatrix(1 << 5), ComplexF64[0 1; 1 0], IMatrix(1 << 2)) * V
+        res = kron(eye(1 << 5), ComplexF64[0 1; 1 0], eye(1 << 2)) * V
         rrr = copy(V)
         controldo(x -> swaprows!(rrr, x + 1, x - 3), it)
         @test rrr ≈ res
@@ -60,10 +68,10 @@ end
         controldo(x -> mulrow!(rrr, x + 1, -1), itercontrol(8, [3, 7, 6], [1, 1, 1]))
 
         M =
-            kron(IMatrix(2), P1, Z, IMatrix(4), P1, IMatrix(4)) +
-            kron(IMatrix(2), P0, IMatrix(8), P0, IMatrix(4)) +
-            kron(IMatrix(2), P1, IMatrix(8), P0, IMatrix(4)) +
-            kron(IMatrix(2), P0, IMatrix(8), P1, IMatrix(4))
+            kron(eye(2), P1, Z, eye(4), P1, eye(4)) +
+            kron(eye(2), P0, eye(8), P0, eye(4)) +
+            kron(eye(2), P1, eye(8), P0, eye(4)) +
+            kron(eye(2), P0, eye(8), P1, eye(4))
 
         @test rrr ≈ M * V
         ic = itercontrol(4, [2, 3], [0, 0])

test/operations.jl

@@ -56,3 +56,7 @@ msk = bmask(2, 5)
     @test bint_r(0.75, nbits = 3) == 6
     @test bint(0.75, nbits = 3) == 3
 end
+
+@testset "random" begin
+    @test rand_bitstr64(5) isa BitStr64{5}
+end

test/reorder.jl

@@ -1,11 +1,4 @@
-using BitBasis, Random, LuxurySparse, SparseArrays, LinearAlgebra
-
-⊗ = kron
-PA = pmrand(2)
-PB = pmrand(2)
-PC = pmrand(2)
-@test reorder(PC ⊗ PB ⊗ PA, [3, 1, 2]) ≈ PB ⊗ PA ⊗ PC
-@test invorder(PC ⊗ PB ⊗ PA) ≈ PA ⊗ PB ⊗ PC
+using BitBasis, Random, SparseArrays, LinearAlgebra
 
 DA = Diagonal(randn(2))
 DB = Diagonal(randn(2))

test/runtests.jl

@@ -1,6 +1,8 @@
 using BitBasis
 using Test
 
+const ⊗ = kron
+
 @testset "test bit literal" begin
     include("bit_str.jl")
 end