Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-27 02:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiunits] Fix measure isNear function (#6313)

Browse Source 
Now the function allows comparison between negative numbers, positive numbers or both.
This commit is contained in:
vichik
2024-01-31 23:18:47 +02:00
committed by GitHub
parent cb094e4ff6
commit 90bb6cfffa
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wpiunits/src/main/java/edu/wpi/first/units/Measure.java
View File

@@ -260,10 +260,9 @@ public interface Measure<U extends Unit<U>> extends Comparable<Measure<U>> {
}
// abs so negative inputs are calculated correctly
var allowedVariance = Math.abs(varianceThreshold);
var tolerance = Math.abs(other.baseUnitMagnitude() * varianceThreshold);
return other.baseUnitMagnitude() * (1 - allowedVariance) <= this.baseUnitMagnitude()
&& other.baseUnitMagnitude() * (1 + allowedVariance) >= this.baseUnitMagnitude();
return Math.abs(this.baseUnitMagnitude() - other.baseUnitMagnitude()) <= tolerance;
}
/**

24
wpiunits/src/test/java/edu/wpi/first/units/MeasureTest.java
View File

@@ -319,5 +319,29 @@ class MeasureTest {
assertFalse(measureA.isNear(measureB, 0.739370));
assertTrue(measureA.isNear(measureB, 0.739375));
assertTrue(measureA.isNear(measureB, 100)); // some stupidly large range +/- 10000%
var measureC = unit.of(-1.21);
var measureD = unit.ofBaseUnits(-64);
assertTrue(measureC.isNear(measureC, 0));
assertTrue(measureD.isNear(measureD, 0));
assertFalse(measureC.isNear(measureD, 0));
assertFalse(measureC.isNear(measureD, 0.50));
assertFalse(measureC.isNear(measureD, 0.739370));
assertTrue(measureC.isNear(measureD, 0.739375));
assertTrue(measureC.isNear(measureD, 100)); // some stupidly large range +/- 10000%
var measureE = Units.Meters.of(1);
var measureF = Units.Feet.of(-3.28084);
assertTrue(measureE.isNear(measureF, 2.01));
assertFalse(measureE.isNear(measureF, 1.99));
assertTrue(measureF.isNear(measureE, 2.01));
assertFalse(measureF.isNear(measureE, 1.99));
assertTrue(Units.Feet.zero().isNear(Units.Millimeters.zero(), 0.001));
assertFalse(Units.Feet.of(2).isNear(Units.Millimeters.of(0), 0.001));
}
}