Foffset is now default to False

This commit is contained in:
Thomas Dehaeze 2020-03-17 11:22:57 +01:00
parent fab78b6527
commit f69edd6dce
10 changed files with 15 additions and 15 deletions

View File

@ -311,7 +311,7 @@ The output =sample_pos= corresponds to the impact point of the X-ray.
#+begin_src matlab #+begin_src matlab
arguments arguments
args.type char {mustBeMember(args.type,{'rigid', 'flexible', 'none', 'modal-analysis', 'init'})} = 'flexible' args.type char {mustBeMember(args.type,{'rigid', 'flexible', 'none', 'modal-analysis', 'init'})} = 'flexible'
args.Foffset logical {mustBeNumericOrLogical} = true args.Foffset logical {mustBeNumericOrLogical} = false
args.density (1,1) double {mustBeNumeric, mustBeNonnegative} = 2800 % Density [kg/m3] args.density (1,1) double {mustBeNumeric, mustBeNonnegative} = 2800 % Density [kg/m3]
args.x0 (1,1) double {mustBeNumeric} = 0 % Rest position of the Joint in the X direction [m] args.x0 (1,1) double {mustBeNumeric} = 0 % Rest position of the Joint in the X direction [m]
args.y0 (1,1) double {mustBeNumeric} = 0 % Rest position of the Joint in the Y direction [m] args.y0 (1,1) double {mustBeNumeric} = 0 % Rest position of the Joint in the Y direction [m]
@ -443,7 +443,7 @@ The Simscape model of the Translation stage consist of:
#+begin_src matlab #+begin_src matlab
arguments arguments
args.type char {mustBeMember(args.type,{'none', 'rigid', 'flexible', 'modal-analysis', 'init'})} = 'flexible' args.type char {mustBeMember(args.type,{'none', 'rigid', 'flexible', 'modal-analysis', 'init'})} = 'flexible'
args.Foffset logical {mustBeNumericOrLogical} = true args.Foffset logical {mustBeNumericOrLogical} = false
end end
#+end_src #+end_src
@ -597,7 +597,7 @@ The Simscape model of the Tilt stage is composed of:
#+begin_src matlab #+begin_src matlab
arguments arguments
args.type char {mustBeMember(args.type,{'none', 'rigid', 'flexible', 'modal-analysis', 'init'})} = 'flexible' args.type char {mustBeMember(args.type,{'none', 'rigid', 'flexible', 'modal-analysis', 'init'})} = 'flexible'
args.Foffset logical {mustBeNumericOrLogical} = true args.Foffset logical {mustBeNumericOrLogical} = false
args.Ry_init (1,1) double {mustBeNumeric} = 0 args.Ry_init (1,1) double {mustBeNumeric} = 0
end end
#+end_src #+end_src
@ -738,7 +738,7 @@ The Simscape model of the Spindle is composed of:
#+begin_src matlab #+begin_src matlab
arguments arguments
args.type char {mustBeMember(args.type,{'none', 'rigid', 'flexible', 'modal-analysis', 'init'})} = 'flexible' args.type char {mustBeMember(args.type,{'none', 'rigid', 'flexible', 'modal-analysis', 'init'})} = 'flexible'
args.Foffset logical {mustBeNumericOrLogical} = true args.Foffset logical {mustBeNumericOrLogical} = false
end end
#+end_src #+end_src
@ -891,7 +891,7 @@ The =rz= structure is saved.
args.AP (3,1) double {mustBeNumeric} = zeros(3,1) args.AP (3,1) double {mustBeNumeric} = zeros(3,1)
args.ARB (3,3) double {mustBeNumeric} = eye(3) args.ARB (3,3) double {mustBeNumeric} = eye(3)
% Force that stiffness of each joint should apply at t=0 % Force that stiffness of each joint should apply at t=0
args.Foffset logical {mustBeNumericOrLogical} = true args.Foffset logical {mustBeNumericOrLogical} = false
end end
#+end_src #+end_src
@ -1361,7 +1361,7 @@ The Simscape model of the sample environment is composed of:
args.mass (1,1) double {mustBeNumeric, mustBePositive} = 50 % [kg] args.mass (1,1) double {mustBeNumeric, mustBePositive} = 50 % [kg]
args.freq (1,1) double {mustBeNumeric, mustBePositive} = 100 % [Hz] args.freq (1,1) double {mustBeNumeric, mustBePositive} = 100 % [Hz]
args.offset (1,1) double {mustBeNumeric} = 0 % [m] args.offset (1,1) double {mustBeNumeric} = 0 % [m]
args.Foffset logical {mustBeNumericOrLogical} = true args.Foffset logical {mustBeNumericOrLogical} = false
end end
#+end_src #+end_src

View File

@ -132,4 +132,4 @@ Fty_x = Fty_x - Fty_x(1);
Fty_z = Fty_z - Fty_z(1); Fty_z = Fty_z - Fty_z(1);
Frz_z = Frz_z - Frz_z(1); Frz_z = Frz_z - Frz_z(1);
save('mat/nass_disturbances.mat', 'Dwx', 'Dwy', 'Dwz', 'Fty_x', 'Fty_z', 'Frz_z', 'Fd', 'Ts', 't'); save('./mat/nass_disturbances.mat', 'Dwx', 'Dwy', 'Dwz', 'Fty_x', 'Fty_z', 'Frz_z', 'Fd', 'Ts', 't');

