Merge branch 'Jalview-JS/jim/JAL-3253-JAL-3418' into Jalview-JS/JAL-3253-applet

[jalview.git] / benchmarking / src / main / java / org / jalview / HiddenColsIteratorsBenchmark.java

diff --git a/benchmarking/src/main/java/org/jalview/HiddenColsIteratorsBenchmark.java b/benchmarking/src/main/java/org/jalview/HiddenColsIteratorsBenchmark.java
index 7836367..477bfad 100644 (file)
--- a/benchmarking/src/main/java/org/jalview/HiddenColsIteratorsBenchmark.java
+++ b/benchmarking/src/main/java/org/jalview/HiddenColsIteratorsBenchmark.java
@@ -104,8 +104,8 @@ public class HiddenColsIteratorsBenchmark {
        {
                int res = 0;
                int startx = tstate.visibleColumn;
-               Iterator<Integer> it = tstate.h.getBoundedStartIterator(startx,
-                               startx+60, true);
+               Iterator<Integer> it = tstate.h.getStartRegionIterator(startx,
+                               startx+60);
         while (it.hasNext())
         {
           res = it.next() - startx;
@@ -123,7 +123,7 @@ public class HiddenColsIteratorsBenchmark {
                int blockEnd;
                int screenY = 0;
                Iterator<int[]> it = tstate.h.getBoundedIterator(startx,
-                               startx+60, true);
+                               startx+60);
         while (it.hasNext())
         {
                int[] region = it.next();
@@ -137,57 +137,4 @@ public class HiddenColsIteratorsBenchmark {
         }
         return blockStart;
        }
-       
-       
-       @Benchmark
-       @BenchmarkMode({Mode.Throughput})
-       public int benchHiddenColsCopy(HiddenColsAndStartState tstate)
-       {
-               int startx = tstate.visibleColumn;
-               int blockEnd;
-               int blockStart = startx;
-               int screenY = 0;
-           for (int[] region : tstate.h.getHiddenColumnsCopy())
-           {
-             int hideStart = region[0];
-             int hideEnd = region[1];
-       
-             if (hideStart <= blockStart)
-             {
-               blockStart += (hideEnd - hideStart) + 1;
-               continue;
-             }
-
-             //do something
-             Blackhole.consumeCPU(5);
-             blockEnd = Math.min(hideStart - 1, blockStart + 60 - screenY);
-             
-             screenY += blockEnd - blockStart + 1;
-                 blockStart = hideEnd + 1;
-               
-                 if (screenY > 60)
-                 {
-                   //done
-                   break;
-                 }
-           }
-           return blockStart;
-       }
-       
-       
-       @Benchmark
-       @BenchmarkMode({Mode.Throughput})
-       public int benchLoop1(HiddenColsAndStartState tstate)
-       {
-               int res = 0;
-               int startx = tstate.visibleColumn;
-               List<Integer> positions = tstate.h.findHiddenRegionPositions(startx, startx+60);
-               
-           for (int pos : positions)
-        {
-          res = pos - startx;
-          Blackhole.consumeCPU(5);
-        }
-           return res;
-       }
 }