enforce use of jsonlab only when MATLAB < 9.1 and Unix end-of-line convention

src/initialize_mdbnomics.m

@@ -21,8 +21,7 @@ function initialize_mdbnomics()
 mdbnomics_src_root = strrep(which('initialize_mdbnomics'), 'initialize_mdbnomics.m', '');
 
 % Set the subfolders to be added in the path.
-p = {'utils' ; ...
-     '/../contrib/jsonlab'};
+p = {'utils'};
 
 % Add missing routines if dynare is not in the path
 if ~exist('OCTAVE_VERSION', 'builtin') || ~exist('contains','builtin')
@@ -49,9 +48,14 @@ end
 P = cellfun(@(c)[mdbnomics_src_root c], p, 'uni', false);
 addpath(P{:});
 
-% Check minimal MATLAB and Octave requirements.
+% Check minimal MATLAB requirements.
 if matlab_ver_less_than('8.5')
     error('The minimum MATLAB requirement of this package is R2015a.');
 end
 
+% Add jsonlab if MATLAB version < R2016b
+if matlab_ver_less_than('9.1')
+    addpath([mdbnomics_src_root '/../contrib/jsonlab']);
+end
+
 assignin('caller', 'mdbnomics_src_root', mdbnomics_src_root);

src/utils/iter_filtered_series.m

@@ -54,7 +54,7 @@ for gg = 1:size(grouped_series, 2)
         posted_series_list{series} = posted_series;
     end
 
-    if matlab_ver_less_than('9.8')
+    if matlab_ver_less_than('9.1')
         posted_series_list = savejson('',posted_series_list, 'Compact', 1);
         posted_series_list = regexprep(posted_series_list,{' [[',']]'},{'[',']'});
     else