Refactoring

WTCN-computational-anatomy-group · Nov 15, 2019 · 1ba210d · 1ba210d
1 parent 47dbdea
commit 1ba210d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/README.md b/README.md
diff --git a/spm_multireg.m b/spm_multireg.m
diff --git a/spm_multireg_par.m b/spm_multireg_par.m
@@ -191,9 +191,17 @@
 if ~isfield(sett,'optim')
     sett.optim = struct;
 end
-if ~isfield(sett.model,'scal')
-     % Scaling of GN updates
-    sett.optim.scal = 1.0;
+if ~isfield(sett.optim,'nls_bf')
+     % Scaling of q GN updates
+    sett.optim.nls_bf = 6;
+end
+if ~isfield(sett.optim,'scal_q')
+     % Scaling of q GN updates
+    sett.optim.scal_q = 1.0;
+end
+if ~isfield(sett.optim,'scal_v')
+     % Scaling of v GN updates
+    sett.optim.scal_v = 1.0;
 end
 
 %------------------

diff --git a/spm_multireg_updt.m b/spm_multireg_updt.m
@@ -311,7 +311,7 @@
 g         = double(dM'*g);
 H         = dM'*H*dM;
 H         = H + eye(numel(q))*(norm(H)*1e-6 + 0.1);
-q         = q + sett.optim.scal*(H\g);
+q         = q + sett.optim.scal_q*(H\g);
 datn.q    = q;
 end
 %==========================================================================
@@ -360,7 +360,7 @@
 g         = double(dM'*g);
 H         = dM'*H*dM;
 H         = H + eye(numel(q))*(norm(H)*1e-6 + 0.1);
-q         = q + sett.optim.scal*(H\g);
+q         = q + sett.optim.scal_q*(H\g);
 datn.q    = q;
 end
 %==========================================================================
@@ -395,7 +395,7 @@
 H         = w.*H0;
 u0        = spm_diffeo('vel2mom', v, sett.var.v_settings);                                                % Initial momentum
 datn.E(2) = 0.5*sum(u0(:).*v(:));                                                                         % Prior term
-v         = v - sett.optim.scal*spm_diffeo('fmg',H, g + u0, [sett.var.v_settings sett.shoot.s_settings]); % Gauss-Newton update
+v         = v - sett.optim.scal_v*spm_diffeo('fmg',H, g + u0, [sett.var.v_settings sett.shoot.s_settings]); % Gauss-Newton update
 
 if sett.var.d(3)==1, v(:,:,:,3) = 0; end % If 2D
 if sett.var.v_settings(1)==0             % Mean displacement should be 0