Skip to content

Commit fdbf958

Browse files
committed
More testing.
1 parent 98f309f commit fdbf958

14 files changed

Lines changed: 100 additions & 30 deletions

File tree

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
3+
4+
.PHONY: act
5+
act:
6+
act --job build

README.adoc

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -435,12 +435,9 @@ Like this it can be consulted
435435
.Accessing configuration
436436
[source,java]
437437
----
438-
import static org.meeuw.configuration.*;
439-
import static org.meeuw.math.text.spi.FormatService.*;
440-
441-
Configuration configuration = ConfigurationService.getConfiguration();
442-
NumberConfiguration aspect = configuration.getAspect(NumberConfiguration.class);
443-
int minimalExponent = aspect.getMinimalExponent();
438+
include::mihxil-math/src/test/java/org/meeuw/test/examples/ConfigurationExample.java[tag=import]
439+
...
440+
include::mihxil-math/src/test/java/org/meeuw/test/examples/ConfigurationExample.java[tag=access, indent=0]
444441
----
445442
This would however probably mainly be used in _implementations_.
446443

@@ -452,12 +449,7 @@ Actual configuration can be done in two basically distinct ways.
452449
.temporary overrides
453450
[source,java]
454451
----
455-
Configuration configuration = ConfigurationService.getConfiguration();
456-
ConfiguraationService.setConfiguration(configuration.toBuilder().aspect(NumberConfiguration.class, (nc) -> nc.withMinimalExponent(8)).build());
457-
458-
... code ...
459-
460-
ConfigurationService.resetToDefaults();
452+
include::mihxil-math/src/test/java/org/meeuw/test/examples/ConfigurationExample.java[tag=configurationService,indent=-]
461453
----
462454

463455
There are some utilities in `ConfigurationService` that makes this process a bit easier.

TODO.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
= todo
2+
3+
-

mihxil-configuration/src/main/java/org/meeuw/configuration/ConfigurationService.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,29 @@ public static void setConfiguration(Configuration configuration) {
9191
CONFIGURATION.set(configuration);
9292
}
9393

94+
/**
95+
* @since 0.10
96+
*/
97+
public static void setConfiguration(Configuration configuration, Consumer<Configuration.Builder> consumer) {
98+
Configuration.Builder builder = configuration.toBuilder();
99+
consumer.accept(builder);
100+
setConfiguration(builder);
101+
}
102+
/**
103+
* @since 0.10
104+
*/
105+
public static void setConfiguration(Consumer<Configuration.Builder> consumer) {
106+
setConfiguration(getConfiguration(), consumer);
107+
}
108+
109+
/**
110+
*
111+
* @since 0.10
112+
*/
113+
public static void setConfiguration(Configuration.Builder configuration) {
114+
setConfiguration(configuration.build());
115+
}
116+
94117
/**
95118
* Unsets the configuration thread local, effectively resetting it the default settings.
96119
*/

mihxil-configuration/src/test/java/org/meeuw/test/configuration/ConfigurationServiceTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@ public void getAndSetConfiguration() {
6464
TestConfigurationAspect aspect = configuration.getAspect(TestConfigurationAspect.class);
6565
int someInt = aspect.getSomeInt();
6666
log.info(() -> String.format("some int: %d", someInt));
67-
ConfigurationService.setConfiguration(configuration.toBuilder()
68-
.configure(TestConfigurationAspect.class, (nc) -> nc.withSomeInt(8))
69-
.build()
67+
ConfigurationService.setConfiguration(builder ->
68+
builder.configure(TestConfigurationAspect.class, (nc) -> nc.withSomeInt(8))
7069
);
7170
assertThat(getConfiguration()
7271
.getAspectValue(TestConfigurationAspect.class, TestConfigurationAspect::getSomeInt)

mihxil-math-theories/src/main/java/org/meeuw/math/abstractalgebra/test/MetricSpaceTheory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ default void distancePositive(@ForAll(ELEMENTS) E a, @ForAll(ELEMENTS) E b) {
4848
}
4949

5050
@Property
51-
default void identifyOfIndiscernibles(@ForAll(ELEMENTS) E a) {
51+
default void identityOfIndiscernibles(@ForAll(ELEMENTS) E a) {
5252
assertThat(a.distanceTo(a).isZero()).isTrue();
5353
}
5454

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package org.meeuw.test.examples;
2+
// tag::import[]
3+
4+
import org.meeuw.configuration.Configuration;
5+
import org.meeuw.configuration.ConfigurationService;
6+
import org.meeuw.math.text.configuration.NumberConfiguration;
7+
// end::import[]
8+
public class ConfigurationExample {
9+
10+
public static void access() {
11+
// tag::access[]
12+
13+
Configuration configuration = ConfigurationService.getConfiguration();
14+
NumberConfiguration aspect = configuration.getAspect(NumberConfiguration.class);
15+
int minimalExponent = aspect.getMinimalExponent();
16+
// end::access[]
17+
}
18+
19+
public static void setConfiguration(String[] argv) {
20+
// tag::configurationService[]
21+
ConfigurationService.setConfiguration(builder ->
22+
builder.configure(NumberConfiguration.class,
23+
(numberConfiguration) -> numberConfiguration.withMinimalExponent(8)
24+
)
25+
);
26+
27+
//...code...
28+
ConfigurationService.resetToDefaults();
29+
// end::configurationService[]
30+
}
31+
}

mihxil-physics/src/main/java/org/meeuw/physics/PhysicalNumber.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,9 @@ public PhysicalNumber toUnits(Unit... units) {
179179
return toUnits(Units.of(units));
180180
}
181181

182+
/**
183+
* Converts the current physical number to a different {@link SystemOfMeasurements}.
184+
*/
182185
public PhysicalNumber toUnits(SystemOfMeasurements systemOfMeasurements) {
183186
return toUnits(systemOfMeasurements.forDimensions(units.getDimensions()));
184187
}

mihxil-physics/src/main/java/org/meeuw/physics/Prefix.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.function.Supplier;
2222

2323
/**
24-
* Multiplication prefix that can be used on a {@link Unit}, to get a new {@code code} that differs a certain factor only, but has the same {@link DimensionalAnalysis}
24+
* Multiplication prefix that can be used on a {@link Unit}, to get a new {@code Unit} that differs a certain factor only, but has the same {@link DimensionalAnalysis}
2525
*
2626
* @author Michiel Meeuwissen
2727
* @since 0.4

mihxil-physics/src/main/java/org/meeuw/physics/PrefixedUnit.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222

2323
import org.meeuw.math.uncertainnumbers.field.UncertainReal;
2424

25+
/**
26+
* A unit wrapping another {@link Unit} with a {@link Prefix}, and it just a multiple of that unit.
27+
*/
2528
public class PrefixedUnit implements Unit {
2629

2730
private final Unit wrapped;

0 commit comments

Comments
 (0)