backup before deleting tests and updating dates

Author: tamaskis

toolbox/ivpsolver/solve_ivp.m

@@ -78,9 +78,9 @@
 
         % defines condition function
         if (tf > t0)
-            C = @(t,y) t <= tf;
+            C = @(t,y) t-h <= tf;
         else
-            C = @(t,y) t >= tf;
+            C = @(t,y) t-h >= tf;
         end
 
         % indicates that final time is known
@@ -293,24 +293,30 @@
     % -----------------
     % Final formatting.
     % -----------------
-    %n=n+1;
+    
     % trims arrays
     y = y(:,1:(n-1));
     t = t(1:(n-1));
 
+    % number of subintervals
+    N = length(t)-1;
+
     % linearly interpolates to find solution at desired final time
     if final_time_known
 
-        % number of subintervals
-        N = length(t)-1;
-        
         % linearly interpolates for solution at tf
         y(:,N+1) = y(:,N)+((y(:,N+1)-y(:,N))/(t(N+1)-t(N)))*(tf-t(N));
 
         % replaces last element of "t" with tf
         t(N+1) = tf;
 
     end
+
+    % deletes penultimate solution if at same time as last solution
+    if (abs(t(N+1)-t(N)) < 1e-10)
+        t(N) = [];
+        y(:,N) = [];
+    end
 
     % transposes solution matrix so it is returned in "standard form"
     y = y.';

toolbox/ivpsolver/test1.m

@@ -12,5 +12,6 @@
     y(i+1) = RK1_euler(f,t(i),y(i),h);
 end
 [t_ivp,y_ivp] = solve_ivp(f,[2,10],y2,h,'Euler');
+[t_ivp,y_ivp] = solve_ivp(f,[10,2],y2,h,'Euler');
 %max(abs(y_ivp-y))
 t_ivp

toolbox/ivpsolver/test2.asv

@@ -0,0 +1,17 @@
+%%
+clear;clc;close all;
+addpath(genpath('..'));
+%%
+f = @(t,y) y;
+y20 = 50;
+[t,y] = solve_ivp(f,[20,10],y20,0.001,'ABM8');
+y10 = y(end)
+[t,y] = solve_ivp(f,[10,20],y10,0.001,'ABM8');
+y20 = y(end)
+%%
+f = @(t,y) y;
+y20 = 50;
+C = @(t,y) t > 10;
+%[t,y] = solve_ivp(f,{20,C},y20,-0.001,'ABM8');
+[t,y] = solve_ivp(f,[20,10],y20,0.001,'ABM8');
+y10 = y(end)

toolbox/ivpsolver/test2.m

@@ -5,13 +5,14 @@
 f = @(t,y) y;
 y20 = 50;
 [t,y] = solve_ivp(f,[20,10],y20,0.001,'ABM8');
-y10 = y(end)
+y10 = y(end);
+t
 [t,y] = solve_ivp(f,[10,20],y10,0.001,'ABM8');
-y20 = y(end)
-% %%
-% f = @(t,y) y;
-% y20 = 50;
-% C = @(t,y) t > 10;
-% %[t,y] = solve_ivp(f,{20,C},y20,-0.001,'ABM8');
-% [t,y] = solve_ivp(f,[20,10],y20,0.001,'ABM8');
-% y10 = y(end)
+y20 = y(end);
+%%
+f = @(t,y) y;
+y20 = 50;
+C = @(t,y) t > 10;
+%[t,y] = solve_ivp(f,{20,C},y20,-0.001,'ABM8');
+[t,y] = solve_ivp(f,[20,10],y20,0.001,'ABM8');
+y10 = y(end);