diff --git a/.github/workflows/profile_all.yml b/.github/workflows/profile_all.yml index 314ea9318d..9298aa1a5c 100644 --- a/.github/workflows/profile_all.yml +++ b/.github/workflows/profile_all.yml @@ -183,8 +183,8 @@ jobs: if: always() shell: bash run: | - solver=${{ matrix.solver }} - cd /tmp/${{ env.SOLNAME }}_profile_prima/ + solver=${{ env.SOLNAME }} + cd /tmp/${solver}_profile_prima/ ls *${solver}*_start -1 > ${solver}_prob_start ls *${solver}*_end -1 > ${solver}_prob_end diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || : diff --git a/.github/workflows/profile_all_sq.yml b/.github/workflows/profile_all_sq.yml index 77766edf6e..4c4e565537 100644 --- a/.github/workflows/profile_all_sq.yml +++ b/.github/workflows/profile_all_sq.yml @@ -177,8 +177,8 @@ jobs: if: always() shell: bash run: | - solver=${{ matrix.solver }} - cd /tmp/${{ env.SOLNAME }}_profile_prima/ + solver=${{ env.SOLNAME }} + cd /tmp/${solver}_profile_prima/ ls *${solver}*_start -1 > ${solver}_prob_start ls *${solver}*_end -1 > ${solver}_prob_end diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || : diff --git a/.github/workflows/profile_cobyla_small.yml b/.github/workflows/profile_cobyla_small.yml index 903f0fe5ef..943b1da548 100644 --- a/.github/workflows/profile_cobyla_small.yml +++ b/.github/workflows/profile_cobyla_small.yml @@ -141,7 +141,7 @@ jobs: if: always() shell: bash run: | - solver=${{ matrix.solver }} + solver=${{ env.SOLNAME }} cd /tmp/${solver}_profile_prima/ ls *${solver}*_start -1 > ${solver}_prob_start ls *${solver}*_end -1 > ${solver}_prob_end diff --git a/.github/workflows/profile_cobyla_small_sq.yml b/.github/workflows/profile_cobyla_small_sq.yml index feec8fccfc..5187e86c8a 100644 --- a/.github/workflows/profile_cobyla_small_sq.yml +++ b/.github/workflows/profile_cobyla_small_sq.yml @@ -147,7 +147,7 @@ jobs: if: always() shell: bash run: | - solver=${{ matrix.solver }} + solver=${{ env.SOLNAME }} cd /tmp/${solver}_profile_prima/ ls *${solver}*_start -1 > ${solver}_prob_start ls *${solver}*_end -1 > ${solver}_prob_end diff --git a/.github/workflows/profile_compiler_options.yml b/.github/workflows/profile_compiler_options.yml index 4b8bca7643..ef2a28019d 100644 --- a/.github/workflows/profile_compiler_options.yml +++ b/.github/workflows/profile_compiler_options.yml @@ -156,8 +156,8 @@ jobs: if: always() shell: bash run: | - solver=${{ matrix.solver }} - cd /tmp/${{ env.SOLNAME }}_profile_prima/ + solver=${{ env.SOLNAME }} + cd /tmp/${solver}_profile_prima/ ls *${solver}*_start -1 > ${solver}_prob_start ls *${solver}*_end -1 > ${solver}_prob_end diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || : diff --git a/.github/workflows/profile_infnan.yml b/.github/workflows/profile_infnan.yml index 3f6260bddf..5bdd1b5bc1 100644 --- a/.github/workflows/profile_infnan.yml +++ b/.github/workflows/profile_infnan.yml @@ -160,8 +160,8 @@ jobs: if: always() shell: bash run: | - solver=${{ matrix.solver }} - cd /tmp/${{ env.SOLNAME }}_profile_prima/ + solver=${{ env.SOLNAME }} + cd /tmp/${solver}_profile_prima/ ls *${solver}*_start -1 > ${solver}_prob_start ls *${solver}*_end -1 > ${solver}_prob_end diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || : diff --git a/.github/workflows/profile_int16.yml b/.github/workflows/profile_int16.yml index 0a6cf64b60..68b5f35ad6 100644 --- a/.github/workflows/profile_int16.yml +++ b/.github/workflows/profile_int16.yml @@ -159,8 +159,8 @@ jobs: if: always() shell: bash run: | - solver=${{ matrix.solver }} - cd /tmp/${{ env.SOLNAME }}_profile_prima/ + solver=${{ env.SOLNAME }} + cd /tmp/${solver}_profile_prima/ ls *${solver}*_start -1 > ${solver}_prob_start ls *${solver}*_end -1 > ${solver}_prob_end diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || : diff --git a/.github/workflows/profile_prima_small.yml b/.github/workflows/profile_prima_small.yml index 1d5671b837..2d03ed7a84 100644 --- a/.github/workflows/profile_prima_small.yml +++ b/.github/workflows/profile_prima_small.yml @@ -129,7 +129,7 @@ jobs: if: always() shell: bash run: | - solver=${{ matrix.solver }} + solver=${{ env.SOLNAME }} cd /tmp/${solver}_profile_prima/ ls *${solver}*_start -1 > ${solver}_prob_start ls *${solver}*_end -1 > ${solver}_prob_end diff --git a/.github/workflows/profile_quadruple.yml b/.github/workflows/profile_quadruple.yml index afba50f9e5..257749be7e 100644 --- a/.github/workflows/profile_quadruple.yml +++ b/.github/workflows/profile_quadruple.yml @@ -129,8 +129,8 @@ jobs: if: always() shell: bash run: | - solver=${{ matrix.solver }} - cd /tmp/${{ env.SOLNAME }}_profile_prima/ + solver=${{ env.SOLNAME }} + cd /tmp/${solver}_profile_prima/ ls *${solver}*_start -1 > ${solver}_prob_start ls *${solver}*_end -1 > ${solver}_prob_end diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || : diff --git a/.github/workflows/profile_rescue_idz_classical.yml b/.github/workflows/profile_rescue_idz_classical.yml index d2f9f341cc..320c8ee884 100644 --- a/.github/workflows/profile_rescue_idz_classical.yml +++ b/.github/workflows/profile_rescue_idz_classical.yml @@ -160,8 +160,8 @@ jobs: if: always() shell: bash run: | - solver=${{ matrix.solver }} - cd /tmp/${{ env.SOLNAME }}_profile_${{ env.BENCHMARK }}/ + solver=${{ env.SOLNAME }} + cd /tmp/${solver}_profile_${{ env.BENCHMARK }}/ ls *${solver}*_start -1 > ${solver}_prob_start ls *${solver}*_end -1 > ${solver}_prob_end diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || : diff --git a/.github/workflows/profile_rescue_idz_modernized.yml b/.github/workflows/profile_rescue_idz_modernized.yml index a371e17919..9466dc60c3 100644 --- a/.github/workflows/profile_rescue_idz_modernized.yml +++ b/.github/workflows/profile_rescue_idz_modernized.yml @@ -160,8 +160,8 @@ jobs: if: always() shell: bash run: | - solver=${{ matrix.solver }} - cd /tmp/${{ env.SOLNAME }}_profile_${{ env.BENCHMARK }}/ + solver=${{ env.SOLNAME }} + cd /tmp/${solver}_profile_${{ env.BENCHMARK }}/ ls *${solver}*_start -1 > ${solver}_prob_start ls *${solver}*_end -1 > ${solver}_prob_end diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || : diff --git a/.github/workflows/profile_single.yml b/.github/workflows/profile_single.yml index 3d31c5b75b..f1680a23bd 100644 --- a/.github/workflows/profile_single.yml +++ b/.github/workflows/profile_single.yml @@ -130,8 +130,8 @@ jobs: if: always() shell: bash run: | - solver=${{ matrix.solver }} - cd /tmp/${{ env.SOLNAME }}_profile_prima/ + solver=${{ env.SOLNAME }} + cd /tmp/${solver}_profile_prima/ ls *${solver}*_start -1 > ${solver}_prob_start ls *${solver}*_end -1 > ${solver}_prob_end diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || : diff --git a/matlab/tests/private/isequiv.m b/matlab/tests/private/isequiv.m index c04b6afb2f..4ee095593e 100644 --- a/matlab/tests/private/isequiv.m +++ b/matlab/tests/private/isequiv.m @@ -683,6 +683,7 @@ function isequiv(solvers, options) 'CHNROSNB', ... 'CHNRSNBM', ... 'ERRINROS', ... + 'ERRINRSM', ... 'HYDCAR6LS', ... 'METHANB8LS', ... 'METHANL8LS', ... @@ -695,6 +696,7 @@ function isequiv(solvers, options) 'CHNROSNB', ... 'CHNRSNBM', ... 'ERRINROS', ... + 'ERRINRSM', ... 'HYDCAR6LS', ... 'METHANL8LS', ... 'TOINTGOR', ... @@ -710,6 +712,7 @@ function isequiv(solvers, options) 'CHNRSNBM', ... 'CHWIRUT2LS', ... 'DALLASS', ... + 'ERRINROS', ... 'ERRINRSM', ... 'GOULDQP1', ... 'HYDCAR6LS', ...