diff --git a/matlab/nass_disturbances.slx b/matlab/nass_disturbances.slx index b440cc5..24da597 100644 Binary files a/matlab/nass_disturbances.slx and b/matlab/nass_disturbances.slx differ diff --git a/matlab/nass_model.slx b/matlab/nass_model.slx index 75f13c5..9747e84 100644 Binary files a/matlab/nass_model.slx and b/matlab/nass_model.slx differ diff --git a/src/initializeController.m b/src/initializeController.m index 34a229e..e26f560 100644 --- a/src/initializeController.m +++ b/src/initializeController.m @@ -1,8 +1,7 @@ function [] = initializeController(args) arguments - args.type char {mustBeMember(args.type,{'open-loop', 'iff', 'dvf', 'hac-dvf'})} = 'open-loop' - args.K (6,6) = ss(zeros(6, 6)) + args.type char {mustBeMember(args.type,{'open-loop', 'iff', 'dvf', 'hac-dvf', 'ref-track-L', 'ref-track-iff-L', 'cascade-hac-lac'})} = 'open-loop' end controller = struct(); @@ -16,8 +15,12 @@ switch args.type controller.type = 3; case 'hac-dvf' controller.type = 4; + case 'ref-track-L' + controller.type = 5; + case 'ref-track-iff-L' + controller.type = 6; + case 'cascade-hac-lac' + controller.type = 7; end -controller.K = args.K; - save('./mat/controller.mat', 'controller');