Merge branch 'master' into ecb-master

externals/x13/installx13.m

@@ -26,6 +26,7 @@ if ~exist('x13.zip','file')
     end
     unzip('x13.zip');
     movefile('binaries/linux','./linux');
+    movefile('binaries/osx','./osx');
     movefile('binaries/windows','./windows');
     rmdir('binaries');
 end

src/@dseries/cumprod.m

@@ -32,7 +32,11 @@ o = copy(varargin{1});
 if nargin<2
     o.cumprod_();
 else
-    o.cumprod_(varargin{2:end});
+    if isoctave
+        o = cumprod_(o, varargin{2:end});
+    else
+        o.cumprod_(varargin{2:end});
+    end
 end
 
 %@test:1

src/@dseries/cumsum.m

@@ -32,7 +32,11 @@ o = copy(varargin{1});
 if nargin<2
     o.cumsum_();
 else
-    o.cumsum_(varargin{2:end});
+    if isoctave()
+        o = cumsum_(o, varargin{2:end});
+    else
+        o.cumsum_(varargin{2:end});
+    end
 end
 
 %@test:1

src/utilities/x13/select_x13_binary.m

@@ -32,6 +32,13 @@ elseif ispc()
     else
         x13_binary = sprintf('%s%s%s%s', x13_binary, '32', filesep(), 'x13.exe');
     end
+elseif ismac()
+    x13_binary = sprintf('%s%s%s', dseries_x13_root, 'osx', filesep());
+    if is64bit()
+        x13_binary = sprintf('%s%s%s%s', x13_binary, '64', filesep(), 'x13');
+    else
+        x13_binary = sprintf('%s%s%s%s', x13_binary, '32', filesep(), 'x13');
+    end
 else
     error('X13 binary is not yet available for this plateform')
 end
\ No newline at end of file

tests/runalltests.m

@@ -13,6 +13,10 @@
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+if isoctave()
+    pkg install -forge io
+end
+
 opath = path();
 
 system('rm -f failed');