Skip to content

Commit 0971101

Browse files
Fixed a couple things after the rebase.
1 parent f09302f commit 0971101

File tree

9 files changed

+4
-340
lines changed

9 files changed

+4
-340
lines changed

CNN/cnnavg.m

Lines changed: 0 additions & 15 deletions
This file was deleted.

CNN/cnncopy.m

Lines changed: 0 additions & 18 deletions
This file was deleted.

CNN/cnnsetup.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
function net = cnnsetup(net, x, y)
2-
assert(exist('OCTAVE_VERSION')==0, 'CNNs does not work with Octave as there is a bug in the implementation of convolution in octave. See: http://savannah.gnu.org/bugs/?39314');
32
inputmaps = 1;
43
mapsize = size(squeeze(x(:, :, 1)));
54

CNN/convadd.m

Lines changed: 0 additions & 8 deletions
This file was deleted.

CNN/convnfft.m

Lines changed: 0 additions & 221 deletions
This file was deleted.

CNN/custom_convn.m

Lines changed: 0 additions & 29 deletions
This file was deleted.

CNN/eh.m

Lines changed: 0 additions & 5 deletions
This file was deleted.

CNN/process_batch.m

Lines changed: 0 additions & 40 deletions
This file was deleted.

tests/test_example_CNN.m

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010
%will run 1 epoch in about 200 second and get around 11% error.
1111
%With 100 epochs you'll get around 1.2% error
1212

13+
1314
if !isOctave()
1415
rng(0)
1516
else
1617
rand('state',0)
1718
end
1819

20+
1921
cnn.layers = {
2022
struct('type', 'i') %input layer
2123
struct('type', 'c', 'outputmaps', 6, 'kernelsize', 5) %convolution layer
@@ -33,8 +35,7 @@
3335
cnn = cnntrain(cnn, train_x, train_y, opts);
3436

3537
[er, bad] = cnntest(cnn, test_x, test_y);
36-
er
38+
3739
%plot mean squared error
38-
%figure; plot(cnn.rL);
39-
er
40+
figure; plot(cnn.rL);
4041
assert(er<0.12, 'Too big error');

0 commit comments

Comments
 (0)