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

[wpiunits] Use div instead of divide for kotlin compatibility (#7387)

Browse Source
This commit is contained in:
Tim Winters
2024-11-15 13:49:40 -05:00
committed by GitHub
parent 453335e354
commit bade0a8716
32 changed files with 1293 additions and 1293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpiunits/src/main/java/edu/wpi/first/units/ImmutableMeasure.java
View File

@@ -81,12 +81,12 @@ public record ImmutableMeasure<U extends Unit>(double magnitude, double baseUnit
}
@Override
public Measure<U> divide(double divisor) {
public Measure<U> div(double divisor) {
return ofBaseUnits(baseUnitMagnitude / divisor, unit);
}
@Override
public Measure<U> divide(Dimensionless divisor) {
public Measure<U> div(Dimensionless divisor) {
return ofBaseUnits(baseUnitMagnitude / divisor.baseUnitMagnitude(), unit);
}
}

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

@@ -614,7 +614,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
Measure<U> divide(double divisor);
Measure<U> div(double divisor);
/**
* Divides this measure by a dimensionless scalar and returns the result.
@@ -622,7 +622,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
Measure<U> divide(Dimensionless divisor);
Measure<U> div(Dimensionless divisor);
/**
* Divides this measurement by another measure and performs some dimensional analysis to reduce
@@ -631,7 +631,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the unit to divide by
* @return the resulting measure
*/
default Measure<?> divide(Measure<?> divisor) {
default Measure<?> div(Measure<?> divisor) {
final double baseUnitResult = baseUnitMagnitude() / divisor.baseUnitMagnitude();
if (unit().getBaseUnit().equals(divisor.unit().getBaseUnit())) {
@@ -671,54 +671,54 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
}
if (divisor instanceof Acceleration<?> acceleration) {
return divide(acceleration);
return div(acceleration);
} else if (divisor instanceof Angle angle) {
return divide(angle);
return div(angle);
} else if (divisor instanceof AngularAcceleration angularAcceleration) {
return divide(angularAcceleration);
return div(angularAcceleration);
} else if (divisor instanceof AngularMomentum angularMomentum) {
return divide(angularMomentum);
return div(angularMomentum);
} else if (divisor instanceof AngularVelocity angularVelocity) {
return divide(angularVelocity);
return div(angularVelocity);
} else if (divisor instanceof Current current) {
return divide(current);
return div(current);
} else if (divisor instanceof Dimensionless dimensionless) {
// n.b. this case should already be covered
return divide(dimensionless);
return div(dimensionless);
} else if (divisor instanceof Distance distance) {
return divide(distance);
return div(distance);
} else if (divisor instanceof Energy energy) {
return divide(energy);
return div(energy);
} else if (divisor instanceof Force force) {
return divide(force);
return div(force);
} else if (divisor instanceof Frequency frequency) {
return divide(frequency);
return div(frequency);
} else if (divisor instanceof LinearAcceleration linearAcceleration) {
return divide(linearAcceleration);
return div(linearAcceleration);
} else if (divisor instanceof LinearVelocity linearVelocity) {
return divide(linearVelocity);
return div(linearVelocity);
} else if (divisor instanceof Mass mass) {
return divide(mass);
return div(mass);
} else if (divisor instanceof MomentOfInertia momentOfInertia) {
return divide(momentOfInertia);
return div(momentOfInertia);
} else if (divisor instanceof Mult<?, ?> mult) {
return divide(mult);
return div(mult);
} else if (divisor instanceof Per<?, ?> per) {
return divide(per);
return div(per);
} else if (divisor instanceof Power power) {
return divide(power);
return div(power);
} else if (divisor instanceof Temperature temperature) {
return divide(temperature);
return div(temperature);
} else if (divisor instanceof Time time) {
return divide(time);
return div(time);
} else if (divisor instanceof Torque torque) {
return divide(torque);
return div(torque);
} else if (divisor instanceof Velocity<?> velocity) {
return divide(velocity);
return div(velocity);
} else if (divisor instanceof Voltage voltage) {
return divide(voltage);
return div(voltage);
} else if (divisor instanceof Resistance resistance) {
return divide(resistance);
return div(resistance);
} else {
// Dimensional analysis fallthrough or a generic input measure type
// Do a basic unit multiplication
@@ -733,7 +733,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Acceleration<?> divisor) {
default Measure<?> div(Acceleration<?> divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -744,7 +744,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Angle divisor) {
default Measure<?> div(Angle divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -756,7 +756,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(AngularAcceleration divisor) {
default Measure<?> div(AngularAcceleration divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -768,7 +768,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(AngularMomentum divisor) {
default Measure<?> div(AngularMomentum divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -780,7 +780,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(AngularVelocity divisor) {
default Measure<?> div(AngularVelocity divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -792,7 +792,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Current divisor) {
default Measure<?> div(Current divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -803,7 +803,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Distance divisor) {
default Measure<?> div(Distance divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -814,7 +814,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Energy divisor) {
default Measure<?> div(Energy divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -825,7 +825,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Force divisor) {
default Measure<?> div(Force divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -836,7 +836,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Frequency divisor) {
default Measure<?> div(Frequency divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -848,7 +848,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(LinearAcceleration divisor) {
default Measure<?> div(LinearAcceleration divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -859,7 +859,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(LinearMomentum divisor) {
default Measure<?> div(LinearMomentum divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -870,7 +870,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(LinearVelocity divisor) {
default Measure<?> div(LinearVelocity divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -881,7 +881,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Mass divisor) {
default Measure<?> div(Mass divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -893,7 +893,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(MomentOfInertia divisor) {
default Measure<?> div(MomentOfInertia divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -905,7 +905,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Mult<?, ?> divisor) {
default Measure<?> div(Mult<?, ?> divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -916,7 +916,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Power divisor) {
default Measure<?> div(Power divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -927,7 +927,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Per<?, ?> divisor) {
default Measure<?> div(Per<?, ?> divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -938,7 +938,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Temperature divisor) {
default Measure<?> div(Temperature divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -951,7 +951,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Time divisor) {
default Measure<?> div(Time divisor) {
return VelocityUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -962,7 +962,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Torque divisor) {
default Measure<?> div(Torque divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -973,7 +973,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Velocity<?> divisor) {
default Measure<?> div(Velocity<?> divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -984,7 +984,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Voltage divisor) {
default Measure<?> div(Voltage divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -995,7 +995,7 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
* @param divisor the measurement to divide by.
* @return the division result
*/
default Measure<?> divide(Resistance divisor) {
default Measure<?> div(Resistance divisor) {
return PerUnit.combine(unit(), divisor.unit())
.ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
}
@@ -1017,13 +1017,13 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
/**
* Divides this measure by a time period and returns the result in the most appropriate unit. This
* is equivalent to {@code divide(period.of(1))}.
* is equivalent to {@code div(period.of(1))}.
*
* @param period the time period measurement to divide by.
* @return the division result
*/
default Measure<?> per(TimeUnit period) {
return divide(period.of(1));
return div(period.of(1));
}
/**

4
wpiunits/src/main/java/edu/wpi/first/units/mutable/GenericMutableMeasureImpl.java
View File

@@ -68,12 +68,12 @@ public final class GenericMutableMeasureImpl<U extends Unit>
}
@Override
public Measure<U> divide(double divisor) {
public Measure<U> div(double divisor) {
return ImmutableMeasure.ofBaseUnits(m_baseUnitMagnitude / divisor, m_unit);
}
@Override
public Measure<U> divide(Dimensionless divisor) {
public Measure<U> div(Dimensionless divisor) {
return ImmutableMeasure.ofBaseUnits(m_baseUnitMagnitude / divisor.baseUnitMagnitude(), m_unit);
}
}