Fix confidence interval calculation

cesarBLG · Oct 1, 2023 · f6b2a5a · f6b2a5a
1 parent 77118a8
commit f6b2a5a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/EVC/LX/level_crossing.cpp b/EVC/LX/level_crossing.cpp
@@ -32,7 +32,7 @@ void update_lx()
     for (auto it=level_crossings.begin(); it!=level_crossings.end(); ) {
         if (!it->lx_protected) {
             if (it->svl_replaced && d_minsafefront(it->start) < it->start.min+it->length) inform_lx = true;
-            if (V_est == 0 && it->stop && d_estfront > it->start.est-it->stoplength) {
+            if (!it->svl_replaced && V_est == 0 && it->stop && d_estfront > it->start.est-it->stoplength) {
                 it->svl_replaced = distance::from_odometer(d_estfront_dir[odometer_orientation == -1]);
                 calculate_SvL();
             }

diff --git a/EVC/Position/distance.cpp b/EVC/Position/distance.cpp
@@ -147,17 +147,11 @@ confidence_data confidence_data::basic()
 }
 dist_base d_maxsafe(const dist_base &d, const confidence_data &conf)
 {
-    if (d > conf.ref)
-        return conf.ref + (d-conf.ref)*1.01 + conf.locacc;
-    else
-        return conf.ref + (d-conf.ref)*0.99 + conf.locacc;
+    return d + std::abs(d-conf.ref)*0.01 + conf.locacc;
 }
 dist_base d_minsafe(const dist_base &d, const confidence_data &conf)
 {
-    if (d > conf.ref)
-        return conf.ref + (d-conf.ref)*0.99 - conf.locacc;
-    else
-        return conf.ref + (d-conf.ref)*1.01 - conf.locacc;
+    return d - std::abs(d-conf.ref)*0.01 + conf.locacc;
 }
 dist_base d_maxsafefront(const confidence_data &conf)
 {