Skip to content

Commit

Permalink
Fix typo in AlphabetExtractor
Browse files Browse the repository at this point in the history
  • Loading branch information
soldatmat committed Mar 4, 2024
1 parent a2ee93c commit fba2810
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 32 deletions.
6 changes: 3 additions & 3 deletions src/alphabet_extractor/alphabet_extractor.jl
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
"""
Creates complete alphabet of all seen symbols at each position in provided sequences.
AlphabetExctractor()
AlphabetExtractor()
Constructs `AlphabetExtractor`.
"""
struct AlphabetExctractor <: AbstractAlphabetExtractor end
struct AlphabetExtractor <: AbstractAlphabetExtractor end

function (::AlphabetExctractor)(sequences::AbstractVector{Vector{Char}})
function (::AlphabetExtractor)(sequences::AbstractVector{Vector{Char}})
alphabets = Vector{Set{Char}}(undef, length(sequences[1]))
for position in 1:length(sequences[1])
symbols = Vector{Char}(undef, length(sequences))
Expand Down
4 changes: 2 additions & 2 deletions src/mutagenesis/recombination.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Constructs `Recombination{T}`.
Recombination(; n=nothing)
Constructs `Recombination{AlphabetExctractor}`.
Constructs `Recombination{AlphabetExtractor}`.
# Keywords
- `n::Union{Int,Nothing}`: If not `nothing`, `n` sequences will be sampled randomly from the recombined mutants.
Expand All @@ -28,7 +28,7 @@ end

Recombination{T}(alphabet_extractor::T; n=nothing) where {T} = Recombination(alphabet_extractor, n)
Recombination(alphabet_extractor::AbstractAlphabetExtractor; n=nothing) = Recombination(alphabet_extractor, n)
Recombination(; n=nothing) = Recombination(AlphabetExctractor(); n)
Recombination(; n=nothing) = Recombination(AlphabetExtractor(); n)

function (m::Recombination)(parents::AbstractVector{Vector{Char}})
@assert DESilico.same_length_sequences(parents)
Expand Down
4 changes: 2 additions & 2 deletions test/unit/alphabet_extractor/alphabet_extractor.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@testset "alphabet_extractor.jl" begin
ae = DESilico.AlphabetExctractor()
@test typeof(ae) == DESilico.AlphabetExctractor
ae = DESilico.AlphabetExtractor()
@test typeof(ae) == DESilico.AlphabetExtractor

parents = [
['A', 'A', 'A'],
Expand Down
50 changes: 25 additions & 25 deletions test/unit/mutagenesis/recombination.jl
Original file line number Diff line number Diff line change
Expand Up @@ -17,49 +17,49 @@

@testset "Constructors" begin
m = DESilico.Recombination()
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExctractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExctractor
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExtractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExtractor
@test isnothing(m.n)

ae = DESilico.AlphabetExctractor()
ae = DESilico.AlphabetExtractor()
m = DESilico.Recombination(ae)
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExctractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExctractor
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExtractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExtractor
@test isnothing(m.n)

ae = DESilico.AlphabetExctractor()
m = DESilico.Recombination{DESilico.AlphabetExctractor}(ae)
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExctractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExctractor
ae = DESilico.AlphabetExtractor()
m = DESilico.Recombination{DESilico.AlphabetExtractor}(ae)
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExtractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExtractor
@test isnothing(m.n)

m = DESilico.Recombination(; n=3)
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExctractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExctractor
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExtractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExtractor
@test m.n == 3

ae = DESilico.AlphabetExctractor()
ae = DESilico.AlphabetExtractor()
m = DESilico.Recombination(ae, 3)
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExctractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExctractor
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExtractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExtractor
@test m.n == 3

ae = DESilico.AlphabetExctractor()
ae = DESilico.AlphabetExtractor()
m = DESilico.Recombination(ae; n=3)
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExctractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExctractor
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExtractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExtractor
@test m.n == 3

ae = DESilico.AlphabetExctractor()
m = DESilico.Recombination{DESilico.AlphabetExctractor}(ae, 3)
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExctractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExctractor
ae = DESilico.AlphabetExtractor()
m = DESilico.Recombination{DESilico.AlphabetExtractor}(ae, 3)
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExtractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExtractor
@test m.n == 3

ae = DESilico.AlphabetExctractor()
m = DESilico.Recombination{DESilico.AlphabetExctractor}(ae; n=3)
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExctractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExctractor
ae = DESilico.AlphabetExtractor()
m = DESilico.Recombination{DESilico.AlphabetExtractor}(ae; n=3)
@test typeof(m) == DESilico.Recombination{DESilico.AlphabetExtractor}
@test typeof(m.alphabet_extractor) == DESilico.AlphabetExtractor
@test m.n == 3
end

Expand Down

0 comments on commit fba2810

Please sign in to comment.