projects
/
valse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix memory leaks on EMGLLF, test OK for EMGrank
[valse.git]
/
src
/
test
/
generate_test_data
/
helpers
/
constructionModelesLassoMLE.m
diff --git
a/src/test/generate_test_data/helpers/constructionModelesLassoMLE.m
b/src/test/generate_test_data/helpers/constructionModelesLassoMLE.m
index
5b7c65e
..
3e852a6
100644
(file)
--- a/
src/test/generate_test_data/helpers/constructionModelesLassoMLE.m
+++ b/
src/test/generate_test_data/helpers/constructionModelesLassoMLE.m
@@
-1,4
+1,4
@@
-function[phi,rho,pi,l
vraisemblance
] = constructionModelesLassoMLE(...
+function[phi,rho,pi,l
lh
] = constructionModelesLassoMLE(...
phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambda,X,Y,seuil,tau,A1,A2)
PI = 4.0 * atan(1.0);
phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambda,X,Y,seuil,tau,A1,A2)
PI = 4.0 * atan(1.0);
@@
-12,7
+12,7
@@
function[phi,rho,pi,lvraisemblance] = constructionModelesLassoMLE(...
phi = zeros(p,m,k,L);
rho = zeros(m,m,k,L);
pi = zeros(k,L);
phi = zeros(p,m,k,L);
rho = zeros(m,m,k,L);
pi = zeros(k,L);
- l
vraisemblance
= zeros(L,2);
+ l
lh
= zeros(L,2);
for lambdaIndex=1:L
% Procedure Lasso-MLE
for lambdaIndex=1:L
% Procedure Lasso-MLE
@@
-51,8
+51,8
@@
function[phi,rho,pi,lvraisemblance] = constructionModelesLassoMLE(...
pi(r,lambdaIndex)*det(rho(:,:,r,lambdaIndex))/(sqrt(2*PI))^m*exp(-dot(delta,delta)/2.0);
end
end
pi(r,lambdaIndex)*det(rho(:,:,r,lambdaIndex))/(sqrt(2*PI))^m*exp(-dot(delta,delta)/2.0);
end
end
- l
vraisemblance
(lambdaIndex,1) = sum(log(densite(:,lambdaIndex)));
- l
vraisemblance
(lambdaIndex,2) = (dimension+m+1)*k-1;
+ l
lh
(lambdaIndex,1) = sum(log(densite(:,lambdaIndex)));
+ l
lh
(lambdaIndex,2) = (dimension+m+1)*k-1;
end
end
end
end