Mercurial > repos > public > sbplib

changeset 701:e89715fe6a6e feature/optim

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add imaginary part to closure in hamiltonian
author Ylva Rydin <ylva.rydin@telia.com>
date Thu, 19 Oct 2017 09:48:18 +0200
parents de7f665e1d00
children 40299ae5fabe
files +scheme/Schrodinger2dCurve.m
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
diff -r de7f665e1d00 -r e89715fe6a6e +scheme/Schrodinger2dCurve.m
--- a/+scheme/Schrodinger2dCurve.m	Mon Oct 16 16:51:22 2017 +0200
+++ b/+scheme/Schrodinger2dCurve.m	Thu Oct 19 09:48:18 2017 +0200
@@ -130,8 +130,8 @@
             D = sqrt(obj.Ji)*(-1/2*(obj.b1*obj.Du + obj.Du*obj.b1) - 1/2*(obj.b2*obj.Dv + obj.Dv*obj.b2) + 1i*obj.c^2*(obj.DUU + obj.DUV + obj.DVU + obj.DVV))*sqrt(obj.Ji); 
         end
         
-         function [Hamiltonian,n] = h_fun(obj,t)
-              Hamiltonian =  -obj.c^2*(obj.DUU + obj.DUV + obj.DVU + obj.DVV)*sqrt(obj.Ji);
+         function [Hamiltonian] = h_fun(obj,t)
+              Hamiltonian =  -sqrt(obj.Ji)*(obj.c^2*(obj.DUU + obj.DUV + obj.DVU + obj.DVV))*sqrt(obj.Ji);
          end    
         
         function [D ]= variable_update(obj,t)
@@ -227,8 +227,8 @@
                     closure = @(t)  sqrt(obj.Ji)*(obj.c^2 * penalty_parameter_1(t)*e' +  penalty_parameter_2(t)*e')*sqrt(obj.Ji);
                     penalty = @(t) -sqrt(obj.Ji)*(obj.c^2 * penalty_parameter_1(t)*e' +  penalty_parameter_2(t)*e')*sqrt(obj.Ji);
                     
-                    closureHamiltonian = @(t)  sqrt(obj.Ji)*(obj.c^2 * penalty_parameter_1(t)*e')*sqrt(obj.Ji);
-                    penaltyHamiltonian = @(t) -sqrt(obj.Ji)*(obj.c^2 * penalty_parameter_1(t)*e')*sqrt(obj.Ji);
+                    closureHamiltonian = @(t)  1i*sqrt(obj.Ji)*(obj.c^2 * penalty_parameter_1(t)*e')*sqrt(obj.Ji);
+                    penaltyHamiltonian = @(t) -1i*sqrt(obj.Ji)*(obj.c^2 * penalty_parameter_1(t)*e')*sqrt(obj.Ji);
                 
         end