From fff07396d208d4f7d6d314eb158a8b3a5ebda0fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?=
<stephane.adjemian@univ-lemans.fr>
Date: Thu, 16 Apr 2015 22:26:24 +0200
Subject: [PATCH] Divided tests/optimizers/fs2000.mod into 12 mod files...
Otherwise the execution of the testsuite is not parallelized. Also, added a test for
mode_compute=1 (if fmincon from Mathworks' Optimization toolbox is
available).
---
tests/Makefile.am | 16 +++++++--
.../{fs2000.mod => fs2000.common.inc} | 34 -------------------
tests/optimizers/fs2000_1.mod | 5 +++
tests/optimizers/fs2000_10.mod | 3 ++
tests/optimizers/fs2000_101.mod | 3 ++
tests/optimizers/fs2000_102.mod | 5 +++
tests/optimizers/fs2000_2.mod | 3 ++
tests/optimizers/fs2000_3.mod | 5 +++
tests/optimizers/fs2000_4.mod | 3 ++
tests/optimizers/fs2000_5.mod | 3 ++
tests/optimizers/fs2000_6.mod | 3 ++
tests/optimizers/fs2000_7.mod | 5 +++
tests/optimizers/fs2000_8.mod | 3 ++
tests/optimizers/fs2000_9.mod | 3 ++
tests/optimizers/fs2000_w.mod | 3 ++
15 files changed, 61 insertions(+), 36 deletions(-)
rename tests/optimizers/{fs2000.mod => fs2000.common.inc} (62%)
create mode 100644 tests/optimizers/fs2000_1.mod
create mode 100644 tests/optimizers/fs2000_10.mod
create mode 100644 tests/optimizers/fs2000_101.mod
create mode 100644 tests/optimizers/fs2000_102.mod
create mode 100644 tests/optimizers/fs2000_2.mod
create mode 100644 tests/optimizers/fs2000_3.mod
create mode 100644 tests/optimizers/fs2000_4.mod
create mode 100644 tests/optimizers/fs2000_5.mod
create mode 100644 tests/optimizers/fs2000_6.mod
create mode 100644 tests/optimizers/fs2000_7.mod
create mode 100644 tests/optimizers/fs2000_8.mod
create mode 100644 tests/optimizers/fs2000_9.mod
create mode 100644 tests/optimizers/fs2000_w.mod
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3ec5ba46ff..107d778bbe 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -205,7 +205,18 @@ MODFILES = \
smoother2histval/fs2000_simul.mod \
smoother2histval/fs2000_smooth.mod \
smoother2histval/fs2000_smooth_stoch_simul.mod \
- optimizers/fs2000.mod \
+ optimizers/fs2000_2.mod \
+ optimizers/fs2000_3.mod \
+ optimizers/fs2000_4.mod \
+ optimizers/fs2000_5.mod \
+ optimizers/fs2000_6.mod \
+ optimizers/fs2000_7.mod \
+ optimizers/fs2000_8.mod \
+ optimizers/fs2000_9.mod \
+ optimizers/fs2000_10.mod \
+ optimizers/fs2000_101.mod \
+ optimizers/fs2000_102.mod \
+ optimizers/fs2000_w.mod \
reporting/example1.mod
XFAIL_MODFILES = ramst_xfail.mod \
@@ -396,7 +407,8 @@ EXTRA_DIST = \
smoother2histval/fsdat_simul.m \
optimal_policy/Ramsey/find_c.m \
optimal_policy/Ramsey/oo_ramsey_policy_initval.mat \
- optimizers/optimizer_function_wrapper.m
+ optimizers/optimizer_function_wrapper.m \
+ optimizers/fs2000.common.inc
TARGETS =
diff --git a/tests/optimizers/fs2000.mod b/tests/optimizers/fs2000.common.inc
similarity index 62%
rename from tests/optimizers/fs2000.mod
rename to tests/optimizers/fs2000.common.inc
index 6da79bd48d..b0762753f7 100644
--- a/tests/optimizers/fs2000.mod
+++ b/tests/optimizers/fs2000.common.inc
@@ -131,37 +131,3 @@ end;
varobs gp_obs gy_obs;
options_.plot_priors=0;
-
-estimation(mode_compute=2,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0, mh_nblocks=2, mh_jscale=0.8);
-
-if exist('fminunc','file')
- estimation(mode_compute=3,datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0, mh_nblocks=2, mh_jscale=0.8);
-end
-
-estimation(mode_compute=4,mode_file=fs2000_mode,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0, mh_nblocks=2, mh_jscale=0.8);
-estimation(mode_compute=5,mode_file=fs2000_mode,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0, mh_nblocks=2, mh_jscale=0.8);
-
-if exist('fminsearch','file')
- estimation(mode_compute=7,mode_file=fs2000_mode,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0, mh_nblocks=2, mh_jscale=0.8);
-end
-
-estimation(mode_compute=8,mode_file=fs2000_mode,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0, mh_nblocks=2, mh_jscale=0.8);
-estimation(mode_compute=9,mode_file=fs2000_mode,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0, mh_nblocks=2, mh_jscale=0.8);
-estimation(mode_compute=10,mode_file=fs2000_mode,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0, mh_nblocks=2, mh_jscale=0.8);
-estimation(mode_compute=101,mode_file=fs2000_mode,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0, mh_nblocks=2, mh_jscale=0.8);
-
-if ~isoctave() && exist('simulannealbnd','file')
- estimation(mode_compute=102,mode_file=fs2000_mode,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0, mh_nblocks=2, mh_jscale=0.8);
-end
-
-estimation(mode_compute=optimizer_function_wrapper,mode_file=fs2000_mode,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0, mh_nblocks=2, mh_jscale=0.8);
-estimation(mode_compute=6,mode_file=fs2000_mode,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0, mh_nblocks=2, mh_jscale=0.8);
-
-/*
- * The following lines were used to generate the data file. If you want to
- * generate another random data file, comment the "estimation" line and uncomment
- * the following lines.
- */
-
-//stoch_simul(periods=200, order=1);
-//datatomfile('fs2000/fsdat_simul', char('gy_obs', 'gp_obs'));
diff --git a/tests/optimizers/fs2000_1.mod b/tests/optimizers/fs2000_1.mod
new file mode 100644
index 0000000000..fe37048359
--- /dev/null
+++ b/tests/optimizers/fs2000_1.mod
@@ -0,0 +1,5 @@
+@#include "fs2000.common.inc"
+
+if ~isoctave() && exist('fmincon','file')
+ estimation(mode_compute=1,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0);
+end
diff --git a/tests/optimizers/fs2000_10.mod b/tests/optimizers/fs2000_10.mod
new file mode 100644
index 0000000000..d46ef9d85f
--- /dev/null
+++ b/tests/optimizers/fs2000_10.mod
@@ -0,0 +1,3 @@
+@#include "fs2000.common.inc"
+
+estimation(mode_compute=10,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0);
diff --git a/tests/optimizers/fs2000_101.mod b/tests/optimizers/fs2000_101.mod
new file mode 100644
index 0000000000..d301ecd186
--- /dev/null
+++ b/tests/optimizers/fs2000_101.mod
@@ -0,0 +1,3 @@
+@#include "fs2000.common.inc"
+
+estimation(mode_compute=101,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0);
diff --git a/tests/optimizers/fs2000_102.mod b/tests/optimizers/fs2000_102.mod
new file mode 100644
index 0000000000..e43dcb254b
--- /dev/null
+++ b/tests/optimizers/fs2000_102.mod
@@ -0,0 +1,5 @@
+@#include "fs2000.common.inc"
+
+if ~isoctave() && exist('simulannealbnd','file')
+ estimation(mode_compute=102,mode_file=fs2000_mode,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0, mh_nblocks=2, mh_jscale=0.8);
+end
diff --git a/tests/optimizers/fs2000_2.mod b/tests/optimizers/fs2000_2.mod
new file mode 100644
index 0000000000..bfd38c7c49
--- /dev/null
+++ b/tests/optimizers/fs2000_2.mod
@@ -0,0 +1,3 @@
+@#include "fs2000.common.inc"
+
+estimation(mode_compute=2,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0);
diff --git a/tests/optimizers/fs2000_3.mod b/tests/optimizers/fs2000_3.mod
new file mode 100644
index 0000000000..5efc98d2a4
--- /dev/null
+++ b/tests/optimizers/fs2000_3.mod
@@ -0,0 +1,5 @@
+@#include "fs2000.common.inc"
+
+if exist('fminunc','file')
+ estimation(mode_compute=3,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0);
+end
diff --git a/tests/optimizers/fs2000_4.mod b/tests/optimizers/fs2000_4.mod
new file mode 100644
index 0000000000..c500afa7fb
--- /dev/null
+++ b/tests/optimizers/fs2000_4.mod
@@ -0,0 +1,3 @@
+@#include "fs2000.common.inc"
+
+estimation(mode_compute=4,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0);
diff --git a/tests/optimizers/fs2000_5.mod b/tests/optimizers/fs2000_5.mod
new file mode 100644
index 0000000000..16fdd957e2
--- /dev/null
+++ b/tests/optimizers/fs2000_5.mod
@@ -0,0 +1,3 @@
+@#include "fs2000.common.inc"
+
+estimation(mode_compute=5,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0);
diff --git a/tests/optimizers/fs2000_6.mod b/tests/optimizers/fs2000_6.mod
new file mode 100644
index 0000000000..7bd0673a71
--- /dev/null
+++ b/tests/optimizers/fs2000_6.mod
@@ -0,0 +1,3 @@
+@#include "fs2000.common.inc"
+
+estimation(mode_compute=6,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0);
diff --git a/tests/optimizers/fs2000_7.mod b/tests/optimizers/fs2000_7.mod
new file mode 100644
index 0000000000..3a58b5fa2f
--- /dev/null
+++ b/tests/optimizers/fs2000_7.mod
@@ -0,0 +1,5 @@
+@#include "fs2000.common.inc"
+
+if exist('fminsearch','file')
+ estimation(mode_compute=7,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0);
+end
diff --git a/tests/optimizers/fs2000_8.mod b/tests/optimizers/fs2000_8.mod
new file mode 100644
index 0000000000..f7415df12c
--- /dev/null
+++ b/tests/optimizers/fs2000_8.mod
@@ -0,0 +1,3 @@
+@#include "fs2000.common.inc"
+
+estimation(mode_compute=8,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0);
diff --git a/tests/optimizers/fs2000_9.mod b/tests/optimizers/fs2000_9.mod
new file mode 100644
index 0000000000..96d75bf96f
--- /dev/null
+++ b/tests/optimizers/fs2000_9.mod
@@ -0,0 +1,3 @@
+@#include "fs2000.common.inc"
+
+estimation(mode_compute=9,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0);
diff --git a/tests/optimizers/fs2000_w.mod b/tests/optimizers/fs2000_w.mod
new file mode 100644
index 0000000000..73f6bdc62a
--- /dev/null
+++ b/tests/optimizers/fs2000_w.mod
@@ -0,0 +1,3 @@
+@#include "fs2000.common.inc"
+
+estimation(mode_compute=optimizer_function_wrapper,order=1, datafile='../fs2000/fsdat_simul', nobs=192, mh_replic=0);
--
GitLab