X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=benchmarking%2Fsrc%2Fmain%2Fjava%2Forg%2Fjalview%2FHiddenColsIteratorsBenchmark.java;h=477bfada0fa4c90f1cdfb1c38efae8fe38bbf272;hb=f53b649151f6393c7353ce51cfd02de348d0bd6e;hp=78363672080b9df4cc471e858a447fe17d551fd8;hpb=a6789f8a91ca11fac840b958ee9207581ea4d14f;p=jalview.git

diff --git a/benchmarking/src/main/java/org/jalview/HiddenColsIteratorsBenchmark.java b/benchmarking/src/main/java/org/jalview/HiddenColsIteratorsBenchmark.java
index 7836367..477bfad 100644
--- 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;
-	}
 }