summaryrefslogtreecommitdiff
path: root/src/de/lmu/ifi/dbs/elki/index/lsh/hashfamilies
diff options
context:
space:
mode:
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/index/lsh/hashfamilies')
-rw-r--r--src/de/lmu/ifi/dbs/elki/index/lsh/hashfamilies/AbstractHashFunctionFamily.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/index/lsh/hashfamilies/AbstractHashFunctionFamily.java b/src/de/lmu/ifi/dbs/elki/index/lsh/hashfamilies/AbstractHashFunctionFamily.java
index 1ed350f0..1c5502eb 100644
--- a/src/de/lmu/ifi/dbs/elki/index/lsh/hashfamilies/AbstractHashFunctionFamily.java
+++ b/src/de/lmu/ifi/dbs/elki/index/lsh/hashfamilies/AbstractHashFunctionFamily.java
@@ -37,7 +37,7 @@ import de.lmu.ifi.dbs.elki.math.linearalgebra.randomprojections.RandomProjection
import de.lmu.ifi.dbs.elki.utilities.RandomFactory;
import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer;
import de.lmu.ifi.dbs.elki.utilities.optionhandling.OptionID;
-import de.lmu.ifi.dbs.elki.utilities.optionhandling.constraints.GreaterConstraint;
+import de.lmu.ifi.dbs.elki.utilities.optionhandling.constraints.CommonConstraints;
import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization.Parameterization;
import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.DoubleParameter;
import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntParameter;
@@ -89,8 +89,8 @@ public abstract class AbstractHashFunctionFamily implements LocalitySensitiveHas
public ArrayList<? extends LocalitySensitiveHashFunction<? super NumberVector<?>>> generateHashFunctions(Relation<? extends NumberVector<?>> relation, int l) {
int dim = RelationUtil.dimensionality(relation);
ArrayList<LocalitySensitiveHashFunction<? super NumberVector<?>>> ps = new ArrayList<>(l);
- final Random rnd = random.getRandom();
- for (int i = 0; i < l; i++) {
+ final Random rnd = random.getSingleThreadedRandom();
+ for(int i = 0; i < l; i++) {
RandomProjectionFamily.Projection mat = proj.generateProjection(dim, k);
ps.add(new MultipleProjectionsLocalitySensitiveHashFunction(mat, width, rnd));
}
@@ -144,19 +144,19 @@ public abstract class AbstractHashFunctionFamily implements LocalitySensitiveHas
protected void makeOptions(Parameterization config) {
super.makeOptions(config);
RandomParameter randP = new RandomParameter(RANDOM_ID, RandomFactory.DEFAULT);
- if (config.grab(randP)) {
+ if(config.grab(randP)) {
random = randP.getValue();
}
DoubleParameter widthP = new DoubleParameter(WIDTH_ID);
- widthP.addConstraint(new GreaterConstraint(0.0));
- if (config.grab(widthP)) {
+ widthP.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE);
+ if(config.grab(widthP)) {
width = widthP.doubleValue();
}
IntParameter lP = new IntParameter(NUMPROJ_ID);
- lP.addConstraint(new GreaterConstraint(0));
- if (config.grab(lP)) {
+ lP.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
+ if(config.grab(lP)) {
k = lP.intValue();
}
}