From e71dd46bc71ee7d0776526f073259cabe7b4bca3 Mon Sep 17 00:00:00 2001 From: Richard Lincoln Date: Mon, 1 Aug 2011 01:23:42 +0100 Subject: [PATCH] Deleting unnecessary interfaces. --- .../java/edu/ufl/cise/klu/common/KLU_analyze.java | 50 -------------------- .../edu/ufl/cise/klu/common/KLU_analyze_given.java | 52 --------------------- .../java/edu/ufl/cise/klu/common/KLU_factor.java | 48 ------------------- .../edu/ufl/cise/klu/common/KLU_l_analyze.java | 52 --------------------- .../ufl/cise/klu/common/KLU_l_analyze_given.java | 54 ---------------------- .../java/edu/ufl/cise/klu/common/KLU_l_factor.java | 50 -------------------- .../java/edu/ufl/cise/klu/common/KLU_version.java | 16 +++---- .../java/edu/ufl/cise/klu/common/KLU_z_factor.java | 50 -------------------- .../edu/ufl/cise/klu/common/KLU_zl_factor.java | 50 -------------------- .../edu/ufl/cise/klu/tdouble/Dklu_analyze.java | 4 ++ .../ufl/cise/klu/tdouble/Dklu_analyze_given.java | 5 ++ 11 files changed, 17 insertions(+), 414 deletions(-) delete mode 100644 src/main/java/edu/ufl/cise/klu/common/KLU_analyze.java delete mode 100644 src/main/java/edu/ufl/cise/klu/common/KLU_analyze_given.java delete mode 100644 src/main/java/edu/ufl/cise/klu/common/KLU_factor.java delete mode 100644 src/main/java/edu/ufl/cise/klu/common/KLU_l_analyze.java delete mode 100644 src/main/java/edu/ufl/cise/klu/common/KLU_l_analyze_given.java delete mode 100644 src/main/java/edu/ufl/cise/klu/common/KLU_l_factor.java delete mode 100644 src/main/java/edu/ufl/cise/klu/common/KLU_z_factor.java delete mode 100644 src/main/java/edu/ufl/cise/klu/common/KLU_zl_factor.java diff --git a/src/main/java/edu/ufl/cise/klu/common/KLU_analyze.java b/src/main/java/edu/ufl/cise/klu/common/KLU_analyze.java deleted file mode 100644 index 72b0509..0000000 --- a/src/main/java/edu/ufl/cise/klu/common/KLU_analyze.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * KLU: a sparse LU factorization algorithm. - * Copyright (C) 2004-2009, Timothy A. Davis. - * Copyright (C) 2011, Richard W. Lincoln. - * http://www.cise.ufl.edu/research/sparse/klu - * - * ------------------------------------------------------------------------- - * - * KLU is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * KLU is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this Module; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package edu.ufl.cise.klu.common; - -/** - * Orders and analyzes a matrix. - */ -public class KLU_analyze -{ - - /* Order the matrix with BTF (or not), then order each block with AMD, - * COLAMD, a natural ordering, or with a user-provided ordering function */ - - /** - * - * @param n A is n-by-n - * @param Ap size n+1, column pointers - * @param Ai size nz, row indices - * @param Common - * @return - */ - public static KLU_symbolic klu_analyze(int n, int[] Ap, int[] Ai, - KLU_common Common) - { - return null; - } - -} diff --git a/src/main/java/edu/ufl/cise/klu/common/KLU_analyze_given.java b/src/main/java/edu/ufl/cise/klu/common/KLU_analyze_given.java deleted file mode 100644 index da75e63..0000000 --- a/src/main/java/edu/ufl/cise/klu/common/KLU_analyze_given.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * KLU: a sparse LU factorization algorithm. - * Copyright (C) 2004-2009, Timothy A. Davis. - * Copyright (C) 2011, Richard W. Lincoln. - * http://www.cise.ufl.edu/research/sparse/klu - * - * ------------------------------------------------------------------------- - * - * KLU is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * KLU is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this Module; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package edu.ufl.cise.klu.common; - -/** - * Analyzes a matrix using given P and Q. - */ -public class KLU_analyze_given -{ - - /* Order the matrix with BTF (or not), then use natural or given ordering - * P and Q on the blocks. P and Q are interpretted as identity - * if NULL. */ - - /** - * - * @param n A is n-by-n - * @param Ap size n+1, column pointers - * @param Ai size nz, row indices - * @param P size n, user's row permutation (may be NULL) - * @param Q size n, user's column permutation (may be NULL) - * @param Common - */ - public static KLU_symbolic klu_analyze_given(int n, int[] Ap, int[] Ai, - int[] P, int[] Q, KLU_common Common) - { - return null; - } - -} diff --git a/src/main/java/edu/ufl/cise/klu/common/KLU_factor.java b/src/main/java/edu/ufl/cise/klu/common/KLU_factor.java deleted file mode 100644 index ec28b69..0000000 --- a/src/main/java/edu/ufl/cise/klu/common/KLU_factor.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * KLU: a sparse LU factorization algorithm. - * Copyright (C) 2004-2009, Timothy A. Davis. - * Copyright (C) 2011, Richard W. Lincoln. - * http://www.cise.ufl.edu/research/sparse/klu - * - * ------------------------------------------------------------------------- - * - * KLU is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * KLU is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this Module; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package edu.ufl.cise.klu.common; - -/** - * Factors a matrix using the klu_analyze results. - */ -public class KLU_factor -{ - - /** - * - * @param Ap size n+1, column pointers - * @param Ai size nz, row indices - * @param Ax size nz, numerical values - * @param Symbolic - * @param Common - * @return KLU_OK if OK, < 0 if error - */ - public static KLU_numeric klu_factor(int[] Ap, int[] Ai, double[] Ax, - KLU_symbolic Symbolic, KLU_common Common) - { - return null; - } - -} diff --git a/src/main/java/edu/ufl/cise/klu/common/KLU_l_analyze.java b/src/main/java/edu/ufl/cise/klu/common/KLU_l_analyze.java deleted file mode 100644 index cc1f26a..0000000 --- a/src/main/java/edu/ufl/cise/klu/common/KLU_l_analyze.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * KLU: a sparse LU factorization algorithm. - * Copyright (C) 2004-2009, Timothy A. Davis. - * Copyright (C) 2011, Richard W. Lincoln. - * http://www.cise.ufl.edu/research/sparse/klu - * - * ------------------------------------------------------------------------- - * - * KLU is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * KLU is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this Module; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package edu.ufl.cise.klu.common; - -/** - * Orders and analyzes a matrix. - * - * 64-bit version. - */ -public class KLU_l_analyze -{ - - /* Order the matrix with BTF (or not), then order each block with AMD, - * COLAMD, a natural ordering, or with a user-provided ordering function */ - - /** - * - * @param n A is n-by-n - * @param Ap size n+1, column pointers - * @param Ai size nz, row indices - * @param Common - * @return - */ - public static KLU_l_symbolic klu_l_analyze(long n, long[] Ap, long[] Ai, - KLU_l_common Common) - { - return null; - } - -} diff --git a/src/main/java/edu/ufl/cise/klu/common/KLU_l_analyze_given.java b/src/main/java/edu/ufl/cise/klu/common/KLU_l_analyze_given.java deleted file mode 100644 index a1f38e0..0000000 --- a/src/main/java/edu/ufl/cise/klu/common/KLU_l_analyze_given.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * KLU: a sparse LU factorization algorithm. - * Copyright (C) 2004-2009, Timothy A. Davis. - * Copyright (C) 2011, Richard W. Lincoln. - * http://www.cise.ufl.edu/research/sparse/klu - * - * ------------------------------------------------------------------------- - * - * KLU is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * KLU is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this Module; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package edu.ufl.cise.klu.common; - -/** - * Analyzes a matrix using given P and Q. - * - * 64-bit version. - */ -public class KLU_l_analyze_given -{ - - /* Order the matrix with BTF (or not), then use natural or given ordering - * P and Q on the blocks. P and Q are interpretted as identity - * if NULL. */ - - /** - * - * @param n A is n-by-n - * @param Ap size n+1, column pointers - * @param Ai size nz, row indices - * @param P size n, user's row permutation (may be NULL) - * @param Q size n, user's column permutation (may be NULL) - * @param Common - */ - public static KLU_l_symbolic klu_l_analyze_given(long n, long[] Ap, - long[] Ai, long[] P, long[] Q, KLU_l_common Common) - { - return null; - } - -} diff --git a/src/main/java/edu/ufl/cise/klu/common/KLU_l_factor.java b/src/main/java/edu/ufl/cise/klu/common/KLU_l_factor.java deleted file mode 100644 index 4402da4..0000000 --- a/src/main/java/edu/ufl/cise/klu/common/KLU_l_factor.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * KLU: a sparse LU factorization algorithm. - * Copyright (C) 2004-2009, Timothy A. Davis. - * Copyright (C) 2011, Richard W. Lincoln. - * http://www.cise.ufl.edu/research/sparse/klu - * - * ------------------------------------------------------------------------- - * - * KLU is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * KLU is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this Module; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package edu.ufl.cise.klu.common; - -/** - * Factors a matrix using the klu_analyze results. - * - * Long / real version. - */ -public class KLU_l_factor -{ - - /** - * - * @param Ap size n+1, column pointers - * @param Ai size nz, row indices - * @param Ax size nz, numerical values - * @param Symbolic - * @param Common - * @return KLU_OK if OK, < 0 if error - */ - public static KLU_l_numeric klu_l_factor(long[] Ap, long[] Ai, double[] Ax, - KLU_l_symbolic Symbolic, KLU_l_common Common) - { - return null; - } - -} diff --git a/src/main/java/edu/ufl/cise/klu/common/KLU_version.java b/src/main/java/edu/ufl/cise/klu/common/KLU_version.java index 5b86395..78c6081 100644 --- a/src/main/java/edu/ufl/cise/klu/common/KLU_version.java +++ b/src/main/java/edu/ufl/cise/klu/common/KLU_version.java @@ -33,15 +33,15 @@ package edu.ufl.cise.klu.common; public class KLU_version { - public static String KLU_DATE = "Mar 24, 2009"; - public static int KLU_VERSION_CODE(int main, int sub) + public static String KLU_DATE = "Mar 24, 2009" ; + public static int KLU_VERSION_CODE (int main, int sub) { - return main * 1000 + sub; + return main * 1000 + sub ; } - public static int KLU_MAIN_VERSION = 1; - public static int KLU_SUB_VERSION = 1; - public static int KLU_SUBSUB_VERSION = 0; - public static int KLU_VERSION = KLU_VERSION_CODE(KLU_MAIN_VERSION, - KLU_SUB_VERSION); + public static int KLU_MAIN_VERSION = 1 ; + public static int KLU_SUB_VERSION = 1 ; + public static int KLU_SUBSUB_VERSION = 0 ; + public static int KLU_VERSION = KLU_VERSION_CODE (KLU_MAIN_VERSION, + KLU_SUB_VERSION) ; } diff --git a/src/main/java/edu/ufl/cise/klu/common/KLU_z_factor.java b/src/main/java/edu/ufl/cise/klu/common/KLU_z_factor.java deleted file mode 100644 index 2db2b8e..0000000 --- a/src/main/java/edu/ufl/cise/klu/common/KLU_z_factor.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * KLU: a sparse LU factorization algorithm. - * Copyright (C) 2004-2009, Timothy A. Davis. - * Copyright (C) 2011, Richard W. Lincoln. - * http://www.cise.ufl.edu/research/sparse/klu - * - * ------------------------------------------------------------------------- - * - * KLU is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * KLU is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this Module; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package edu.ufl.cise.klu.common; - -/** - * Factors a matrix using the klu_analyze results. - * - * Complex version. - */ -public class KLU_z_factor -{ - - /** - * - * @param Ap size n+1, column pointers - * @param Ai size nz, row indices - * @param Ax size 2*nz, numerical values (real,imag pairs) - * @param Symbolic - * @param Common - * @return KLU_OK if OK, < 0 if error - */ - public static KLU_numeric klu_factor(int[] Ap, int[] Ai, double[] Ax, - KLU_symbolic Symbolic, KLU_common Common) - { - return null; - } - -} diff --git a/src/main/java/edu/ufl/cise/klu/common/KLU_zl_factor.java b/src/main/java/edu/ufl/cise/klu/common/KLU_zl_factor.java deleted file mode 100644 index a746656..0000000 --- a/src/main/java/edu/ufl/cise/klu/common/KLU_zl_factor.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * KLU: a sparse LU factorization algorithm. - * Copyright (C) 2004-2009, Timothy A. Davis. - * Copyright (C) 2011, Richard W. Lincoln. - * http://www.cise.ufl.edu/research/sparse/klu - * - * ------------------------------------------------------------------------- - * - * KLU is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * KLU is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this Module; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package edu.ufl.cise.klu.common; - -/** - * Factors a matrix using the klu_analyze results. - * - * Long / complex version. - */ -public class KLU_zl_factor -{ - - /** - * - * @param Ap size n+1, column pointers - * @param Ai size nz, row indices - * @param Ax size 2*nz, numerical values (real,imag pairs) - * @param Symbolic - * @param Common - * @return KLU_OK if OK, < 0 if error - */ - public static KLU_numeric klu_factor(long[] Ap, long[] Ai, double[] Ax, - KLU_l_symbolic Symbolic, KLU_l_common Common) - { - return null; - } - -} diff --git a/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_analyze.java b/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_analyze.java index df0110c..9be90c7 100644 --- a/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_analyze.java +++ b/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_analyze.java @@ -28,6 +28,8 @@ import edu.ufl.cise.klu.common.KLU_common; import edu.ufl.cise.klu.common.KLU_symbolic; /** + * Orders and analyzes a matrix. + * * Order the matrix using BTF (or not), and then AMD, COLAMD, the natural * ordering, or the user-provided-function on the blocks. Does not support * using a given ordering (use klu_analyze_given for that case). @@ -463,6 +465,8 @@ public class Dklu_analyze extends Dklu_internal } /** + * Order the matrix with BTF (or not), then order each block with AMD, + * COLAMD, a natural ordering, or with a user-provided ordering function. * * @param n A is n-by-n * @param Ap size n+1, column pointers diff --git a/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_analyze_given.java b/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_analyze_given.java index 3348666..37c753f 100644 --- a/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_analyze_given.java +++ b/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_analyze_given.java @@ -28,6 +28,8 @@ import edu.ufl.cise.klu.common.KLU_common; import edu.ufl.cise.klu.common.KLU_symbolic; /** + * Analyzes a matrix using given P and Q. + * * Given an input permutation P and Q, create the Symbolic object. BTF can * be done to modify the user's P and Q (does not perform the max transversal; * just finds the strongly-connected components). @@ -153,6 +155,9 @@ public class Dklu_analyze_given extends Dklu_internal } /** + * Order the matrix with BTF (or not), then use natural or given ordering + * P and Q on the blocks. P and Q are interpreted as identity + * if NULL. * * @param n A is n-by-n * @param Ap size n+1, column pointers -- 2.11.4.GIT