Fixed remove method.

src/@dates/remove_.m

@@ -15,7 +15,7 @@ function o = remove_(o, p) % --*-- Unitary tests --*--
 %
 % See also pop, setdiff
 
-% Copyright (C) 2013-2020 Dynare Team
+% Copyright © 2013-2020 Dynare Team
 %
 % This code is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -43,101 +43,151 @@ if ~isequal(o.freq,p.freq)
 end
 
 if isoctave
-    time = setdiff(o.time,p.time,'rows');
+    if o.freq==365
+        [~, io] = setdiff(o.time(:,1), p.time(:,1));
+        time = o.time(io,:);
+    else
+        time = setdiff(o.time,p.time,'rows');
+    end
 else
-    time = setdiff(o.time,p.time,'rows','legacy');
+    if o.freq==365
+        [~, io] = setdiff(o.time(:,1),p.time(:,1),'legacy');
+        time = o.time(io,:);
+    else
+        time = setdiff(o.time,p.time,'rows','legacy');
+    end
 end
 
 o.time = time;
 
+return
+
 %@test:1
-%$ % Define some dates objects
-%$ d = dates('1950Q1'):dates('1952Q4');
-%$ e = dates('1951Q1'):dates('1952Q4');
-%$ f = dates('1950Q1'):dates('1950Q4');
-%$
-%$ % Call the tested routine.
-%$ try
-%$     d.remove_(e);
-%$     t(1) = true;
-%$ catch
-%$     t(1) = false;
-%$ end
-%$
-%$ % Check the results.
-%$ if t(1)
-%$     t(2) = dassert(d,f);
-%$ end
-%$
-%$ T = all(t);
+% Define some dates objects
+d = dates('1950Q1'):dates('1952Q4');
+e = dates('1951Q1'):dates('1952Q4');
+f = dates('1950Q1'):dates('1950Q4');
+
+% Call the tested routine.
+try
+    d.remove_(e);
+    t(1) = true;
+catch
+    t(1) = false;
+end
+
+% Check the results.
+if t(1)
+    t(2) = dassert(d,f);
+end
+
+T = all(t);
 %@eof:1
 
 %@test:2
-%$ % Define some dates objects
-%$ d = dates('1950Q1','1950Q2','1950Q1');
-%$ e = dates('1950Q1');
-%$ f = dates('1950Q2');
-%$
-%$ % Call the tested routine.
-%$ try
-%$     d.remove_(e);
-%$     t(1) = true;
-%$ catch
-%$     t(1) = false;
-%$ end
-%$
-%$ % Check the results.
-%$ if t(1)
-%$     t(2) = dassert(d,f);
-%$ end
-%$
-%$ T = all(t);
+% Define some dates objects
+d = dates('1950Q1','1950Q2','1950Q1');
+e = dates('1950Q1');
+f = dates('1950Q2');
+
+% Call the tested routine.
+try
+    d.remove_(e);
+    t(1) = true;
+catch
+    t(1) = false;
+end
+
+% Check the results.
+if t(1)
+    t(2) = dassert(d,f);
+end
+
+T = all(t);
 %@eof:2
 
 %@test:3
-%$ % Define some dates objects
-%$ d = dates('1950Q1','1950Q2','1950Q1');
-%$ e = dates('1950Q1');
-%$
-%$ % Call the tested routine.
-%$ try
-%$     d.remove();
-%$     t(1) = false;
-%$ catch
-%$     t(1) = true;
-%$ end
-%$
-%$ T = all(t);
+% Define some dates objects
+d = dates('1950Q1','1950Q2','1950Q1');
+e = dates('1950Q1');
+
+% Call the tested routine.
+try
+    d.remove();
+    t(1) = false;
+catch
+    t(1) = true;
+end
+
+T = all(t);
 %@eof:3
 
 %@test:4
-%$ % Define some dates objects
-%$ d = dates('1950Q1','1950Q2','1950Q1');
-%$ e = '1950Q1';
-%$
-%$ % Call the tested routine.
-%$ try
-%$     d.remove(e);
-%$     t(1) = false;
-%$ catch
-%$     t(1) = true;
-%$ end
-%$
-%$ T = all(t);
+% Define some dates objects
+d = dates('1950Q1','1950Q2','1950Q1');
+e = '1950Q1';
+
+% Call the tested routine.
+try
+    d.remove(e);
+    t(1) = false;
+catch
+    t(1) = true;
+end
+
+T = all(t);
 %@eof:4
 
 %@test:5
-%$ % Define some dates objects
-%$ d = dates('1950Q1','1950Q2','1950Q1');
-%$ e = dates('1950M1');
-%$
-%$ % Call the tested routine.
-%$ try
-%$     d.remove();
-%$     t(1) = false;
-%$ catch
-%$     t(1) = true;
-%$ end
-%$
-%$ T = all(t);
+% Define some dates objects
+d = dates('1950Q1','1950Q2','1950Q1');
+e = dates('1950M1');
+
+% Call the tested routine.
+try
+    d.remove();
+    t(1) = false;
+catch
+    t(1) = true;
+end
+
+T = all(t);
 %@eof:5
+
+%@test:6
+% Define some dates objects
+d = dates('2000-01-01'):dates('2000-01-04');
+
+% Call the tested routine.
+try
+    d.remove_(dates('2000-01-02'));
+    t(1) = true;
+catch
+    t(1) = false;
+end
+
+if t(1)
+    t(2) = d==dates('2000-01-01', '2000-01-03', '2000-01-04');
+end
+
+T = all(t);
+%@eof:6
+
+%@test:7
+% Define some dates objects
+d = dates('2000-01-01'):dates('2000-01-04');
+
+% Call the tested routine.
+try
+    d.remove_(dates('2000-01-02', '2000-01-04'));
+    t(1) = true;
+catch
+    t(1) = false;
+end
+
+if t(1)
+    t(2) = d==dates('2000-01-01', '2000-01-03');
+end
+
+T = all(t);
+%@eof:7
\ No newline at end of file