From e232e9407156e7d3a8a8b519d067c67334e8d964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Adjemia=20=28Scylla=29?= <stepan@dynare.org>
Date: Sat, 9 Feb 2019 23:07:06 +0100
Subject: [PATCH] Abandon previous attempts to use matlab namespace...
for dseries (see 48115cb, which does not work with Octave) or a
method (see ef923e4, which does not work with all supported Matlab's
versions) to initialize the dseries class.
---
src/{@dseries/initialize.m => initialize_dseries_class.m} | 4 ++--
tests/runalltests.m | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
rename src/{@dseries/initialize.m => initialize_dseries_class.m} (96%)
diff --git a/src/@dseries/initialize.m b/src/initialize_dseries_class.m
similarity index 96%
rename from src/@dseries/initialize.m
rename to src/initialize_dseries_class.m
index 4a42ad2..1548145 100644
--- a/src/@dseries/initialize.m
+++ b/src/initialize_dseries_class.m
@@ -1,4 +1,4 @@
-function initialize(fake)
+function initialize_dseries_class()
% Copyright (C) 2015-2019 Dynare Team
%
@@ -16,7 +16,7 @@ function initialize(fake)
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
% Get the path to the dseries toolbox.
-dseries_src_root = strrep(which('@dseries/initialize.m'),'@dseries/initialize.m','');
+dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m','');
% Check that the x13 binary is available
nox13 = false;
diff --git a/tests/runalltests.m b/tests/runalltests.m
index b82d9c6..c8e9f3a 100644
--- a/tests/runalltests.m
+++ b/tests/runalltests.m
@@ -15,7 +15,7 @@ function runalltests()
% You should have received a copy of the GNU General Public License
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
-dseries_src_root = strrep(which('runalltests'),'tests/runalltests.m','');
+dseries_src_root = []; % Will be updated by calling initialize_dseries_class().
opath = path();
@@ -34,10 +34,10 @@ unit_tests_root = strrep(which('runalltests'),'runalltests.m','');
% Initialize the dseries module
try
- dseries().initialize();
+ initialize_dseries_class();
catch
addpath([unit_tests_root '../src']);
- dseries().initialize();
+ initialize_dseries_class();
end
warning off
--
GitLab