From c7988c071708865d6f6fce1e93c45582ff70e4e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Hermes=29?= <stepan@dynare.org> Date: Mon, 24 Dec 2018 10:37:26 +0100 Subject: [PATCH] Updated dseries submodule (moved dates class into dseries submodule). --- .gitmodules | 4 ---- matlab/dynare_config.m | 3 +-- matlab/modules/dates | 1 - matlab/modules/dseries | 2 +- 4 files changed, 2 insertions(+), 8 deletions(-) delete mode 160000 matlab/modules/dates diff --git a/.gitmodules b/.gitmodules index 3d5849e4e7..2e19fa9ad9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,10 +16,6 @@ [submodule "matlab/particles"] path = matlab/particles url = https://git.dynare.org/Dynare/particles.git -[submodule "matlab/modules/dates"] - path = matlab/modules/dates - url = https://git.dynare.org/Dynare/dates.git - branch = master [submodule "matlab/modules/dseries"] path = matlab/modules/dseries url = https://git.dynare.org/Dynare/dseries.git diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m index f8ae331636..2b09bafdc5 100644 --- a/matlab/dynare_config.m +++ b/matlab/dynare_config.m @@ -64,7 +64,6 @@ p = {'/distributions/' ; ... '/cli/' ; ... '/lmmcp/' ; ... '/optimization/' ; ... - '/modules/dates/src/' ; ... '/modules/dseries/src/' ; ... '/utilities/doc/' ; ... '/utilities/tests/src/' ; ... @@ -246,6 +245,6 @@ if verbose end % Initialization of the dates and dseries classes (recursive). -initialize_dseries_toolbox; +dseries.initialize(); cd(origin); diff --git a/matlab/modules/dates b/matlab/modules/dates deleted file mode 160000 index f25def5a11..0000000000 --- a/matlab/modules/dates +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f25def5a115443186fa325293ed66dce4aaf1ad9 diff --git a/matlab/modules/dseries b/matlab/modules/dseries index ec904edb0b..164fe3b5ed 160000 --- a/matlab/modules/dseries +++ b/matlab/modules/dseries @@ -1 +1 @@ -Subproject commit ec904edb0b9d5688b678ebb198ab500535a0bd18 +Subproject commit 164fe3b5edb354053ba74664c2956a073ab022a1 -- GitLab