Merge pull request rasmusbergpalm#77 from rasmusbergpalm/require-octave-3.8

Require octave 3.8

Author: rasmusbergpalm

CNN/cnnbp.m

@@ -41,12 +41,7 @@
         if strcmp(net.layers{l}.type, 'c')
             for j = 1 : numel(net.layers{l}.a)
                 for i = 1 : numel(net.layers{l - 1}.a)
-                    %ugly if, until convn() is fixed in Octave.
-                    if(isOctave())
-                        net.layers{l}.dk{i}{j} = convn_valid(flipall(net.layers{l - 1}.a{i}), net.layers{l}.d{j}) / size(net.layers{l}.d{j}, 3);
-                    else
-                        net.layers{l}.dk{i}{j} = convn(flipall(net.layers{l - 1}.a{i}), net.layers{l}.d{j}, 'valid') / size(net.layers{l}.d{j}, 3);
-                    end				
+                    net.layers{l}.dk{i}{j} = convn(flipall(net.layers{l - 1}.a{i}), net.layers{l}.d{j}, 'valid') / size(net.layers{l}.d{j}, 3);
                 end
                 net.layers{l}.db{j} = sum(net.layers{l}.d{j}(:)) / size(net.layers{l}.d{j}, 3);
             end

CNN/cnnsetup.m

@@ -1,4 +1,5 @@
 function net = cnnsetup(net, x, y)
+    assert(~isOctave() || compare_versions(OCTAVE_VERSION, '3.8.0', '>='), ['Octave 3.8.0 or greater is required for CNNs as there is a bug in convolution in previous versions. See http://savannah.gnu.org/bugs/?39314. Your version is ' OCTAVE_VERSION]);
     inputmaps = 1;
     mapsize = size(squeeze(x(:, :, 1)));
 

CNN/convn_valid.m

@@ -22,8 +22,8 @@
 
 
 opts.alpha = 1;
-opts.batchsize = 200;
-opts.numepochs = 7;
+opts.batchsize = 50;
+opts.numepochs = 1;
 
 cnn = cnnsetup(cnn, train_x, train_y);
 cnn = cnntrain(cnn, train_x, train_y, opts);