Skip to content

more elegant use of lambda #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Serrof merged 2 commits into from
Dec 6, 2025
Merged

more elegant use of lambda #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e3bf92
more elegant use of lambda
Serrof Dec 6, 2025
8899fd6
fixing more code smells
Serrof Dec 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions hipparchus-clustering/src/test/java/org/hipparchus/clustering/DBSCANClustererTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,12 @@ void testGetMinPts() {

@Test
void testNegativeEps() {
assertThrows(MathIllegalArgumentException.class, () -> {
new DBSCANClusterer<DoublePoint>(-2.0, 5);
});
assertThrows(MathIllegalArgumentException.class, () -> new DBSCANClusterer<DoublePoint>(-2.0, 5));
}

@Test
void testNegativeMinPts() {
assertThrows(MathIllegalArgumentException.class, () -> {
new DBSCANClusterer<DoublePoint>(2.0, -5);
});
assertThrows(MathIllegalArgumentException.class, () -> new DBSCANClusterer<DoublePoint>(2.0, -5));
}

@Test
Expand Down
4 changes: 1 addition & 3 deletions hipparchus-clustering/src/test/java/org/hipparchus/clustering/FuzzyKMeansClustererTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,7 @@ void testCluster() {

@Test
void testTooSmallFuzzynessFactor() {
assertThrows(MathIllegalArgumentException.class, () -> {
new FuzzyKMeansClusterer<DoublePoint>(3, 1.0);
});
assertThrows(MathIllegalArgumentException.class, () -> new FuzzyKMeansClusterer<DoublePoint>(3, 1.0));
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion hipparchus-core/src/test/java/org/hipparchus/CalculusFieldElementAbstractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ public void testSign() {

@Test
public void testLinearCombinationReference() {
doTestLinearCombinationReference(x -> build(x), 5.0e-16, 1.0);
doTestLinearCombinationReference(this::build, 5.0e-16, 1.0);
}

protected void doTestLinearCombinationReference(final DoubleFunction<T> builder,
Expand Down
4 changes: 1 addition & 3 deletions hipparchus-core/src/test/java/org/hipparchus/UnitTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,7 @@ public static Object serializeAndRecover(Object o) {
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
ObjectInputStream si = new ObjectInputStream(bis);
return si.readObject();
} catch (IOException ioe) {
return null;
} catch (ClassNotFoundException cnfe) {
} catch (IOException | ClassNotFoundException ioe) {
return null;
}
}
Expand Down
2 changes: 1 addition & 1 deletion hipparchus-core/src/test/java/org/hipparchus/analysis/FieldFunctionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public <T extends CalculusFieldElement<T>> T value(T x) {
}
};
CalculusFieldUnivariateFunction<Binary64> f1Converted = f1.toCalculusFieldUnivariateFunction(Binary64Field.getInstance());
CalculusFieldUnivariateFunction<Binary64> f2 = x -> x.twice();
CalculusFieldUnivariateFunction<Binary64> f2 = CalculusFieldElement::twice;

for (double x = 0; x < 1; x += 0.01) {
assertEquals(f2.value(new Binary64(x)).getReal(),
Expand Down
61 changes: 10 additions & 51 deletions hipparchus-core/src/test/java/org/hipparchus/analysis/FunctionUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,23 +226,17 @@ void testFixingArguments() {

@Test
void testSampleWrongBounds(){
assertThrows(MathIllegalArgumentException.class, () -> {
FunctionUtils.sample(new Sin(), FastMath.PI, 0.0, 10);
});
assertThrows(MathIllegalArgumentException.class, () -> FunctionUtils.sample(new Sin(), FastMath.PI, 0.0, 10));
}

@Test
void testSampleNegativeNumberOfPoints(){
assertThrows(MathIllegalArgumentException.class, () -> {
FunctionUtils.sample(new Sin(), 0.0, FastMath.PI, -1);
});
assertThrows(MathIllegalArgumentException.class, () -> FunctionUtils.sample(new Sin(), 0.0, FastMath.PI, -1));
}

@Test
void testSampleNullNumberOfPoints(){
assertThrows(MathIllegalArgumentException.class, () -> {
FunctionUtils.sample(new Sin(), 0.0, FastMath.PI, 0);
});
assertThrows(MathIllegalArgumentException.class, () -> FunctionUtils.sample(new Sin(), 0.0, FastMath.PI, 0));
}

@Test
Expand All @@ -260,24 +254,9 @@ void testSample() {
@Test
void testToDifferentiableUnivariate() {

final UnivariateFunction f0 = new UnivariateFunction() {
@Override
public double value(final double x) {
return x * x;
}
};
final UnivariateFunction f1 = new UnivariateFunction() {
@Override
public double value(final double x) {
return 2 * x;
}
};
final UnivariateFunction f2 = new UnivariateFunction() {
@Override
public double value(final double x) {
return 2;
}
};
final UnivariateFunction f0 = x -> x * x;
final UnivariateFunction f1 = x -> 2 * x;
final UnivariateFunction f2 = x -> 2;
final UnivariateDifferentiableFunction f = FunctionUtils.toDifferentiable(f0, f1, f2);

DSFactory factory = new DSFactory(1, 2);
Expand Down Expand Up @@ -306,18 +285,8 @@ void testToDifferentiableMultivariate() {

final double a = 1.5;
final double b = 0.5;
final MultivariateFunction f = new MultivariateFunction() {
@Override
public double value(final double[] point) {
return a * point[0] + b * point[1];
}
};
final MultivariateVectorFunction gradient = new MultivariateVectorFunction() {
@Override
public double[] value(final double[] point) {
return new double[] { a, b };
}
};
final MultivariateFunction f = point -> a * point[0] + b * point[1];
final MultivariateVectorFunction gradient = point -> new double[] { a, b };
final MultivariateDifferentiableFunction mdf = FunctionUtils.toDifferentiable(f, gradient);

DSFactory factory11 = new DSFactory(1, 1);
Expand Down Expand Up @@ -358,18 +327,8 @@ void testToDifferentiableMultivariateInconsistentGradient() {

final double a = 1.5;
final double b = 0.5;
final MultivariateFunction f = new MultivariateFunction() {
@Override
public double value(final double[] point) {
return a * point[0] + b * point[1];
}
};
final MultivariateVectorFunction gradient = new MultivariateVectorFunction() {
@Override
public double[] value(final double[] point) {
return new double[] { a, b, 0.0 };
}
};
final MultivariateFunction f = point -> a * point[0] + b * point[1];
final MultivariateVectorFunction gradient = point -> new double[] { a, b, 0.0 };
final MultivariateDifferentiableFunction mdf = FunctionUtils.toDifferentiable(f, gradient);

DSFactory factory = new DSFactory(1, 1);
Expand Down
8 changes: 2 additions & 6 deletions hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/DSCompilerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,12 @@ void testIndices() {

@Test
void testIncompatibleParams() {
assertThrows(MathIllegalArgumentException.class, () -> {
DSCompiler.getCompiler(3, 2).checkCompatibility(DSCompiler.getCompiler(4, 2));
});
assertThrows(MathIllegalArgumentException.class, () -> DSCompiler.getCompiler(3, 2).checkCompatibility(DSCompiler.getCompiler(4, 2)));
}

@Test
void testIncompatibleOrder() {
assertThrows(MathIllegalArgumentException.class, () -> {
DSCompiler.getCompiler(3, 3).checkCompatibility(DSCompiler.getCompiler(3, 2));
});
assertThrows(MathIllegalArgumentException.class, () -> DSCompiler.getCompiler(3, 3).checkCompatibility(DSCompiler.getCompiler(3, 2)));
}

@Test
Expand Down
16 changes: 4 additions & 12 deletions ...s-core/src/test/java/org/hipparchus/analysis/differentiation/DerivativeStructureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,23 +69,17 @@ protected DerivativeStructure build(final double x) {

@Test
void testWrongVariableIndex() {
assertThrows(MathIllegalArgumentException.class, () -> {
new DSFactory(3, 1).variable(3, 1.0);
});
assertThrows(MathIllegalArgumentException.class, () -> new DSFactory(3, 1).variable(3, 1.0));
}

@Test
void testMissingOrders() {
assertThrows(MathIllegalArgumentException.class, () -> {
new DSFactory(3, 1).variable(0, 1.0).getPartialDerivative(0, 1);
});
assertThrows(MathIllegalArgumentException.class, () -> new DSFactory(3, 1).variable(0, 1.0).getPartialDerivative(0, 1));
}

@Test
void testTooLargeOrder() {
assertThrows(MathIllegalArgumentException.class, () -> {
new DSFactory(3, 1).variable(0, 1.0).getPartialDerivative(1, 1, 2);
});
assertThrows(MathIllegalArgumentException.class, () -> new DSFactory(3, 1).variable(0, 1.0).getPartialDerivative(1, 1, 2));
}

@Test
Expand Down Expand Up @@ -1518,9 +1512,7 @@ void testDegRad() {

@Test
void testComposeMismatchedDimensions() {
assertThrows(MathIllegalArgumentException.class, () -> {
new DSFactory(1, 3).variable(0, 1.2).compose(new double[3]);
});
assertThrows(MathIllegalArgumentException.class, () -> new DSFactory(1, 3).variable(0, 1.2).compose(new double[3]));
}

@Test
Expand Down
4 changes: 1 addition & 3 deletions ...st/java/org/hipparchus/analysis/differentiation/FieldDerivativeStructureAbstractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ protected FieldDerivativeStructure<T> build(final double x) {

@Test
public void testWrongFieldVariableIndex() {
assertThrows(MathIllegalArgumentException.class, () -> {
buildFactory(3, 1).variable(3, buildScalar(1.0));
});
assertThrows(MathIllegalArgumentException.class, () -> buildFactory(3, 1).variable(3, buildScalar(1.0)));
}

@Test
Expand Down
20 changes: 1 addition & 19 deletions ...est/java/org/hipparchus/analysis/differentiation/FieldDerivativeStructureComplexTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,25 +65,7 @@ public void testHypotNoOverflow() {
@Override
@Test
public void testLinearCombinationReference() {
doTestLinearCombinationReference(x -> build(x), 4.8e-16, 1.0);
}

@Override
@Test
public void testLinearCombination1DSDS() {
doTestLinearCombination1DSDS(1.0e-15);
}

@Override
@Test
public void testLinearCombination1FieldDS() {
doTestLinearCombination1FieldDS(1.0e-15);
}

@Override
@Test
public void testLinearCombination1DoubleDS() {
doTestLinearCombination1DoubleDS(1.0e-15);
doTestLinearCombinationReference(this::build, 4.8e-16, 1.0);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/org/hipparchus/analysis/differentiation/FieldDerivativeStructureDfpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void testHypotNoOverflow() {
@Override
@Test
public void testLinearCombinationReference() {
doTestLinearCombinationReference(x -> build(x), 4.15e-9, 4.21e-9);
doTestLinearCombinationReference(this::build, 4.15e-9, 4.21e-9);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...core/src/test/java/org/hipparchus/analysis/differentiation/FieldGradientBinary64Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ public void testHashcode() {
@Override
@Test
public void testLinearCombinationReference() {
doTestLinearCombinationReference(x -> build(x), 5.0e-16, 1.0);
doTestLinearCombinationReference(this::build, 5.0e-16, 1.0);
}
}
2 changes: 1 addition & 1 deletion ...chus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldGradientDfpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void testHashcode() {
@Override
@Test
public void testLinearCombinationReference() {
doTestLinearCombinationReference(x -> build(x), 5.0e-9, 4.212e-9);
doTestLinearCombinationReference(this::build, 5.0e-9, 4.212e-9);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative1Binary64Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ void testHashcode() {
@Override
@Test
public void testLinearCombinationReference() {
doTestLinearCombinationReference(x -> build(x), 5.0e-9, 1.0);
doTestLinearCombinationReference(this::build, 5.0e-9, 1.0);
}
}
2 changes: 1 addition & 1 deletion .../test/java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative1DfpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void testHashcode() {
@Override
@Test
public void testLinearCombinationReference() {
doTestLinearCombinationReference(x -> build(x), 5.0e-9, 4.212e-9);
doTestLinearCombinationReference(this::build, 5.0e-9, 4.212e-9);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative2Binary64Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ public void testHashcode() {
@Override
@Test
public void testLinearCombinationReference() {
doTestLinearCombinationReference(x -> build(x), 5.0e-16, 1.0);
doTestLinearCombinationReference(this::build, 5.0e-16, 1.0);
}
}
2 changes: 1 addition & 1 deletion .../test/java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative2DfpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void testHashcode() {
@Override
@Test
public void testLinearCombinationReference() {
doTestLinearCombinationReference(x -> build(x), 5.0e-9, 4.212e-9);
doTestLinearCombinationReference(this::build, 5.0e-9, 4.212e-9);
}

@Override
Expand Down
Loading