put required categories on all binding functions, not just one of each name

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Add.java

@@ -16,11 +16,14 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongToIntFunction;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Add implements LongToIntFunction {
 
     private final long addend;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Div.java

@@ -15,6 +15,8 @@
  */
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.Description;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
@@ -22,6 +24,7 @@ import java.util.function.LongToIntFunction;
 
 @Description("divides the operand by an long and returns the whole part")
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Div implements LongToIntFunction {
     private final int divisor;
 

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValue.java

@@ -28,7 +28,6 @@ import java.util.function.LongToIntFunction;
  */
 @ThreadSafeMapper
 @Categories({Category.general})
-
 public class FixedValue implements LongToIntFunction {
 
     private final int fixedValue;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mul.java

@@ -16,11 +16,14 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongToIntFunction;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Mul implements LongToIntFunction {
 
     public Mul(int multiplicand) {

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Scale.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2022 nosqlbench
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int;
-
-import io.nosqlbench.virtdata.api.annotations.Categories;
-import io.nosqlbench.virtdata.api.annotations.Category;
-import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
-
-import java.util.function.LongToIntFunction;
-
-@ThreadSafeMapper
-@Deprecated
-@Categories({Category.general})
-public class Scale implements LongToIntFunction {
-
-    private final double scaleFactor;
-
-    public Scale(double scaleFactor) {
-        this.scaleFactor = scaleFactor;
-    }
-
-    @Override
-    public int applyAsInt(long value) {
-        return (int) (scaleFactor * (double) value);
-    }
-}

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Add.java

@@ -16,11 +16,14 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongUnaryOperator;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Add implements LongUnaryOperator {
 
     private final long addend;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddCycleRange.java

@@ -16,11 +16,14 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongUnaryOperator;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class AddCycleRange implements LongUnaryOperator {
 
     private final CycleRange cycleRange;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddHashRange.java

@@ -16,11 +16,14 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongUnaryOperator;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class AddHashRange implements LongUnaryOperator {
 
     private final HashRange hashRange;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Clamp.java

@@ -16,6 +16,8 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.Example;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
@@ -26,6 +28,7 @@ import java.util.function.LongUnaryOperator;
  * at most the maximum value.
  */
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Clamp implements LongUnaryOperator {
 
     private final long min;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/CycleRange.java

@@ -16,11 +16,14 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongUnaryOperator;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class CycleRange implements LongUnaryOperator {
 
     private final long minValue;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Div.java

@@ -15,6 +15,8 @@
  */
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.Example;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
@@ -24,6 +26,7 @@ import java.util.function.LongUnaryOperator;
  * Divide the operand by a fixed value and return the result.
  */
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Div implements LongUnaryOperator {
     private final long divisor;
 

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValue.java

@@ -16,11 +16,14 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongUnaryOperator;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class FixedValue implements LongUnaryOperator {
 
     private final long fixedValue;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashInterval.java

@@ -17,6 +17,8 @@
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
 import io.nosqlbench.api.errors.BasicError;
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.Example;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
@@ -33,6 +35,7 @@ import java.util.function.LongUnaryOperator;
  * (5,6), or as wide as the relevant data type allows.
  */
 @ThreadSafeMapper
+@Categories({Category.general})
 public class HashInterval implements LongUnaryOperator {
 
     private final long minValue;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRange.java

@@ -17,6 +17,8 @@
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
 import io.nosqlbench.api.errors.BasicError;
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongUnaryOperator;
@@ -30,6 +32,7 @@ import java.util.function.LongUnaryOperator;
  * (5,5), or as wide as the relevant data type allows.
  */
 @ThreadSafeMapper
+@Categories({Category.general})
 public class HashRange implements LongUnaryOperator {
 
     private final long minValue;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaled.java

@@ -16,6 +16,8 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongUnaryOperator;
@@ -25,6 +27,7 @@ import java.util.function.LongUnaryOperator;
  * a scale factor, with a default scale factor of 1.0d
  */
 @ThreadSafeMapper
+@Categories({Category.general})
 public class HashRangeScaled implements LongUnaryOperator {
 
     private final double scalefactor;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Interpolate.java

@@ -17,12 +17,15 @@
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.Example;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongUnaryOperator;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Interpolate implements LongUnaryOperator {
 
     private final io.nosqlbench.virtdata.library.basics.shared.from_long.to_double.Interpolate basefunc;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Max.java

@@ -16,6 +16,8 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.Example;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
@@ -25,6 +27,7 @@ import java.util.function.LongUnaryOperator;
  * Return the maximum of either the input value or the specified max.
  */
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Max implements LongUnaryOperator {
 
     private final long max;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Min.java

@@ -16,6 +16,8 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongUnaryOperator;
@@ -24,6 +26,7 @@ import java.util.function.LongUnaryOperator;
  * Return the minimum of either the input value or the specified minimum.
  */
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Min implements LongUnaryOperator {
 
     private final long min;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mod.java

@@ -15,6 +15,8 @@
  */
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongUnaryOperator;
@@ -23,6 +25,7 @@ import java.util.function.LongUnaryOperator;
  * Return the result of modulo division by the specified divisor.
  */
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Mod implements LongUnaryOperator {
 
     private final Long modulo;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mul.java

@@ -16,6 +16,8 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongUnaryOperator;
@@ -24,6 +26,7 @@ import java.util.function.LongUnaryOperator;
  * Return the result of multiplying the specified value with the input.
  */
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Mul implements LongUnaryOperator {
 
     public Mul(long multiplicand) {

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SignedHash.java

@@ -16,6 +16,8 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import io.nosqlbench.virtdata.murmur.Murmur3F;
 
@@ -32,6 +34,7 @@ import java.util.function.LongUnaryOperator;
  * as well as negative values.
  */
 @ThreadSafeMapper
+@Categories({Category.general})
 public class SignedHash implements LongUnaryOperator {
 
     // TODO: Bench this against the non-state based TL implementations

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStep.java

@@ -16,6 +16,8 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.Example;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
@@ -38,6 +40,7 @@ import java.util.function.LongUnaryOperator;
  * join the project or let us know.</p>
  */
 @ThreadSafeMapper
+@Categories({Category.experimental})
 public class TriangularStep implements LongUnaryOperator {
 
     private final Hash hasher = new Hash();

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/FixedValue.java

@@ -16,11 +16,14 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongFunction;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class FixedValue implements LongFunction<String> {
 
     private final String value;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_uuid/ToBase64String.java

@@ -16,6 +16,8 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.from_uuid;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.Example;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
@@ -26,8 +28,9 @@ import java.util.UUID;
 import java.util.function.Function;
 
 @ThreadSafeMapper
+@Categories(Category.conversion)
 public class ToBase64String implements Function<UUID,String> {
-    private ThreadLocal<Base64.Encoder> tl_encoder = ThreadLocal.withInitial(Base64::getEncoder);
+    private final ThreadLocal<Base64.Encoder> tl_encoder = ThreadLocal.withInitial(Base64::getEncoder);
 
     @Example({"ToBase64String()","Encode the bits of a UUID into a Base64 String"})
     public ToBase64String() {

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddCycleRange.java

@@ -16,6 +16,8 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.unary_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.IntUnaryOperator;
@@ -24,6 +26,7 @@ import java.util.function.IntUnaryOperator;
  * Adds a cycle range to the input, producing an increasing sawtooth-like output.
  */
 @ThreadSafeMapper
+@Categories({Category.general})
 public class AddCycleRange implements IntUnaryOperator {
 
     private final CycleRange cycleRange;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddHashRange.java

@@ -16,6 +16,8 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.unary_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.IntUnaryOperator;
@@ -24,6 +26,7 @@ import java.util.function.IntUnaryOperator;
  * Adds a pseudo-random value within the specified range to the input.
  */
 @ThreadSafeMapper
+@Categories({Category.general})
 public class AddHashRange implements IntUnaryOperator {
 
     private final io.nosqlbench.virtdata.library.basics.shared.unary_int.HashRange hashRange;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Clamp.java

@@ -16,12 +16,15 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.unary_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.Example;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.IntUnaryOperator;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Clamp implements IntUnaryOperator {
 
     private final int min;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/CycleRange.java

@@ -16,6 +16,8 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.unary_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.Example;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
@@ -25,6 +27,7 @@ import java.util.function.IntUnaryOperator;
  * Yields a value within a specified range, which rolls over continuously.
  */
 @ThreadSafeMapper
+@Categories({Category.general})
 public class CycleRange implements IntUnaryOperator {
 
     private final int minValue;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Div.java

@@ -15,6 +15,8 @@
  */
 package io.nosqlbench.virtdata.library.basics.shared.unary_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.Description;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
@@ -22,6 +24,7 @@ import java.util.function.IntUnaryOperator;
 
 @Description("divides the operand by an integer and returns the whole part")
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Div implements IntUnaryOperator {
     private final int divisor;
 

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashInterval.java

@@ -17,12 +17,15 @@
 package io.nosqlbench.virtdata.library.basics.shared.unary_int;
 
 import io.nosqlbench.api.errors.BasicError;
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.Example;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.IntUnaryOperator;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class HashInterval implements IntUnaryOperator {
 
     private final int minValue;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRange.java

@@ -17,11 +17,14 @@
 package io.nosqlbench.virtdata.library.basics.shared.unary_int;
 
 import io.nosqlbench.api.errors.BasicError;
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.IntUnaryOperator;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class HashRange implements IntUnaryOperator {
 
     private final int minValue;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRangeScaled.java

@@ -16,11 +16,14 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.unary_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.IntUnaryOperator;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class HashRangeScaled implements IntUnaryOperator {
 
     private final Hash hash = new Hash();

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Max.java

@@ -16,11 +16,14 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.unary_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.IntUnaryOperator;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Max implements IntUnaryOperator {
 
     private final int max;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Min.java

@@ -16,11 +16,14 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.unary_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.IntUnaryOperator;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Min implements IntUnaryOperator {
 
     private final int min;

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mod.java

@@ -15,11 +15,14 @@
  */
 package io.nosqlbench.virtdata.library.basics.shared.unary_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.IntUnaryOperator;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Mod implements IntUnaryOperator {
     private final int modulo;
 

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mul.java

@@ -16,11 +16,14 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.unary_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.IntUnaryOperator;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class Mul implements IntUnaryOperator {
 
     public Mul(int addend) {

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Scale.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2022 nosqlbench
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.nosqlbench.virtdata.library.basics.shared.unary_int;
-
-import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
-
-import java.util.function.IntUnaryOperator;
-
-/**
- * Scale the input by the factor provided.
- * @deprecated use Mul(...) instead
- */
-@ThreadSafeMapper
-public class Scale implements IntUnaryOperator {
-
-    private final double scaleFactor;
-
-    public Scale(double scaleFactor) {
-        this.scaleFactor = scaleFactor;
-    }
-
-    @Override
-    public int applyAsInt(int operand) {
-        return (int) (scaleFactor * (double) operand);
-    }
-}

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignedHash.java

@@ -16,6 +16,8 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.unary_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import io.nosqlbench.virtdata.murmur.Murmur3F;
 
@@ -23,6 +25,7 @@ import java.nio.ByteBuffer;
 import java.util.function.IntUnaryOperator;
 
 @ThreadSafeMapper
+@Categories({Category.general})
 public class SignedHash implements IntUnaryOperator {
 
     private final ThreadLocal<Murmur3F> murmur3f_TL = ThreadLocal.withInitial(Murmur3F::new);

virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToString.java

@@ -16,6 +16,8 @@
 
 package io.nosqlbench.virtdata.library.basics.shared.unary_string;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.Function;
@@ -26,6 +28,7 @@ import java.util.function.Function;
  * String.valueOf() to the result.
  */
 @ThreadSafeMapper
+@Categories({Category.conversion})
 public class ToString implements Function<Object,String> {
 
     @Override

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Cauchy.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.CauchyDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Cauchy extends LongToDoubleContinuousCurve {
     public Cauchy(double median, double scale, String... mods) {
         super(new CauchyDistribution(median, scale), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ChiSquared.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.ChiSquaredDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class ChiSquared extends LongToDoubleContinuousCurve {
     public ChiSquared(double degreesOfFreedom, String... mods) {
         super(new ChiSquaredDistribution(degreesOfFreedom), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ConstantContinuous.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.ConstantContinuousDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class ConstantContinuous extends LongToDoubleContinuousCurve {
     public ConstantContinuous(double value, String... mods) {
         super(new ConstantContinuousDistribution(value), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Enumerated.java

@@ -16,11 +16,14 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.Example;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.math4.distribution.EnumeratedRealDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Enumerated extends LongToDoubleContinuousCurve {
 
     @Example({"Enumerated('1 2 3 4 5 6')","a fair 6-sided die"})

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Exponential.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.ExponentialDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Exponential extends LongToDoubleContinuousCurve {
     public Exponential(double mean, String... mods) {
         super(new ExponentialDistribution(mean), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/F.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.FDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class F extends LongToDoubleContinuousCurve {
     public F(double numeratorDegreesOfFreedom, double denominatorDegreesOfFreedom, String... mods) {
         super(new FDistribution(numeratorDegreesOfFreedom, denominatorDegreesOfFreedom), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gamma.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.GammaDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Gamma extends LongToDoubleContinuousCurve {
     public Gamma(double shape, double scale, String... mods) {
         super(new GammaDistribution(shape, scale), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gumbel.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.GumbelDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Gumbel extends LongToDoubleContinuousCurve {
     public Gumbel(double mu, double beta, String... mods) {
         super(new GumbelDistribution(mu, beta), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Laplace.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.LaplaceDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Laplace extends LongToDoubleContinuousCurve {
     public Laplace(double mu, double beta, String... mods) {
         super(new LaplaceDistribution(mu, beta), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Levy.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.LevyDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Levy extends LongToDoubleContinuousCurve { public Levy(double mu, double c, String... mods) { super(new LevyDistribution(mu,c), mods);
     }
 }

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/LogNormal.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.LogNormalDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class LogNormal extends LongToDoubleContinuousCurve {
     public LogNormal(double scale, double shape, String... mods) {
         super(new LogNormalDistribution(scale, shape), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Logistic.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.LogisticDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Logistic extends LongToDoubleContinuousCurve {
     public Logistic(double mu, double scale, String... mods) {
         super(new LogisticDistribution(mu, scale), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Nakagami.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.NakagamiDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Nakagami extends LongToDoubleContinuousCurve {
     public Nakagami(double mu, double omega, String... mods) {
         super(new NakagamiDistribution(mu, omega), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Normal.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.NormalDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Normal extends LongToDoubleContinuousCurve {
     public Normal(double mean, double sd, String... mods) {
         super(new NormalDistribution(mean, sd), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Pareto.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.ParetoDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Pareto extends LongToDoubleContinuousCurve {
     public Pareto(double scale, double shape, String... mods) {
         super(new ParetoDistribution(scale, shape), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/T.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.TDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class T extends LongToDoubleContinuousCurve {
     public T(double degreesOfFreedom, String... mods) {
         super(new TDistribution(degreesOfFreedom), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Triangular.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.TriangularDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Triangular extends LongToDoubleContinuousCurve {
     public Triangular(double a, double c, double b, String... mods) {
         super(new TriangularDistribution(a,c,b), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Uniform.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.UniformContinuousDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Uniform extends LongToDoubleContinuousCurve {
     public Uniform(double lower, double upper, String... mods) {
         super(new UniformContinuousDistribution(lower, upper), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Weibull.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.WeibullDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Weibull extends LongToDoubleContinuousCurve {
     public Weibull(double alpha, double beta, String... mods) {
         super(new WeibullDistribution(alpha, beta), mods);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Geometric.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.int_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.GeometricDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Geometric extends IntToLongDiscreteCurve {
     public Geometric(double p, String... modslist) {
         super(new GeometricDistribution(p), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Hypergeometric.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.int_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.HypergeometricDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Hypergeometric extends IntToLongDiscreteCurve {
     public Hypergeometric(int populationSize, int numberOfSuccesses, int sampleSize, String... modslist) {
         super(new HypergeometricDistribution(populationSize, numberOfSuccesses, sampleSize), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Pascal.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.int_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.PascalDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Pascal extends IntToLongDiscreteCurve {
     public Pascal(int r, double p, String... modslist) {
         super(new PascalDistribution(r, p), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Poisson.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.int_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.PoissonDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Poisson extends IntToLongDiscreteCurve {
     public Poisson(double p, String... modslist) {
         super(new PoissonDistribution(p), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Uniform.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.int_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.UniformDiscreteDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Uniform extends IntToLongDiscreteCurve {
     public Uniform(int lower, int upper, String... modslist) {
         super(new UniformDiscreteDistribution(lower, upper), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Zipf.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.int_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.ZipfDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Zipf extends IntToLongDiscreteCurve {
     public Zipf(int numberOfElements, double exponent, String... modslist) {
         super(new ZipfDistribution(numberOfElements, exponent), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Geometric.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.long_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.GeometricDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Geometric extends LongToIntDiscreteCurve {
     public Geometric(double p, String... modslist) {
         super(new GeometricDistribution(p), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Hypergeometric.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.long_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.HypergeometricDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Hypergeometric extends LongToIntDiscreteCurve {
     public Hypergeometric(int populationSize, int numberOfSuccesses, int sampleSize, String... modslist) {
         super(new HypergeometricDistribution(populationSize, numberOfSuccesses, sampleSize), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Pascal.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.long_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.PascalDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Pascal extends LongToIntDiscreteCurve {
     public Pascal(int r, double p, String... modslist) {
         super(new PascalDistribution(r, p), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Poisson.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.long_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.PoissonDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Poisson extends LongToIntDiscreteCurve {
     public Poisson(double p, String... modslist) {
         super(new PoissonDistribution(p), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Uniform.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.long_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.UniformDiscreteDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Uniform extends LongToIntDiscreteCurve {
     public Uniform(int lower, int upper, String... modslist) {
         super(new UniformDiscreteDistribution(lower, upper), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Zipf.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.long_int;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.ZipfDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Zipf extends LongToIntDiscreteCurve {
     public Zipf(int numberOfElements, double exponent, String... modslist) {
         super(new ZipfDistribution(numberOfElements, exponent), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Geometric.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.long_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.GeometricDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Geometric extends LongToLongDiscreteCurve {
     public Geometric(double p, String... modslist) {
         super(new GeometricDistribution(p), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Hypergeometric.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.long_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.HypergeometricDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Hypergeometric extends LongToLongDiscreteCurve {
     public Hypergeometric(int populationSize, int numberOfSuccesses, int sampleSize, String... modslist) {
         super(new HypergeometricDistribution(populationSize, numberOfSuccesses, sampleSize), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Pascal.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.long_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.PascalDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Pascal extends LongToLongDiscreteCurve {
     public Pascal(int r, double p, String... modslist) {
         super(new PascalDistribution(r, p), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Poisson.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.long_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.PoissonDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Poisson extends LongToLongDiscreteCurve {
     public Poisson(double p, String... modslist) {
         super(new PoissonDistribution(p), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Uniform.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.long_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.UniformDiscreteDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Uniform extends LongToLongDiscreteCurve {
     public Uniform(int lower, int upper, String... modslist) {
         super(new UniformDiscreteDistribution(lower, upper), modslist);

virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Zipf.java

@@ -16,10 +16,13 @@
 
 package io.nosqlbench.virtdata.library.curves4.discrete.long_long;
 
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.apache.commons.statistics.distribution.ZipfDistribution;
 
 @ThreadSafeMapper
+@Categories({Category.distributions})
 public class Zipf extends LongToLongDiscreteCurve {
     public Zipf(int numberOfElements, double exponent, String... modslist) {
         super(new ZipfDistribution(numberOfElements, exponent), modslist);