Skip to content

Commit

Permalink
Merge pull request #6 from jdtuck/remove_gropt
Browse files Browse the repository at this point in the history
Remove gropt
  • Loading branch information
jdtuck authored Dec 21, 2023
2 parents 3826ea3 + db9ebde commit 6664043
Show file tree
Hide file tree
Showing 2,348 changed files with 636 additions and 66,014 deletions.
Binary file modified DP/DynamicProgrammingQ.mexmaca64
Binary file not shown.
Binary file modified DP/DynamicProgrammingQ2.mexmaca64
Binary file not shown.
14 changes: 5 additions & 9 deletions align_fPCA.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
% option.smooth = 0; % smooth data using standard box filter
% option.sparam = 25; % number of times to run filter
% option.showplot = 1; % turns on and off plotting
% option.method = 'DP1'; % optimization method (DP, DP2, SIMUL, RBFGS)
% option.w = 0.0; % BFGS weight
% option.method = 'DP'; % optimization method (DP, SIMUL, RBFGS)
% option.MaxItr = 20; % maximum iterations
%
% Output:
Expand Down Expand Up @@ -53,7 +52,6 @@
option.sparam = 25;
option.showplot = 1;
option.method = 'DP1';
option.w = 0.0;
option.MaxItr = 20;
elseif nargin < 4
lambda = 0;
Expand All @@ -63,7 +61,6 @@
option.sparam = 25;
option.showplot = 1;
option.method = 'DP1';
option.w = 0.0;
option.MaxItr = 20;
elseif nargin < 5
option.parallel = 0;
Expand All @@ -72,7 +69,6 @@
option.sparam = 25;
option.showplot = 1;
option.method = 'DP1';
option.w = 0.0;
option.MaxItr = 20;
end

Expand Down Expand Up @@ -157,12 +153,12 @@
gam = zeros(N,size(q,1));
if option.parallel == 1
parfor k = 1:N
gam(k,:) = optimum_reparam(qhat(:,k),q(:,k),t,lambda,option.method,option.w, ...
gam(k,:) = optimum_reparam(qhat(:,k),q(:,k),t,lambda,option.method, ...
mf(1), f(1,k));
end
else
for k = 1:N
gam(k,:) = optimum_reparam(qhat(:,k),q(:,k),t,lambda,option.method,option.w, ...
gam(k,:) = optimum_reparam(qhat(:,k),q(:,k),t,lambda,option.method, ...
mf(1), f(1,k));
end
end
Expand Down Expand Up @@ -216,12 +212,12 @@
gam = zeros(N,size(q,1));
if option.parallel == 1
parfor k = 1:N
gam(k,:) = optimum_reparam(qhat(:,k),q(:,k,1),t,lambda,option.method,option.w, ...
gam(k,:) = optimum_reparam(qhat(:,k),q(:,k,1),t,lambda,option.method, ...
mf(1,r+1), f(1,k,r+1));
end
else
for k = 1:N
gam(k,:) = optimum_reparam(qhat(:,k),q(:,k,1),t,lambda,option.method,option.w, ...
gam(k,:) = optimum_reparam(qhat(:,k),q(:,k,1),t,lambda,option.method, ...
mf(1,r+1), f(1,k,r+1));
end
end
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 6664043

Please sign in to comment.