Changeset 37

Timestamp:

08/29/12 13:32:21 (12 years ago)

Author:

dtax

Message:

Allow also to classify double matrices.

File:

• prextra/loglc2.m (modified) (2 diffs)

prextra/loglc2.m

@@ -23 +23 @@
     name = 'Logistic2';
     if ~exist('minFunc', 'file')
-        prwarning(1, 'LOGLC2 requires the minFunc optimizer. Please download it from www.di.ens.fr/~mschmidt/Software/minFunc.html and add it to the Matlab path.');
+        error('LOGLC2 requires the minFunc optimizer. Please download it from www.di.ens.fr/~mschmidt/Software/minFunc.html and add it to the Matlab path.');
     end
     
@@ -49 +49 @@
         
     % Handle evaluation of a trained LOGLC2 W for a dataset A 
-    elseif isa(A, 'dataset') && isa(W, 'mapping') 
+    elseif (isa(A, 'dataset') && isa(W, 'mapping')) || (isa(A, 'double') && isa(W, 'mapping'))
         
         % Evaluate logistic classifier