Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

a fix for spurious NaNs #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions ChangeLog
@@ -1,3 +1,9 @@
2018-09-03 Fabien Le Floc'h <fabien@2ipi.com>
* DESCRIPTION (Version): New version is 1.6-1

* src/solve.QP.compact.f, src/solve.QP.f : Changed temp variable
calculation to avoid NaNs related to double underflow.

2013-04-17 Berwin A Turlach <Berwin.Turlach@gmail.com>

* DESCRIPTION (Version): New versin is 1.5-5
Expand Down
10 changes: 5 additions & 5 deletions DESCRIPTION
@@ -1,16 +1,16 @@
Package: quadprog
Type: Package
Title: Functions to solve Quadratic Programming Problems.
Version: 1.5-5
Date: 2013-04-17
Version: 1.6-1
Date: 2018-09-03
Author: S original by Berwin A. Turlach <Berwin.Turlach@gmail.com> R
port by Andreas Weingessel <Andreas.Weingessel@ci.tuwien.ac.at>
Maintainer: Berwin A. Turlach <Berwin.Turlach@gmail.com>
Maintainer: Berwin A. Turlach <Berwin.Turlach@gmail.com>, Fabien Le Floc'h <fabien@2ipi.com>
Description: This package contains routines and documentation for
solving quadratic programming problems.
Depends: R (>= 2.15.0)
License: GPL (>= 2)
Packaged: 2013-04-17 08:35:43 UTC; berwin
Packaged: 2018-09-03 08:35:43 UTC; fabien
NeedsCompilation: yes
Repository: CRAN
Date/Publication: 2013-04-17 13:42:49
Date/Publication: 2018-09-03 13:42:49
4 changes: 2 additions & 2 deletions src/solve.QP.compact.f
Expand Up @@ -419,7 +419,7 @@ subroutine qpgen1(dmat, dvec, fddmat, n, sol, lagr, crval, amat,
if (work(i) .EQ. 0.d0) goto 160
gc = max(abs(work(i-1)),abs(work(i)))
gs = min(abs(work(i-1)),abs(work(i)))
temp = sign(gc*sqrt(1+gs*gs/(gc*gc)), work(i-1))
temp = sign(gc*sqrt(1+(gs/gc)*(gs/gc)), work(i-1))
gc = work(i-1)/temp
gs = work(i)/temp
c
Expand Down Expand Up @@ -507,7 +507,7 @@ subroutine qpgen1(dmat, dvec, fddmat, n, sol, lagr, crval, amat,
if (work(l1) .EQ. 0.d0) goto 798
gc = max(abs(work(l1-1)),abs(work(l1)))
gs = min(abs(work(l1-1)),abs(work(l1)))
temp = sign(gc*sqrt(1+gs*gs/(gc*gc)), work(l1-1))
temp = sign(gc*sqrt(1+(gs/gc)*(gs/gc)), work(l1-1))
gc = work(l1-1)/temp
gs = work(l1)/temp
c
Expand Down
4 changes: 2 additions & 2 deletions src/solve.QP.f
Expand Up @@ -410,7 +410,7 @@ subroutine qpgen2(dmat, dvec, fddmat, n, sol, lagr, crval, amat,
if (work(i) .EQ. 0.d0) goto 160
gc = max(abs(work(i-1)),abs(work(i)))
gs = min(abs(work(i-1)),abs(work(i)))
temp = sign(gc*sqrt(1+gs*gs/(gc*gc)), work(i-1))
temp = sign(gc*sqrt(1+(gs/gc)*(gs/gc)), work(i-1))
gc = work(i-1)/temp
gs = work(i)/temp
c
Expand Down Expand Up @@ -498,7 +498,7 @@ subroutine qpgen2(dmat, dvec, fddmat, n, sol, lagr, crval, amat,
if (work(l1) .EQ. 0.d0) goto 798
gc = max(abs(work(l1-1)),abs(work(l1)))
gs = min(abs(work(l1-1)),abs(work(l1)))
temp = sign(gc*sqrt(1+gs*gs/(gc*gc)), work(l1-1))
temp = sign(gc*sqrt(1+(gs/gc)*(gs/gc)), work(l1-1))
gc = work(l1-1)/temp
gs = work(l1)/temp
c
Expand Down