diff options
| author | ziejd2 | 2018-04-25 16:43:19 -0500 |
|---|---|---|
| committer | ziejd2 | 2018-04-25 16:43:19 -0500 |
| commit | 74b673ba4a706085201a5610b938ff98f08f641d (patch) | |
| tree | cb39006ea1a39499e00dbbb0e0097087a4567031 /sourcecodes/bnt-master/KPMstats | |
| parent | a781cb1ff2e7ae6de0f686bd02cd279261485b1e (diff) | |
| download | BNW-74b673ba4a706085201a5610b938ff98f08f641d.tar.gz | |
Bug fixes, code comments, and minor changes
Diffstat (limited to 'sourcecodes/bnt-master/KPMstats')
| -rw-r--r-- | sourcecodes/bnt-master/KPMstats/clg_Mstep.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sourcecodes/bnt-master/KPMstats/clg_Mstep.m b/sourcecodes/bnt-master/KPMstats/clg_Mstep.m index b7da903b..1790819a 100644 --- a/sourcecodes/bnt-master/KPMstats/clg_Mstep.m +++ b/sourcecodes/bnt-master/KPMstats/clg_Mstep.m @@ -80,11 +80,11 @@ end %%% Estimate mean and regression -if ~isempty(clamped_weights) & ~isempty(clamped_mean) +if ~isempty(clamped_weights) && ~isempty(clamped_mean) B = clamped_weights; mu = clamped_mean; end -if ~isempty(clamped_weights) & isempty(clamped_mean) +if ~isempty(clamped_weights) && isempty(clamped_mean) B = clamped_weights; % eqn 5 mu = zeros(Ysz, Q); @@ -92,7 +92,7 @@ if ~isempty(clamped_weights) & isempty(clamped_mean) mu(:,i) = (Y(:,i) - B(:,:,i)*X(:,i)) / w(i); end end -if isempty(clamped_weights) & ~isempty(clamped_mean) +if isempty(clamped_weights) && ~isempty(clamped_mean) mu = clamped_mean; % eqn 3 B = zeros(Ysz, Xsz, Q); @@ -102,7 +102,7 @@ if isempty(clamped_weights) & ~isempty(clamped_mean) B(:,:,i) = (XX(:,:,i) \ tmp')'; end end -if isempty(clamped_weights) & isempty(clamped_mean) +if isempty(clamped_weights) && isempty(clamped_mean) mu = zeros(Ysz, Q); B = zeros(Ysz, Xsz, Q); % Nothing is clamped, so we must estimate B and mu jointly |