Skip to content

Commit

Permalink
Mass change: chain .addConstraint statements
Browse files Browse the repository at this point in the history
  • Loading branch information
kno10 committed Mar 27, 2018
1 parent 67a7e29 commit dd07de6
Show file tree
Hide file tree
Showing 123 changed files with 388 additions and 409 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ public static class Parameterizer extends AbstractParameterizer {
@Override
protected void makeOptions(Parameterization config) {
super.makeOptions(config);
StringParameter titleP = new StringParameter(WINDOW_TITLE_ID);
titleP.setOptional(true);
StringParameter titleP = new StringParameter(WINDOW_TITLE_ID) //
.setOptional(true);
if(config.grab(titleP)) {
title = titleP.getValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,8 @@ protected void makeOptions(Parameterization config) {
output = outputP.getValue();
}

DoubleParameter ratioP = new DoubleParameter(RATIO_ID, 1.33);
ratioP.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE);
DoubleParameter ratioP = new DoubleParameter(RATIO_ID, 1.33) //
.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE);
if(config.grab(ratioP)) {
ratio = ratioP.doubleValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ public static class Parameterizer extends AbstractParameterizer {
@Override
protected void makeOptions(Parameterization config) {
super.makeOptions(config);
IntParameter maxdimP = new IntParameter(ScatterPlotFactory.Parameterizer.MAXDIM_ID, ScatterPlotFactory.MAX_DIMENSIONS_DEFAULT);
maxdimP.addConstraint(CommonConstraints.GREATER_EQUAL_ZERO_INT);
IntParameter maxdimP = new IntParameter(ScatterPlotFactory.Parameterizer.MAXDIM_ID, ScatterPlotFactory.MAX_DIMENSIONS_DEFAULT) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ZERO_INT);
if(config.grab(maxdimP)) {
maxdim = maxdimP.intValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ public static class Parameterizer extends AbstractParameterizer {
@Override
protected void makeOptions(Parameterization config) {
super.makeOptions(config);
IntParameter maxdimP = new IntParameter(MAXDIM_ID, MAX_DIMENSIONS_DEFAULT);
maxdimP.addConstraint(CommonConstraints.GREATER_EQUAL_ZERO_INT);
IntParameter maxdimP = new IntParameter(MAXDIM_ID, MAX_DIMENSIONS_DEFAULT) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ZERO_INT);
if(config.grab(maxdimP)) {
maxdim = maxdimP.intValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ public static class Parameterizer extends AbstractParameterizer {
@Override
protected void makeOptions(Parameterization config) {
super.makeOptions(config);
Flag fillF = new Flag(TreeMBRVisualization.Parameterizer.FILL_ID);
fillF.setDefaultValue(Boolean.TRUE);
Flag fillF = new Flag(TreeMBRVisualization.Parameterizer.FILL_ID) //
.setDefaultValue(Boolean.TRUE);
if(config.grab(fillF)) {
fill = fillF.isTrue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ public static class Parameterizer extends AbstractParameterizer {
@Override
protected void makeOptions(Parameterization config) {
super.makeOptions(config);
IntParameter digitsP = new IntParameter(DIGITS_ID, 4);
digitsP.addConstraint(CommonConstraints.GREATER_EQUAL_ZERO_INT);
IntParameter digitsP = new IntParameter(DIGITS_ID, 4) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ZERO_INT);

if(config.grab(digitsP)) {
int digits = digitsP.intValue();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ public static class Parameterizer<O> extends AbstractDistanceBasedAlgorithm.Para
@Override
protected void makeOptions(Parameterization config) {
super.makeOptions(config);
IntParameter numclustersP = new IntParameter(CutDendrogramByNumberOfClusters.Parameterizer.MINCLUSTERS_ID);
numclustersP.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
IntParameter numclustersP = new IntParameter(CutDendrogramByNumberOfClusters.Parameterizer.MINCLUSTERS_ID) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
if(config.grab(numclustersP)) {
numclusters = numclustersP.intValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ public static class Parameterizer<O> extends AbstractDistanceBasedAlgorithm.Para
@Override
protected void makeOptions(Parameterization config) {
super.makeOptions(config);
IntParameter numclustersP = new IntParameter(CutDendrogramByNumberOfClusters.Parameterizer.MINCLUSTERS_ID);
numclustersP.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
IntParameter numclustersP = new IntParameter(CutDendrogramByNumberOfClusters.Parameterizer.MINCLUSTERS_ID) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
if(config.grab(numclustersP)) {
numclusters = numclustersP.intValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -369,14 +369,14 @@ public static class Parameterizer<O> extends AbstractDistanceBasedAlgorithm.Para
@Override
protected void makeOptions(Parameterization config) {
super.makeOptions(config);
IntParameter numclustersP = new IntParameter(CutDendrogramByNumberOfClusters.Parameterizer.MINCLUSTERS_ID);
numclustersP.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
IntParameter numclustersP = new IntParameter(CutDendrogramByNumberOfClusters.Parameterizer.MINCLUSTERS_ID) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
if(config.grab(numclustersP)) {
numclusters = numclustersP.intValue();
}

EnumParameter<Linkage> linkageP = new EnumParameter<>(LINKAGE_ID, Linkage.class);
linkageP.setDefaultValue(Linkage.WARD);
EnumParameter<Linkage> linkageP = new EnumParameter<>(LINKAGE_ID, Linkage.class) //
.setDefaultValue(Linkage.WARD);
if(config.grab(linkageP)) {
linkage = linkageP.getValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,8 @@ public static class Parameterizer<O> extends AbstractDistanceBasedAlgorithm.Para
@Override
protected void makeOptions(Parameterization config) {
super.makeOptions(config);
EnumParameter<Linkage> linkageP = new EnumParameter<>(LINKAGE_ID, Linkage.class);
linkageP.setDefaultValue(Linkage.WARD);
EnumParameter<Linkage> linkageP = new EnumParameter<>(LINKAGE_ID, Linkage.class) //
.setDefaultValue(Linkage.WARD);
if(config.grab(linkageP)) {
linkage = linkageP.getValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -484,8 +484,8 @@ protected void makeOptions(Parameterization config) {
}
}

IntParameter kP = new IntParameter(K_ID);
kP.addConstraint(CommonConstraints.GREATER_THAN_ONE_INT);
IntParameter kP = new IntParameter(K_ID) //
.addConstraint(CommonConstraints.GREATER_THAN_ONE_INT);
if(config.grab(kP)) {
k = kP.getValue();
}
Expand All @@ -495,8 +495,8 @@ protected void makeOptions(Parameterization config) {
initializer = initialP.instantiateClass(config);
}

IntParameter maxiterP = new IntParameter(MAXITER_ID, -1);
maxiterP.addConstraint(CommonConstraints.GREATER_EQUAL_MINUSONE_INT);
IntParameter maxiterP = new IntParameter(MAXITER_ID, -1) //
.addConstraint(CommonConstraints.GREATER_EQUAL_MINUSONE_INT);
if(config.grab(maxiterP)) {
maxiter = maxiterP.intValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ public static class Parameterizer<O> extends AbstractDistanceBasedAlgorithm.Para
protected void makeOptions(Parameterization config) {
// The super class has the distance function parameter!
super.makeOptions(config);
IntParameter kParam = new IntParameter(K_ID);
kParam.addConstraint(CommonConstraints.GREATER_THAN_ONE_INT);
IntParameter kParam = new IntParameter(K_ID) //
.addConstraint(CommonConstraints.GREATER_THAN_ONE_INT);
if(config.grab(kParam)) {
k = kParam.getValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ protected void makeOptions(Parameterization config) {
if(config.grab(dimsP)) {
dims = dimsP.intValue();
// Add additional constraints:
probP.addConstraint(new LessConstraint(dimsP.intValue()));
probP.addConstraint(new GreaterEqualConstraint(-dimsP.intValue()));
probP.addConstraint(new LessConstraint(dimsP.intValue())) //
.addConstraint(new GreaterEqualConstraint(-dimsP.intValue()));
}
if(config.grab(probP)) {
probcol = probP.intValue();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -719,8 +719,8 @@ protected void makeOptions(Parameterization config) {
DoubleParameter gridP = new DoubleParameter(GRID_ID) //
.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE);
if(epsilon > 0.) {
gridP.setDefaultValue(10. * epsilon);
gridP.addConstraint(new GreaterEqualConstraint(1. * epsilon));
gridP.setDefaultValue(10. * epsilon) //
.addConstraint(new GreaterEqualConstraint(1. * epsilon));
}
if(config.grab(gridP)) {
gridwidth = gridP.doubleValue();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@ protected void makeOptions(Parameterization config) {
epsilon = epsilonP.getValue();
}

IntParameter minptsP = new IntParameter(MINPTS_ID);
minptsP.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
IntParameter minptsP = new IntParameter(MINPTS_ID) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
if(config.grab(minptsP)) {
minpts = minptsP.intValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,14 @@ protected void makeOptions(Parameterization config) {
if(config.grab(param)) {
initialization = param.instantiateClass(config);
}
final DoubleParameter lambdaP = new DoubleParameter(LAMBDA_ID, .5);
lambdaP.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE);
lambdaP.addConstraint(CommonConstraints.LESS_THAN_ONE_DOUBLE);
final DoubleParameter lambdaP = new DoubleParameter(LAMBDA_ID, .5) //
.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE) //
.addConstraint(CommonConstraints.LESS_THAN_ONE_DOUBLE);
if(config.grab(lambdaP)) {
lambda = lambdaP.doubleValue();
}
final IntParameter convergenceP = new IntParameter(CONVERGENCE_ID, 15);
convergenceP.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
final IntParameter convergenceP = new IntParameter(CONVERGENCE_ID, 15) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
if(config.grab(convergenceP)) {
convergence = convergenceP.intValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ public static class Parameterizer<V extends NumberVector, M extends MeanModel> e

@Override
protected void makeOptions(Parameterization config) {
IntParameter trialsP = new IntParameter(TRIALS_ID);
trialsP.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
IntParameter trialsP = new IntParameter(TRIALS_ID) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
if(config.grab(trialsP)) {
trials = trialsP.intValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,8 @@ public static class Parameterizer<V extends NumberVector> extends AbstractKMeans
@Override
protected void makeOptions(Parameterization config) {
super.makeOptions(config);
IntParameter blocksP = new IntParameter(BLOCKS_ID, 10);
blocksP.addConstraint(CommonConstraints.GREATER_THAN_ONE_INT);
IntParameter blocksP = new IntParameter(BLOCKS_ID, 10) //
.addConstraint(CommonConstraints.GREATER_THAN_ONE_INT);
if(config.grab(blocksP)) {
blocks = blocksP.intValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@ public static class Parameterizer<V extends NumberVector, M extends MeanModel> e
protected void makeOptions(Parameterization config) {
super.makeOptions(config);

IntParameter kP = new IntParameter(KMeans.K_ID);
kP.addConstraint(CommonConstraints.GREATER_THAN_ONE_INT);
IntParameter kP = new IntParameter(KMeans.K_ID) //
.addConstraint(CommonConstraints.GREATER_THAN_ONE_INT);
if (config.grab(kP)) {
k = kP.intValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@ public static class Parameterizer<V> extends AbstractDistanceBasedAlgorithm.Para
@Override
protected void makeOptions(Parameterization config) {
super.makeOptions(config);
IntParameter kP = new IntParameter(KMeans.K_ID);
kP.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
IntParameter kP = new IntParameter(KMeans.K_ID) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
if(config.grab(kP)) {
k = kP.intValue();
}
Expand All @@ -315,8 +315,8 @@ protected void makeOptions(Parameterization config) {
initializer = initialP.instantiateClass(config);
}

IntParameter maxiterP = new IntParameter(KMeans.MAXITER_ID, 0);
maxiterP.addConstraint(CommonConstraints.GREATER_EQUAL_ZERO_INT);
IntParameter maxiterP = new IntParameter(KMeans.MAXITER_ID, 0) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ZERO_INT);
if(config.grab(maxiterP)) {
maxiter = maxiterP.intValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,8 @@ public static class Parameterizer<V extends NumberVector> extends AbstractParame
@Override
protected void makeOptions(Parameterization config) {
super.makeOptions(config);
IntParameter dimP = new IntParameter(DIM_ID, 0);
dimP.addConstraint(CommonConstraints.GREATER_EQUAL_ZERO_INT);
IntParameter dimP = new IntParameter(DIM_ID, 0) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ZERO_INT);
if(config.grab(dimP)) {
dim = dimP.intValue();
}
Expand All @@ -355,14 +355,14 @@ protected void makeOptions(Parameterization config) {
mode = modeP.getValue();
}

IntParameter kP = new IntParameter(K_ID);
kP.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
IntParameter kP = new IntParameter(K_ID) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
if(config.grab(kP)) {
k = kP.intValue();
}

IntParameter windowP = new IntParameter(WINDOW_ID);
windowP.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
IntParameter windowP = new IntParameter(WINDOW_ID) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
if(config.grab(windowP)) {
minwindow = windowP.intValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,9 @@ public static class Parameterizer<V extends NumberVector> extends AbstractParame
@Override
protected void makeOptions(Parameterization config) {
super.makeOptions(config);
DoubleParameter alphaP = new DoubleParameter(HiSCPreferenceVectorIndex.Factory.ALPHA_ID, HiSCPreferenceVectorIndex.Factory.DEFAULT_ALPHA);
alphaP.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE);
alphaP.addConstraint(CommonConstraints.LESS_THAN_ONE_DOUBLE);
DoubleParameter alphaP = new DoubleParameter(HiSCPreferenceVectorIndex.Factory.ALPHA_ID, HiSCPreferenceVectorIndex.Factory.DEFAULT_ALPHA) //
.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE) //
.addConstraint(CommonConstraints.LESS_THAN_ONE_DOUBLE);
if(config.grab(alphaP)) {
alpha = alphaP.doubleValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -937,42 +937,42 @@ protected void makeOptions(Parameterization config) {
super.makeOptions(config);

{
DoubleParameter param = new DoubleParameter(ALPHA_THRESHOLD_ID, .001);
param.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE);
param.addConstraint(CommonConstraints.LESS_THAN_HALF_DOUBLE);
DoubleParameter param = new DoubleParameter(ALPHA_THRESHOLD_ID, .001) //
.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE) //
.addConstraint(CommonConstraints.LESS_THAN_HALF_DOUBLE);
if(config.grab(param)) {
alpha = param.getValue();
}
}

{
DoubleParameter param = new DoubleParameter(POISSON_THRESHOLD_ID, 1.e-4);
param.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE);
param.addConstraint(CommonConstraints.LESS_THAN_HALF_DOUBLE);
DoubleParameter param = new DoubleParameter(POISSON_THRESHOLD_ID, 1.e-4) //
.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE) //
.addConstraint(CommonConstraints.LESS_THAN_HALF_DOUBLE);
if(config.grab(param)) {
poissonThreshold = param.getValue();
}
}

{
IntParameter param = new IntParameter(MAX_EM_ITERATIONS_ID, 20);
param.addConstraint(CommonConstraints.GREATER_EQUAL_MINUSONE_INT);
IntParameter param = new IntParameter(MAX_EM_ITERATIONS_ID, 20) //
.addConstraint(CommonConstraints.GREATER_EQUAL_MINUSONE_INT);
if(config.grab(param)) {
maxEmIterations = param.getValue();
}
}

{
DoubleParameter param = new DoubleParameter(EM_DELTA_ID, 1.e-5);
param.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE);
DoubleParameter param = new DoubleParameter(EM_DELTA_ID, 1.e-5) //
.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE);
if(config.grab(param)) {
emDelta = param.getValue();
}
}

{
IntParameter param = new IntParameter(MIN_CLUSTER_SIZE_ID, 1);
param.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
IntParameter param = new IntParameter(MIN_CLUSTER_SIZE_ID, 1) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
if(config.grab(param)) {
minClusterSize = param.getValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -485,8 +485,8 @@ protected void makeOptions(Parameterization config) {
epsilon = epsilonP.getValue();
}

IntParameter minptsP = new IntParameter(MINPTS_ID);
minptsP.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
IntParameter minptsP = new IntParameter(MINPTS_ID) //
.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
if(config.grab(minptsP)) {
minpts = minptsP.getValue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@ protected void makeOptions(Parameterization config) {
multiple = multipleF.getValue();
}

PatternParameter noisepatP = new PatternParameter(NOISE_ID);
noisepatP.setOptional(true);
PatternParameter noisepatP = new PatternParameter(NOISE_ID) //
.setOptional(true);
if(config.grab(noisepatP)) {
noisepat = noisepatP.getValue();
}
Expand Down
Loading

0 comments on commit dd07de6

Please sign in to comment.