Skip to content

Commit d9e3bda

Browse files
tholdentholden
committed
Revert "update to latest"
This reverts commit 6d74b67.
1 parent 6d74b67 commit d9e3bda

File tree

11 files changed

+18
-18
lines changed

11 files changed

+18
-18
lines changed

‎Solvers/Source/scip/Include/scipmex.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* SCIPMEX - A MATLAB MEX Interface to SCIP
22
* Released Under the BSD 3-Clause License:
3-
* https://www.inverseproblem.co.nz/OPTI/index.php/DL/License
3+
* https://www.controlengineering.co.nz/Wikis/OPTI/index.php/DL/License
44
*
55
* Copyright (C) Jonathan Currie 2018
6-
* www.inverseproblem.co.nz
6+
* www.controlengineering.co.nz
77
*/
88

99
#ifndef SCIPMEXINC

‎Solvers/Source/scip/scipeventmex.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* SCIPMEX - A MATLAB MEX Interface to SCIP
22
* Released Under the BSD 3-Clause License:
3-
* https://www.inverseproblem.co.nz/OPTI/index.php/DL/License
3+
* https://www.controlengineering.co.nz/Wikis/OPTI/index.php/DL/License
44
*
55
* Copyright (C) Jonathan Currie 2018
6-
* www.inverseproblem.co.nz
6+
* www.controlengineering.co.nz
77
*/
88

99
#include "scipmex.h"

‎Solvers/Source/scip/scipmex.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* SCIPMEX - A MATLAB MEX Interface to SCIP
22
* Released Under the BSD 3-Clause License:
3-
* https://www.inverseproblem.co.nz/OPTI/index.php/DL/License
3+
* https://www.controlengineering.co.nz/Wikis/OPTI/index.php/DL/License
44
*
55
* Copyright (C) Jonathan Currie 2018
6-
* www.inverseproblem.co.nz
6+
* www.controlengineering.co.nz
77
*/
88

99
/* Based in parts on matscip.c supplied with SCIP */
@@ -1214,7 +1214,7 @@ void printSolverInfo()
12141214
#endif
12151215
#endif
12161216

1217-
mexPrintf("\n MEX Interface J.Currie 2013 [BSD3] (www.inverseproblem.co.nz)\n");
1217+
mexPrintf("\n MEX Interface J.Currie 2013 [BSD3] (www.controlengineering.co.nz)\n");
12181218
mexPrintf("-----------------------------------------------------------\n");
12191219
}
12201220

‎Solvers/Source/scip/scipnlmex.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* SCIPMEX - A MATLAB MEX Interface to SCIP
22
* Released Under the BSD 3-Clause License:
3-
* https://www.inverseproblem.co.nz/OPTI/index.php/DL/License
3+
* https://www.controlengineering.co.nz/Wikis/OPTI/index.php/DL/License
44
*
55
* Copyright (C) Jonathan Currie 2018
6-
* www.inverseproblem.co.nz
6+
* www.controlengineering.co.nz
77
*/
88

99
#include "scip/scip.h"

‎Solvers/Source/scip/scipsdpmex.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* SCIPSDPMEX - A MATLAB MEX Interface to SCIP-SDP
22
* Released Under the BSD 3-Clause License:
3-
* https://www.inverseproblem.co.nz/OPTI/index.php/DL/License
3+
* https://www.controlengineering.co.nz/Wikis/OPTI/index.php/DL/License
44
*
55
* Copyright (C) Jonathan Currie 2018
6-
* www.inverseproblem.co.nz
6+
* www.controlengineering.co.nz
77
*/
88

99
#include "mex.h"
@@ -540,6 +540,6 @@ void printSolverInfo()
540540

541541
mexPrintf(" - Intel Math Kernel Library [v%d.%d R%d]\n",__INTEL_MKL__,__INTEL_MKL_MINOR__,__INTEL_MKL_UPDATE__);
542542

543-
mexPrintf("\n MEX Interface J.Currie 2013 [BSD3] (www.inverseproblem.co.nz)\n");
543+
mexPrintf("\n MEX Interface J.Currie 2013 [BSD3] (www.controlengineering.co.nz)\n");
544544
mexPrintf("-----------------------------------------------------------\n");
545545
}

‎Solvers/opti_scip.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
% THIS IS A WRAPPER FOR SCIP USING THE MEX INTERFACE
3131
% See supplied ZIB Academic License
3232

33-
% Copyright (C) 2012 Jonathan Currie (IPL)
33+
% Copyright (C) 2012 Jonathan Currie (Control Engineering)
3434

3535
t = tic;
3636

‎Solvers/opti_scipasl.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
% THIS IS A WRAPPER FOR SCIP USING THE MEX INTERFACE
2525
% See supplied ZIB Academic License
2626

27-
% Copyright (C) 2012/2013 Jonathan Currie (IPL)
27+
% Copyright (C) 2012/2013 Jonathan Currie (Control Engineering)
2828

2929
t = tic;
3030

‎Solvers/opti_scipnl.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
% THIS IS A WRAPPER FOR SCIP USING THE MEX INTERFACE
5454
% See supplied ZIB Academic License
5555

56-
% Copyright (C) 2012/2013 Jonathan Currie (IPL)
56+
% Copyright (C) 2012/2013 Jonathan Currie (Control Engineering)
5757

5858
t = tic;
5959

‎Solvers/scip.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@
8282
% same directory as the input file. Remember SCIP does not solve models with
8383
% trigonometric functions.
8484
%
85-
% Copyright (C) 2012-2013 Jonathan Currie (IPL)
85+
% Copyright (C) 2012-2013 Jonathan Currie (Control Engineering)

‎Solvers/scipvar.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
% deterministic MATLAB function into an SCIP MEX Interface compatible
66
% instruction list. Use 'methods(scipvar)' to see available functions.
77
%
8-
% Copyright (C) 2012/2013 Jonathan Currie (IPL)
8+
% Copyright (C) 2012/2013 Jonathan Currie (Control Engineering)
99

1010
%#ok<*STOUT,*MANU,*INUSD>
1111

‎Utilities/opti/scipset.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
%
1818
% See supplied SCIP Documentation for further details of these options.
1919

20-
% Copyright (C) 2013 Jonathan Currie (IPL)
20+
% Copyright (C) 2013 Jonathan Currie (Control Engineering)
2121

2222
% Print out possible values of properties.
2323
if ((nargin == 0) && (nargout == 0))

0 commit comments

Comments
 (0)