Skip to content

Commit f24200a

Browse files
author
Brad Carman
committed
fixed SampleData allocation
1 parent 875b923 commit f24200a

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

src/Blocks/sources.jl

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -497,19 +497,29 @@ Base.:+(x::Number, y::Parameter) = x + y.ref
497497
Base.:+(y::Parameter, x::Number) = Base.:+(x, y)
498498
Base.:+(x::Parameter, y::Parameter) = x.ref + y.ref
499499

500+
Base.:-(y::Parameter) = -y.ref
500501
Base.:-(x::Number, y::Parameter) = x - y.ref
501502
Base.:-(y::Parameter, x::Number) = y.ref - x
502503
Base.:-(x::Parameter, y::Parameter) = x.ref - y.ref
503504

504-
Base.:^(x::Number, y::Parameter) = Base.power_by_squaring(x, y.ref)
505-
Base.:^(y::Parameter, x::Number) = Base.power_by_squaring(y.ref, x)
506-
Base.:^(x::Parameter, y::Parameter) = Base.power_by_squaring(x.ref, y.ref)
505+
Base.:^(x::Number, y::Parameter) = Base.:^(x, y.ref)
506+
Base.:^(y::Parameter, x::Number) = Base.:^(y.ref, x)
507+
Base.:^(x::Parameter, y::Parameter) = Base.:^(x.ref, y.ref)
507508

508509
Base.isless(x::Parameter, y::Number) = Base.isless(x.ref, y)
509510
Base.isless(y::Number, x::Parameter) = Base.isless(y, x.ref)
510511

511512
Base.copy(x::Parameter{T}) where {T} = Parameter{T}(copy(x.data), x.ref)
512513

514+
Base.max(x::Number, y::Parameter) = max(x, y.ref)
515+
Base.max(x::Parameter, y::Number) = max(x.ref, y)
516+
Base.max(x::Parameter, y::Parameter) = max(x.ref, y.ref)
517+
518+
Base.min(x::Number, y::Parameter) = min(x, y.ref)
519+
Base.min(x::Parameter, y::Number) = min(x.ref, y)
520+
Base.min(x::Parameter, y::Parameter) = min(x.ref, y.ref)
521+
522+
513523
function Base.show(io::IO, m::MIME"text/plain", p::Parameter)
514524
if !isempty(p.data)
515525
print(io, p.data)

src/Mechanical/Translational/Translational.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ include("utils.jl")
1818
export Mass, Spring, Damper, Fixed
1919
include("components.jl")
2020

21-
export Force, Position
21+
export Force, Position, Velocity, Acceleration
2222
include("sources.jl")
2323

2424
export ForceSensor, PositionSensor

0 commit comments

Comments
 (0)