From f69edd6dce29b48256114bab8e45fd6036b49496 Mon Sep 17 00:00:00 2001 From: Thomas Dehaeze Date: Tue, 17 Mar 2020 11:22:57 +0100 Subject: [PATCH] Foffset is now default to False --- org/simscape_subsystems.org | 12 ++++++------ src/initializeDisturbances.m | 2 +- src/initializeGranite.m | 2 +- src/initializeMicroHexapod.m | 2 +- src/initializePosError.m | 2 +- src/initializeReferences.m | 2 +- src/initializeRy.m | 2 +- src/initializeRz.m | 2 +- src/initializeSample.m | 2 +- src/initializeTy.m | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/org/simscape_subsystems.org b/org/simscape_subsystems.org index 51aec70..5f4eabc 100644 --- a/org/simscape_subsystems.org +++ b/org/simscape_subsystems.org @@ -311,7 +311,7 @@ The output =sample_pos= corresponds to the impact point of the X-ray. #+begin_src matlab arguments 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.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] @@ -443,7 +443,7 @@ The Simscape model of the Translation stage consist of: #+begin_src matlab arguments 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_src @@ -597,7 +597,7 @@ The Simscape model of the Tilt stage is composed of: #+begin_src matlab arguments 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 end #+end_src @@ -738,7 +738,7 @@ The Simscape model of the Spindle is composed of: #+begin_src matlab arguments 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_src @@ -891,7 +891,7 @@ The =rz= structure is saved. args.AP (3,1) double {mustBeNumeric} = zeros(3,1) args.ARB (3,3) double {mustBeNumeric} = eye(3) % Force that stiffness of each joint should apply at t=0 - args.Foffset logical {mustBeNumericOrLogical} = true + args.Foffset logical {mustBeNumericOrLogical} = false end #+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.freq (1,1) double {mustBeNumeric, mustBePositive} = 100 % [Hz] args.offset (1,1) double {mustBeNumeric} = 0 % [m] - args.Foffset logical {mustBeNumericOrLogical} = true + args.Foffset logical {mustBeNumericOrLogical} = false end #+end_src diff --git a/src/initializeDisturbances.m b/src/initializeDisturbances.m index 5075a1d..91f73f4 100644 --- a/src/initializeDisturbances.m +++ b/src/initializeDisturbances.m @@ -132,4 +132,4 @@ Fty_x = Fty_x - Fty_x(1); Fty_z = Fty_z - Fty_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'); diff --git a/src/initializeGranite.m b/src/initializeGranite.m index 21c21fa..6547140 100644 --- a/src/initializeGranite.m +++ b/src/initializeGranite.m @@ -2,7 +2,7 @@ function [granite] = initializeGranite(args) arguments 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.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] diff --git a/src/initializeMicroHexapod.m b/src/initializeMicroHexapod.m index 9204995..486acd2 100644 --- a/src/initializeMicroHexapod.m +++ b/src/initializeMicroHexapod.m @@ -33,7 +33,7 @@ arguments args.AP (3,1) double {mustBeNumeric} = zeros(3,1) args.ARB (3,3) double {mustBeNumeric} = eye(3) % Force that stiffness of each joint should apply at t=0 - args.Foffset logical {mustBeNumericOrLogical} = true + args.Foffset logical {mustBeNumericOrLogical} = false end micro_hexapod = initializeFramesPositions('H', args.H, 'MO_B', args.MO_B); diff --git a/src/initializePosError.m b/src/initializePosError.m index b0b12ec..e942c6f 100644 --- a/src/initializePosError.m +++ b/src/initializePosError.m @@ -25,4 +25,4 @@ pos_error.Dy = args.Dy; pos_error.Ry = args.Ry; pos_error.Rz = args.Rz; -save('mat/pos_error.mat', 'pos_error'); +save('./mat/pos_error.mat', 'pos_error'); diff --git a/src/initializeReferences.m b/src/initializeReferences.m index ea313e4..213ba7f 100644 --- a/src/initializeReferences.m +++ b/src/initializeReferences.m @@ -215,5 +215,5 @@ Dn = struct('time', t, 'signals', struct('values', Dn)); Dnl = struct('time', t, 'signals', struct('values', Dnl)); %% 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 diff --git a/src/initializeRy.m b/src/initializeRy.m index 34aa7e9..b156199 100644 --- a/src/initializeRy.m +++ b/src/initializeRy.m @@ -2,7 +2,7 @@ function [ry] = initializeRy(args) arguments 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 end diff --git a/src/initializeRz.m b/src/initializeRz.m index 6e89a17..164e92f 100644 --- a/src/initializeRz.m +++ b/src/initializeRz.m @@ -2,7 +2,7 @@ function [rz] = initializeRz(args) arguments args.type char {mustBeMember(args.type,{'none', 'rigid', 'flexible', 'modal-analysis', 'init'})} = 'flexible' - args.Foffset logical {mustBeNumericOrLogical} = true + args.Foffset logical {mustBeNumericOrLogical} = false end rz = struct(); diff --git a/src/initializeSample.m b/src/initializeSample.m index e6ddb74..b970c31 100644 --- a/src/initializeSample.m +++ b/src/initializeSample.m @@ -7,7 +7,7 @@ arguments args.mass (1,1) double {mustBeNumeric, mustBePositive} = 50 % [kg] args.freq (1,1) double {mustBeNumeric, mustBePositive} = 100 % [Hz] args.offset (1,1) double {mustBeNumeric} = 0 % [m] - args.Foffset logical {mustBeNumericOrLogical} = true + args.Foffset logical {mustBeNumericOrLogical} = false end sample = struct(); diff --git a/src/initializeTy.m b/src/initializeTy.m index 5dd580f..19bc37d 100644 --- a/src/initializeTy.m +++ b/src/initializeTy.m @@ -2,7 +2,7 @@ function [ty] = initializeTy(args) arguments args.type char {mustBeMember(args.type,{'none', 'rigid', 'flexible', 'modal-analysis', 'init'})} = 'flexible' - args.Foffset logical {mustBeNumericOrLogical} = true + args.Foffset logical {mustBeNumericOrLogical} = false end ty = struct();