Skip to content

Commit

Permalink
230127.074816.CST revise fortran tests
Browse files Browse the repository at this point in the history
Former-commit-id: 8e7dc66d6a3c3e870b905ff7cba558416500f397 [formerly 0983199ff96ecf8f811c1362d2ec69322556fce2]
Former-commit-id: 06ad26ac1cb02a891409c1f1ccbd2fe746cf1e3b
  • Loading branch information
zaikunzhang committed Jan 26, 2023
1 parent 699722e commit d593610
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test_ifx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
cd "$ROOT_DIR"/fortran/tests
$SEDI 's|800|300|g' test_*.f90
if [[ -f "test_uobyqa.f90" ]] ; then
$SEDI 's|bign = 120|bign = 110|g' test_uobyqa.f90
$SEDI 's|bign = 120|bign = 100|g' test_uobyqa.f90
fi
export FFLAGS=${{ matrix.fflags }} && export TESTDIM=${{ matrix.testdim }} && make xtest_${{ matrix.ikind }}.${{ matrix.solver }}
cd "$ROOT_DIR"/fortran/examples/${{ matrix.solver }} && make xtest
Expand Down
2 changes: 1 addition & 1 deletion fortran/cobyla/cobylb.f90
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module cobylb_mod
!
! Started: July 2021
!
! Last Modified: Tuesday, December 13, 2022 PM01:05:34
! Last Modified: Thursday, January 26, 2023 PM10:35:56
!--------------------------------------------------------------------------------------------------!

implicit none
Expand Down
6 changes: 3 additions & 3 deletions fortran/tests/testsuite/param.f90
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module param_mod
!
! Started: September 2021
!
! Last Modified: Sunday, February 13, 2022 PM05:04:16
! Last Modified: Friday, January 27, 2023 AM07:48:04
!--------------------------------------------------------------------------------------------------!

use, non_intrinsic :: consts_mod, only : RP, IK, TENTH
Expand All @@ -15,11 +15,11 @@ module param_mod
public :: DIMSTRIDE_DFT, MINDIM_DFT, MAXDIM_DFT, NRAND_DFT, NOISE_LEVEL_DFT, RANDSEED_DFT, NOISE_TYPE_DFT

! Use an odd stride so that both odd and even dimensional problems will be tested.
integer(IK), parameter :: DIMSTRIDE_DFT = 3
integer(IK), parameter :: DIMSTRIDE_DFT = 5
! Testing univariate problems can help us to uncover some bugs that can only occur in extreme cases.
integer(IK), parameter :: MINDIM_DFT = 1
integer(IK), parameter :: MAXDIM_DFT = 20
integer(IK), parameter :: NRAND_DFT = 5
integer(IK), parameter :: NRAND_DFT = 2
integer, parameter :: RANDSEED_DFT = 42
real(RP), parameter :: NOISE_LEVEL_DFT = TENTH
character(len=*), parameter :: NOISE_TYPE_DFT = 'gaussian'
Expand Down
2 changes: 1 addition & 1 deletion todo/TODO
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
$ gcc -pg main.f90
$ gprof a.out gmon.out | gprof2dot | dot -Tpng -o output.png

3. 20230108: See matlab/TODO
3. 20230108: See TODO_mat
8 changes: 6 additions & 2 deletions todo/TODO_mat
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
When the MATLAB version is implemented (e.g., newuoa_mat), we may remove the 'matlab/interfaces/' directory,
1. When the MATLAB version is implemented (e.g., newuoa_mat), we may remove the 'matlab/interfaces/' directory,
and put its content directly below matlab/

20230108: put the MEX files under newuoa_for, and name them ast newuoa_for_dgm, etc? What about gethuge?
githuge is used only in preprima and maxint, the latter again only used in preprima.

Make newuoa etc unavailable to the end users. (?)
2. Make newuoa etc unavailable to the end users. (?)

3. 20230128: Check what happens with
cobyla(macup('LHAIFAM'))
The classical version works well, but not the new one.

0 comments on commit d593610

Please sign in to comment.