X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosState.java;h=347c119883842db8ccd3e5cc13218728873c27db;hb=643c2fb03833d658320f476ef731bbb06fe3cc31;hp=a120e0c7e1965b1caa14a8b289997d3aa69ddb48;hpb=76532162d63239b00a51dd0ff6b1356b07b62d2d;p=fw%2Faltos diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java index a120e0c7..347c1198 100644 --- a/altoslib/AltosState.java +++ b/altoslib/AltosState.java @@ -31,8 +31,9 @@ public class AltosState implements Cloneable, Serializable { public int set; + static final double filter_len = 2.0; static final double ascent_filter_len = 0.5; - static final double descent_filter_len = 0.5; + static final double descent_filter_len = 5.0; /* derived data */ @@ -64,8 +65,10 @@ public class AltosState implements Cloneable, Serializable { } void set_filtered(double new_value, double time) { - if (prev_value != AltosLib.MISSING) - new_value = (prev_value * 15.0 + new_value) / 16.0; + if (prev_value != AltosLib.MISSING) { + double f = 1/Math.exp((time - prev_set_time) / filter_len); + new_value = f * new_value + (1-f) * prev_value; + } set(new_value, time); }