Changeset 114

Timestamp:

11/16/16 15:10:36 (8 years ago)

Author:

dtax

Message:

STUPID BUG!!!!!

File:

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

prextra/lassoc.m

@@ -6 +6 @@
 % parameter.
 
-function w = lassoc(x, lambda)
+% w = lassoc(x, lambda)
+function w = lassoc(varargin)
 
-mustScale=0;
+argin = shiftargin(varargin,'scalar');
+argin = setdefaults(argin,[],1);
 
-if (nargin < 2)
-        %prwarning(3,'Lambda set to one');
-        lambda = 1;
-end
-if (nargin < 1) | (isempty(x))
-        w = prmapping(mfilename,{lambda});
-        w = setname(w,'LASSO classifier');
-        return
-end
+if mapping_task(argin,'definition')
 
-if ~ismapping(lambda)   % train the mapping
+   w = define_mapping(argin,'untrained','LASSO classifier');
 
+elseif mapping_task(argin,'training')
+
+   [x,lambda] = deal(argin{:});
     % Unpack the dataset.
     islabtype(x,'crisp');
@@ -27 +24 @@
     [n,k,c] = getsize(x);
 
-    % Is this necessary??
-    if mustScale
-        wsc = scalem(x,'variance');
-        x.data = x.data*wsc;
-    end
     % make sure a bias is added:
     x = [x ones(n,1)];
@@ -52 +44 @@
 
     % and store the results:
-    if mustScale
-        W.wsc = wsc;
-    end
-
     W.beta = beta; % the ultimate weights
     W.nr = nr;
-    w = prmapping(mfilename,'trained',W,getlablist(x),size(x,2),c);
+    w = prmapping(mfilename,'trained',W,getlablist(x),k,c);
     w = setname(w,'LASSO classifier (l=%f)',lambda);
 
 else
+    [x,lambda] = deal(argin{1:2});
     % Evaluate the classifier on new data:
     W = getdata(lambda);
     n = size(x,1);
 
-    % scaling and linear classifier:
-    if mustScale
-        x = x*W.wsc;
-    end
     % make sure a bias is added:
     x = [x ones(n,1)];