Removed redundant argument (#238, #290)

home-climate-control · Oct 11, 2023 · d09a207 · d09a207
1 parent f6b64f0
commit d09a207
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/dz3r-model/src/main/java/net/sf/dz3r/device/actuator/economizer/AbstractEconomizer.java b/dz3r-model/src/main/java/net/sf/dz3r/device/actuator/economizer/AbstractEconomizer.java
@@ -72,16 +72,12 @@ public abstract class AbstractEconomizer <A extends Comparable<A>> implements Si
     /**
      * Create an instance.
      *
-     * Note that only the {@code ambientFlux} argument is present, indoor flux is provided to {@link #compute(Flux)}.
-     *
-     * @param ambientFlux Flux from the ambient temperature sensor.
      * @param targetDevice Switch to control the economizer actuator.
      */
     protected AbstractEconomizer(
             Clock clock,
             String name,
             EconomizerSettings settings,
-            Flux<Signal<Double, Void>> ambientFlux,
             Switch<A> targetDevice) {
 
         this.clock = clock == null ? Clock.systemUTC() : clock;

diff --git a/dz3r-model/src/main/java/net/sf/dz3r/device/actuator/economizer/v1/SimpleEconomizer.java b/dz3r-model/src/main/java/net/sf/dz3r/device/actuator/economizer/v1/SimpleEconomizer.java
@@ -31,7 +31,7 @@ public SimpleEconomizer(
             Flux<Signal<Double, Void>> ambientFlux,
             Switch<A> targetDevice) {
 
-        super(null, name, settings, ambientFlux, targetDevice);
+        super(null, name, settings, targetDevice);
 
         initFluxes(ambientFlux);
     }

diff --git a/dz3r-model/src/main/java/net/sf/dz3r/device/actuator/economizer/v2/PidEconomizer.java b/dz3r-model/src/main/java/net/sf/dz3r/device/actuator/economizer/v2/PidEconomizer.java
@@ -54,7 +54,7 @@ public PidEconomizer(
             Flux<Signal<Double, Void>> ambientFlux,
             Switch<A> targetDevice) {
 
-        super(clock, name, settings, ambientFlux, targetDevice);
+        super(clock, name, settings, targetDevice);
 
         controller = new SimplePidController<>("(controller) " + getAddress(), 0, settings.P, settings.I, 0, settings.saturationLimit);
         signalRenderer = new HysteresisController<>("(signalRenderer) " + getAddress(), 0, HYSTERESIS);

diff --git a/dz3r-model/src/test/java/net/sf/dz3r/device/actuator/economizer/AbstractEconomizerTest.java b/dz3r-model/src/test/java/net/sf/dz3r/device/actuator/economizer/AbstractEconomizerTest.java
@@ -30,7 +30,7 @@ void targetAdjustmentTest(TargetAdjustmentTestData source) {
                 true,
                 1.0, 0.0001, 1.0);
 
-        var e = new TestEconomizer("eco", settings, Flux.empty(), new NullSwitch(""));
+        var e = new TestEconomizer("eco", settings, new NullSwitch(""));
 
         var signal = e.computeCombined(source.indoorTemperature, source.ambientTemperature);
 
@@ -45,11 +45,10 @@ private class TestEconomizer extends AbstractEconomizer<String> {
          * <p>
          * Note that only the {@code ambientFlux} argument is present, indoor flux is provided to {@link #compute(Flux)}.
          *
-         * @param ambientFlux  Flux from the ambient temperature sensor.
          * @param targetDevice Switch to control the economizer actuator.
          */
-        protected TestEconomizer(String name, EconomizerSettings settings, Flux<Signal<Double, Void>> ambientFlux, Switch<String> targetDevice) {
-            super(Clock.systemUTC(), name, settings, ambientFlux, targetDevice);
+        protected TestEconomizer(String name, EconomizerSettings settings, Switch<String> targetDevice) {
+            super(Clock.systemUTC(), name, settings, targetDevice);
         }
 
         @Override

diff --git a/dz3r-model/src/test/java/net/sf/dz3r/device/actuator/economizer/v1/SimpleEconomizerTest.java b/dz3r-model/src/test/java/net/sf/dz3r/device/actuator/economizer/v1/SimpleEconomizerTest.java
@@ -52,7 +52,7 @@ void dropToOnAndBack() {
         var sinkWrapper = new SinkWrapper<Signal<Double, Void>>();
         var deferredAmbientFlux = Flux.create(sinkWrapper::connect);
 
-        var economizer = new SimpleEconomizer<String>(
+        var economizer = new SimpleEconomizer<>(
                 "economizer",
                 settings,
                 deferredAmbientFlux,