mirror of
https://git.freebsd.org/ports.git
synced 2025-06-13 16:50:29 -04:00
95c9562d17
- Bump portrevision. Obtained from: https://sourceforge.net/p/octave/linear-algebra/ci/default/tree/
147 lines
5.3 KiB
C++
147 lines
5.3 KiB
C++
--- dbleGSVD.cc.orig 2015-01-24 19:54:11 UTC
|
|
+++ dbleGSVD.cc
|
|
@@ -14,14 +14,14 @@
|
|
// You should have received a copy of the GNU General Public License along with
|
|
// this program; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
-#ifdef HAVE_CONFIG_H
|
|
-#include <config.h>
|
|
-#endif
|
|
+#include "dbleGSVD.h"
|
|
|
|
#include <iostream>
|
|
|
|
-#include "dbleGSVD.h"
|
|
+#include <octave/oct.h>
|
|
+
|
|
#include "f77-fcn.h"
|
|
+#include "lo-error.h"
|
|
|
|
/*
|
|
uncomment those lines to monitor k and l
|
|
@@ -29,6 +29,13 @@
|
|
#include "pager.h"
|
|
*/
|
|
|
|
+#if defined (OCTAVE_HAVE_F77_INT_TYPE)
|
|
+# define TO_F77_INT(x) octave::to_f77_int (x)
|
|
+#else
|
|
+# define TO_F77_INT(x) (x)
|
|
+typedef octave_idx_type F77_INT;
|
|
+#endif
|
|
+
|
|
extern "C"
|
|
{
|
|
F77_RET_T
|
|
@@ -37,26 +44,26 @@ extern "C"
|
|
F77_CONST_CHAR_ARG_DECL, // JOBU (input) CHARACTER*1
|
|
F77_CONST_CHAR_ARG_DECL, // JOBV (input) CHARACTER*1
|
|
F77_CONST_CHAR_ARG_DECL, // JOBQ (input) CHARACTER*1
|
|
- const octave_idx_type&, // M (input) INTEGER
|
|
- const octave_idx_type&, // N (input) INTEGER
|
|
- const octave_idx_type&, // P (input) INTEGER
|
|
- octave_idx_type &, // K (output) INTEGER
|
|
- octave_idx_type &, // L (output) INTEGER
|
|
+ const F77_INT&, // M (input) INTEGER
|
|
+ const F77_INT&, // N (input) INTEGER
|
|
+ const F77_INT&, // P (input) INTEGER
|
|
+ F77_INT &, // K (output) INTEGER
|
|
+ F77_INT &, // L (output) INTEGER
|
|
double*, // A (input/output) DOUBLE PRECISION array, dimension (LDA,N)
|
|
- const octave_idx_type&, // LDA (input) INTEGER
|
|
+ const F77_INT&, // LDA (input) INTEGER
|
|
double*, // B (input/output) DOUBLE PRECISION array, dimension (LDB,N)
|
|
- const octave_idx_type&, // LDB (input) INTEGER
|
|
+ const F77_INT&, // LDB (input) INTEGER
|
|
double*, // ALPHA (output) DOUBLE PRECISION array, dimension (N)
|
|
double*, // BETA (output) DOUBLE PRECISION array, dimension (N)
|
|
double*, // U (output) DOUBLE PRECISION array, dimension (LDU,M)
|
|
- const octave_idx_type&, // LDU (input) INTEGER
|
|
+ const F77_INT&, // LDU (input) INTEGER
|
|
double*, // V (output) DOUBLE PRECISION array, dimension (LDV,P)
|
|
- const octave_idx_type&, // LDV (input) INTEGER
|
|
+ const F77_INT&, // LDV (input) INTEGER
|
|
double*, // Q (output) DOUBLE PRECISION array, dimension (LDQ,N)
|
|
- const octave_idx_type&, // LDQ (input) INTEGER
|
|
+ const F77_INT&, // LDQ (input) INTEGER
|
|
double*, // WORK (workspace) DOUBLE PRECISION array
|
|
- int*, // IWORK (workspace/output) INTEGER array, dimension (N)
|
|
- octave_idx_type& // INFO (output)INTEGER
|
|
+ F77_INT*, // IWORK (workspace/output) INTEGER array, dimension (N)
|
|
+ F77_INT& // INFO (output)INTEGER
|
|
F77_CHAR_ARG_LEN_DECL
|
|
F77_CHAR_ARG_LEN_DECL
|
|
F77_CHAR_ARG_LEN_DECL
|
|
@@ -117,11 +124,11 @@ GSVD::R_matrix (void) const
|
|
octave_idx_type
|
|
GSVD::init (const Matrix& a, const Matrix& b, GSVD::type gsvd_type)
|
|
{
|
|
- octave_idx_type info;
|
|
+ F77_INT info;
|
|
|
|
- octave_idx_type m = a.rows ();
|
|
- octave_idx_type n = a.cols ();
|
|
- octave_idx_type p = b.rows ();
|
|
+ F77_INT m = TO_F77_INT (a.rows ());
|
|
+ F77_INT n = TO_F77_INT (a.cols ());
|
|
+ F77_INT p = TO_F77_INT (b.rows ());
|
|
|
|
Matrix atmp = a;
|
|
double *tmp_dataA = atmp.fortran_vec ();
|
|
@@ -129,17 +136,17 @@ GSVD::init (const Matrix& a, const Matri
|
|
Matrix btmp = b;
|
|
double *tmp_dataB = btmp.fortran_vec ();
|
|
|
|
- // octave_idx_type min_mn = m < n ? m : n;
|
|
+ // F77_INT min_mn = m < n ? m : n;
|
|
|
|
char jobu = 'U';
|
|
char jobv = 'V';
|
|
char jobq = 'Q';
|
|
|
|
- octave_idx_type nrow_u = m;
|
|
- octave_idx_type nrow_v = p;
|
|
- octave_idx_type nrow_q = n;
|
|
+ F77_INT nrow_u = m;
|
|
+ F77_INT nrow_v = p;
|
|
+ F77_INT nrow_q = n;
|
|
|
|
- octave_idx_type k, l;
|
|
+ F77_INT k, l;
|
|
|
|
switch (gsvd_type)
|
|
{
|
|
@@ -183,14 +190,14 @@ GSVD::init (const Matrix& a, const Matri
|
|
}
|
|
double *q = right_sm.fortran_vec ();
|
|
|
|
- octave_idx_type lwork = 3*n;
|
|
+ F77_INT lwork = 3*n;
|
|
lwork = lwork > m ? lwork : m;
|
|
lwork = (lwork > p ? lwork : p) + n;
|
|
|
|
Array<double> work (dim_vector (lwork, 1));
|
|
Array<double> alpha (dim_vector (n, 1));
|
|
Array<double> beta (dim_vector (n, 1));
|
|
- Array<int> iwork (dim_vector (n, 1));
|
|
+ Array<F77_INT> iwork (dim_vector (n, 1));
|
|
|
|
F77_XFCN (dggsvd, DGGSVD, (F77_CONST_CHAR_ARG2 (&jobu, 1),
|
|
F77_CONST_CHAR_ARG2 (&jobv, 1),
|
|
@@ -213,13 +220,13 @@ GSVD::init (const Matrix& a, const Matri
|
|
if (info > 0) {
|
|
(*current_liboctave_error_handler) ("dggsvd.f: Jacobi-type procedure failed to converge.");
|
|
} else {
|
|
- octave_idx_type i, j;
|
|
+ F77_INT i, j;
|
|
|
|
if (GSVD::std == gsvd_type) {
|
|
R.resize(k+l, k+l);
|
|
- int astart = n-k-l;
|
|
+ F77_INT astart = n-k-l;
|
|
if (m - k - l >= 0) {
|
|
- int astart = n-k-l;
|
|
+ F77_INT astart = n-k-l;
|
|
/*
|
|
* R is stored in A(1:K+L,N-K-L+1:N)
|
|
*/
|