Merge branch 'bug/JAL-2846' into develop

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

diff --git a/benchmarking/src/main/java/org/jalview/HiddenColumnsBenchmark.java b/benchmarking/src/main/java/org/jalview/HiddenColumnsBenchmark.java
index 383a064..07b76f9 100644 (file)
--- 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"})
@@ -102,31 +102,16 @@ public class HiddenColumnsBenchmark
        @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
-       @BenchmarkMode({Mode.Throughput})
-       public List<Integer> benchFindHiddenRegionPositions(HiddenColsAndStartState tstate)
-       {
-               return tstate.h.findHiddenRegionPositions();
-       }*/
-       
-       @Benchmark
-       @BenchmarkMode({Mode.Throughput})
-       public ArrayList<int[]> benchGetHiddenColumnsCopy(HiddenColsAndStartState tstate)
-       {
-               return tstate.h.getHiddenColumnsCopy();
-       }
-       
-       
        @Benchmark
        @BenchmarkMode({Mode.Throughput})
     public int benchGetSize(HiddenColsAndStartState tstate)