diff options
-rw-r--r-- | unsupported/Eigen/src/NonLinear/hybrd.h | 2 | ||||
-rw-r--r-- | unsupported/Eigen/src/NonLinear/hybrj.h | 2 | ||||
-rw-r--r-- | unsupported/Eigen/src/NonLinear/lmder.h | 2 | ||||
-rw-r--r-- | unsupported/Eigen/src/NonLinear/lmdif.h | 2 | ||||
-rw-r--r-- | unsupported/Eigen/src/NonLinear/lmstr.h | 2 | ||||
-rw-r--r-- | unsupported/Eigen/src/NonLinear/qrfac.h | 5 |
6 files changed, 8 insertions, 7 deletions
diff --git a/unsupported/Eigen/src/NonLinear/hybrd.h b/unsupported/Eigen/src/NonLinear/hybrd.h index 183b2a9cb..143f88832 100644 --- a/unsupported/Eigen/src/NonLinear/hybrd.h +++ b/unsupported/Eigen/src/NonLinear/hybrd.h @@ -104,7 +104,7 @@ L30: /* compute the qr factorization of the jacobian. */ - ei_qrfac<Scalar>(n, n, fjac.data(), fjac.rows(), false, iwa, 1, wa1.data(), wa2.data(), wa3.data()); + ei_qrfac<Scalar>(n, n, fjac.data(), fjac.rows(), false, iwa, 1, wa1.data(), wa2.data()); /* on the first iteration and if mode is 1, scale according */ /* to the norms of the columns of the initial jacobian. */ diff --git a/unsupported/Eigen/src/NonLinear/hybrj.h b/unsupported/Eigen/src/NonLinear/hybrj.h index 587f42099..8f78c1868 100644 --- a/unsupported/Eigen/src/NonLinear/hybrj.h +++ b/unsupported/Eigen/src/NonLinear/hybrj.h @@ -92,7 +92,7 @@ L30: /* compute the qr factorization of the jacobian. */ - ei_qrfac<Scalar>(n, n, fjac.data(), fjac.rows(), false, iwa, 1, wa1.data(), wa2.data(), wa3.data()); + ei_qrfac<Scalar>(n, n, fjac.data(), fjac.rows(), false, iwa, 1, wa1.data(), wa2.data()); /* on the first iteration and if mode is 1, scale according */ /* to the norms of the columns of the initial jacobian. */ diff --git a/unsupported/Eigen/src/NonLinear/lmder.h b/unsupported/Eigen/src/NonLinear/lmder.h index 7ae2d82bf..d08530947 100644 --- a/unsupported/Eigen/src/NonLinear/lmder.h +++ b/unsupported/Eigen/src/NonLinear/lmder.h @@ -97,7 +97,7 @@ L40: /* compute the qr factorization of the jacobian. */ - ei_qrfac<Scalar>(m, n, fjac.data(), fjac.rows(), true, ipvt.data(), n, wa1.data(), wa2.data(), wa3.data()); + ei_qrfac<Scalar>(m, n, fjac.data(), fjac.rows(), true, ipvt.data(), n, wa1.data(), wa2.data()); ipvt.cwise()-=1; // qrfac() creates ipvt with fortran convetion (1->n), convert it to c (0->n-1) /* on the first iteration and if mode is 1, scale according */ diff --git a/unsupported/Eigen/src/NonLinear/lmdif.h b/unsupported/Eigen/src/NonLinear/lmdif.h index 67244f306..59bc51cbd 100644 --- a/unsupported/Eigen/src/NonLinear/lmdif.h +++ b/unsupported/Eigen/src/NonLinear/lmdif.h @@ -96,7 +96,7 @@ L40: /* compute the qr factorization of the jacobian. */ - ei_qrfac<Scalar>(m, n, fjac.data(), fjac.rows(), true, ipvt.data(), n, wa1.data(), wa2.data(), wa3.data()); + ei_qrfac<Scalar>(m, n, fjac.data(), fjac.rows(), true, ipvt.data(), n, wa1.data(), wa2.data()); ipvt.cwise()-=1; // qrfac() creates ipvt with fortran convetion (1->n), convert it to c (0->n-1) /* on the first iteration and if mode is 1, scale according */ diff --git a/unsupported/Eigen/src/NonLinear/lmstr.h b/unsupported/Eigen/src/NonLinear/lmstr.h index 783217a54..b228a2e9e 100644 --- a/unsupported/Eigen/src/NonLinear/lmstr.h +++ b/unsupported/Eigen/src/NonLinear/lmstr.h @@ -120,7 +120,7 @@ L40: if (! sing) goto L130; ipvt.cwise()+=1; - ei_qrfac<Scalar>(n, n, fjac.data(), fjac.rows(), true, ipvt.data(), n, wa1.data(), wa2.data(), wa3.data()); + ei_qrfac<Scalar>(n, n, fjac.data(), fjac.rows(), true, ipvt.data(), n, wa1.data(), wa2.data()); ipvt.cwise()-=1; // qrfac() creates ipvt with fortran convetion (1->n), convert it to c (0->n-1) for (j = 0; j < n; ++j) { if (fjac(j,j) == 0.) diff --git a/unsupported/Eigen/src/NonLinear/qrfac.h b/unsupported/Eigen/src/NonLinear/qrfac.h index 829ea0d11..94e36bb26 100644 --- a/unsupported/Eigen/src/NonLinear/qrfac.h +++ b/unsupported/Eigen/src/NonLinear/qrfac.h @@ -2,7 +2,7 @@ template <typename Scalar> void ei_qrfac(int m, int n, Scalar *a, int lda, int pivot, int *ipvt, int /* lipvt */, Scalar *rdiag, - Scalar *acnorm, Scalar *wa) + Scalar *acnorm) { /* System generated locals */ int a_dim1, a_offset; @@ -15,8 +15,9 @@ void ei_qrfac(int m, int n, Scalar *a, int int minmn; Scalar ajnorm; + Matrix< Scalar, Dynamic, 1 > wa(n+1); + /* Parameter adjustments */ - --wa; --acnorm; --rdiag; a_dim1 = lda; |