Skip to content

Commit 6105691

Browse files
committed
Doc: Update luksan links
Closes #602
1 parent 15e1e77 commit 6105691

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

doc/docs/NLopt_Algorithms.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ The code was modified for inclusion in NLopt by S. G. Johnson in 2010, with the
357357

358358
This algorithm in NLopt (specified by NLOPT_LD_LBFGS), is based on a Fortran implementation of the low-storage BFGS algorithm written by Prof. Ladislav Luksan, and graciously posted online under the GNU LGPL at:
359359

360-
- <http://www.uivt.cas.cz/~luksan/subroutines.html>
360+
- <http://www.cs.cas.cz/~luksan/subroutines.html>
361361

362362
The original L-BFGS algorithm, based on variable-metric updates via Strang recurrences, was described by the papers:
363363

@@ -376,7 +376,7 @@ The `NLOPT_LD_LBFGS` algorithm supports the following internal parameter, which
376376

377377
This algorithm in NLopt, is based on a Fortran implementation of a preconditioned inexact truncated Newton algorithm written by Prof. Ladislav Luksan, and graciously posted online under the GNU LGPL at:
378378

379-
- <http://www.uivt.cas.cz/~luksan/subroutines.html>
379+
- <http://www.cs.cas.cz/~luksan/subroutines.html>
380380

381381
NLopt includes several variations of this algorithm by Prof. Luksan. First, a variant preconditioned by the low-storage BFGS algorithm with steepest-descent restarting, specified as `NLOPT_LD_TNEWTON_PRECOND_RESTART`. Second, simplified versions `NLOPT_LD_TNEWTON_PRECOND` (same without restarting), `NLOPT_LD_TNEWTON_RESTART` (same without preconditioning), and `NLOPT_LD_TNEWTON` (same without restarting or preconditioning).
382382

@@ -397,7 +397,7 @@ All the `NLOPT_LD_TNEWTON` algorithms support the following internal parameter,
397397

398398
This algorithm in NLopt, is based on a Fortran implementation of a shifted limited-memory variable-metric algorithm by Prof. Ladislav Luksan, and graciously posted online under the GNU LGPL at:
399399

400-
- <http://www.uivt.cas.cz/~luksan/subroutines.html>
400+
- <http://www.cs.cas.cz/~luksan/subroutines.html>
401401

402402
There are two variations of this algorithm: `NLOPT_LD_VAR2`, using a rank-2 method, and `NLOPT_LD_VAR1`, using a rank-1 method.
403403

doc/docs/NLopt_License_and_Copyright.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
The NLopt library is under the [GNU Lesser General Public License](https://en.wikipedia.org/wiki/GNU_Lesser_General_Public_License) (LGPL), and the copyrights are owned by a variety of authors.
66

7-
In general, the different code in NLopt comes from different sources, and have a variety of licenses. For example, all of the *new* code we wrote for NLopt is under the [MIT License](https://en.wikipedia.org/wiki/MIT_License) (which imposes essentially no practical restrictions, and is hence compatible with the LGPL). The *combination* of all of this software is under the conjunction of the license terms, and in particular they are limited by the most restrictive of the licenses for the portions, which in this case is the LGPL. (The other portions of NLopt are under LGPL-compatible, less-restrictive licenses like the MIT license. So, if you remove the LGPL portions, which are currently code [by Ladislav Luksan](http://www.uivt.cas.cz/~luksan/subroutines.html), the remainder reverts to a looser license.)
7+
In general, the different code in NLopt comes from different sources, and have a variety of licenses. For example, all of the *new* code we wrote for NLopt is under the [MIT License](https://en.wikipedia.org/wiki/MIT_License) (which imposes essentially no practical restrictions, and is hence compatible with the LGPL). The *combination* of all of this software is under the conjunction of the license terms, and in particular they are limited by the most restrictive of the licenses for the portions, which in this case is the LGPL. (The other portions of NLopt are under LGPL-compatible, less-restrictive licenses like the MIT license. So, if you remove the LGPL portions, which are currently code [by Ladislav Luksan](http://www.cs.cas.cz/~luksan/subroutines.html), the remainder reverts to a looser license.)
88

99
New code written for NLopt, including tutorial code at [NLopt Tutorial](NLopt_Tutorial.md), is Copyright © 2007-2020 Massachusetts Institute of Technology and other authors, and comes with **no warranty**:
1010

0 commit comments

Comments
 (0)