Changeset 82

Timestamp:

08/20/13 10:34:55 (11 years ago)

Author:

dtax

Message:

Now better?

File:

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

prextra/loglc2.m

@@ -28 +28 @@
     % Handle untrained calls like W = loglc2([]);
     if nargin == 0 || isempty(A)
-        B = mapping(mfilename); 
+        B = prmapping(mfilename); 
         B = setname(B, name); 
         return;
         
     % Handle training on dataset A (use A * loglc2, A * loglc2([]), and loglc2(A))
-    elseif (nargin == 1 && isa(A, 'dataset')) || (isa(A, 'dataset') && isa(W, 'double'))
+    elseif (nargin == 1 && isdataset(A)) || (isdataset(A) && isa(W, 'double'))
         if nargin < 2
             W = 0;
@@ -45 +45 @@
         % Train the logistic regressor
         [data.E, data.E_bias] = train_logreg(+A', getnlab(A)', W);
-        B = mapping(mfilename, 'trained', data, getlablist(A), k, c);
+        B = prmapping(mfilename, 'trained', data, getlablist(A), k, c);
         B = setname(B, name);
         
     % Handle evaluation of a trained LOGLC2 W for a dataset A 
-    elseif (isa(A, 'dataset') && isa(W, 'mapping')) || (isa(A, 'double') && isa(W, 'mapping'))
+    elseif (isdataset(A) && ismapping(W)) || (isa(A,'double') && ismapping(W))
         
         % Evaluate logistic classifier
         [~, test_post] = eval_logreg(+A', W.data.E, W.data.E_bias);
-        A = dataset(A); 
+        A = prdataset(A); 
         B = setdata(A, test_post', getlabels(W));
         ll = [];
@@ -106 +106 @@
     x = [E(:); E_bias(:)];
     options.Method = 'lbfgs';
-    options.Display = 'on';
+    %options.Display = 'on'; %DXD: nooooo!
+    options.Display = 'off';
     options.TolFun = 1e-4;
     options.TolX = 1e-4;