View File

@ -2,7 +2,7 @@ function [granite] = initializeGranite(args)
arguments arguments
args.type char {mustBeMember(args.type,{'rigid', 'flexible', 'none', 'modal-analysis', 'init'})} = 'flexible' args.type char {mustBeMember(args.type,{'rigid', 'flexible', 'none', 'modal-analysis', 'init'})} = 'flexible'
args.Foffset logical {mustBeNumericOrLogical} = true args.Foffset logical {mustBeNumericOrLogical} = false
args.density (1,1) double {mustBeNumeric, mustBeNonnegative} = 2800 % Density [kg/m3] args.density (1,1) double {mustBeNumeric, mustBeNonnegative} = 2800 % Density [kg/m3]
args.x0 (1,1) double {mustBeNumeric} = 0 % Rest position of the Joint in the X direction [m] args.x0 (1,1) double {mustBeNumeric} = 0 % Rest position of the Joint in the X direction [m]
args.y0 (1,1) double {mustBeNumeric} = 0 % Rest position of the Joint in the Y direction [m] args.y0 (1,1) double {mustBeNumeric} = 0 % Rest position of the Joint in the Y direction [m]

View File

@ -33,7 +33,7 @@ arguments
args.AP (3,1) double {mustBeNumeric} = zeros(3,1) args.AP (3,1) double {mustBeNumeric} = zeros(3,1)
args.ARB (3,3) double {mustBeNumeric} = eye(3) args.ARB (3,3) double {mustBeNumeric} = eye(3)
% Force that stiffness of each joint should apply at t=0 % Force that stiffness of each joint should apply at t=0
args.Foffset logical {mustBeNumericOrLogical} = true args.Foffset logical {mustBeNumericOrLogical} = false
end end
micro_hexapod = initializeFramesPositions('H', args.H, 'MO_B', args.MO_B); micro_hexapod = initializeFramesPositions('H', args.H, 'MO_B', args.MO_B);

View File

@ -25,4 +25,4 @@ pos_error.Dy = args.Dy;
pos_error.Ry = args.Ry; pos_error.Ry = args.Ry;
pos_error.Rz = args.Rz; pos_error.Rz = args.Rz;
save('mat/pos_error.mat', 'pos_error'); save('./mat/pos_error.mat', 'pos_error');

View File

@ -215,5 +215,5 @@ Dn = struct('time', t, 'signals', struct('values', Dn));
Dnl = struct('time', t, 'signals', struct('values', Dnl)); Dnl = struct('time', t, 'signals', struct('values', Dnl));
%% Save %% Save
save('mat/nass_references.mat', 'Dy', 'Ry', 'Rz', 'Dh', 'Dhl', 'Rm', 'Dn', 'Dnl', 'Ts'); save('./mat/nass_references.mat', 'Dy', 'Ry', 'Rz', 'Dh', 'Dhl', 'Rm', 'Dn', 'Dnl', 'Ts');
end end

View File

@ -2,7 +2,7 @@ function [ry] = initializeRy(args)
arguments arguments
args.type char {mustBeMember(args.type,{'none', 'rigid', 'flexible', 'modal-analysis', 'init'})} = 'flexible' args.type char {mustBeMember(args.type,{'none', 'rigid', 'flexible', 'modal-analysis', 'init'})} = 'flexible'
args.Foffset logical {mustBeNumericOrLogical} = true args.Foffset logical {mustBeNumericOrLogical} = false
args.Ry_init (1,1) double {mustBeNumeric} = 0 args.Ry_init (1,1) double {mustBeNumeric} = 0
end end

View File

@ -2,7 +2,7 @@ function [rz] = initializeRz(args)
arguments arguments
args.type char {mustBeMember(args.type,{'none', 'rigid', 'flexible', 'modal-analysis', 'init'})} = 'flexible' args.type char {mustBeMember(args.type,{'none', 'rigid', 'flexible', 'modal-analysis', 'init'})} = 'flexible'
args.Foffset logical {mustBeNumericOrLogical} = true args.Foffset logical {mustBeNumericOrLogical} = false
end end
rz = struct(); rz = struct();

View File

@ -7,7 +7,7 @@ arguments
args.mass (1,1) double {mustBeNumeric, mustBePositive} = 50 % [kg] args.mass (1,1) double {mustBeNumeric, mustBePositive} = 50 % [kg]
args.freq (1,1) double {mustBeNumeric, mustBePositive} = 100 % [Hz] args.freq (1,1) double {mustBeNumeric, mustBePositive} = 100 % [Hz]
args.offset (1,1) double {mustBeNumeric} = 0 % [m] args.offset (1,1) double {mustBeNumeric} = 0 % [m]
args.Foffset logical {mustBeNumericOrLogical} = true args.Foffset logical {mustBeNumericOrLogical} = false
end end
sample = struct(); sample = struct();

View File

@ -2,7 +2,7 @@ function [ty] = initializeTy(args)
arguments arguments
args.type char {mustBeMember(args.type,{'none', 'rigid', 'flexible', 'modal-analysis', 'init'})} = 'flexible' args.type char {mustBeMember(args.type,{'none', 'rigid', 'flexible', 'modal-analysis', 'init'})} = 'flexible'
args.Foffset logical {mustBeNumericOrLogical} = true args.Foffset logical {mustBeNumericOrLogical} = false
end end
ty = struct(); ty = struct();