Merge pull request rasmusbergpalm#1 from tonibagur/tonibagur

Fix the using of ~ symbol which causes octave to crash
uestcyc · Apr 15, 2014 · 8dbd241 · 8dbd241
2 parents c083531 + db922d8
commit 8dbd241
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/NN/nneval.m b/NN/nneval.m
@@ -15,11 +15,11 @@
 
 %calc misclassification rate if softmax
 if strcmp(nn.output,'softmax')
-    [er_train, ~]               = nntest(nn, train_x, train_y);
+    [er_train, dummy]               = nntest(nn, train_x, train_y);
     loss.train.e_frac(end+1)    = er_train;
 
     if nargin == 6
-        [er_val, ~]             = nntest(nn, val_x, val_y);
+        [er_val, dummy]             = nntest(nn, val_x, val_y);
         loss.val.e_frac(end+1)  = er_val;
     end
 end

diff --git a/NN/nnpredict.m b/NN/nnpredict.m
@@ -3,6 +3,6 @@
     nn = nnff(nn, x, zeros(size(x,1), nn.size(end)));
     nn.testing = 0;
 
-    [~, i] = max(nn.a{end},[],2);
+    [dummy, i] = max(nn.a{end},[],2);
     labels = i;
 end
diff --git a/NN/nntest.m b/NN/nntest.m
@@ -1,6 +1,6 @@
 function [er, bad] = nntest(nn, x, y)
     labels = nnpredict(nn, x);
-    [~, expected] = max(y,[],2);
+    [dummy, expected] = max(y,[],2);
     bad = find(labels ~= expected);    
     er = numel(bad) / size(x, 1);
 end