Rename getBenchmark function to getResultOutput

18 files changed, 31 insertions, 32 deletions

diff --git a/src/org/opensolaris/hub/libmicro/NativeCaseMicro.java b/src/org/opensolaris/hub/libmicro/NativeCaseMicro.java
index d6c0190..9c04b20 100644
--- a/src/org/opensolaris/hub/libmicro/NativeCaseMicro.java
+++ b/src/org/opensolaris/hub/libmicro/NativeCaseMicro.java
@@ -82,7 +82,7 @@ public class NativeCaseMicro  extends Case {
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
         if (!couldFetchReport()) {
             return "No benchmark report";
         }
diff --git a/src/org/zeroxlab/benchmark/Benchmark.java b/src/org/zeroxlab/benchmark/Benchmark.java
index 712a009..0af37db 100644
--- a/src/org/zeroxlab/benchmark/Benchmark.java
+++ b/src/org/zeroxlab/benchmark/Benchmark.java
@@ -630,7 +630,7 @@ public class Benchmark extends TabActivity implements View.OnClickListener {
             result += "============================================================\n";
             result += mycase.getTitle() + "\n";
             result += "------------------------------------------------------------\n";
-            result += mycase.getBenchmark().trim() + "\n";
+            result += mycase.getResultOutput().trim() + "\n";
         }
         result += "============================================================\n";
 
diff --git a/src/org/zeroxlab/benchmark/Case.java b/src/org/zeroxlab/benchmark/Case.java
index ab3dc7c..53656f9 100644
--- a/src/org/zeroxlab/benchmark/Case.java
+++ b/src/org/zeroxlab/benchmark/Case.java
@@ -234,8 +234,7 @@ public abstract class Case{
         return true;
     }
 
-    public String getBenchmark() {
-
+    public String getResultOutput() {
         if (!couldFetchReport()) {
             return "No benchmark report";
         }
diff --git a/src/org/zeroxlab/benchmark/CaseArithmetic.java b/src/org/zeroxlab/benchmark/CaseArithmetic.java
index 4fb800b..3584192 100644
--- a/src/org/zeroxlab/benchmark/CaseArithmetic.java
+++ b/src/org/zeroxlab/benchmark/CaseArithmetic.java
@@ -80,7 +80,7 @@ public class CaseArithmetic extends Case{
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
         String result = "\n";
         for (int i = 0; i < mInfo.length; i++) {
             result += TesterArithmetic.bundleToString(mInfo[i]);
@@ -94,7 +94,7 @@ public class CaseArithmetic extends Case{
         ArrayList<Scenario> scenarios = new ArrayList<Scenario>();
 
         Scenario s = new Scenario(getTitle(), mType, mTags);
-        s.mLog = getBenchmark();
+        s.mLog = getResultOutput();
         for (int i=0; i<mInfo.length; i++)
             s.mResults.add(mInfo[i].getDouble(TesterArithmetic.MFLOPS));
 
diff --git a/src/org/zeroxlab/benchmark/CaseCanvas.java b/src/org/zeroxlab/benchmark/CaseCanvas.java
index 89e2ae8..0958624 100644
--- a/src/org/zeroxlab/benchmark/CaseCanvas.java
+++ b/src/org/zeroxlab/benchmark/CaseCanvas.java
@@ -56,7 +56,7 @@ public class CaseCanvas extends Case{
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
         if (!couldFetchReport()) {
             return "Cavas has no report";
         }
@@ -81,7 +81,7 @@ public class CaseCanvas extends Case{
         ArrayList<Scenario> scenarios = new ArrayList<Scenario>();
 
         Scenario s = new Scenario(getTitle(), mType, mTags);
-        s.mLog = getBenchmark();
+        s.mLog = getResultOutput();
         for (int i = 0; i < mResult.length; i++) {
             float second = (mResult[i] / 1000f);
             float fps = (float)mCaseRound / second;
diff --git a/src/org/zeroxlab/benchmark/CaseDrawArc.java b/src/org/zeroxlab/benchmark/CaseDrawArc.java
index e944c67..7fd1d5c 100644
--- a/src/org/zeroxlab/benchmark/CaseDrawArc.java
+++ b/src/org/zeroxlab/benchmark/CaseDrawArc.java
@@ -55,7 +55,7 @@ public class CaseDrawArc extends Case{
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
         if (!couldFetchReport()) {
             return "DrawArc has no report";
         }
@@ -80,7 +80,7 @@ public class CaseDrawArc extends Case{
         ArrayList<Scenario> scenarios = new ArrayList<Scenario>();
 
         Scenario s = new Scenario(getTitle(), mType, mTags);
-        s.mLog = getBenchmark();
+        s.mLog = getResultOutput();
         for (int i = 0; i < mResult.length; i++) {
             float second = (mResult[i] / 1000f);
             float fps = (float)mCaseRound / second;
diff --git a/src/org/zeroxlab/benchmark/CaseDrawCircle.java b/src/org/zeroxlab/benchmark/CaseDrawCircle.java
index 0a3fcb8..1a43c9a 100644
--- a/src/org/zeroxlab/benchmark/CaseDrawCircle.java
+++ b/src/org/zeroxlab/benchmark/CaseDrawCircle.java
@@ -55,7 +55,7 @@ public class CaseDrawCircle extends Case{
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
         if (!couldFetchReport()) {
             return "DrawCircle has no report";
         }
@@ -80,7 +80,7 @@ public class CaseDrawCircle extends Case{
         ArrayList<Scenario> scenarios = new ArrayList<Scenario>();
 
         Scenario s = new Scenario(getTitle(), mType, mTags);
-        s.mLog = getBenchmark();
+        s.mLog = getResultOutput();
         for (int i = 0; i < mResult.length; i++) {
             float second = (mResult[i] / 1000f);
             float fps = (float)mCaseRound / second;
diff --git a/src/org/zeroxlab/benchmark/CaseDrawCircle2.java b/src/org/zeroxlab/benchmark/CaseDrawCircle2.java
index f8a8eed..7bc5209 100644
--- a/src/org/zeroxlab/benchmark/CaseDrawCircle2.java
+++ b/src/org/zeroxlab/benchmark/CaseDrawCircle2.java
@@ -55,7 +55,7 @@ public class CaseDrawCircle2 extends Case{
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
         if (!couldFetchReport()) {
             return "DrawCircle2 has no report";
         }
@@ -80,7 +80,7 @@ public class CaseDrawCircle2 extends Case{
         ArrayList<Scenario> scenarios = new ArrayList<Scenario>();
 
         Scenario s = new Scenario(getTitle(), mType, mTags);
-        s.mLog = getBenchmark();
+        s.mLog = getResultOutput();
         for (int i = 0; i < mResult.length; i++) {
             float second = (mResult[i] / 1000f);
             float fps = (float)mCaseRound / second;
diff --git a/src/org/zeroxlab/benchmark/CaseDrawImage.java b/src/org/zeroxlab/benchmark/CaseDrawImage.java
index 8e6d723..d9ef73e 100644
--- a/src/org/zeroxlab/benchmark/CaseDrawImage.java
+++ b/src/org/zeroxlab/benchmark/CaseDrawImage.java
@@ -55,7 +55,7 @@ public class CaseDrawImage extends Case{
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
         if (!couldFetchReport()) {
             return "DrawImage has no report";
         }
@@ -80,7 +80,7 @@ public class CaseDrawImage extends Case{
         ArrayList<Scenario> scenarios = new ArrayList<Scenario>();
 
         Scenario s = new Scenario(getTitle(), mType, mTags);
-        s.mLog = getBenchmark();
+        s.mLog = getResultOutput();
         for (int i = 0; i < mResult.length; i++) {
             float second = (mResult[i] / 1000f);
             float fps = (float)mCaseRound / second;
diff --git a/src/org/zeroxlab/benchmark/CaseDrawRect.java b/src/org/zeroxlab/benchmark/CaseDrawRect.java
index 58ae44c..680f8cf 100644
--- a/src/org/zeroxlab/benchmark/CaseDrawRect.java
+++ b/src/org/zeroxlab/benchmark/CaseDrawRect.java
@@ -55,7 +55,7 @@ public class CaseDrawRect extends Case{
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
         if (!couldFetchReport()) {
             return "DrawRect has no report";
         }
@@ -80,7 +80,7 @@ public class CaseDrawRect extends Case{
         ArrayList<Scenario> scenarios = new ArrayList<Scenario>();
 
         Scenario s = new Scenario(getTitle(), mType, mTags);
-        s.mLog = getBenchmark();
+        s.mLog = getResultOutput();
         for (int i = 0; i < mResult.length; i++) {
             float second = (mResult[i] / 1000f);
             float fps = (float)mCaseRound / second;
diff --git a/src/org/zeroxlab/benchmark/CaseDrawText.java b/src/org/zeroxlab/benchmark/CaseDrawText.java
index 6ba1151..bf85877 100644
--- a/src/org/zeroxlab/benchmark/CaseDrawText.java
+++ b/src/org/zeroxlab/benchmark/CaseDrawText.java
@@ -55,7 +55,7 @@ public class CaseDrawText extends Case{
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
         if (!couldFetchReport()) {
             return "DrawText has no report";
         }
@@ -80,7 +80,7 @@ public class CaseDrawText extends Case{
         ArrayList<Scenario> scenarios = new ArrayList<Scenario>();
 
         Scenario s = new Scenario(getTitle(), mType, mTags);
-        s.mLog = getBenchmark();
+        s.mLog = getResultOutput();
         for (int i = 0; i < mResult.length; i++) {
             float second = (mResult[i] / 1000f);
             float fps = (float)mCaseRound / second;
diff --git a/src/org/zeroxlab/benchmark/CaseGC.java b/src/org/zeroxlab/benchmark/CaseGC.java
index 809d695..c7200e6 100644
--- a/src/org/zeroxlab/benchmark/CaseGC.java
+++ b/src/org/zeroxlab/benchmark/CaseGC.java
@@ -69,7 +69,7 @@ public class CaseGC extends Case{
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
 
         if (!couldFetchReport()) {
             return "No benchmark report";
@@ -83,7 +83,7 @@ public class CaseGC extends Case{
         ArrayList<Scenario> scenarios = new ArrayList<Scenario>();
 
         Scenario s = new Scenario(getTitle(), mType, mTags);
-        s.mLog = getBenchmark();
+        s.mLog = getResultOutput();
         s.mResults.add(time);
         scenarios.add(s);
 
diff --git a/src/org/zeroxlab/benchmark/CaseGLCube.java b/src/org/zeroxlab/benchmark/CaseGLCube.java
index a029f5e..3ce82ed 100644
--- a/src/org/zeroxlab/benchmark/CaseGLCube.java
+++ b/src/org/zeroxlab/benchmark/CaseGLCube.java
@@ -58,7 +58,7 @@ public class CaseGLCube extends Case{
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
         if (!couldFetchReport()) {
             return "GLCube has no report";
         }
@@ -83,7 +83,7 @@ public class CaseGLCube extends Case{
         ArrayList<Scenario> scenarios = new ArrayList<Scenario>();
 
         Scenario s = new Scenario(getTitle(), mType, mTags);
-        s.mLog = getBenchmark();
+        s.mLog = getResultOutput();
         for (int i = 0; i < mResult.length; i++) {
             float fps = (float)mCaseRound /  (mResult[i] / 1000f);
             s.mResults.add(((Float)fps).doubleValue());
diff --git a/src/org/zeroxlab/benchmark/CaseNeheLesson08.java b/src/org/zeroxlab/benchmark/CaseNeheLesson08.java
index 722a299..ca120a9 100644
--- a/src/org/zeroxlab/benchmark/CaseNeheLesson08.java
+++ b/src/org/zeroxlab/benchmark/CaseNeheLesson08.java
@@ -59,7 +59,7 @@ public class CaseNeheLesson08 extends Case {
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
         if (!couldFetchReport()) {
             return "Nehe Lesson 8 has no report";
         }
@@ -83,7 +83,7 @@ public class CaseNeheLesson08 extends Case {
         ArrayList<Scenario> scenarios = new ArrayList<Scenario>();
 
         Scenario s = new Scenario(getTitle(), mType, mTags);
-        s.mLog = getBenchmark();
+        s.mLog = getResultOutput();
         for (int i = 0; i < mResult.length; i++) {
             float fps = (float)mCaseRound /  (mResult[i] / 1000f);
             s.mResults.add(((Float)fps).doubleValue());
diff --git a/src/org/zeroxlab/benchmark/CaseNeheLesson16.java b/src/org/zeroxlab/benchmark/CaseNeheLesson16.java
index 7da6f15..f529305 100644
--- a/src/org/zeroxlab/benchmark/CaseNeheLesson16.java
+++ b/src/org/zeroxlab/benchmark/CaseNeheLesson16.java
@@ -57,7 +57,7 @@ public class CaseNeheLesson16 extends Case {
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
         if (!couldFetchReport()) {
             return "Nehe Lesson 16 has no report";
         }
@@ -81,7 +81,7 @@ public class CaseNeheLesson16 extends Case {
         ArrayList<Scenario> scenarios = new ArrayList<Scenario>();
 
         Scenario s = new Scenario(getTitle(), mType, mTags);
-        s.mLog = getBenchmark();
+        s.mLog = getResultOutput();
         for (int i = 0; i < mResult.length; i++) {
             float fps = (float)mCaseRound /  (mResult[i] / 1000f);
             s.mResults.add(((Float)fps).doubleValue());
diff --git a/src/org/zeroxlab/benchmark/CaseScimark2.java b/src/org/zeroxlab/benchmark/CaseScimark2.java
index 8c7f4c1..a9b8bf0 100644
--- a/src/org/zeroxlab/benchmark/CaseScimark2.java
+++ b/src/org/zeroxlab/benchmark/CaseScimark2.java
@@ -80,7 +80,7 @@ public class CaseScimark2 extends Case{
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
         if (!couldFetchReport()) {
             return "No benchmark report";
         }
diff --git a/src/org/zeroxlab/benchmark/CaseTeapot.java b/src/org/zeroxlab/benchmark/CaseTeapot.java
index 84ccc8a..be2dc26 100644
--- a/src/org/zeroxlab/benchmark/CaseTeapot.java
+++ b/src/org/zeroxlab/benchmark/CaseTeapot.java
@@ -53,7 +53,7 @@ public class CaseTeapot extends Case {
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
         if (!couldFetchReport()) {
             return "Teapot has no report";
         }
@@ -77,7 +77,7 @@ public class CaseTeapot extends Case {
         ArrayList<Scenario> scenarios = new ArrayList<Scenario>();
 
         Scenario s = new Scenario(getTitle(), mType, mTags);
-        s.mLog = getBenchmark();
+        s.mLog = getResultOutput();
         for (int i = 0; i < mResult.length; i++) {
             float fps = (float)mCaseRound /  (mResult[i] / 1000f);
             s.mResults.add(((Float)fps).doubleValue());
diff --git a/src/org/zeroxlab/byteunix/NativeCaseUbench.java b/src/org/zeroxlab/byteunix/NativeCaseUbench.java
index 277446b..7b40698 100644
--- a/src/org/zeroxlab/byteunix/NativeCaseUbench.java
+++ b/src/org/zeroxlab/byteunix/NativeCaseUbench.java
@@ -82,7 +82,7 @@ public class NativeCaseUbench  extends Case {
     }
 
     @Override
-    public String getBenchmark() {
+    public String getResultOutput() {
         if (!couldFetchReport()) {
             return "No benchmark report";
         }