automatic commit at releng box

mc36 · Dec 21, 2021 · 8fb2572 · 8fb2572
1 parent dd4673b
commit 8fb2572
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/src/net/freertr/rtr/rtrIsisIface.java b/src/net/freertr/rtr/rtrIsisIface.java
@@ -905,6 +905,7 @@ public static void routerGetHelp(userHelping l) {
         l.add(null, "5 .           minimum                 take lowest");
         l.add(null, "5 .           average                 take average");
         l.add(null, "5 .           maximum                 take highest");
+        l.add(null, "5 .           differs                 take differences");
     }
 
     /**

diff --git a/src/net/freertr/rtr/rtrLsrpIface.java b/src/net/freertr/rtr/rtrLsrpIface.java
@@ -523,6 +523,7 @@ public static void routerGetHelp(userHelping l) {
         l.add(null, "5 .           minimum                   take lowest");
         l.add(null, "5 .           average                   take average");
         l.add(null, "5 .           maximum                   take highest");
+        l.add(null, "5 .           differs                   take differences");
     }
 
     /**

diff --git a/src/net/freertr/rtr/rtrOspf4iface.java b/src/net/freertr/rtr/rtrOspf4iface.java
@@ -857,6 +857,7 @@ public static void routerGetHelp(userHelping l) {
         l.add(null, "5 .           minimum               take lowest");
         l.add(null, "5 .           average               take average");
         l.add(null, "5 .           maximum               take highest");
+        l.add(null, "5 .           differs               take differences");
     }
 
     /**

diff --git a/src/net/freertr/rtr/rtrOspf6iface.java b/src/net/freertr/rtr/rtrOspf6iface.java
@@ -772,6 +772,7 @@ public static void routerGetHelp(userHelping l) {
         l.add(null, "5 .           minimum               take lowest");
         l.add(null, "5 .           average               take average");
         l.add(null, "5 .           maximum               take highest");
+        l.add(null, "5 .           differs               take differences");
     }
 
     /**

diff --git a/src/net/freertr/tab/tabAverage.java b/src/net/freertr/tab/tabAverage.java
@@ -11,7 +11,7 @@
 public class tabAverage {
 
     /**
-     * mode, 0=none, 1=min, 2=avg, 3=max
+     * mode, 0=none, 1=min, 2=avg, 3=max, 4=diff
      */
     public int algorithm = 1;
 
@@ -85,6 +85,8 @@ public String getAlgoName() {
                 return "average";
             case 3:
                 return "maximum";
+            case 4:
+                return "differs";
             default:
                 return "unknown=" + algorithm;
         }
@@ -112,6 +114,10 @@ public void string2algo(String a) {
             algorithm = 3;
             return;
         }
+        if (a.equals("differs")) {
+            algorithm = 4;
+            return;
+        }
         algorithm = 0;
     }
 
@@ -174,8 +180,8 @@ public int getResult(int met) {
                         met += cur;
                     }
                     met /= pastValues.size();
-                    break;
                 }
+                break;
             case 3:
                 met = Integer.MIN_VALUE;
                 synchronized (pastValues) {
@@ -185,8 +191,23 @@ public int getResult(int met) {
                             met = cur;
                         }
                     }
-                    break;
                 }
+                break;
+            case 4:
+                synchronized (pastValues) {
+                    met = 0;
+                    int prv = pastValues.get(0);
+                    for (int i = 1; i < pastValues.size(); i++) {
+                        int cur = pastValues.get(i);
+                        int dif = prv - cur;
+                        prv = cur;
+                        if (dif < 0) {
+                            dif = -dif;
+                        }
+                        met += dif;
+                    }
+                }
+                break;
             default:
                 return met;
         }