only adjust end/peak if it improves both mean and RMS deviations

openaps · Jun 4, 2018 · 90ddd23 · 90ddd23
1 parent 68b1a66
commit 90ddd23
Showing 1 changed file with 37 additions and 25 deletions.
diff --git a/lib/autotune/index.js b/lib/autotune/index.js
@@ -52,24 +52,30 @@ function tuneAllTheThings (inputs) {
     var newDIA = DIA;
     if (diaDeviations) {
         var currentDIAMeanDev = diaDeviations[2].meanDeviation;
-        //var currentDIAMeanDev = diaDeviations[2].RMSDeviation;
-        //var currentDIAMeanDev = diaDeviations[2].SMRDeviation;
-        //console.error(DIA,currentDIAMeanDev);
-        var minDeviations = 1000000;
-        var best = 2;
+        var currentDIARMSDev = diaDeviations[2].RMSDeviation;
+        //console.error(DIA,currentDIAMeanDev,currentDIARMSDev);
+        var minMeanDeviations = 1000000;
+        var minRMSDeviations = 1000000;
+        var meanBest = 2;
+        var RMSBest = 2;
         for (var i=0; i < diaDeviations.length; i++) {
-            var deviations = diaDeviations[i].meanDeviation;
-            if (deviations < minDeviations) {
-                minDeviations = Math.round(deviations*1000)/1000;
-                var best = i;
+            var meanDeviations = diaDeviations[i].meanDeviation;
+            var RMSDeviations = diaDeviations[i].RMSDeviation;
+            if (meanDeviations < minMeanDeviations) {
+                minMeanDeviations = Math.round(meanDeviations*1000)/1000;
+                var meanBest = i;
+            }
+            if (RMSDeviations < minRMSDeviations) {
+                minRMSDeviations = Math.round(RMSDeviations*1000)/1000;
+                var RMSBest = i;
             }
         }
-        if ( best < 2 ) {
-            if ( diaDeviations[1].meanDeviation < currentDIAMeanDev * 0.99 ) {
+        if ( meanBest < 2 && RMSBest < 2 ) {
+            if ( diaDeviations[1].meanDeviation < currentDIAMeanDev * 0.99 && diaDeviations[1].RMSDeviation < currentDIARMSDev * 0.99 ) {
                 newDIA = diaDeviations[1].dia;
             }
-        } else if ( best > 2 ) {
-            if ( diaDeviations[3].meanDeviation < currentDIAMeanDev * 0.99 ) {
+        } else if ( meanBest > 2 && RMSBest > 2 ) {
+            if ( diaDeviations[3].meanDeviation < currentDIAMeanDev * 0.99 && diaDeviations[3].RMSDeviation < currentDIARMSDev * 0.99 ) {
                 newDIA = diaDeviations[3].dia;
             }
         }
@@ -86,24 +92,30 @@ function tuneAllTheThings (inputs) {
     var newPeak = peak;
     if (peakDeviations) {
         var currentPeakMeanDev = peakDeviations[2].meanDeviation;
-        //var currentPeakMeanDev = peakDeviations[2].RMSDeviation;
-        //var currentPeakMeanDev = peakDeviations[2].SMRDeviation;
+        var currentPeakRMSDev = peakDeviations[2].RMSDeviation;
         //console.error(currentPeakMeanDev);
-        var minDeviations = 1000000;
-        var best = 2;
+        var minMeanDeviations = 1000000;
+        var minRMSDeviations = 1000000;
+        var meanBest = 2;
+        var RMSBest = 2;
         for (var i=0; i < peakDeviations.length; i++) {
-            var deviations = peakDeviations[i].meanDeviation;
-            if (deviations < minDeviations) {
-                minDeviations = Math.round(deviations*1000)/1000;
-                var best = i;
+            var meanDeviations = peakDeviations[i].meanDeviation;
+            var RMSDeviations = peakDeviations[i].RMSDeviation;
+            if (meanDeviations < minMeanDeviations) {
+                minMeanDeviations = Math.round(meanDeviations*1000)/1000;
+                var meanBest = i;
+            }
+            if (RMSDeviations < minRMSDeviations) {
+                minRMSDeviations = Math.round(RMSDeviations*1000)/1000;
+                var RMSBest = i;
             }
         }
-        if ( best < 2 ) {
-            if ( peakDeviations[1].meanDeviation < currentPeakMeanDev * 0.99 ) {
+        if ( meanBest < 2 && RMSBest < 2 ) {
+            if ( peakDeviations[1].meanDeviation < currentPeakMeanDev * 0.99 && peakDeviations[1].RMSDeviation < currentDIARMSDev * 0.99 ) {
                 newPeak = peakDeviations[1].peak;
             }
-        } else if ( best > 2 ) {
-            if ( peakDeviations[3].meanDeviation < currentPeakMeanDev * 0.99 ) {
+        } else if ( meanBest > 2 ) {
+            if ( peakDeviations[3].meanDeviation < currentPeakMeanDev * 0.99 && peakDeviations[3].RMSDeviation < currentDIARMSDev * 0.99 ) {
                 newPeak = peakDeviations[3].peak;
             }
         }