Demonstrated the futility of current derivative channel implementation (

#322)
home-climate-control · Jun 12, 2024 · 5250324 · 5250324
1 parent 8e04942
commit 5250324
Showing 1 changed file with 75 additions and 1 deletion.
diff --git a/modules/hcc-model/src/test/java/net/sf/dz3r/controller/pid/SimplePidControllerTest.java b/modules/hcc-model/src/test/java/net/sf/dz3r/controller/pid/SimplePidControllerTest.java
@@ -112,7 +112,7 @@ record PidOutputTuple(
     @ParameterizedTest
     @MethodSource("getIntegralStream")
     void testIntegral(Flux<PidSourceTuple> source) {
-        var c = new SimplePidController<PidSourceTuple>("simple", 20.0, 1, 0.00001, 0, 2);
+        var c = new SimplePidController<PidSourceTuple>("integral", 20.0, 1, 0.00001, 0, 2);
         var now = Instant.now();
         var signal = source
                 .map(t -> tuple2signal(now, t));
@@ -126,6 +126,24 @@ void testIntegral(Flux<PidSourceTuple> source) {
                 .blockLast();
     }
 
+
+    @ParameterizedTest
+    @MethodSource("getDerivativeStream")
+    void testDerivative(Flux<PidSourceTuple> source) {
+        var c = new SimplePidController<PidSourceTuple>("derivative", 20.0, 1, 0, 2_000, 0);
+        var now = Instant.now();
+        var signal = source
+                .map(t -> tuple2signal(now, t));
+
+        var output = c
+                .compute(signal)
+                .doOnNext(s -> {
+                    logger.debug("output: {}", s);
+                    assertThat(((PidController.PidStatus) s.getValue()).d).isEqualTo(s.payload.expectedOutput);
+                })
+                .blockLast();
+    }
+
     private Signal<Double, PidSourceTuple> tuple2signal(Instant start, PidSourceTuple source) {
         return new Signal<>(start.plus(source.offset), source.pv, source);
     }
@@ -150,4 +168,60 @@ public static Stream<Flux<PidSourceTuple>> getIntegralStream() {
                 )
         );
     }
+
+    public static Stream<Flux<PidSourceTuple>> getDerivativeStream() {
+
+        return Stream.of(
+
+                // PV is changing
+                Flux.just(
+                        new PidSourceTuple(Duration.ZERO, 20.0, 20, 0),
+
+                        // With current algorithm, only one derivative component immediately following the change will be non-zero
+
+                        new PidSourceTuple(Duration.ofSeconds(1), 20.0, 21, 2),
+                        new PidSourceTuple(Duration.ofSeconds(2), 20.0, 21, 0),
+                        new PidSourceTuple(Duration.ofSeconds(3), 20.0, 21, 0),
+                        new PidSourceTuple(Duration.ofSeconds(4), 20.0, 21, 0),
+                        new PidSourceTuple(Duration.ofSeconds(5), 20.0, 21, 0),
+                        new PidSourceTuple(Duration.ofSeconds(10), 20.0, 21, 0),
+                        new PidSourceTuple(Duration.ofSeconds(15), 20.0, 21, 0),
+
+                        new PidSourceTuple(Duration.ofSeconds(20), 20.0, 20, -0.4),
+                        new PidSourceTuple(Duration.ofSeconds(21), 20.0, 20, 0),
+                        new PidSourceTuple(Duration.ofSeconds(25), 20.0, 20, 0),
+                        new PidSourceTuple(Duration.ofSeconds(30), 20.0, 20, 0),
+
+                        new PidSourceTuple(Duration.ofSeconds(35), 20.0, 22, 0.8),
+                        new PidSourceTuple(Duration.ofSeconds(36), 20.0, 22, 0),
+                        new PidSourceTuple(Duration.ofSeconds(40), 20.0, 22, 0),
+                        new PidSourceTuple(Duration.ofSeconds(45), 20.0, 22, 0)
+                ),
+
+                // Setpoint is changing
+                Flux.just(
+                        new PidSourceTuple(Duration.ZERO, 20.0, 20, 0),
+
+                        // With current algorithm, setpoint changes cause no reaction at all
+
+                        new PidSourceTuple(Duration.ofSeconds(1), 21.0, 20, 0),
+                        new PidSourceTuple(Duration.ofSeconds(2), 21.0, 20, 0),
+                        new PidSourceTuple(Duration.ofSeconds(3), 21.0, 20, 0),
+                        new PidSourceTuple(Duration.ofSeconds(4), 21.0, 20, 0),
+                        new PidSourceTuple(Duration.ofSeconds(5), 21.0, 20, 0),
+                        new PidSourceTuple(Duration.ofSeconds(10), 21.0, 20, 0),
+                        new PidSourceTuple(Duration.ofSeconds(15), 21.0, 20, 0),
+
+                        new PidSourceTuple(Duration.ofSeconds(20), 20.0, 20, 0),
+                        new PidSourceTuple(Duration.ofSeconds(21), 20.0, 20, 0),
+                        new PidSourceTuple(Duration.ofSeconds(25), 20.0, 20, 0),
+                        new PidSourceTuple(Duration.ofSeconds(30), 20.0, 20, 0),
+
+                        new PidSourceTuple(Duration.ofSeconds(35), 22.0, 20, 0),
+                        new PidSourceTuple(Duration.ofSeconds(36), 22.0, 20, 0),
+                        new PidSourceTuple(Duration.ofSeconds(40), 22.0, 20, 0),
+                        new PidSourceTuple(Duration.ofSeconds(45), 22.0, 20, 0)
+                )
+        );
+    }
 }