SWZ:

- reverting part of last change to handling of Qi and Ri in ComputingTasks.cc: r is the number of lags present in the restrictions
- fixing handling of Dirichlet option in mhm_input.dat. This fixes the strange Signal messages when running C executables.
- fix path in test_upper_cholesky.mod

matlab/global_initialization.m

@@ -292,6 +292,6 @@ options_.ms.draws_nbr_burn_in_2 = 10000;
 options_.ms.draws_nbr_mean_var_estimate = 200000;
 options_.ms.draws_nbr_modified_harmonic_mean = 1000000;
 options_.ms.thinning_factor = 1;
-options_.ms.dirichlet_scale = 1;
+options_.ms.dirichlet_scale = [1.0 1.5 2.0];
 % initialize persistent variables in priordens()
 priordens([],[],[],[],[],[],1);

matlab/swz/swz_write_mhm_input.m

@@ -34,5 +34,6 @@ function swz_write_mhm_input(fname,options_ms)
     fprintf(fh,'//------- It seems that Dan''s code only use the first element of the following scales.  The scale applies to the Dirichlet''s hyperparameter alpha for the diagonal of the transition matrix in the weighting function.  Note that the weighting function for the transition matrix parameters is Dirichlet. ---------\n');
             
     fprintf(fh,'//== scale values for Dirichlet distribution ==//\n');
-    fprintf(fh,'1\n\n');
-    fprintf(fh,'%d\n',options_ms.dirichlet_scale);
+    fprintf(fh,'3\n\n');
+    fprintf(fh,'%f ',options_ms.dirichlet_scale);
+    fprintf(fh,'\n');

preprocessor/ComputingTasks.cc

@@ -1102,7 +1102,7 @@ SvarIdentificationStatement::writeOutput(ostream &output, const string &basename
       int n = symbol_table.endo_nbr();
 //       int m = symbol_table.exo_nbr();
       int m = 1; // this is the constant, not the shocks
-      int r = getMaxLag()+1;
+      int r = getMaxLag();
       int k = r*n+m;
 
       if (k < 1)

tests/swz/test_upper_cholesky.mod

@@ -1,4 +1,4 @@
-addpath '/home/michel/dynare/svn/dynare/trunk/matlab/swz';
+addpath '../../matlab/swz';
 var Y Pie R;
 
 model;