Skip to content

Commit c8dfbba

Browse files
committed
git subrepo pull mp-opt-model
subrepo: subdir: "mp-opt-model" merged: "41789c03" upstream: origin: "git@github.com:MATPOWER/mp-opt-model" branch: "master" commit: "41789c03" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "4f60dd7"
1 parent bf62b95 commit c8dfbba

5 files changed

Lines changed: 17 additions & 6 deletions

File tree

mp-opt-model/.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ jobs:
2525
uses: actions/checkout@v4
2626

2727
- name: Include IPOPT?
28-
if: matrix.platform == 'matlab' || matrix.os != 'ubuntu-16.04'
2928
run: echo "INCLUDE_IPOPT=1" >> $GITHUB_ENV
3029

3130
- name: Include OSQP?
32-
if: matrix.platform == 'matlab' || (matrix.os != 'ubuntu-16.04' && matrix.os != 'ubuntu-18.04')
31+
if: startsWith(matrix.os, 'ubuntu')
3332
run: echo "INCLUDE_OSQP=1" >> $GITHUB_ENV
3433

3534
- name: Cache IPOPT Libs (macOS)

mp-opt-model/.gitrepo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = git@github.com:MATPOWER/mp-opt-model
88
branch = master
9-
commit = be0fe1cfbe5d5ce80bac76270225a8019bd0d895
10-
parent = 52323c86f992387fe49cec965637168107edfd6a
9+
commit = 41789c034445bdfd98eefd9b4de022cdef2fcb4b
10+
parent = bf62b95b6cb33a206c3480ebe91758f927c3335d
1111
method = merge
1212
cmdver = 0.4.9

mp-opt-model/CHANGES.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@ Change history for MP-Opt-Model
22
===============================
33

44

5+
since version 5.0
6+
-----------------
7+
8+
#### 9/25/25
9+
- Improve reliability of detection of CLP MEX file.
10+
11+
#### 7/18/25
12+
- Fix failing tests in `t_qcqps_master` when `'DEFAULT'` implies `'FMINCON'`
13+
(as in MATLAB Online).
14+
15+
516
Version 5.0 - *Jul 12, 2025*
617
----------------------------
718

mp-opt-model/lib/have_feature_opti_clp.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
% Covered by the 3-clause BSD License (see LICENSE file for details).
1717
% See https://github.com/MATPOWER/mp-opt-model for more info.
1818

19+
s = which('clp'); %% help it find .mex* before .m
1920
TorF = exist('opti_clp', 'file') == 2 && exist('clp', 'file') == 3;
2021
vstr = '';
2122
rdate = '';

mp-opt-model/lib/mpomver.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
% See https://github.com/MATPOWER/mp-opt-model for more info.
2525

2626
v = struct( 'Name', 'MP-Opt-Model', ...
27-
'Version', '5.0', ...
27+
'Version', '5.0.1-dev', ...
2828
'Release', '', ...
29-
'Date', '12-Jul-2025' );
29+
'Date', '25-Sep-2025' );
3030
if nargout > 0
3131
if nargin > 0
3232
rv = v;

0 commit comments

Comments
 (0)