Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "QuestBase"
uuid = "7e80f742-43d6-403d-a9ea-981410111d43"
authors = ["Orjan Ameye <[email protected]>", "Jan Kosata <[email protected]>", "Javier del Pino <[email protected]>"]
version = "0.3.3"
version = "0.3.4"

[deps]
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
Expand Down
6 changes: 6 additions & 0 deletions src/HarmonicEquation.jl
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,12 @@ function _remove_brackets(eom::HarmonicEquation)
return substitute_all(equations_lhs, variable_rules)
end

function _remove_brackets(eqs::Vector{Num}, vars::Vector{Num})
vars_ = _remove_brackets.(vars)
variable_rules = Dict(zip(vars, vars_))
return substitute_all(eqs, variable_rules), vars_
end

"""
$(TYPEDSIGNATURES)
Rearrange `eom` to the standard form, such that the derivatives of the variables are on one side.
Expand Down
27 changes: 19 additions & 8 deletions src/HarmonicVariable.jl
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,30 @@ mutable struct HarmonicVariable
natural_variable::Num
end

function HarmonicVariable(symbol::Num)
return HarmonicVariable(symbol, "", "", Num(1), Num(0))
end

function Base.show(io::IO, hv::HarmonicVariable)
return println(
io,
"Harmonic variable ",
string.(hv.symbol) * " for harmonic ",
string(hv.ω),
" of ",
string(hv.natural_variable),
)
if isempty(hv.type)
s = "Harmonic variable " * string.(hv.symbol)
else
s =
"Harmonic variable " *
string.(hv.symbol) *
" for harmonic " *
string(hv.ω) *
" of " *
string(hv.natural_variable)
end
return println(io, s)
end

"""Gives the relation between `var` and the underlying natural variable."""
function _show_ansatz(var::HarmonicVariable)
if isempty(var.type)
return string(var.symbol)
end
t = var.natural_variable.val.arguments
t = length(t) == 1 ? string(t[1]) : error("more than 1 independent variable")
ω = string(var.ω)
Expand Down
6 changes: 6 additions & 0 deletions test/HarmonicVariable.jl
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ end

# Test _show_ansatz
@test contains(_show_ansatz(hv), "cos(ωt)")

@variables x
hv = HarmonicVariable(x)
@test repr(hv) == "Harmonic variable x\n"

@test _show_ansatz(hv) == "x"
end

@testset "Coordinate Transforms" begin
Expand Down
Loading