From 2006f985b8c6cb21be748e0d62c7d205ddc666f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?=
 <stephane.adjemian@univ-lemans.fr>
Date: Mon, 23 Nov 2015 11:54:14 +0100
Subject: [PATCH] Workaround for Octave 4.0.

With Octave `which('dates')` returns nothing (Octave claims that `dates`
is a built in function).
---
 src/@dates/private/comparison_arg_checks.m | 28 +++++++++++-----------
 src/@dates/private/dates4display.m         | 16 ++++++-------
 src/@dates/private/greaterorequal.m        | 20 ++++++++--------
 src/@dates/private/greaterthan.m           | 20 ++++++++--------
 src/@dates/private/lessorequal.m           | 20 ++++++++--------
 src/@dates/private/lessthan.m              | 20 ++++++++--------
 6 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/src/@dates/private/comparison_arg_checks.m b/src/@dates/private/comparison_arg_checks.m
index 82fa455..7abcd82 100644
--- a/src/@dates/private/comparison_arg_checks.m
+++ b/src/@dates/private/comparison_arg_checks.m
@@ -49,8 +49,8 @@ p = varargin{2};
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(1);
@@ -65,8 +65,8 @@ p = varargin{2};
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks('make', 'my', 'day');
@@ -81,8 +81,8 @@ p = varargin{2};
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks('punk', dates('1950Q1'));
@@ -97,8 +97,8 @@ p = varargin{2};
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(dates('1950Q1'), 1);
@@ -113,8 +113,8 @@ p = varargin{2};
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(dates('1950Q1'), dates('1950M1'));
@@ -129,8 +129,8 @@ p = varargin{2};
 
 %@test:6
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(dates('1950Q1'):dates('1950Q2'), dates('1950Q1'):dates('1950Q3'));
@@ -145,8 +145,8 @@ p = varargin{2};
 
 %@test:7
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(dates('1950Q2'), dates('1950Q1'));
diff --git a/src/@dates/private/dates4display.m b/src/@dates/private/dates4display.m
index b8d1a0a..e598196 100644
--- a/src/@dates/private/dates4display.m
+++ b/src/@dates/private/dates4display.m
@@ -49,8 +49,8 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$ addpath('../../../data/')
 %$
 %$ try
@@ -77,8 +77,8 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$ addpath('../../../data/')
 %$
 %$ try
@@ -105,8 +105,8 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$ addpath('../../../data/')
 %$
 %$ try
@@ -133,8 +133,8 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$ addpath('../../../data/')
 %$
 %$ try
diff --git a/src/@dates/private/greaterorequal.m b/src/@dates/private/greaterorequal.m
index d99a0ce..8979673 100644
--- a/src/@dates/private/greaterorequal.m
+++ b/src/@dates/private/greaterorequal.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];
diff --git a/src/@dates/private/greaterthan.m b/src/@dates/private/greaterthan.m
index ffc7695..cbdfca6 100644
--- a/src/@dates/private/greaterthan.m
+++ b/src/@dates/private/greaterthan.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];
diff --git a/src/@dates/private/lessorequal.m b/src/@dates/private/lessorequal.m
index 58d05e7..9b33b5d 100644
--- a/src/@dates/private/lessorequal.m
+++ b/src/@dates/private/lessorequal.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];
diff --git a/src/@dates/private/lessthan.m b/src/@dates/private/lessthan.m
index c2e3228..57563da 100644
--- a/src/@dates/private/lessthan.m
+++ b/src/@dates/private/lessthan.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];
-- 
GitLab