fixed pull req comments

Author: elswit

src/+otp/+arenstorf/+presets/Canonical.m

@@ -1,13 +1,19 @@
-classdef Canonical < otp.arenstorf.ArenstorfProblem
+classdef Canonical < otp.arenstorf.Arenstorf
     methods
-        function obj = Canonical
-            params.m1 = 0.012277471;
-            params.m2 = 1-0.012277471;
-
+        function obj = Canonical(varargin)
+                 
+            p = inputParser;
+            addParameter(p, 'm1', 0.012277471, @isscalar);
+            parse(p, varargin{:});
+            s = p.Results;
+            
+            params.m1 = s.m1;
+            params.m2 = 1-params.m1;
+                
             y0 = [0.994; 0; 0; -2.00158510637908252240537862224];
-            tspan = [0,20];
+            tspan = [0,17.0652165601579625588917206249];
 
-            obj = obj@otp.arenstorf.ArenstorfProblem(tspan, y0, params);
+            obj = obj@otp.arenstorf.Arenstorf(tspan, y0, params);
         end
 
     end

src/+otp/+arenstorf/ArenstorfProblem.m src/+otp/+arenstorf/Arenstorf.msrc/+otp/+arenstorf/ArenstorfProblem.m renamed to src/+otp/+arenstorf/Arenstorf.m

@@ -1,10 +1,10 @@
-classdef ArenstorfProblem < otp.Problem
+classdef Arenstorf < otp.Problem
   % The classic  3-body  problem with parameters from
   % Reference:  Hairer, Ernst, Syvert Paul Nørsett, and Gerhard Wanner.
   % Solving Ordinary Differential Equations I: Nonstiff Problems Springer-Verlag, 1987.
   % CH II, p. 129.
   methods
-    function obj = ArenstorfProblem(timeSpan, y0, parameters)
+    function obj = Arenstorf(timeSpan, y0, parameters)
       obj@otp.Problem('Arenstorf Orbit Problem', 4, timeSpan, y0, parameters);
     end
   end
@@ -13,7 +13,7 @@
 
     function onSettingsChanged(obj)
       m1 = obj.Parameters.m1;
-      m2 = obj.Parameters.m2;
+      m2 = 1- obj.Parameters.m1;
 
       obj.Rhs = otp.Rhs( @(t, y) otp.arenstorf.f(t, y, m1, m2), ...
         otp.Rhs.FieldNames.Jacobian, @(t, y) otp.arenstorf.jac(t, y, m1, m2));
@@ -24,8 +24,8 @@ function validateNewState(obj, newTimeSpan, newY0, newParameters)
       validateNewState@otp.Problem(obj, newTimeSpan, newY0, newParameters);
 
       otp.utils.StructParser(newParameters) ...
-        .checkField('m1', 'scalar', 'real', 'finite', 'positive') ...
-        .checkField('m2', 'scalar', 'real', 'finite', 'positive');
+        .checkField('m1', 'scalar', 'real', 'finite', 'positive', @(x) x<1) ...
+        .checkField('m2', 'scalar', 'real', 'finite', 'positive', @(x) x<1);
     end
 
     function mov = internalMovie(obj, t, y, varargin)

src/+otp/+arenstorf/jac.m

@@ -1,9 +1,14 @@
 function dfy = jac(~, y, m1 ,m2)
 
-dfy =[
-                                                                                                                                                                                                 0,                                                                                                                                                   0,  1, 0;
-                                                                                                                                                                                                 0,                                                                                                                                                   0,  0, 1;
- (3*m1*(2*m2 - 2*y(1))*(m2 - y(1)))/(2*((m2 - y(1))^2 + y(2)^2)^(5/2)) - m1/((m2 - y(1))^2 + y(2)^2)^(3/2) - m2/((m1 + y(1))^2 + y(2)^2)^(3/2) + (3*m2*(2*m1 + 2*y(1))*(m1 + y(1)))/(2*((m1 + y(1))^2 + y(2)^2)^(5/2)) + 1,                                                     (3*m2*y(2)*(m1 + y(1)))/((m1 + y(1))^2 + y(2)^2)^(5/2) - (3*m1*y(2)*(m2 - y(1)))/((m2 - y(1))^2 + y(2)^2)^(5/2),  0, 2;
-                                                                                           (3*m2*y(2)*(m1 + y(1)))/((m1 + y(1))^2 + y(2)^2)^(5/2) - (3*m1*y(2)*(2*m2 - 2*y(1)))/(2*((m2 - y(1))^2 + y(2)^2)^(5/2)), (3*m1*y(2)^2)/((m2 - y(1))^2 + y(2)^2)^(5/2) - m1/((m2 - y(1))^2 + y(2)^2)^(3/2) - m2/((m1 + y(1))^2 + y(2)^2)^(3/2) + (3*m2*y(2)^2)/((m1 + y(1))^2 + y(2)^2)^(5/2) + 1, -2, 0];
+D1 = m1/((m2 - y(1))^2 + y(2)^2)^(3/2);
+D2 = m2/((m1 + y(1))^2 + y(2)^2)^(3/2);
+L1 = (2*((m2 - y(1))^2 + y(2)^2)^(5/2));
+L2 = ((m1 + y(1))^2 + y(2)^2)^(5/2);
+
+
+dfy =[ 0,  0,  1, 0;
+       0,  0,  0, 1;
+       (3*m1*(2*m2 - 2*y(1))*(m2 - y(1)))/L1 - D1 - D2 + (3*m2*(2*m1 + 2*y(1))*(m1 + y(1)))/(2*L2) + 1,  (3*m2*y(2)*(m1 + y(1)))/L2 - (3*m1*y(2)*(m2 - y(1)))/((m2 - y(1))^2 + y(2)^2)^(5/2),  0, 2;
+       (3*m2*y(2)*(m1 + y(1)))/L2 - (3*m1*y(2)*(2*m2 - 2*y(1)))/L1, (3*m1*y(2)^2)/((m2 - y(1))^2 + y(2)^2)^(5/2) - D1 - D2 + (3*m2*y(2)^2)/L2 + 1, -2, 0];
 
 end

src/+otp/Problem.m

@@ -242,8 +242,8 @@ function validateNewState(obj, newTimeSpan, newY0, newParameters)
         end
 
         function mov = internalMovie(obj, t, y, varargin)
-            mov = otp.utils.movie.PhasePlaneMovie(obj.Name, @obj.index2label, varargin{:});
-            mov.record(t, y(1:2,:));
+            mov = otp.utils.movie.TrajectoryMovie(obj.Name, @obj.index2label, varargin{:});
+            mov.record(t, y);
         end
 
         function label = internalIndex2label(~, index)