Skip to content

Commit e6b6d15

Browse files
committed
Julia 1.9 fixes.
1 parent 47b27b9 commit e6b6d15

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "CMDimCircuits"
22
uuid = "393e8715-ea6a-4fca-bb1f-4c907b63b032"
3-
version = "0.3.1"
3+
version = "0.3.2"
44

55
[deps]
66
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

src/CircuitAnalysis/base.jl

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#CircuitAnalysis: Base tools
2+
import MDDatasets: DataMD
23

34

45
#==Main data structures
@@ -41,10 +42,16 @@ const TCapacitance = DataTag{:C}
4142
#==Helper functions
4243
===============================================================================#
4344
#multMD: disambiguate multiplication to use
44-
multMD(a, b) = a*b #DataMD values don't require .*
45-
multMD(a::AbstractArray, b::AbstractArray) = a .* b
46-
divMD(a, b) = a/b #DataMD values don't require .*
47-
divMD(a::AbstractArray, b::AbstractArray) = a ./ b
45+
multMD(a, b) = a .* b
46+
divMD(a, b) = a ./ b
47+
48+
#DataMD values don't work with .* (should this be changed?):
49+
multMD(a::DataMD, b::DataMD) = a*b
50+
multMD(a::DataMD, b) = a*b
51+
multMD(a, b::DataMD) = a*b
52+
divMD(a::DataMD, b::DataMD) = a/b
53+
divMD(a::DataMD, b) = a/b
54+
divMD(a, b::DataMD) = a/b
4855

4956

5057
#==Operations
@@ -101,7 +108,7 @@ impedance(c::TCapacitance, args...; kwargs...) = impedance(admittance(c, args...
101108
#TODO: create admittance(:L, value, f=x)??
102109

103110
#Inductor values:
104-
_Z(l::TInductance, f) = admittance(multMD((2*pi*c.v)im, f))
111+
_Z(l::TInductance, f) = impedance(multMD((2*pi*l.v)im, f))
105112
_Z(l::TInductance, ::Nothing) = throw(ArgumentError("Missing kwarg :f"))
106113
impedance(l::TInductance; f = nothing) = _Z(l, f)
107114
admittance(l::TInductance, args...; kwargs...) = admittance(impedance(l, args...; kwargs...))

src/NetwAnalysis/npconvert.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ end
331331

332332
#==Reference impedance transformation/passthrough
333333
===============================================================================#
334-
z0xfrm(np::Network, z0::Float64) where TP =
334+
z0xfrm(np::Network, z0::Float64) =
335335
error("Unable to perform z0 transformation for $(typeof(np)).")
336336
#S-parameter impedance transformation:
337337
z0xfrm(np::SParameters, z0::Float64) =

0 commit comments

Comments
 (0)