refactor: StdLogicVector and StdULogicVector

- adds setindex! and related tests
- logic and levels are now `Array`
- predefined logic vectors are now consts

Author: ven-k

src/Electrical/Digital/logic_vectors.jl

@@ -1,23 +1,23 @@
-import Base: size, axes, getindex
+import Base: size, axes, getindex, setindex!
 
 const LogicOrNumber = Union{Logic, Number}
 
 struct StdULogicVector{N} <: AbstractArray{Logic, N}
-    logic::AbstractArray{Logic}
-    level::AbstractArray{Int}
-    function StdULogicVector(l::AbstractArray)
+    logic::Array{Logic}
+    level::Array{Int}
+    function StdULogicVector(l::Array)
         N = ndims(l)
-        l = AbstractArray{Logic}(convert.(Logic, l))
+        l = Array{Logic}(convert.(Logic, l))
         new{N}(l, get_logic_level.(l))
     end
 end
 
 struct StdLogicVector{N} <: AbstractArray{Logic, N}
-    logic::AbstractArray{Logic}
-    level::AbstractArray{Int}
-    function StdLogicVector(l::AbstractArray)
+    logic::Array{Logic}
+    level::Array{Int}
+    function StdLogicVector(l::Array)
         N = ndims(l)
-        l = AbstractArray{Logic}(convert.(Logic, l))
+        l = Array{Logic}(convert.(Logic, l))
         new{N}(l, get_logic_level.(l))
     end
 end
@@ -37,11 +37,21 @@ function Base.getindex(s::LogicVector, i1::Int, i2::Int,
     getindex(s.logic, i1, i2, I...)
 end
 
+function Base.setindex!(A::LogicVector, x::Logic, i1::Int)
+    setindex!(A.logic, x, i1)
+    setindex!(A.level, get_logic_level(x), i1)
+end
+
+function Base.setindex!(A::LogicVector, x::Logic, i1::Int, i2::Int, I::Int...)
+    setindex!(A.logic, x, i1, i2, I...)
+    setindex!(A.level, get_logic_level(x), i1, i2, I...)
+end
+
 get_logic_level(s::LogicVector) = s.level
 
 # predefined vectors
-std_ulogic = StdULogicVector([U, X, F0, F1, Z, W, L, H, DC])
-UX01 = StdULogicVector([U, X, F0, F1])
-UX01Z = StdULogicVector([U, X, F0, F1, Z])
-X01 = StdULogicVector([X, F0, F1])
-X01Z = StdULogicVector([X, F0, F1, Z])
+const std_ulogic = StdULogicVector([U, X, F0, F1, Z, W, L, H, DC])
+const UX01 = StdULogicVector([U, X, F0, F1])
+const UX01Z = StdULogicVector([U, X, F0, F1, Z])
+const X01 = StdULogicVector([X, F0, F1])
+const X01Z = StdULogicVector([X, F0, F1, Z])

src/Electrical/Electrical.jl

@@ -25,7 +25,6 @@ include("Analog/sensors.jl")
 export Voltage, Current
 include("Analog/sources.jl")
 
-# include("Digital/logic_vectors.jl")
 # include("Digital/gates.jl")
 # include("Digital/sources.jl")
 
@@ -38,7 +37,8 @@ export Logic
 include("Digital/logic.jl")
 
 export StdLogicVector, StdULogicVector,
-       std_ulogic, UX01, UX01Z, X01, X01Z
+       std_ulogic, UX01, UX01Z, X01, X01Z,
+       get_logic_level
 include("Digital/logic_vectors.jl")
 
 include("Digital/tables.jl")

test/Electrical/digital.jl

@@ -38,13 +38,20 @@ using ModelingToolkitStandardLibrary.Electrical: get_logic_level
     @test X01Z.logic == [X, F0, F1, Z]
 
     # Logic vector helpers
-    logic_vector = StdULogicVector([U F0
-                                    F1 X])
-    size(logic_vector) == (2, 2)
-    axes(logic_vector) == (Base.OneTo(2), Base.OneTo(2))
-    getindex(logic_vector, 1, 1) == U
+    test_logic_matrix = StdULogicVector([U F0
+                                         F1 X])
+    test_logic_vector = StdLogicVector([U, F0, F1, X])
 
-    getindex(StdLogicVector([U, F0, F1, X]), 1) == U
+    size(test_logic_matrix) == (2, 2)
+    axes(test_logic_matrix) == (Base.OneTo(2), Base.OneTo(2))
+
+    getindex(test_logic_matrix, 1, 1) == U
+    getindex(test_logic_vector, 1) == U
+
+    setindex!(test_logic_matrix, Z, 1, 1)
+    @test test_logic_matrix[1, 1] == Z
+    setindex!(test_logic_vector, Z, 1)
+    @test test_logic_vector[1] == Z
 
     # Logic helper functions
     @test get_logic_level.([U, X, F0, F1, Z, W, L, H, DC]) == 1:9
@@ -62,8 +69,8 @@ end
     @test _or(0, 1, U, 1) == F1
     @test _xor(0, 1, U, U, 1, 1) == U
     # tests (Number, Logic) input
-    @info _and(1, F1) == F1
-    @info _or(0, F0) == F0
+    @test _and(1, F1) == F1
+    @test _or(0, F0) == F0
     @test _xor(1, F0) == F1
     # tests Number and Logic (via internal convert)
     @test _not(1) == F0