-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
examples/test_functions: Polish copying permission statements
* examples/test_functions/stk_testcase_truss3.m: Polish copying permission statement. * examples/test_functions/stk_testfun_hartman3.m: Idem. * examples/test_functions/stk_testfun_hartman4.m: Idem. * examples/test_functions/stk_testfun_hartman6.m: Idem. * examples/test_functions/stk_testfun_hartman_generic.m: Idem. * examples/test_functions/stk_testfun_sixhumpscamel.m: Idem. * examples/test_functions/stk_testfun_threehumpscamel.m: Idem. * examples/test_functions/stk_testfun_truss3_bb.m: Idem. * examples/test_functions/stk_testfun_truss3_vol.m: Idem. * examples/test_functions/stk_testfun_twobumps.m: Idem. * examples/test_functions/stk_testfun_braninhoo.m: Source formatting
- Loading branch information
Showing
13 changed files
with
131 additions
and
103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,20 @@ | ||
2024-10-29 Julien Bect <[email protected]> | ||
|
||
examples/test_functions: Polish copying permission statements | ||
|
||
* examples/test_functions/stk_testcase_truss3.m: Polish copying | ||
permission statement. | ||
* examples/test_functions/stk_testfun_hartman3.m: Idem. | ||
* examples/test_functions/stk_testfun_hartman4.m: Idem. | ||
* examples/test_functions/stk_testfun_hartman6.m: Idem. | ||
* examples/test_functions/stk_testfun_hartman_generic.m: Idem. | ||
* examples/test_functions/stk_testfun_sixhumpscamel.m: Idem. | ||
* examples/test_functions/stk_testfun_threehumpscamel.m: Idem. | ||
* examples/test_functions/stk_testfun_truss3_bb.m: Idem. | ||
* examples/test_functions/stk_testfun_truss3_vol.m: Idem. | ||
* examples/test_functions/stk_testfun_twobumps.m: Idem. | ||
* examples/test_functions/stk_testfun_braninhoo.m: Source formatting | ||
|
||
2024-10-27 Julien Bect <[email protected]> | ||
|
||
examples/test_functions: Polish doc | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -57,7 +57,7 @@ | |
% | ||
% The standard deviations F1_std and F2_std are used in the formulation | ||
% of robust optimization problems [see 1, chap 11]. | ||
% | ||
% | ||
% NUMERICAL FUNCTIONS | ||
% | ||
% Two numerical functions are provided to compute the quantities of | ||
|
@@ -128,17 +128,18 @@ | |
% | ||
% See also: stk_testfun_truss3_vol, stk_testfun_truss3_bb | ||
|
||
% Author | ||
% | ||
% Julien Bect <[email protected]> | ||
|
||
% Copying Permission Statement (this file) | ||
% | ||
% To the extent possible under law, CentraleSupelec has waived all | ||
% copyright and related or neighboring rights to | ||
% stk_testcase_truss3.m. This work is published from France. | ||
% Written in 2017 by Julien Bect <[email protected]> | ||
% | ||
% License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/> | ||
% To the extent possible under law, CentraleSupelec has dedicated all | ||
% copyright and related and neighboring rights to this software to the | ||
% public domain worldwide. This software is distributed without any | ||
% warranty. | ||
% | ||
% You should have received a copy of the CC0 Public Domain Dedication | ||
% along with this software. If not, see | ||
% <http://creativecommons.org/publicdomain/zero/1.0/>. | ||
|
||
% Copyright Notice | ||
% | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,17 +19,18 @@ | |
% [2] Dixon L.C.W., Szego G.P., Towards Global Optimization 2, North- | ||
% Holland, Amsterdam, The Netherlands (1978) | ||
|
||
% Author | ||
% | ||
% Julien Bect <[email protected]> | ||
|
||
% Copying Permission Statement (this file) | ||
% | ||
% To the extent possible under law, CentraleSupelec has waived all | ||
% copyright and related or neighboring rights to | ||
% stk_testfun_braninhoo.m. This work is published from France. | ||
% Written in 2012 by Julien Bect <[email protected]> | ||
% | ||
% To the extent possible under law, CentraleSupelec has dedicated all | ||
% copyright and related and neighboring rights to this software to the | ||
% public domain worldwide. This software is distributed without any | ||
% warranty. | ||
% | ||
% License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/> | ||
% You should have received a copy of the CC0 Public Domain Dedication | ||
% along with this software. If not, see | ||
% <http://creativecommons.org/publicdomain/zero/1.0/>. | ||
|
||
% Copying Permission Statement (STK toolbox as a whole) | ||
% | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -57,17 +57,18 @@ | |
% DiceKriging package, version 1.6.0 from 2021-02-23 | ||
% URL: https://cran.r-project.org/web/packages/DiceKriging/index.html | ||
|
||
% Author | ||
% | ||
% Julien Bect <[email protected]> | ||
|
||
% Copying Permission Statement (this file) | ||
% | ||
% To the extent possible under law, CentraleSupelec has waived all | ||
% copyright and related or neighboring rights to | ||
% stk_testfun_hartman3.m. This work is published from France. | ||
% Written in 2022 by Julien Bect <[email protected]> | ||
% | ||
% To the extent possible under law, CentraleSupelec has dedicated all | ||
% copyright and related and neighboring rights to this software to the | ||
% public domain worldwide. This software is distributed without any | ||
% warranty. | ||
% | ||
% License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/> | ||
% You should have received a copy of the CC0 Public Domain Dedication | ||
% along with this software. If not, see | ||
% <http://creativecommons.org/publicdomain/zero/1.0/>. | ||
|
||
% Copying Permission Statement (STK toolbox as a whole) | ||
% | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,7 @@ | |
% computes the value Y of the Hartman4 function at X. | ||
% | ||
% The Hartman4 function is a test function in dimension 4, | ||
% which is usually minimized over [0, 1]^4. | ||
% which is usually minimized over [0, 1]^4. | ||
% | ||
% HISTORICAL REMARKS | ||
% | ||
|
@@ -62,17 +62,18 @@ | |
% Kriging-Based Optimization for Computer Experiments. R package | ||
% version 2.1.1. URL: https://CRAN.R-project.org/package=DiceOptim. | ||
|
||
% Author | ||
% | ||
% Julien Bect <[email protected]> | ||
|
||
% Copying Permission Statement (this file) | ||
% | ||
% To the extent possible under law, CentraleSupelec has waived all | ||
% copyright and related or neighboring rights to | ||
% stk_testfun_hartman4.m. This work is published from France. | ||
% Written in 2022 by Julien Bect <[email protected]> | ||
% | ||
% To the extent possible under law, CentraleSupelec has dedicated all | ||
% copyright and related and neighboring rights to this software to the | ||
% public domain worldwide. This software is distributed without any | ||
% warranty. | ||
% | ||
% License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/> | ||
% You should have received a copy of the CC0 Public Domain Dedication | ||
% along with this software. If not, see | ||
% <http://creativecommons.org/publicdomain/zero/1.0/>. | ||
|
||
% Copying Permission Statement (STK toolbox as a whole) | ||
% | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,17 +58,18 @@ | |
% DiceKriging package, version 1.6.0 from 2021-02-23 | ||
% URL: https://cran.r-project.org/web/packages/DiceKriging/index.html | ||
|
||
% Author | ||
% | ||
% Julien Bect <[email protected]> | ||
|
||
% Copying Permission Statement (this file) | ||
% | ||
% To the extent possible under law, CentraleSupelec has waived all | ||
% copyright and related or neighboring rights to | ||
% stk_testfun_hartman6.m. This work is published from France. | ||
% Written in 2022 by Julien Bect <[email protected]> | ||
% | ||
% To the extent possible under law, CentraleSupelec has dedicated all | ||
% copyright and related and neighboring rights to this software to the | ||
% public domain worldwide. This software is distributed without any | ||
% warranty. | ||
% | ||
% License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/> | ||
% You should have received a copy of the CC0 Public Domain Dedication | ||
% along with this software. If not, see | ||
% <http://creativecommons.org/publicdomain/zero/1.0/>. | ||
|
||
% Copying Permission Statement (STK toolbox as a whole) | ||
% | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
% STK_TESTFUN_HARTMAN_GENERIC compute the value of a Hartman function | ||
% | ||
% CALL: Y = stk_testfun_hartman_generic (X, A, P, C) | ||
% | ||
% | ||
% computes the value Y of the Hartman function with parameters A, P, C, | ||
% at the points contained in X. | ||
% | ||
|
@@ -42,10 +42,6 @@ | |
% | ||
% See also stk_testfun_hartman3, stk_testfun_hartman4, stk_testfun_hartman6 | ||
|
||
% Author | ||
% | ||
% Julien Bect <[email protected]> | ||
|
||
% IMPLEMENTATION | ||
% | ||
% This implementation has been written from scratch using [1, 3] as | ||
|
@@ -55,11 +51,16 @@ | |
|
||
% Copying Permission Statement (this file) | ||
% | ||
% To the extent possible under law, CentraleSupelec has waived all | ||
% copyright and related or neighboring rights to | ||
% stk_testfun_hartman_generic.m. This work is published from France. | ||
% Written in 2022 by Julien Bect <[email protected]> | ||
% | ||
% To the extent possible under law, CentraleSupelec has dedicated all | ||
% copyright and related and neighboring rights to this software to the | ||
% public domain worldwide. This software is distributed without any | ||
% warranty. | ||
% | ||
% License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/> | ||
% You should have received a copy of the CC0 Public Domain Dedication | ||
% along with this software. If not, see | ||
% <http://creativecommons.org/publicdomain/zero/1.0/>. | ||
|
||
% Copying Permission Statement (STK toolbox as a whole) | ||
% | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,18 +28,19 @@ | |
% Modelling and Numerical Optimisation, Vol. 4, No. 2, pp. 150–194 | ||
% (2013). | ||
|
||
% Author | ||
% Copying Permission Statement (this file) | ||
% | ||
% Written in 2024 by Romain Ait Abdelmalek-Lomenech | ||
% <[email protected]> | ||
|
||
% Copying Permission Statement (this file) | ||
% <[email protected]> | ||
% | ||
% To the extent possible under law, CentraleSupelec has waived all | ||
% copyright and related or neighboring rights to | ||
% stk_testfun_sixhumpscamel.m. This work is published from France. | ||
% To the extent possible under law, CentraleSupelec has dedicated all | ||
% copyright and related and neighboring rights to this software to the | ||
% public domain worldwide. This software is distributed without any | ||
% warranty. | ||
% | ||
% License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/> | ||
% You should have received a copy of the CC0 Public Domain Dedication | ||
% along with this software. If not, see | ||
% <http://creativecommons.org/publicdomain/zero/1.0/>. | ||
|
||
% Copying Permission Statement (STK toolbox as a whole) | ||
% | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,18 +24,19 @@ | |
% Modelling and Numerical Optimisation, Vol. 4, No. 2, pp. 150–194 | ||
% (2013). | ||
|
||
% Author | ||
% Copying Permission Statement (this file) | ||
% | ||
% Written in 2024 by Romain Ait Abdelmalek-Lomenech | ||
% <[email protected]> | ||
|
||
% Copying Permission Statement (this file) | ||
% <[email protected]> | ||
% | ||
% To the extent possible under law, CentraleSupelec has waived all | ||
% copyright and related or neighboring rights to | ||
% stk_testfun_threehumpscamel.m. This work is published from France. | ||
% To the extent possible under law, CentraleSupelec has dedicated all | ||
% copyright and related and neighboring rights to this software to the | ||
% public domain worldwide. This software is distributed without any | ||
% warranty. | ||
% | ||
% License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/> | ||
% You should have received a copy of the CC0 Public Domain Dedication | ||
% along with this software. If not, see | ||
% <http://creativecommons.org/publicdomain/zero/1.0/>. | ||
|
||
% Copying Permission Statement (STK toolbox as a whole) | ||
% | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,17 +4,18 @@ | |
% | ||
% See also: stk_testcase_truss3, stk_testfun_truss3_vol | ||
|
||
% Author | ||
% | ||
% Julien Bect <[email protected]> | ||
|
||
% Copying Permission Statement (this file) | ||
% | ||
% To the extent possible under law, CentraleSupelec has waived all | ||
% copyright and related or neighboring rights to | ||
% stk_testfun_truss3_bb.m. This work is published from France. | ||
% Written in 2017 by Julien Bect <[email protected]> | ||
% | ||
% License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/> | ||
% To the extent possible under law, CentraleSupelec has dedicated all | ||
% copyright and related and neighboring rights to this software to the | ||
% public domain worldwide. This software is distributed without any | ||
% warranty. | ||
% | ||
% You should have received a copy of the CC0 Public Domain Dedication | ||
% along with this software. If not, see | ||
% <http://creativecommons.org/publicdomain/zero/1.0/>. | ||
|
||
% Copying Permission Statement (STK toolbox as a whole) | ||
% | ||
|
@@ -45,20 +46,20 @@ | |
% Check input size | ||
[n, dim] = size (x_); | ||
switch dim | ||
|
||
case 4 | ||
% Use nominal loads | ||
F = zeros (n, 2); | ||
F(:, 1) = const.F1_mean; | ||
F(:, 2) = const.F2_mean; | ||
x_ = [x_ F]; | ||
|
||
case 6 | ||
% Loads have been provided as well | ||
|
||
otherwise | ||
error ('Incorrect number of variables.'); | ||
|
||
end | ||
|
||
% Extract variables | ||
|
@@ -96,23 +97,23 @@ | |
y = zeros (n, 2); % Displacement of node P | ||
s = zeros (n, 3); % Tensile stress in the bars | ||
for i = 1:n | ||
|
||
% Rectangular matrix A for Equ. 9.1 in Das (1997) p.65, gives the | ||
% equilibrium relation between tensile forces and loads (small displacements) | ||
A = [cos_theta(i) sin_theta(i); 0 1; -cos_alpha(i) sin_alpha(i)]; | ||
|
||
% Stiffness matrix | ||
K = A' * (diag (C(i, :))) * A; | ||
|
||
% Compute the displacement of node P | ||
y(i, :) = F(i, :) / K; | ||
|
||
% Bar elongations | ||
delta = y(i, :) * A'; | ||
|
||
% Tensile stresses (Hooke's law) | ||
s(i, :) = E * delta ./ LL(i, :); | ||
|
||
end | ||
|
||
% Output: return displacement of node P and tensile stresses (five outputs) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,17 +4,18 @@ | |
% | ||
% See also: stk_testcase_truss3, stk_testfun_truss3_bb | ||
|
||
% Author | ||
% | ||
% Julien Bect <[email protected]> | ||
|
||
% Copying Permission Statement (this file) | ||
% | ||
% To the extent possible under law, CentraleSupelec has waived all | ||
% copyright and related or neighboring rights to | ||
% stk_testfun_truss3_vol.m. This work is published from France. | ||
% Written in 2017 by Julien Bect <[email protected]> | ||
% | ||
% To the extent possible under law, CentraleSupelec has dedicated all | ||
% copyright and related and neighboring rights to this software to the | ||
% public domain worldwide. This software is distributed without any | ||
% warranty. | ||
% | ||
% License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/> | ||
% You should have received a copy of the CC0 Public Domain Dedication | ||
% along with this software. If not, see | ||
% <http://creativecommons.org/publicdomain/zero/1.0/>. | ||
|
||
% Copying Permission Statement (STK toolbox as a whole) | ||
% | ||
|
Oops, something went wrong.