New version of MAHEVE plus corrections.

[mapping.git] / src / and / Mapping / Linpack.java

diff --git a/src/and/Mapping/Linpack.java b/src/and/Mapping/Linpack.java
index b92d7d3..b3a4997 100644 (file)
--- a/src/and/Mapping/Linpack.java
+++ b/src/and/Mapping/Linpack.java
@@ -81,11 +81,6 @@ public class Linpack
                int n,i,lda;
                int ipvt[] = new int[1000];
 
-               //double mflops_result;
-               //double residn_result;
-               //double time_result;
-               //double eps_result;
-
                lda = 1001;
                n = 500;
 
@@ -114,15 +109,10 @@ public class Linpack
 
                eps_result = epslon((double)1.0);
                /*
-
-    residn_result = resid/( n*norma*normx*eps_result );
-    time_result = total;
-    mflops_result = ops/(1.0e6*total);
-
-    return ("Mflops/s: " + mflops_result +
-           "  Time: " + time_result + " secs" +
-           "  Norm Res: " + residn_result +
-           "  Precision: " + eps_result);
+           return ("Mflops/s: " + mflops_result +
+              "  Time: " + time_result + " secs" +
+              "  Norm Res: " + residn_result +
+              "  Precision: " + eps_result);
                 */
                residn_result = resid/( n*norma*normx*eps_result );
                residn_result += 0.005; // for rounding
@@ -139,11 +129,6 @@ public class Linpack
                mflops_result = (int)(mflops_result*1000);
                mflops_result /= 1000;
 
-               //    System.out.println("Mflops/s: " + mflops_result +
-               //          "  Time: " + time_result + " secs" +
-               //          "  Norm Res: " + residn_result +
-               //          "  Precision: " + eps_result);
-
                return mflops_result ;
        }
 
@@ -157,7 +142,7 @@ public class Linpack
                init = 1325;
                norma = 0.0;
                /*  Next two for() statements switched.  Solver wants
-matrix in column order. --dmd 3/3/97
+               matrix in column order. --dmd 3/3/97
                 */
                for (i = 0; i < n; i++) {
                        for (j = 0; j < n; j++) {