add tests and fix stochastic matrix bug

bmad-sim · Jun 26, 2024 · 391af76 · 391af76
1 parent b23d8fb
commit 391af76
Show file tree

Hide file tree

Showing 39 changed files with 63 additions and 9 deletions.
diff --git a/src/map/ctors.jl b/src/map/ctors.jl
@@ -239,6 +239,7 @@ function zero(::Type{$t{S,T,U,V,W}}; use::UseType=GTPSA.desc_current, idpt::W=no
 
   if V != Nothing
     E = similar(V, nv, nv)
+    E .= 0
   else
     E = nothing
   end

diff --git a/src/map/methods.jl b/src/map/methods.jl
@@ -1,6 +1,6 @@
 # --- norm ---
 function norm(m::Union{TaylorMap,VectorField})
-  nrm = zero(numtype(eltype(m.x)))
+  nrm = 0.
 
   nv = numvars(m)
   for i=1:nv

diff --git a/src/normal.jl b/src/normal.jl
@@ -114,7 +114,7 @@ function normal(m::DAMap, resonances=nothing)
 
   an = c∘an∘c^-1
 
-  return a0 ∘ a1 ∘ an, eg
+  return a0 ∘ a1 ∘ an#, eg
 end
 
 

diff --git a/src/canonize/ac.map → test/canonize/ac.map b/src/canonize/ac.map → test/canonize/ac.map
diff --git a/src/canonize/test.map → test/canonize/test.map b/src/canonize/test.map → test/canonize/test.map
diff --git a/src/canonize_rad/R_fpp.map → test/canonize_rad/R_fpp.map b/src/canonize_rad/R_fpp.map → test/canonize_rad/R_fpp.map
diff --git a/src/canonize_rad/ac.map → test/canonize_rad/ac.map b/src/canonize_rad/ac.map → test/canonize_rad/ac.map
diff --git a/src/canonize_rad/test.map → test/canonize_rad/test.map b/src/canonize_rad/test.map → test/canonize_rad/test.map
diff --git a/src/coast/R.map → test/coast/R.map b/src/coast/R.map → test/coast/R.map
diff --git a/src/coast/R1.map → test/coast/R1.map b/src/coast/R1.map → test/coast/R1.map
diff --git a/src/coast/a0.map → test/coast/a0.map b/src/coast/a0.map → test/coast/a0.map
diff --git a/src/coast/a1.map → test/coast/a1.map b/src/coast/a1.map → test/coast/a1.map
diff --git a/src/coast/atot.map → test/coast/atot.map b/src/coast/atot.map → test/coast/atot.map
diff --git a/src/coast/test.map → test/coast/test.map b/src/coast/test.map → test/coast/test.map
diff --git a/src/matt/ant.txt → test/matt/ant.txt b/src/matt/ant.txt → test/matt/ant.txt
diff --git a/src/matt/ant_inv.txt → test/matt/ant_inv.txt b/src/matt/ant_inv.txt → test/matt/ant_inv.txt
diff --git a/src/matt/antinv_order2.txt → test/matt/antinv_order2.txt b/src/matt/antinv_order2.txt → test/matt/antinv_order2.txt
diff --git a/src/matt/m1_ant.txt → test/matt/m1_ant.txt b/src/matt/m1_ant.txt → test/matt/m1_ant.txt
diff --git a/src/matt/m1_before.txt → test/matt/m1_before.txt b/src/matt/m1_before.txt → test/matt/m1_before.txt
diff --git a/src/matt/testm1_2.txt → test/matt/testm1_2.txt b/src/matt/testm1_2.txt → test/matt/testm1_2.txt
diff --git a/src/matt/testm1_2_a.txt → test/matt/testm1_2_a.txt b/src/matt/testm1_2_a.txt → test/matt/testm1_2_a.txt
diff --git a/src/order10/R.map → test/order10/R.map b/src/order10/R.map → test/order10/R.map
diff --git a/src/order10/test.map → test/order10/test.map b/src/order10/test.map → test/order10/test.map
diff --git a/src/order2/R.map → test/order2/R.map b/src/order2/R.map → test/order2/R.map
diff --git a/src/order2/R_fpp_ring.map → test/order2/R_fpp_ring.map b/src/order2/R_fpp_ring.map → test/order2/R_fpp_ring.map
diff --git a/src/order2/atot.map → test/order2/atot.map b/src/order2/atot.map → test/order2/atot.map
diff --git a/src/order2/atot_berz.map → test/order2/atot_berz.map b/src/order2/atot_berz.map → test/order2/atot_berz.map
diff --git a/src/order2/atoti.map → test/order2/atoti.map b/src/order2/atoti.map → test/order2/atoti.map
diff --git a/src/order2/atoti_m_tot.map → test/order2/atoti_m_tot.map b/src/order2/atoti_m_tot.map → test/order2/atoti_m_tot.map
diff --git a/src/order2/m1.map → test/order2/m1.map b/src/order2/m1.map → test/order2/m1.map
diff --git a/src/order2/m_atot.map → test/order2/m_atot.map b/src/order2/m_atot.map → test/order2/m_atot.map
diff --git a/src/order2/test.map → test/order2/test.map b/src/order2/test.map → test/order2/test.map
diff --git a/src/order6var4/R.map → test/order6var4/R.map b/src/order6var4/R.map → test/order6var4/R.map
diff --git a/src/order6var4/test.map → test/order6var4/test.map b/src/order6var4/test.map → test/order6var4/test.map
diff --git a/src/radiation/R.map → test/radiation/R.map b/src/radiation/R.map → test/radiation/R.map
diff --git a/src/radiation/atot.map → test/radiation/atot.map b/src/radiation/atot.map → test/radiation/atot.map
diff --git a/src/radiation/m2.map → test/radiation/m2.map b/src/radiation/m2.map → test/radiation/m2.map
diff --git a/src/radiation/test.map → test/radiation/test.map b/src/radiation/test.map → test/radiation/test.map
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,7 +1,7 @@
 using NonlinearNormalForm
 using Test
 
-@testset "NonlinearNormalForm.jl" begin
+@testset "Composition and inversion" begin
     d = Descriptor(1,2)
     x1 = vars()[1]
     m1 = DAMap(x=[1+2*x1+2*x1^2], x0=[4])
@@ -19,9 +19,62 @@ using Test
     @test norm(m2^3 - DAMap(x=[1+8*x1+56*x1^2], x0=[3])) < tol
     @test norm(mt2^3 - TPSAMap(x=[13+8*x1-8*x1^2], x0=[3])) < tol
 
-    # with temporary inverter"
-    #@test norm(m1^-3 - DAMap(x=[4+0.125*x1-0.109375*x1^2],x0=[1])) < tol
-    #@test norm(m1^-3 - inv(m1^3)) < tol
-    #@test norm(mt1^-3 - inv(mt1^3)) < tol
-    #@test norm(mt1^-3 - TPSAMap(x=[4+0.9615384615384616E-02*x1-0.4978379608557124E-04*x1^2],x0=[-35])) < tol 
-end
+    @test norm(m1^-3 - DAMap(x=[4+0.125*x1-0.109375*x1^2],x0=[1])) < tol
+    @test norm(m1^-3 - inv(m1^3)) < tol
+    @test norm(mt1^-3 - inv(mt1^3)) < tol
+    @test norm(mt1^-3 - TPSAMap(x=[4+0.9615384615384616E-02*x1-0.4978379608557124E-04*x1^2],x0=[-35])) < tol 
+end
+
+@testset "Comparison with FPP" begin
+
+    tol = 1e-12
+
+
+    # Normal form -------------------------------------
+    # 2D all pseudo-harmonic oscillators order 3
+    m = read_fpp_map("order2/test.map")
+    R_fpp = read_fpp_map("order2/R.map")
+    c = to_phasor(m)
+    a = normal(m)
+    @test norm(inv(c)∘inv(a)∘m∘a∘c - R_fpp) < tol
+
+    # 2D all pseudo-harmonic oscillators order 10
+    m = read_fpp_map("order10/test.map")
+    R_fpp = read_fpp_map("order10/R.map")
+    c = to_phasor(m)
+    a = normal(m)
+    @test norm(inv(c)∘inv(a)∘m∘a∘c - R_fpp) < tol
+
+    # 4D all pseudo-harmonic oscillators order 6
+    m = read_fpp_map("order6var4/test.map")
+    R_fpp = read_fpp_map("order6var4/R.map")
+    c = to_phasor(m)
+    a = normal(m)
+    @test norm(inv(c)∘inv(a)∘m∘a∘c - R_fpp) < 1e-8
+
+    # 6D coasting last plane order 3
+    m = read_fpp_map("coast/test.map",idpt=true)
+    R_fpp = read_fpp_map("coast/R.map",idpt=true)
+    c = to_phasor(m)
+    a = normal(m)
+    @test norm(inv(c)∘inv(a)∘m∘a∘c - R_fpp) < tol
+
+    # Equilibrium moments -----------------------------
+    Σ_fpp = [ 0.3799021729309453E-03   0.6751391708793735E-04   0.5210559309521585E-04   0.5356022290151431E-04   0.7855831912608747E-04   0.2787256761813361E-04;
+         0.6751391708793728E-04   0.1198436499688306E-03   0.2355446920731669E-05   0.2584036833779584E-04   0.4495800939032602E-04  -0.5279019399759065E-05;
+         0.5210559309521584E-04   0.2355446920731667E-05   0.9446395990088929E-04   0.6887819755086758E-04   0.1212047267833650E-03   0.1627981838787403E-03;
+         0.5356022290151429E-04   0.2584036833779585E-04   0.6887819755086762E-04   0.2881897937276110E-03   0.8460461412432578E-04  -0.8485345202908079E-05;
+         0.7855831912608744E-04   0.4495800939032603E-04   0.1212047267833649E-03   0.8460461412432579E-04   0.1116532341434929E-03   0.9345624000572918E-04;
+         0.2787256761813363E-04  -0.5279019399759087E-05   0.1627981838787403E-03  -0.8485345202908038E-05   0.9345624000572919E-04   0.2503415143184575E-03]
+    m = read_fpp_map("radiation/test.map")
+    R_fpp = read_fpp_map("radiation/R.map")
+    c = to_phasor(m)
+    a = normal(m)
+    @test norm(inv(c)*inv(a)*m*a*c - R_fpp) < tol
+    Σ = equilibrium_moments(m,a)
+    @test norm(Σ - Σ_fpp) < tol
+
+
+
+end
+