X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=benchmarking%2Fsrc%2Fmain%2Fjava%2Forg%2Fjalview%2FHiddenColumnsBenchmark.java;h=07b76f924f8bf19afcc1ae05d2a3be09758eae26;hb=948bd3bcbacc509da0cefaae3eedd97300a6ccce;hp=ae2d628125af331c402e2a495a76d50052c56bf2;hpb=4d3cf3e91660d6b1c5bcdee4bef34c2747ac7023;p=jalview.git

diff --git a/benchmarking/src/main/java/org/jalview/HiddenColumnsBenchmark.java b/benchmarking/src/main/java/org/jalview/HiddenColumnsBenchmark.java
index ae2d628..07b76f9 100644
--- a/benchmarking/src/main/java/org/jalview/HiddenColumnsBenchmark.java
+++ b/benchmarking/src/main/java/org/jalview/HiddenColumnsBenchmark.java
@@ -54,7 +54,7 @@ public class HiddenColumnsBenchmark
 	@State(Scope.Thread)
 	public static class HiddenColsAndStartState
 	{
-		@Param({"300", "10000", "100000"})
+		@Param({"100", "1000", "10000", "100000", "1000000"})
 		public int maxcols;
 		
 		@Param({"1", "50", "90"})
@@ -98,18 +98,18 @@ public class HiddenColumnsBenchmark
 	
 	/* Convention: functions in alphabetical order */
 	
-/*	@Benchmark
+	@Benchmark
 	@BenchmarkMode({Mode.Throughput})
 	public int benchAdjustForHiddenColumns(HiddenColsAndStartState tstate)
 	{
-		return tstate.h.adjustForHiddenColumns(tstate.visibleColumn);
+		return tstate.h.visibleToAbsoluteColumn(tstate.visibleColumn);
 	}
 	
 	@Benchmark
 	@BenchmarkMode({Mode.Throughput})
 	public int benchFindColumnPosition(HiddenColsAndStartState tstate)
 	{
-		return tstate.h.findColumnPosition(tstate.visibleColumn);
+		return tstate.h.absoluteToVisibleColumn(tstate.visibleColumn);
 	}
 	
 	@Benchmark
@@ -118,7 +118,7 @@ public class HiddenColumnsBenchmark
     {
 		return tstate.h.getSize();
     }
-*/
+
    @Benchmark
     @BenchmarkMode({Mode.Throughput})
     public HiddenColumns benchHideCols(HiddenColsAndStartState tstate) 
@@ -127,7 +127,7 @@ public class HiddenColumnsBenchmark
     			tstate.visibleColumn+2000); 
     	return tstate.h;
     }
-   /*
+   
 	@Benchmark
 	@BenchmarkMode({Mode.Throughput})
     public boolean benchIsVisible(HiddenColsAndStartState tstate) 
@@ -152,6 +152,6 @@ public class HiddenColumnsBenchmark
     	tstate.h.revealAllHiddenColumns(sel);
     	return tstate.h;
     }
-	*/
+	
 	
 }
\ No newline at end of file