Merge pull request #43 from jakobnissen/removeiter

Remove iteration of BioSymbol
BioJulia · Mar 21, 2021 · 6f0180f · 6f0180f
2 parents 4d11c1e + 698855b
commit 6f0180f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/src/BioSymbols.jl b/src/BioSymbols.jl
@@ -122,9 +122,9 @@ encoded_data(x::BioSymbol) = reinterpret(encoded_data_eltype(typeof(x)), x)
 function encode(::Type{T}, x) where T <: BioSymbol
     return reinterpret(T, convert(encoded_data_eltype(T), x))
 end
-Base.length(::BioSymbol) = 1
-Base.iterate(sym::BioSymbol) = (sym, nothing)
-Base.iterate(sym::BioSymbol, state) = nothing
+
+# Enable broadcasting
+Base.broadcastable(x::BioSymbol) = (x,)
 
 include("nucleicacid.jl")
 include("aminoacid.jl")

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -11,21 +11,6 @@ function round_trip(x)
     return x == y
 end
 
-@testset "BioSymbols" begin
-    for i in alphabet(DNA)
-        @test length(i) == 1
-        @test collect(i) == [i]
-    end
-    for i in alphabet(RNA)
-        @test length(i) == 1
-        @test collect(i) == [i]
-    end
-    for i in alphabet(AminoAcid)
-        @test length(i) == 1
-        @test collect(i) == [i]
-    end
-end
-
 @testset "NucleicAcids" begin
     @testset "Conversions" begin
         @testset "UInt8" begin
@@ -296,6 +281,14 @@ end
         end
     end
 
+    @testset "Broadcasting" begin
+    	v = DNA[DNA_A, DNA_C, DNA_G, DNA_C]
+    	v[2:3] .= DNA_A
+    	@test v == [DNA_A, DNA_A, DNA_A, DNA_C]
+    	v .= DNA_T
+    	@test v == fill(DNA_T, 4)
+    end
+
     @testset "Show DNA" begin
         dnas = [DNA_A, DNA_C, DNA_G, DNA_T, DNA_N, DNA_Gap]
         @testset "print" begin