MoM: Testsuite fixes for Octave

tests/estimation/method_of_moments/AFVRR/AFVRR_M0.mod

@@ -256,11 +256,13 @@ dev_Q            = AndreasenEtAl.Q@{orderApp} - oo_.mom.Q;
 dev_datamoments  = str2double(AndreasenEtAl.moments@{orderApp}(:,5)) - oo_.mom.data_moments;
 dev_modelmoments = str2double(AndreasenEtAl.moments@{orderApp}(:,6)) - oo_.mom.model_moments;
 
+if ~isoctave %there is no table command in Octave
 table([AndreasenEtAl.Q@{orderApp} ; str2double(AndreasenEtAl.moments@{orderApp}(:,5)) ; str2double(AndreasenEtAl.moments@{orderApp}(:,6))],...
       [oo_.mom.Q                  ; oo_.mom.data_moments                              ; oo_.mom.model_moments                            ],...
       [dev_Q                      ; dev_datamoments                                   ; dev_modelmoments                                 ],...
       'VariableNames', {'Andreasen et al', 'Dynare', 'dev'},...
       'RowNames', ['Q'; strcat('Data_', M_.matched_moments(:,4)); strcat('Model_', M_.matched_moments(:,4))])
+end
 
 if norm(dev_modelmoments)> 1e-4
     error('Something wrong in the computation of moments at order @{orderApp}')

tests/estimation/method_of_moments/AFVRR/AFVRR_MFB.mod

@@ -257,11 +257,13 @@ dev_Q            = AndreasenEtAl.Q@{orderApp} - oo_.mom.Q;
 dev_datamoments  = str2double(AndreasenEtAl.moments@{orderApp}(:,5)) - oo_.mom.data_moments;
 dev_modelmoments = str2double(AndreasenEtAl.moments@{orderApp}(:,6)) - oo_.mom.model_moments;
 
+if ~isoctave %there is no table command in Octave
 table([AndreasenEtAl.Q@{orderApp} ; str2double(AndreasenEtAl.moments@{orderApp}(:,5)) ; str2double(AndreasenEtAl.moments@{orderApp}(:,6))],...
       [oo_.mom.Q                  ; oo_.mom.data_moments                              ; oo_.mom.model_moments                            ],...
       [dev_Q                      ; dev_datamoments                                   ; dev_modelmoments                                 ],...
       'VariableNames', {'Andreasen et al', 'Dynare', 'dev'},...
       'RowNames', ['Q'; strcat('Data_', M_.matched_moments(:,4)); strcat('Model_', M_.matched_moments(:,4))])
+end
 
 if norm(dev_modelmoments)> 1e-4
     warning('Something wrong in the computation of moments at order @{orderApp}')

tests/estimation/method_of_moments/AFVRR/AFVRR_MFB_RRA.mod

@@ -256,11 +256,13 @@ dev_Q            = AndreasenEtAl.Q@{orderApp} - oo_.mom.Q;
 dev_datamoments  = str2double(AndreasenEtAl.moments@{orderApp}(:,5)) - oo_.mom.data_moments;
 dev_modelmoments = str2double(AndreasenEtAl.moments@{orderApp}(:,6)) - oo_.mom.model_moments;
 
+if ~isoctave %there is no table command in Octave
 table([AndreasenEtAl.Q@{orderApp} ; str2double(AndreasenEtAl.moments@{orderApp}(:,5)) ; str2double(AndreasenEtAl.moments@{orderApp}(:,6))],...
       [oo_.mom.Q                  ; oo_.mom.data_moments                              ; oo_.mom.model_moments                            ],...
       [dev_Q                      ; dev_datamoments                                   ; dev_modelmoments                                 ],...
       'VariableNames', {'Andreasen et al', 'Dynare', 'dev'},...
       'RowNames', ['Q'; strcat('Data_', M_.matched_moments(:,4)); strcat('Model_', M_.matched_moments(:,4))])
+end
 
 if norm(dev_modelmoments)> 1e-4
     warning('Something wrong in the computation of moments at order @{orderApp}')

tests/estimation/method_of_moments/RBC/RBC_MoM_GMM_gradient_optim.mod

@@ -88,8 +88,13 @@ end;
 
   estimated_params_init(use_calibration);
   end;
-  %1 3 13
+  
   @#for optimizer in [1, 3, 13]
+    @#if estimParams == 2 && optimizer == 13
+        %skip due to buggy behavior in Octave
+        if ~isoctave
+    @#endif
+  
   method_of_moments(
           mom_method = GMM         % method of moments method; possible values: GMM|SMM
         , datafile   = 'RBC_Andreasen_Data_2.mat' % name of filename with data
@@ -110,6 +115,11 @@ end;
         , silent_optimizer                  % run minimization of moments distance silently without displaying results or saving files in between        
         , analytic_jacobian
   );
+  
+    @#if estimParams == 2 && optimizer == 13
+        %skip due to buggy behavior in Octave
+        end
+    @#endif
   @#endfor  
   
 @#endfor

tests/estimation/method_of_moments/RBC/RBC_MoM_optimizer.mod

@@ -118,6 +118,12 @@ options_.solveopt.TolXConstraint=1e-3;
     end;
 
     @#for optimizer in OPTIMIZERS
+        
+        @#if estimParams == 2 && optimizer == 13
+            %skip due to buggy behavior in Octave
+        if ~isoctave
+        @#endif
+        
     method_of_moments(
           mom_method = GMM         % method of moments method; possible values: GMM|SMM
         , datafile   = 'RBC_Andreasen_Data_2.mat' % name of filename with data
@@ -139,6 +145,11 @@ options_.solveopt.TolXConstraint=1e-3;
         @#endif
         %, silent_optimizer                  % run minimization of moments distance silently without displaying results or saving files in between
     );
+    
+        @#if estimParams == 2 && optimizer == 13
+            %skip due to buggy behavior in Octave
+        end
+        @#endif
     @#endfor
 @#endfor