Merge pull request #105 from bmad-sim/newmapparams

nonbreaking default

Author: mattsignorelli

Project.toml

@@ -1,7 +1,7 @@
 name = "Beamlines"
 uuid = "5bb90b03-0719-46b8-8ce4-1ef3afd3cd4b"
 authors = ["Matt Signorelli <mgs255@cornell.edu> and contributors"]
-version = "0.8.3"
+version = "0.8.4"
 
 [deps]
 Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"

src/misc.jl

@@ -1,13 +1,20 @@
-@kwdef mutable struct MapParams{F<:Function, P<:Tuple} <: AbstractParams
+@kwdef mutable struct MapParams{F<:Function, P} <: AbstractParams
   transport_map::F = (v, q, p=nothing) -> (v, q)
-  transport_map_params::P = ()
+  transport_map_params::P = nothing
 end
 
 function Base.isapprox(a::MapParams, b::MapParams)
-  return a.transport_map == b.transport_map && 
-         all(a.transport_map_params .≈ b.transport_map_params)
+  if xor(isnothing(a.transport_map_params), isnothing(b.transport_map_params))
+    return false
+  elseif isnothing(a.transport_map_params) && isnothing(b.transport_map_params)
+    return true
+  else
+    return a.transport_map == b.transport_map && 
+          all(a.transport_map_params .≈ b.transport_map_params)
+  end
 end
 
+
 # === THIS BLOCK WAS PARTIALLY WRITTEN BY CLAUDE ===
 # Generated function for arbitrary-length tuples
 @generated function deval(mp::MapParams{F,P}) where {F,P}