From 6c6402fdebfad50e97c2d0bce5554df1b9048b3b Mon Sep 17 00:00:00 2001 From: sebastien Date: Tue, 14 Oct 2008 09:14:20 +0000 Subject: [PATCH] trunk tests: * added Makefile for cleaning tests directory * removed some useless stuff in objectives/ * added some svn:ignore properties git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@2150 ac1d8469-bf42-47a9-8791-bf33cf982152 --- tests/Makefile | 31 +++++++++++ tests/objectives/CVS/Entries | 7 --- tests/objectives/CVS/Repository | 1 - tests/objectives/CVS/Root | 1 - tests/objectives/CVS/Tag | 1 - tests/objectives/sgu_ex1.log | 15 ----- tests/objectives/sgu_ex1.m | 98 --------------------------------- tests/objectives/sgu_ex1_ff.m | 11 ---- tests/objectives/sgu_ex1_fff.m | 11 ---- 9 files changed, 31 insertions(+), 145 deletions(-) create mode 100644 tests/Makefile delete mode 100644 tests/objectives/CVS/Entries delete mode 100644 tests/objectives/CVS/Repository delete mode 100644 tests/objectives/CVS/Root delete mode 100644 tests/objectives/CVS/Tag delete mode 100644 tests/objectives/sgu_ex1.log delete mode 100644 tests/objectives/sgu_ex1.m delete mode 100644 tests/objectives/sgu_ex1_ff.m delete mode 100644 tests/objectives/sgu_ex1_fff.m diff --git a/tests/Makefile b/tests/Makefile new file mode 100644 index 000000000..01f2bf32f --- /dev/null +++ b/tests/Makefile @@ -0,0 +1,31 @@ +MODS=$(shell find -name '*.mod') + +all: + +clean: + # Model files + rm -f $(patsubst %.mod, %.m, $(MODS)) + rm -f $(patsubst %.mod, %_static.m, $(MODS)) + rm -f $(patsubst %.mod, %_dynamic.m, $(MODS)) + + # Results + rm -f $(patsubst %.mod, %_results.mat, $(MODS)) + rm -f $(patsubst %.mod, %_mode.mat, $(MODS)) + rm -f $(patsubst %.mod, %_mh_mode.mat, $(MODS)) + rm -f $(patsubst %.mod, %_mean.mat, $(MODS)) + rm -f $(patsubst %.mod, %_pindx.mat, $(MODS)) + rm -f $(patsubst %.mod, %_params.mat, $(MODS)) + rm -rf $(patsubst %.mod, %, $(MODS)) + + rm -f $(patsubst %.mod, %.log, $(MODS)) + + # Graphics + rm -f $(patsubst %.mod, %*.pdf, $(MODS)) + rm -f $(patsubst %.mod, %*.eps, $(MODS)) + rm -f $(patsubst %.mod, %*.fig, $(MODS)) + + # Remove files generated by csminwel.m + rm -f $(shell find -name g1.mat) + rm -f $(shell find -name g2.mat) + rm -f $(shell find -name g3.mat) + rm -f $(shell find -name H.dat) diff --git a/tests/objectives/CVS/Entries b/tests/objectives/CVS/Entries deleted file mode 100644 index 6957afc35..000000000 --- a/tests/objectives/CVS/Entries +++ /dev/null @@ -1,7 +0,0 @@ -/sgu_ex1.log/1.1.2.1/Sun Feb 6 15:45:32 2005//Tv3_03 -/sgu_ex1.m/1.1.2.1/Sun Feb 6 15:45:32 2005//Tv3_03 -/sgu_ex1.mat/1.1.2.1/Sun Feb 6 15:45:32 2005//Tv3_03 -/sgu_ex1.mod/1.1.2.1/Sun Feb 6 15:45:32 2005//Tv3_03 -/sgu_ex1_ff.m/1.1.2.1/Sun Feb 6 15:45:32 2005//Tv3_03 -/sgu_ex1_fff.m/1.1.2.1/Sun Feb 6 15:45:32 2005//Tv3_03 -D diff --git a/tests/objectives/CVS/Repository b/tests/objectives/CVS/Repository deleted file mode 100644 index f3767c29d..000000000 --- a/tests/objectives/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -dynare_test/tests/objectives diff --git a/tests/objectives/CVS/Root b/tests/objectives/CVS/Root deleted file mode 100644 index 880aa9790..000000000 --- a/tests/objectives/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:ext:pythie.cepremap.cnrs.fr/var/lib/cvs diff --git a/tests/objectives/CVS/Tag b/tests/objectives/CVS/Tag deleted file mode 100644 index 9f3656bd3..000000000 --- a/tests/objectives/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -Tv3_03 diff --git a/tests/objectives/sgu_ex1.log b/tests/objectives/sgu_ex1.log deleted file mode 100644 index 5ec876302..000000000 --- a/tests/objectives/sgu_ex1.log +++ /dev/null @@ -1,15 +0,0 @@ - - -MATRIX OF COVARIANCE OF EXOGENOUS SHOCKS - -Variables e -e 1.000000 -POLICY AND TRANSITION FUNCTIONS - k a c -Constant -1.552215 0 -0.969516 -(correction) 0.241022 0 -0.096072 -k(-1) 0.419109 0 0.252523 -e 1.397031 1.000000 0.841743 -k(-1)k(-1) -0.003501 0 -0.002559 -e e -0.038899 0 -0.028434 -k(-1) e -0.023340 0 -0.017061 diff --git a/tests/objectives/sgu_ex1.m b/tests/objectives/sgu_ex1.m deleted file mode 100644 index 01307659c..000000000 --- a/tests/objectives/sgu_ex1.m +++ /dev/null @@ -1,98 +0,0 @@ -clear all -global scalv_ ex_ recur_ recurs_ ys_ y_ exe_ lgy_ lgx_ lgr_ dsmpl_ endval_ - ... -global endo_nbr exo_nbr iy_ ykmin_ ykmax_ xkmin_ xkmax_ zkmin_ zkmax_ iter_ - ... -global dynatol_ slowc_ maxit_ valf_ ys0_ recurs0_ timing_ ct_ gstep_ Sigma_e_ fname_ lgx_orig_ord_ -dsmpl_=0; -dynatol_=0.00001; -maxit_=10; -slowc_=1; -timing_=0; -ct_=0; -gstep_=1e-2; -endval_=0;rplottype_=0; -fname_ = 'sgu_ex1'; -logname_ = 'sgu_ex1.log'; -diary off; -warning off; -delete sgu_ex1.log; -warning on; -warning backtrace; -diary sgu_ex1.log; - -iter_ = 20000; - - - - -global alpha beta delta gamma rho - - -beta = 0.95; -delta = 1; -alpha = 0.3; -rho = 0; -gamma = 2; - -lgy_ = 'a'; -lgy_ = str2mat(lgy_,'c'); -lgy_ = str2mat(lgy_,'k'); -lgx_ = 'e'; -lgx_orig_ord_ = [1]; -endo_nbr = 3; -exo_nbr = 1; -recur_nbr = 0; -iy_ = [ 1 0 2]; -temp = [ 3 4 5]; -iy_ = [ iy_ ; temp ]; -temp = [ 6 7 0]; -iy_ = [ iy_ ; temp ]; -ykmin_ = 1; -ykmax_ = 1; -xkmin_ = 0; -xkmax_ = 0; -zkmin_ = 0; -zkmax_ = 0; - - -% INITVAL -valf_ = 0; -endval_=0; -ys_ = zeros(3,1); -exe_ = zeros(1,1); -ys0_ = 0; -ex0_ = 0; -recurs0_ = 0; -ys_(3)=0; -ys_(2)=0; -ys_(1)=0; -exe_(1)=0; -if exo_nbr > 0; - ex_ =ones(iter_ + xkmin_ + xkmax_,1) * exe_'; -end; - - -Sigma_e_ = 1; - -var_list_ = []; -options.ar = 0; -options.dr_algo = 0; -options.simul_algo = 0; -options.nocorr = 1; -options.drop = 100; -options.linear = 0; -options.nofunctions = 0; -options.nomoments = 1; -options.irf = 0; -options.order = 2; -options.replic = 0; -stoch_simul(options,var_list_); - - -global dr_ -dr_obj_ = dr_; - -save sgu_ex1 dr_obj_; - -diary off diff --git a/tests/objectives/sgu_ex1_ff.m b/tests/objectives/sgu_ex1_ff.m deleted file mode 100644 index 0b7777363..000000000 --- a/tests/objectives/sgu_ex1_ff.m +++ /dev/null @@ -1,11 +0,0 @@ - -function z=sgu_ex1_ff(y) -z=zeros(3,1); -global ex_ it_ recur_ - -global alpha beta delta gamma rho -z(1) = exp(y(4))+exp(y(5)) -((1-delta)*exp(y(2))+exp(y(3))*exp(y(2))^alpha) ... -; -z(2) = exp(y(4))^(-gamma) -(beta*exp(y(7))^(-gamma)*(exp(y(6))*alpha*exp( ... -y(5))^(alpha-1)+1-delta)); -z(3) = y(3) -(rho*y(1)+ex_(it_-1,1)); diff --git a/tests/objectives/sgu_ex1_fff.m b/tests/objectives/sgu_ex1_fff.m deleted file mode 100644 index bf6325be4..000000000 --- a/tests/objectives/sgu_ex1_fff.m +++ /dev/null @@ -1,11 +0,0 @@ - -function z=sgu_ex1_fff(y) -z=zeros(3,1); -global ex_ it_ recur_ - -global alpha beta delta gamma rho -z(1) = exp(y(2))+exp(y(3)) -((1-delta)*exp(y(3))+exp(y(1))*exp(y(3))^alpha) ... -; -z(2) = exp(y(2))^(-gamma) -(beta*exp(y(2))^(-gamma)*(exp(y(1))*alpha*exp( ... -y(3))^(alpha-1)+1-delta)); -z(3) = y(1) -(rho*y(1)+ex_(it_-1,1));