diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/EpilogueGenerator.java b/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/EpilogueGenerator.java index 866bfdf676..0b91eab035 100644 --- a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/EpilogueGenerator.java +++ b/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/EpilogueGenerator.java @@ -176,7 +176,7 @@ public class EpilogueGenerator { out.println(" config.loggingPeriod = Seconds.of(robot.getPeriod());"); out.println(" }"); out.println(" if (config.loggingPeriodOffset == null) {"); - out.println(" config.loggingPeriodOffset = config.loggingPeriod.divide(2);"); + out.println(" config.loggingPeriodOffset = config.loggingPeriod.div(2);"); out.println(" }"); out.println(); out.println(" robot.addPeriodic(() -> {"); diff --git a/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/EpilogueGeneratorTest.java b/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/EpilogueGeneratorTest.java index a2d0b18411..c30da2deef 100644 --- a/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/EpilogueGeneratorTest.java +++ b/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/EpilogueGeneratorTest.java @@ -172,7 +172,7 @@ class EpilogueGeneratorTest { config.loggingPeriod = Seconds.of(robot.getPeriod()); } if (config.loggingPeriodOffset == null) { - config.loggingPeriodOffset = config.loggingPeriod.divide(2); + config.loggingPeriodOffset = config.loggingPeriod.div(2); } robot.addPeriodic(() -> { @@ -252,7 +252,7 @@ class EpilogueGeneratorTest { config.loggingPeriod = Seconds.of(robot.getPeriod()); } if (config.loggingPeriodOffset == null) { - config.loggingPeriodOffset = config.loggingPeriod.divide(2); + config.loggingPeriodOffset = config.loggingPeriod.div(2); } robot.addPeriodic(() -> { @@ -284,7 +284,7 @@ class EpilogueGeneratorTest { config.loggingPeriod = Seconds.of(robot.getPeriod()); } if (config.loggingPeriodOffset == null) { - config.loggingPeriodOffset = config.loggingPeriod.divide(2); + config.loggingPeriodOffset = config.loggingPeriod.div(2); } robot.addPeriodic(() -> { diff --git a/wpiunits/src/generate/main/java/Measure-interface.java.jinja b/wpiunits/src/generate/main/java/Measure-interface.java.jinja index 100dbc4bb1..06622b8c6e 100644 --- a/wpiunits/src/generate/main/java/Measure-interface.java.jinja +++ b/wpiunits/src/generate/main/java/Measure-interface.java.jinja @@ -66,18 +66,18 @@ public interface {{ helpers['type_decl'](name) }} extends Measure<{{ helpers['mt } @Override - default {{ helpers['type_usage'](name) }} divide(double divisor) { + default {{ helpers['type_usage'](name) }} div(double divisor) { return ({{ helpers['type_usage'](name) }}) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default {{ config[name]['divide']['Time'] or "Velocity<{}>".format(helpers['mtou'](name)) }} per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } {% for unit in math_units -%} {% if unit == "Dimensionless" %} @Override - default {{ helpers['type_usage'](name) }} divide({{ unit }} divisor) { + default {{ helpers['type_usage'](name) }} div({{ unit }} divisor) { return ({{ helpers['type_usage'](name) }}) {{ config[name]['base_unit'] }}.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -103,23 +103,23 @@ public interface {{ helpers['type_decl'](name) }} extends Measure<{{ helpers['mt {% endif -%} {% if unit in config[name]['divide'] %} @Override - default {{ config[name]['divide'][unit] }} divide({{ unit }} divisor) { + default {{ config[name]['divide'][unit] }} div({{ unit }} divisor) { return {{ config[config[name]['divide'][unit]]['base_unit'] }}.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } {% elif unit == "Time" %} @Override - default Velocity<{{ helpers['mtou'](name) }}> divide({{ unit }} divisor) { + default Velocity<{{ helpers['mtou'](name) }}> div({{ unit }} divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } {% elif unit == name %} @Override - default Dimensionless divide({{ unit }} divisor) { + default Dimensionless div({{ unit }} divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } {% else %} @Override - default Per<{{ helpers['mtou'](name) }}, {{ helpers['mtou'](unit) }}> divide({{ unit }} divisor) { - return (Per<{{ helpers['mtou'](name) }}, {{ helpers['mtou'](unit) }}>) Measure.super.divide(divisor); + default Per<{{ helpers['mtou'](name) }}, {{ helpers['mtou'](unit) }}> div({{ unit }} divisor) { + return (Per<{{ helpers['mtou'](name) }}, {{ helpers['mtou'](unit) }}>) Measure.super.div(divisor); } {% endif -%} {% endif -%} diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Acceleration.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Acceleration.java index faf17d53ee..6db6eaba55 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Acceleration.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Acceleration.java @@ -66,13 +66,13 @@ public interface Acceleration extends Measure divide(double divisor) { + default Acceleration div(double divisor) { return (Acceleration) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity> per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Acceleration extends Measure, AccelerationUnit> divide(Acceleration divisor) { - return (Per, AccelerationUnit>) Measure.super.divide(divisor); + default Per, AccelerationUnit> div(Acceleration divisor) { + return (Per, AccelerationUnit>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Acceleration extends Measure, AngleUnit> divide(Angle divisor) { - return (Per, AngleUnit>) Measure.super.divide(divisor); + default Per, AngleUnit> div(Angle divisor) { + return (Per, AngleUnit>) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Acceleration extends Measure, AngularAccelerationUnit> divide(AngularAcceleration divisor) { - return (Per, AngularAccelerationUnit>) Measure.super.divide(divisor); + default Per, AngularAccelerationUnit> div(AngularAcceleration divisor) { + return (Per, AngularAccelerationUnit>) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Acceleration extends Measure, AngularMomentumUnit> divide(AngularMomentum divisor) { - return (Per, AngularMomentumUnit>) Measure.super.divide(divisor); + default Per, AngularMomentumUnit> div(AngularMomentum divisor) { + return (Per, AngularMomentumUnit>) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Acceleration extends Measure, AngularVelocityUnit> divide(AngularVelocity divisor) { - return (Per, AngularVelocityUnit>) Measure.super.divide(divisor); + default Per, AngularVelocityUnit> div(AngularVelocity divisor) { + return (Per, AngularVelocityUnit>) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Acceleration extends Measure, CurrentUnit> divide(Current divisor) { - return (Per, CurrentUnit>) Measure.super.divide(divisor); + default Per, CurrentUnit> div(Current divisor) { + return (Per, CurrentUnit>) Measure.super.div(divisor); } @Override - default Acceleration divide(Dimensionless divisor) { + default Acceleration div(Dimensionless divisor) { return (Acceleration) unit().of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Acceleration extends Measure, DistanceUnit> divide(Distance divisor) { - return (Per, DistanceUnit>) Measure.super.divide(divisor); + default Per, DistanceUnit> div(Distance divisor) { + return (Per, DistanceUnit>) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface Acceleration extends Measure, EnergyUnit> divide(Energy divisor) { - return (Per, EnergyUnit>) Measure.super.divide(divisor); + default Per, EnergyUnit> div(Energy divisor) { + return (Per, EnergyUnit>) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface Acceleration extends Measure, ForceUnit> divide(Force divisor) { - return (Per, ForceUnit>) Measure.super.divide(divisor); + default Per, ForceUnit> div(Force divisor) { + return (Per, ForceUnit>) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface Acceleration extends Measure, FrequencyUnit> divide(Frequency divisor) { - return (Per, FrequencyUnit>) Measure.super.divide(divisor); + default Per, FrequencyUnit> div(Frequency divisor) { + return (Per, FrequencyUnit>) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Acceleration extends Measure, LinearAccelerationUnit> divide(LinearAcceleration divisor) { - return (Per, LinearAccelerationUnit>) Measure.super.divide(divisor); + default Per, LinearAccelerationUnit> div(LinearAcceleration divisor) { + return (Per, LinearAccelerationUnit>) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Acceleration extends Measure, LinearMomentumUnit> divide(LinearMomentum divisor) { - return (Per, LinearMomentumUnit>) Measure.super.divide(divisor); + default Per, LinearMomentumUnit> div(LinearMomentum divisor) { + return (Per, LinearMomentumUnit>) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Acceleration extends Measure, LinearVelocityUnit> divide(LinearVelocity divisor) { - return (Per, LinearVelocityUnit>) Measure.super.divide(divisor); + default Per, LinearVelocityUnit> div(LinearVelocity divisor) { + return (Per, LinearVelocityUnit>) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface Acceleration extends Measure, MassUnit> divide(Mass divisor) { - return (Per, MassUnit>) Measure.super.divide(divisor); + default Per, MassUnit> div(Mass divisor) { + return (Per, MassUnit>) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Acceleration extends Measure, MomentOfInertiaUnit> divide(MomentOfInertia divisor) { - return (Per, MomentOfInertiaUnit>) Measure.super.divide(divisor); + default Per, MomentOfInertiaUnit> div(MomentOfInertia divisor) { + return (Per, MomentOfInertiaUnit>) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Acceleration extends Measure, MultUnit> divide(Mult divisor) { - return (Per, MultUnit>) Measure.super.divide(divisor); + default Per, MultUnit> div(Mult divisor) { + return (Per, MultUnit>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Acceleration extends Measure, PerUnit> divide(Per divisor) { - return (Per, PerUnit>) Measure.super.divide(divisor); + default Per, PerUnit> div(Per divisor) { + return (Per, PerUnit>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Acceleration extends Measure, PowerUnit> divide(Power divisor) { - return (Per, PowerUnit>) Measure.super.divide(divisor); + default Per, PowerUnit> div(Power divisor) { + return (Per, PowerUnit>) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface Acceleration extends Measure, ResistanceUnit> divide(Resistance divisor) { - return (Per, ResistanceUnit>) Measure.super.divide(divisor); + default Per, ResistanceUnit> div(Resistance divisor) { + return (Per, ResistanceUnit>) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface Acceleration extends Measure, TemperatureUnit> divide(Temperature divisor) { - return (Per, TemperatureUnit>) Measure.super.divide(divisor); + default Per, TemperatureUnit> div(Temperature divisor) { + return (Per, TemperatureUnit>) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Acceleration extends Measure> divide(Time divisor) { + default Velocity> div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Acceleration extends Measure, TorqueUnit> divide(Torque divisor) { - return (Per, TorqueUnit>) Measure.super.divide(divisor); + default Per, TorqueUnit> div(Torque divisor) { + return (Per, TorqueUnit>) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Acceleration extends Measure, VelocityUnit> divide(Velocity divisor) { - return (Per, VelocityUnit>) Measure.super.divide(divisor); + default Per, VelocityUnit> div(Velocity divisor) { + return (Per, VelocityUnit>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface Acceleration extends Measure, VoltageUnit> divide(Voltage divisor) { - return (Per, VoltageUnit>) Measure.super.divide(divisor); + default Per, VoltageUnit> div(Voltage divisor) { + return (Per, VoltageUnit>) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Angle.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Angle.java index 7add45abde..baeef70597 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Angle.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Angle.java @@ -66,13 +66,13 @@ public interface Angle extends Measure { } @Override - default Angle divide(double divisor) { + default Angle div(double divisor) { return (Angle) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default AngularVelocity per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Angle extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,7 +93,7 @@ public interface Angle extends Measure { } @Override - default Dimensionless divide(Angle divisor) { + default Dimensionless div(Angle divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -104,8 +104,8 @@ public interface Angle extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Angle extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Angle extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Angle extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default Angle divide(Dimensionless divisor) { + default Angle div(Dimensionless divisor) { return (Angle) Radians.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Angle extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface Angle extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface Angle extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface Angle extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Angle extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Angle extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Angle extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface Angle extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Angle extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Angle extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Angle extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Angle extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface Angle extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface Angle extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Angle extends Measure { } @Override - default AngularVelocity divide(Time divisor) { + default AngularVelocity div(Time divisor) { return RadiansPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Angle extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Angle extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface Angle extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularAcceleration.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularAcceleration.java index 195883e9a9..cb0f4668a1 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularAcceleration.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularAcceleration.java @@ -66,13 +66,13 @@ public interface AngularAcceleration extends Measure { } @Override - default AngularAcceleration divide(double divisor) { + default AngularAcceleration div(double divisor) { return (AngularAcceleration) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,7 +104,7 @@ public interface AngularAcceleration extends Measure { } @Override - default Dimensionless divide(AngularAcceleration divisor) { + default Dimensionless div(AngularAcceleration divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -115,8 +115,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default AngularAcceleration divide(Dimensionless divisor) { + default AngularAcceleration div(Dimensionless divisor) { return (AngularAcceleration) RadiansPerSecondPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,7 +191,7 @@ public interface AngularAcceleration extends Measure { } @Override - default AngularVelocity divide(Frequency divisor) { + default AngularVelocity div(Frequency divisor) { return RadiansPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -202,8 +202,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface AngularAcceleration extends Measure { } @Override - default Velocity divide(Time divisor) { + default Velocity div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface AngularAcceleration extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularMomentum.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularMomentum.java index 03958031da..d769afc56d 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularMomentum.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularMomentum.java @@ -66,13 +66,13 @@ public interface AngularMomentum extends Measure { } @Override - default AngularMomentum divide(double divisor) { + default AngularMomentum div(double divisor) { return (AngularMomentum) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,7 +115,7 @@ public interface AngularMomentum extends Measure { } @Override - default Dimensionless divide(AngularMomentum divisor) { + default Dimensionless div(AngularMomentum divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -126,7 +126,7 @@ public interface AngularMomentum extends Measure { } @Override - default MomentOfInertia divide(AngularVelocity divisor) { + default MomentOfInertia div(AngularVelocity divisor) { return KilogramSquareMeters.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -137,12 +137,12 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default AngularMomentum divide(Dimensionless divisor) { + default AngularMomentum div(Dimensionless divisor) { return (AngularMomentum) KilogramMetersSquaredPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface AngularMomentum extends Measure { } @Override - default Velocity divide(Time divisor) { + default Velocity div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface AngularMomentum extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularVelocity.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularVelocity.java index a25105f401..c796721ada 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularVelocity.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularVelocity.java @@ -66,13 +66,13 @@ public interface AngularVelocity extends Measure { } @Override - default AngularVelocity divide(double divisor) { + default AngularVelocity div(double divisor) { return (AngularVelocity) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default AngularAcceleration per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,7 +126,7 @@ public interface AngularVelocity extends Measure { } @Override - default Dimensionless divide(AngularVelocity divisor) { + default Dimensionless div(AngularVelocity divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -137,12 +137,12 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default AngularVelocity divide(Dimensionless divisor) { + default AngularVelocity div(Dimensionless divisor) { return (AngularVelocity) RadiansPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface AngularVelocity extends Measure { } @Override - default AngularAcceleration divide(Time divisor) { + default AngularAcceleration div(Time divisor) { return RadiansPerSecondPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface AngularVelocity extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } default Frequency asFrequency() { return Hertz.of(baseUnitMagnitude()); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Current.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Current.java index cbc1e5bc5e..2362f3f677 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Current.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Current.java @@ -66,13 +66,13 @@ public interface Current extends Measure { } @Override - default Current divide(double divisor) { + default Current div(double divisor) { return (Current) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Current extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Current extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Current extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Current extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Current extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Current extends Measure { } @Override - default Dimensionless divide(Current divisor) { + default Dimensionless div(Current divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @Override - default Current divide(Dimensionless divisor) { + default Current div(Dimensionless divisor) { return (Current) Amps.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Current extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface Current extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface Current extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface Current extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Current extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Current extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Current extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface Current extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Current extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Current extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Current extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Current extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface Current extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface Current extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Current extends Measure { } @Override - default Velocity divide(Time divisor) { + default Velocity div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Current extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Current extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface Current extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Dimensionless.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Dimensionless.java index 02e2b6671f..c0cbe5bd18 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Dimensionless.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Dimensionless.java @@ -66,13 +66,13 @@ public interface Dimensionless extends Measure { } @Override - default Dimensionless divide(double divisor) { + default Dimensionless div(double divisor) { return (Dimensionless) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Frequency per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Dimensionless extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default Dimensionless divide(Dimensionless divisor) { + default Dimensionless div(Dimensionless divisor) { return (Dimensionless) Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Dimensionless extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Dimensionless extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Dimensionless extends Measure { } @Override - default Frequency divide(Time divisor) { + default Frequency div(Time divisor) { return Hertz.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Dimensionless extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface Dimensionless extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Distance.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Distance.java index 4ed08219cb..ec639e265f 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Distance.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Distance.java @@ -66,13 +66,13 @@ public interface Distance extends Measure { } @Override - default Distance divide(double divisor) { + default Distance div(double divisor) { return (Distance) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default LinearVelocity per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Distance extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Distance extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Distance extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Distance extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Distance extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Distance extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default Distance divide(Dimensionless divisor) { + default Distance div(Dimensionless divisor) { return (Distance) Meters.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,7 +158,7 @@ public interface Distance extends Measure { } @Override - default Dimensionless divide(Distance divisor) { + default Dimensionless div(Distance divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -169,8 +169,8 @@ public interface Distance extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface Distance extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface Distance extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Distance extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Distance extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,7 +224,7 @@ public interface Distance extends Measure { } @Override - default Time divide(LinearVelocity divisor) { + default Time div(LinearVelocity divisor) { return Seconds.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -235,8 +235,8 @@ public interface Distance extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Distance extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Distance extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Distance extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Distance extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface Distance extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface Distance extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Distance extends Measure { } @Override - default LinearVelocity divide(Time divisor) { + default LinearVelocity div(Time divisor) { return MetersPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Distance extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Distance extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface Distance extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Energy.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Energy.java index 8b424b17bd..7b101081e8 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Energy.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Energy.java @@ -66,13 +66,13 @@ public interface Energy extends Measure { } @Override - default Energy divide(double divisor) { + default Energy div(double divisor) { return (Energy) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Power per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Energy extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Energy extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Energy extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Energy extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Energy extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Energy extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default Energy divide(Dimensionless divisor) { + default Energy div(Dimensionless divisor) { return (Energy) Joules.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Energy extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,7 +169,7 @@ public interface Energy extends Measure { } @Override - default Dimensionless divide(Energy divisor) { + default Dimensionless div(Energy divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -180,8 +180,8 @@ public interface Energy extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface Energy extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Energy extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Energy extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Energy extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface Energy extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Energy extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Energy extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Energy extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Energy extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface Energy extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface Energy extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Energy extends Measure { } @Override - default Power divide(Time divisor) { + default Power div(Time divisor) { return Watts.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Energy extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Energy extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface Energy extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Force.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Force.java index 307ebccaa1..10b0decfe6 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Force.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Force.java @@ -66,13 +66,13 @@ public interface Force extends Measure { } @Override - default Force divide(double divisor) { + default Force div(double divisor) { return (Force) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Force extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Force extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Force extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Force extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Force extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Force extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default Force divide(Dimensionless divisor) { + default Force div(Dimensionless divisor) { return (Force) Newtons.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Force extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface Force extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,7 +180,7 @@ public interface Force extends Measure { } @Override - default Dimensionless divide(Force divisor) { + default Dimensionless div(Force divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -191,8 +191,8 @@ public interface Force extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,7 +202,7 @@ public interface Force extends Measure { } @Override - default Mass divide(LinearAcceleration divisor) { + default Mass div(LinearAcceleration divisor) { return Kilograms.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -213,8 +213,8 @@ public interface Force extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Force extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,7 +235,7 @@ public interface Force extends Measure { } @Override - default LinearAcceleration divide(Mass divisor) { + default LinearAcceleration div(Mass divisor) { return MetersPerSecondPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -246,8 +246,8 @@ public interface Force extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Force extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Force extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Force extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface Force extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface Force extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Force extends Measure { } @Override - default Velocity divide(Time divisor) { + default Velocity div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Force extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Force extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface Force extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Frequency.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Frequency.java index 2b80fe1836..e553f495fd 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Frequency.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Frequency.java @@ -66,13 +66,13 @@ public interface Frequency extends Measure { } @Override - default Frequency divide(double divisor) { + default Frequency div(double divisor) { return (Frequency) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Frequency extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Frequency extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default Frequency divide(Dimensionless divisor) { + default Frequency div(Dimensionless divisor) { return (Frequency) Hertz.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,7 +191,7 @@ public interface Frequency extends Measure { } @Override - default Dimensionless divide(Frequency divisor) { + default Dimensionless div(Frequency divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -202,8 +202,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Frequency extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Frequency extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Frequency extends Measure { } @Override - default Velocity divide(Time divisor) { + default Velocity div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Frequency extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface Frequency extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } /** Converts this frequency to the time period between cycles. */ default Time asPeriod() { return Seconds.of(1 / baseUnitMagnitude()); } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearAcceleration.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearAcceleration.java index a7b6ee5e84..bbbeb8f793 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearAcceleration.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearAcceleration.java @@ -66,13 +66,13 @@ public interface LinearAcceleration extends Measure { } @Override - default LinearAcceleration divide(double divisor) { + default LinearAcceleration div(double divisor) { return (LinearAcceleration) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default LinearAcceleration divide(Dimensionless divisor) { + default LinearAcceleration div(Dimensionless divisor) { return (LinearAcceleration) MetersPerSecondPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,7 +191,7 @@ public interface LinearAcceleration extends Measure { } @Override - default LinearVelocity divide(Frequency divisor) { + default LinearVelocity div(Frequency divisor) { return MetersPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -202,7 +202,7 @@ public interface LinearAcceleration extends Measure { } @Override - default Dimensionless divide(LinearAcceleration divisor) { + default Dimensionless div(LinearAcceleration divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -213,8 +213,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface LinearAcceleration extends Measure { } @Override - default Velocity divide(Time divisor) { + default Velocity div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface LinearAcceleration extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearMomentum.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearMomentum.java index 6f81cdac5b..bf0cff3d72 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearMomentum.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearMomentum.java @@ -66,13 +66,13 @@ public interface LinearMomentum extends Measure { } @Override - default LinearMomentum divide(double divisor) { + default LinearMomentum div(double divisor) { return (LinearMomentum) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Force per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default LinearMomentum divide(Dimensionless divisor) { + default LinearMomentum div(Dimensionless divisor) { return (LinearMomentum) KilogramMetersPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,7 +213,7 @@ public interface LinearMomentum extends Measure { } @Override - default Dimensionless divide(LinearMomentum divisor) { + default Dimensionless div(LinearMomentum divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -224,7 +224,7 @@ public interface LinearMomentum extends Measure { } @Override - default Mass divide(LinearVelocity divisor) { + default Mass div(LinearVelocity divisor) { return Kilograms.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -235,7 +235,7 @@ public interface LinearMomentum extends Measure { } @Override - default LinearVelocity divide(Mass divisor) { + default LinearVelocity div(Mass divisor) { return MetersPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -246,8 +246,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface LinearMomentum extends Measure { } @Override - default Force divide(Time divisor) { + default Force div(Time divisor) { return Newtons.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface LinearMomentum extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearVelocity.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearVelocity.java index a02ab74d9f..3b85ef7789 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearVelocity.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearVelocity.java @@ -66,13 +66,13 @@ public interface LinearVelocity extends Measure { } @Override - default LinearVelocity divide(double divisor) { + default LinearVelocity div(double divisor) { return (LinearVelocity) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default LinearAcceleration per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default LinearVelocity divide(Dimensionless divisor) { + default LinearVelocity div(Dimensionless divisor) { return (LinearVelocity) MetersPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,7 +224,7 @@ public interface LinearVelocity extends Measure { } @Override - default Dimensionless divide(LinearVelocity divisor) { + default Dimensionless div(LinearVelocity divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -235,8 +235,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface LinearVelocity extends Measure { } @Override - default LinearAcceleration divide(Time divisor) { + default LinearAcceleration div(Time divisor) { return MetersPerSecondPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface LinearVelocity extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mass.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mass.java index 582ca31e0e..2c1c138ef1 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mass.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mass.java @@ -66,13 +66,13 @@ public interface Mass extends Measure { } @Override - default Mass divide(double divisor) { + default Mass div(double divisor) { return (Mass) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Mass extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Mass extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Mass extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Mass extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Mass extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Mass extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default Mass divide(Dimensionless divisor) { + default Mass div(Dimensionless divisor) { return (Mass) Kilograms.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Mass extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface Mass extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface Mass extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface Mass extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Mass extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Mass extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Mass extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,7 +235,7 @@ public interface Mass extends Measure { } @Override - default Dimensionless divide(Mass divisor) { + default Dimensionless div(Mass divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -246,8 +246,8 @@ public interface Mass extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Mass extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Mass extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Mass extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface Mass extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface Mass extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Mass extends Measure { } @Override - default Velocity divide(Time divisor) { + default Velocity div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Mass extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Mass extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface Mass extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/MomentOfInertia.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/MomentOfInertia.java index ce2a1ca5c9..8fc6ed9670 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/MomentOfInertia.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/MomentOfInertia.java @@ -66,13 +66,13 @@ public interface MomentOfInertia extends Measure { } @Override - default MomentOfInertia divide(double divisor) { + default MomentOfInertia div(double divisor) { return (MomentOfInertia) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default MomentOfInertia divide(Dimensionless divisor) { + default MomentOfInertia div(Dimensionless divisor) { return (MomentOfInertia) KilogramSquareMeters.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,7 +246,7 @@ public interface MomentOfInertia extends Measure { } @Override - default Dimensionless divide(MomentOfInertia divisor) { + default Dimensionless div(MomentOfInertia divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -257,8 +257,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface MomentOfInertia extends Measure { } @Override - default Velocity divide(Time divisor) { + default Velocity div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface MomentOfInertia extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mult.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mult.java index ef2ebea43f..83489d46cf 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mult.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mult.java @@ -66,13 +66,13 @@ public interface Mult extends Measure divide(double divisor) { + default Mult div(double divisor) { return (Mult) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity> per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Mult extends Measure, AccelerationUnit> divide(Acceleration divisor) { - return (Per, AccelerationUnit>) Measure.super.divide(divisor); + default Per, AccelerationUnit> div(Acceleration divisor) { + return (Per, AccelerationUnit>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Mult extends Measure, AngleUnit> divide(Angle divisor) { - return (Per, AngleUnit>) Measure.super.divide(divisor); + default Per, AngleUnit> div(Angle divisor) { + return (Per, AngleUnit>) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Mult extends Measure, AngularAccelerationUnit> divide(AngularAcceleration divisor) { - return (Per, AngularAccelerationUnit>) Measure.super.divide(divisor); + default Per, AngularAccelerationUnit> div(AngularAcceleration divisor) { + return (Per, AngularAccelerationUnit>) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Mult extends Measure, AngularMomentumUnit> divide(AngularMomentum divisor) { - return (Per, AngularMomentumUnit>) Measure.super.divide(divisor); + default Per, AngularMomentumUnit> div(AngularMomentum divisor) { + return (Per, AngularMomentumUnit>) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Mult extends Measure, AngularVelocityUnit> divide(AngularVelocity divisor) { - return (Per, AngularVelocityUnit>) Measure.super.divide(divisor); + default Per, AngularVelocityUnit> div(AngularVelocity divisor) { + return (Per, AngularVelocityUnit>) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Mult extends Measure, CurrentUnit> divide(Current divisor) { - return (Per, CurrentUnit>) Measure.super.divide(divisor); + default Per, CurrentUnit> div(Current divisor) { + return (Per, CurrentUnit>) Measure.super.div(divisor); } @Override - default Mult divide(Dimensionless divisor) { + default Mult div(Dimensionless divisor) { return (Mult) unit().of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Mult extends Measure, DistanceUnit> divide(Distance divisor) { - return (Per, DistanceUnit>) Measure.super.divide(divisor); + default Per, DistanceUnit> div(Distance divisor) { + return (Per, DistanceUnit>) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface Mult extends Measure, EnergyUnit> divide(Energy divisor) { - return (Per, EnergyUnit>) Measure.super.divide(divisor); + default Per, EnergyUnit> div(Energy divisor) { + return (Per, EnergyUnit>) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface Mult extends Measure, ForceUnit> divide(Force divisor) { - return (Per, ForceUnit>) Measure.super.divide(divisor); + default Per, ForceUnit> div(Force divisor) { + return (Per, ForceUnit>) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface Mult extends Measure, FrequencyUnit> divide(Frequency divisor) { - return (Per, FrequencyUnit>) Measure.super.divide(divisor); + default Per, FrequencyUnit> div(Frequency divisor) { + return (Per, FrequencyUnit>) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Mult extends Measure, LinearAccelerationUnit> divide(LinearAcceleration divisor) { - return (Per, LinearAccelerationUnit>) Measure.super.divide(divisor); + default Per, LinearAccelerationUnit> div(LinearAcceleration divisor) { + return (Per, LinearAccelerationUnit>) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Mult extends Measure, LinearMomentumUnit> divide(LinearMomentum divisor) { - return (Per, LinearMomentumUnit>) Measure.super.divide(divisor); + default Per, LinearMomentumUnit> div(LinearMomentum divisor) { + return (Per, LinearMomentumUnit>) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Mult extends Measure, LinearVelocityUnit> divide(LinearVelocity divisor) { - return (Per, LinearVelocityUnit>) Measure.super.divide(divisor); + default Per, LinearVelocityUnit> div(LinearVelocity divisor) { + return (Per, LinearVelocityUnit>) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface Mult extends Measure, MassUnit> divide(Mass divisor) { - return (Per, MassUnit>) Measure.super.divide(divisor); + default Per, MassUnit> div(Mass divisor) { + return (Per, MassUnit>) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Mult extends Measure, MomentOfInertiaUnit> divide(MomentOfInertia divisor) { - return (Per, MomentOfInertiaUnit>) Measure.super.divide(divisor); + default Per, MomentOfInertiaUnit> div(MomentOfInertia divisor) { + return (Per, MomentOfInertiaUnit>) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Mult extends Measure, MultUnit> divide(Mult divisor) { - return (Per, MultUnit>) Measure.super.divide(divisor); + default Per, MultUnit> div(Mult divisor) { + return (Per, MultUnit>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Mult extends Measure, PerUnit> divide(Per divisor) { - return (Per, PerUnit>) Measure.super.divide(divisor); + default Per, PerUnit> div(Per divisor) { + return (Per, PerUnit>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Mult extends Measure, PowerUnit> divide(Power divisor) { - return (Per, PowerUnit>) Measure.super.divide(divisor); + default Per, PowerUnit> div(Power divisor) { + return (Per, PowerUnit>) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface Mult extends Measure, ResistanceUnit> divide(Resistance divisor) { - return (Per, ResistanceUnit>) Measure.super.divide(divisor); + default Per, ResistanceUnit> div(Resistance divisor) { + return (Per, ResistanceUnit>) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface Mult extends Measure, TemperatureUnit> divide(Temperature divisor) { - return (Per, TemperatureUnit>) Measure.super.divide(divisor); + default Per, TemperatureUnit> div(Temperature divisor) { + return (Per, TemperatureUnit>) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Mult extends Measure> divide(Time divisor) { + default Velocity> div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Mult extends Measure, TorqueUnit> divide(Torque divisor) { - return (Per, TorqueUnit>) Measure.super.divide(divisor); + default Per, TorqueUnit> div(Torque divisor) { + return (Per, TorqueUnit>) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Mult extends Measure, VelocityUnit> divide(Velocity divisor) { - return (Per, VelocityUnit>) Measure.super.divide(divisor); + default Per, VelocityUnit> div(Velocity divisor) { + return (Per, VelocityUnit>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface Mult extends Measure, VoltageUnit> divide(Voltage divisor) { - return (Per, VoltageUnit>) Measure.super.divide(divisor); + default Per, VoltageUnit> div(Voltage divisor) { + return (Per, VoltageUnit>) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Per.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Per.java index 4ba089d695..fa776bee00 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Per.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Per.java @@ -66,13 +66,13 @@ public interface Per extends Measur } @Override - default Per divide(double divisor) { + default Per div(double divisor) { return (Per) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity> per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Per extends Measur } @Override - default Per, AccelerationUnit> divide(Acceleration divisor) { - return (Per, AccelerationUnit>) Measure.super.divide(divisor); + default Per, AccelerationUnit> div(Acceleration divisor) { + return (Per, AccelerationUnit>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Per extends Measur } @Override - default Per, AngleUnit> divide(Angle divisor) { - return (Per, AngleUnit>) Measure.super.divide(divisor); + default Per, AngleUnit> div(Angle divisor) { + return (Per, AngleUnit>) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Per extends Measur } @Override - default Per, AngularAccelerationUnit> divide(AngularAcceleration divisor) { - return (Per, AngularAccelerationUnit>) Measure.super.divide(divisor); + default Per, AngularAccelerationUnit> div(AngularAcceleration divisor) { + return (Per, AngularAccelerationUnit>) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Per extends Measur } @Override - default Per, AngularMomentumUnit> divide(AngularMomentum divisor) { - return (Per, AngularMomentumUnit>) Measure.super.divide(divisor); + default Per, AngularMomentumUnit> div(AngularMomentum divisor) { + return (Per, AngularMomentumUnit>) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Per extends Measur } @Override - default Per, AngularVelocityUnit> divide(AngularVelocity divisor) { - return (Per, AngularVelocityUnit>) Measure.super.divide(divisor); + default Per, AngularVelocityUnit> div(AngularVelocity divisor) { + return (Per, AngularVelocityUnit>) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Per extends Measur } @Override - default Per, CurrentUnit> divide(Current divisor) { - return (Per, CurrentUnit>) Measure.super.divide(divisor); + default Per, CurrentUnit> div(Current divisor) { + return (Per, CurrentUnit>) Measure.super.div(divisor); } @Override - default Per divide(Dimensionless divisor) { + default Per div(Dimensionless divisor) { return (Per) unit().of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Per extends Measur } @Override - default Per, DistanceUnit> divide(Distance divisor) { - return (Per, DistanceUnit>) Measure.super.divide(divisor); + default Per, DistanceUnit> div(Distance divisor) { + return (Per, DistanceUnit>) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface Per extends Measur } @Override - default Per, EnergyUnit> divide(Energy divisor) { - return (Per, EnergyUnit>) Measure.super.divide(divisor); + default Per, EnergyUnit> div(Energy divisor) { + return (Per, EnergyUnit>) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface Per extends Measur } @Override - default Per, ForceUnit> divide(Force divisor) { - return (Per, ForceUnit>) Measure.super.divide(divisor); + default Per, ForceUnit> div(Force divisor) { + return (Per, ForceUnit>) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface Per extends Measur } @Override - default Per, FrequencyUnit> divide(Frequency divisor) { - return (Per, FrequencyUnit>) Measure.super.divide(divisor); + default Per, FrequencyUnit> div(Frequency divisor) { + return (Per, FrequencyUnit>) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Per extends Measur } @Override - default Per, LinearAccelerationUnit> divide(LinearAcceleration divisor) { - return (Per, LinearAccelerationUnit>) Measure.super.divide(divisor); + default Per, LinearAccelerationUnit> div(LinearAcceleration divisor) { + return (Per, LinearAccelerationUnit>) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Per extends Measur } @Override - default Per, LinearMomentumUnit> divide(LinearMomentum divisor) { - return (Per, LinearMomentumUnit>) Measure.super.divide(divisor); + default Per, LinearMomentumUnit> div(LinearMomentum divisor) { + return (Per, LinearMomentumUnit>) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Per extends Measur } @Override - default Per, LinearVelocityUnit> divide(LinearVelocity divisor) { - return (Per, LinearVelocityUnit>) Measure.super.divide(divisor); + default Per, LinearVelocityUnit> div(LinearVelocity divisor) { + return (Per, LinearVelocityUnit>) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface Per extends Measur } @Override - default Per, MassUnit> divide(Mass divisor) { - return (Per, MassUnit>) Measure.super.divide(divisor); + default Per, MassUnit> div(Mass divisor) { + return (Per, MassUnit>) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Per extends Measur } @Override - default Per, MomentOfInertiaUnit> divide(MomentOfInertia divisor) { - return (Per, MomentOfInertiaUnit>) Measure.super.divide(divisor); + default Per, MomentOfInertiaUnit> div(MomentOfInertia divisor) { + return (Per, MomentOfInertiaUnit>) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Per extends Measur } @Override - default Per, MultUnit> divide(Mult divisor) { - return (Per, MultUnit>) Measure.super.divide(divisor); + default Per, MultUnit> div(Mult divisor) { + return (Per, MultUnit>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Per extends Measur } @Override - default Per, PerUnit> divide(Per divisor) { - return (Per, PerUnit>) Measure.super.divide(divisor); + default Per, PerUnit> div(Per divisor) { + return (Per, PerUnit>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Per extends Measur } @Override - default Per, PowerUnit> divide(Power divisor) { - return (Per, PowerUnit>) Measure.super.divide(divisor); + default Per, PowerUnit> div(Power divisor) { + return (Per, PowerUnit>) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface Per extends Measur } @Override - default Per, ResistanceUnit> divide(Resistance divisor) { - return (Per, ResistanceUnit>) Measure.super.divide(divisor); + default Per, ResistanceUnit> div(Resistance divisor) { + return (Per, ResistanceUnit>) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface Per extends Measur } @Override - default Per, TemperatureUnit> divide(Temperature divisor) { - return (Per, TemperatureUnit>) Measure.super.divide(divisor); + default Per, TemperatureUnit> div(Temperature divisor) { + return (Per, TemperatureUnit>) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Per extends Measur } @Override - default Velocity> divide(Time divisor) { + default Velocity> div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Per extends Measur } @Override - default Per, TorqueUnit> divide(Torque divisor) { - return (Per, TorqueUnit>) Measure.super.divide(divisor); + default Per, TorqueUnit> div(Torque divisor) { + return (Per, TorqueUnit>) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Per extends Measur } @Override - default Per, VelocityUnit> divide(Velocity divisor) { - return (Per, VelocityUnit>) Measure.super.divide(divisor); + default Per, VelocityUnit> div(Velocity divisor) { + return (Per, VelocityUnit>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface Per extends Measur } @Override - default Per, VoltageUnit> divide(Voltage divisor) { - return (Per, VoltageUnit>) Measure.super.divide(divisor); + default Per, VoltageUnit> div(Voltage divisor) { + return (Per, VoltageUnit>) Measure.super.div(divisor); } default Measure timesDivisor(Measure multiplier) { return (Measure) baseUnit().numerator().ofBaseUnits(baseUnitMagnitude() * multiplier.baseUnitMagnitude()); diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Power.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Power.java index c59db65973..6cfc1feb40 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Power.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Power.java @@ -66,13 +66,13 @@ public interface Power extends Measure { } @Override - default Power divide(double divisor) { + default Power div(double divisor) { return (Power) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Power extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Power extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Power extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Power extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Power extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Power extends Measure { } @Override - default Voltage divide(Current divisor) { + default Voltage div(Current divisor) { return Volts.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @Override - default Power divide(Dimensionless divisor) { + default Power div(Dimensionless divisor) { return (Power) Watts.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Power extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,7 +169,7 @@ public interface Power extends Measure { } @Override - default Frequency divide(Energy divisor) { + default Frequency div(Energy divisor) { return Hertz.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -180,8 +180,8 @@ public interface Power extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface Power extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Power extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Power extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Power extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface Power extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Power extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Power extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Power extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,7 +279,7 @@ public interface Power extends Measure { } @Override - default Dimensionless divide(Power divisor) { + default Dimensionless div(Power divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -290,8 +290,8 @@ public interface Power extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface Power extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Power extends Measure { } @Override - default Velocity divide(Time divisor) { + default Velocity div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Power extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Power extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,7 +345,7 @@ public interface Power extends Measure { } @Override - default Current divide(Voltage divisor) { + default Current div(Voltage divisor) { return Amps.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Resistance.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Resistance.java index 6453861674..06e0dad2c7 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Resistance.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Resistance.java @@ -66,13 +66,13 @@ public interface Resistance extends Measure { } @Override - default Resistance divide(double divisor) { + default Resistance div(double divisor) { return (Resistance) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Resistance extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Resistance extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default Resistance divide(Dimensionless divisor) { + default Resistance div(Dimensionless divisor) { return (Resistance) Ohms.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Resistance extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Resistance extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,7 +290,7 @@ public interface Resistance extends Measure { } @Override - default Dimensionless divide(Resistance divisor) { + default Dimensionless div(Resistance divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -301,8 +301,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Resistance extends Measure { } @Override - default Velocity divide(Time divisor) { + default Velocity div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Resistance extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface Resistance extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Temperature.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Temperature.java index 85aa59a656..1ce254265b 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Temperature.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Temperature.java @@ -66,13 +66,13 @@ public interface Temperature extends Measure { } @Override - default Temperature divide(double divisor) { + default Temperature div(double divisor) { return (Temperature) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Temperature extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Temperature extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default Temperature divide(Dimensionless divisor) { + default Temperature div(Dimensionless divisor) { return (Temperature) Kelvin.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Temperature extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Temperature extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,7 +301,7 @@ public interface Temperature extends Measure { } @Override - default Dimensionless divide(Temperature divisor) { + default Dimensionless div(Temperature divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -312,7 +312,7 @@ public interface Temperature extends Measure { } @Override - default Velocity divide(Time divisor) { + default Velocity div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Temperature extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface Temperature extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Time.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Time.java index 0501111a99..f09bf36a3e 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Time.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Time.java @@ -66,13 +66,13 @@ public interface Time extends Measure { } @Override - default Time divide(double divisor) { + default Time div(double divisor) { return (Time) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Dimensionless per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Time extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Time extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Time extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Time extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Time extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Time extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default Time divide(Dimensionless divisor) { + default Time div(Dimensionless divisor) { return (Time) Seconds.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Time extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface Time extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface Time extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface Time extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Time extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Time extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Time extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface Time extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Time extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Time extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Time extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Time extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface Time extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface Time extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Time extends Measure { } @Override - default Dimensionless divide(Time divisor) { + default Dimensionless div(Time divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Time extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Time extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface Time extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } default Frequency asFrequency() { return Hertz.of(1 / baseUnitMagnitude()); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Torque.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Torque.java index f0d4b3a0ee..253e70d331 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Torque.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Torque.java @@ -66,13 +66,13 @@ public interface Torque extends Measure { } @Override - default Torque divide(double divisor) { + default Torque div(double divisor) { return (Torque) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Torque extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Torque extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Torque extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Torque extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Torque extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Torque extends Measure { } @Override - default Per divide(Current divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Current divisor) { + return (Per) Measure.super.div(divisor); } @Override - default Torque divide(Dimensionless divisor) { + default Torque div(Dimensionless divisor) { return (Torque) NewtonMeters.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,7 +158,7 @@ public interface Torque extends Measure { } @Override - default Force divide(Distance divisor) { + default Force div(Distance divisor) { return Newtons.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -169,8 +169,8 @@ public interface Torque extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,7 +180,7 @@ public interface Torque extends Measure { } @Override - default Distance divide(Force divisor) { + default Distance div(Force divisor) { return Meters.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -191,8 +191,8 @@ public interface Torque extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Torque extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Torque extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Torque extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface Torque extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Torque extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Torque extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Torque extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Torque extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface Torque extends Measure { } @Override - default Per divide(Resistance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Resistance divisor) { + return (Per) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface Torque extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Torque extends Measure { } @Override - default Velocity divide(Time divisor) { + default Velocity div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,7 +323,7 @@ public interface Torque extends Measure { } @Override - default Dimensionless divide(Torque divisor) { + default Dimensionless div(Torque divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -334,8 +334,8 @@ public interface Torque extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,8 +345,8 @@ public interface Torque extends Measure { } @Override - default Per divide(Voltage divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Voltage divisor) { + return (Per) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Velocity.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Velocity.java index 6843519bc0..6c8ece51a6 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Velocity.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Velocity.java @@ -66,13 +66,13 @@ public interface Velocity extends Measure> { } @Override - default Velocity divide(double divisor) { + default Velocity div(double divisor) { return (Velocity) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity> per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Velocity extends Measure> { } @Override - default Per, AccelerationUnit> divide(Acceleration divisor) { - return (Per, AccelerationUnit>) Measure.super.divide(divisor); + default Per, AccelerationUnit> div(Acceleration divisor) { + return (Per, AccelerationUnit>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Velocity extends Measure> { } @Override - default Per, AngleUnit> divide(Angle divisor) { - return (Per, AngleUnit>) Measure.super.divide(divisor); + default Per, AngleUnit> div(Angle divisor) { + return (Per, AngleUnit>) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Velocity extends Measure> { } @Override - default Per, AngularAccelerationUnit> divide(AngularAcceleration divisor) { - return (Per, AngularAccelerationUnit>) Measure.super.divide(divisor); + default Per, AngularAccelerationUnit> div(AngularAcceleration divisor) { + return (Per, AngularAccelerationUnit>) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Velocity extends Measure> { } @Override - default Per, AngularMomentumUnit> divide(AngularMomentum divisor) { - return (Per, AngularMomentumUnit>) Measure.super.divide(divisor); + default Per, AngularMomentumUnit> div(AngularMomentum divisor) { + return (Per, AngularMomentumUnit>) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Velocity extends Measure> { } @Override - default Per, AngularVelocityUnit> divide(AngularVelocity divisor) { - return (Per, AngularVelocityUnit>) Measure.super.divide(divisor); + default Per, AngularVelocityUnit> div(AngularVelocity divisor) { + return (Per, AngularVelocityUnit>) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Velocity extends Measure> { } @Override - default Per, CurrentUnit> divide(Current divisor) { - return (Per, CurrentUnit>) Measure.super.divide(divisor); + default Per, CurrentUnit> div(Current divisor) { + return (Per, CurrentUnit>) Measure.super.div(divisor); } @Override - default Velocity divide(Dimensionless divisor) { + default Velocity div(Dimensionless divisor) { return (Velocity) unit().of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Velocity extends Measure> { } @Override - default Per, DistanceUnit> divide(Distance divisor) { - return (Per, DistanceUnit>) Measure.super.divide(divisor); + default Per, DistanceUnit> div(Distance divisor) { + return (Per, DistanceUnit>) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface Velocity extends Measure> { } @Override - default Per, EnergyUnit> divide(Energy divisor) { - return (Per, EnergyUnit>) Measure.super.divide(divisor); + default Per, EnergyUnit> div(Energy divisor) { + return (Per, EnergyUnit>) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface Velocity extends Measure> { } @Override - default Per, ForceUnit> divide(Force divisor) { - return (Per, ForceUnit>) Measure.super.divide(divisor); + default Per, ForceUnit> div(Force divisor) { + return (Per, ForceUnit>) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface Velocity extends Measure> { } @Override - default Per, FrequencyUnit> divide(Frequency divisor) { - return (Per, FrequencyUnit>) Measure.super.divide(divisor); + default Per, FrequencyUnit> div(Frequency divisor) { + return (Per, FrequencyUnit>) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Velocity extends Measure> { } @Override - default Per, LinearAccelerationUnit> divide(LinearAcceleration divisor) { - return (Per, LinearAccelerationUnit>) Measure.super.divide(divisor); + default Per, LinearAccelerationUnit> div(LinearAcceleration divisor) { + return (Per, LinearAccelerationUnit>) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Velocity extends Measure> { } @Override - default Per, LinearMomentumUnit> divide(LinearMomentum divisor) { - return (Per, LinearMomentumUnit>) Measure.super.divide(divisor); + default Per, LinearMomentumUnit> div(LinearMomentum divisor) { + return (Per, LinearMomentumUnit>) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Velocity extends Measure> { } @Override - default Per, LinearVelocityUnit> divide(LinearVelocity divisor) { - return (Per, LinearVelocityUnit>) Measure.super.divide(divisor); + default Per, LinearVelocityUnit> div(LinearVelocity divisor) { + return (Per, LinearVelocityUnit>) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface Velocity extends Measure> { } @Override - default Per, MassUnit> divide(Mass divisor) { - return (Per, MassUnit>) Measure.super.divide(divisor); + default Per, MassUnit> div(Mass divisor) { + return (Per, MassUnit>) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Velocity extends Measure> { } @Override - default Per, MomentOfInertiaUnit> divide(MomentOfInertia divisor) { - return (Per, MomentOfInertiaUnit>) Measure.super.divide(divisor); + default Per, MomentOfInertiaUnit> div(MomentOfInertia divisor) { + return (Per, MomentOfInertiaUnit>) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Velocity extends Measure> { } @Override - default Per, MultUnit> divide(Mult divisor) { - return (Per, MultUnit>) Measure.super.divide(divisor); + default Per, MultUnit> div(Mult divisor) { + return (Per, MultUnit>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Velocity extends Measure> { } @Override - default Per, PerUnit> divide(Per divisor) { - return (Per, PerUnit>) Measure.super.divide(divisor); + default Per, PerUnit> div(Per divisor) { + return (Per, PerUnit>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Velocity extends Measure> { } @Override - default Per, PowerUnit> divide(Power divisor) { - return (Per, PowerUnit>) Measure.super.divide(divisor); + default Per, PowerUnit> div(Power divisor) { + return (Per, PowerUnit>) Measure.super.div(divisor); } @@ -290,8 +290,8 @@ public interface Velocity extends Measure> { } @Override - default Per, ResistanceUnit> divide(Resistance divisor) { - return (Per, ResistanceUnit>) Measure.super.divide(divisor); + default Per, ResistanceUnit> div(Resistance divisor) { + return (Per, ResistanceUnit>) Measure.super.div(divisor); } @@ -301,8 +301,8 @@ public interface Velocity extends Measure> { } @Override - default Per, TemperatureUnit> divide(Temperature divisor) { - return (Per, TemperatureUnit>) Measure.super.divide(divisor); + default Per, TemperatureUnit> div(Temperature divisor) { + return (Per, TemperatureUnit>) Measure.super.div(divisor); } @Override @@ -311,7 +311,7 @@ public interface Velocity extends Measure> { } @Override - default Velocity> divide(Time divisor) { + default Velocity> div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -322,8 +322,8 @@ public interface Velocity extends Measure> { } @Override - default Per, TorqueUnit> divide(Torque divisor) { - return (Per, TorqueUnit>) Measure.super.divide(divisor); + default Per, TorqueUnit> div(Torque divisor) { + return (Per, TorqueUnit>) Measure.super.div(divisor); } @@ -333,8 +333,8 @@ public interface Velocity extends Measure> { } @Override - default Per, VelocityUnit> divide(Velocity divisor) { - return (Per, VelocityUnit>) Measure.super.divide(divisor); + default Per, VelocityUnit> div(Velocity divisor) { + return (Per, VelocityUnit>) Measure.super.div(divisor); } @@ -344,8 +344,8 @@ public interface Velocity extends Measure> { } @Override - default Per, VoltageUnit> divide(Voltage divisor) { - return (Per, VoltageUnit>) Measure.super.divide(divisor); + default Per, VoltageUnit> div(Voltage divisor) { + return (Per, VoltageUnit>) Measure.super.div(divisor); } } diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Voltage.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Voltage.java index c315759bde..04553eda43 100644 --- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Voltage.java +++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Voltage.java @@ -66,13 +66,13 @@ public interface Voltage extends Measure { } @Override - default Voltage divide(double divisor) { + default Voltage div(double divisor) { return (Voltage) unit().ofBaseUnits(baseUnitMagnitude() / divisor); } @Override default Velocity per(TimeUnit period) { - return divide(period.of(1)); + return div(period.of(1)); } @@ -82,8 +82,8 @@ public interface Voltage extends Measure { } @Override - default Per> divide(Acceleration divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Acceleration divisor) { + return (Per>) Measure.super.div(divisor); } @@ -93,8 +93,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(Angle divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Angle divisor) { + return (Per) Measure.super.div(divisor); } @@ -104,8 +104,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(AngularAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -115,8 +115,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(AngularMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -126,8 +126,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(AngularVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(AngularVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -137,12 +137,12 @@ public interface Voltage extends Measure { } @Override - default Resistance divide(Current divisor) { + default Resistance div(Current divisor) { return Ohms.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @Override - default Voltage divide(Dimensionless divisor) { + default Voltage div(Dimensionless divisor) { return (Voltage) Volts.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -158,8 +158,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(Distance divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Distance divisor) { + return (Per) Measure.super.div(divisor); } @@ -169,8 +169,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(Energy divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Energy divisor) { + return (Per) Measure.super.div(divisor); } @@ -180,8 +180,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(Force divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Force divisor) { + return (Per) Measure.super.div(divisor); } @@ -191,8 +191,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(Frequency divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Frequency divisor) { + return (Per) Measure.super.div(divisor); } @@ -202,8 +202,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(LinearAcceleration divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearAcceleration divisor) { + return (Per) Measure.super.div(divisor); } @@ -213,8 +213,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(LinearMomentum divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearMomentum divisor) { + return (Per) Measure.super.div(divisor); } @@ -224,8 +224,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(LinearVelocity divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(LinearVelocity divisor) { + return (Per) Measure.super.div(divisor); } @@ -235,8 +235,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(Mass divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Mass divisor) { + return (Per) Measure.super.div(divisor); } @@ -246,8 +246,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(MomentOfInertia divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(MomentOfInertia divisor) { + return (Per) Measure.super.div(divisor); } @@ -257,8 +257,8 @@ public interface Voltage extends Measure { } @Override - default Per> divide(Mult divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Mult divisor) { + return (Per>) Measure.super.div(divisor); } @@ -268,8 +268,8 @@ public interface Voltage extends Measure { } @Override - default Per> divide(Per divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Per divisor) { + return (Per>) Measure.super.div(divisor); } @@ -279,8 +279,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(Power divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Power divisor) { + return (Per) Measure.super.div(divisor); } @@ -290,7 +290,7 @@ public interface Voltage extends Measure { } @Override - default Current divide(Resistance divisor) { + default Current div(Resistance divisor) { return Amps.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -301,8 +301,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(Temperature divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Temperature divisor) { + return (Per) Measure.super.div(divisor); } @@ -312,7 +312,7 @@ public interface Voltage extends Measure { } @Override - default Velocity divide(Time divisor) { + default Velocity div(Time divisor) { return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } @@ -323,8 +323,8 @@ public interface Voltage extends Measure { } @Override - default Per divide(Torque divisor) { - return (Per) Measure.super.divide(divisor); + default Per div(Torque divisor) { + return (Per) Measure.super.div(divisor); } @@ -334,8 +334,8 @@ public interface Voltage extends Measure { } @Override - default Per> divide(Velocity divisor) { - return (Per>) Measure.super.divide(divisor); + default Per> div(Velocity divisor) { + return (Per>) Measure.super.div(divisor); } @@ -345,7 +345,7 @@ public interface Voltage extends Measure { } @Override - default Dimensionless divide(Voltage divisor) { + default Dimensionless div(Voltage divisor) { return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude()); } diff --git a/wpiunits/src/main/java/edu/wpi/first/units/ImmutableMeasure.java b/wpiunits/src/main/java/edu/wpi/first/units/ImmutableMeasure.java index 1abb789f99..64005b0987 100644 --- a/wpiunits/src/main/java/edu/wpi/first/units/ImmutableMeasure.java +++ b/wpiunits/src/main/java/edu/wpi/first/units/ImmutableMeasure.java @@ -81,12 +81,12 @@ public record ImmutableMeasure(double magnitude, double baseUnit } @Override - public Measure divide(double divisor) { + public Measure div(double divisor) { return ofBaseUnits(baseUnitMagnitude / divisor, unit); } @Override - public Measure divide(Dimensionless divisor) { + public Measure div(Dimensionless divisor) { return ofBaseUnits(baseUnitMagnitude / divisor.baseUnitMagnitude(), unit); } } diff --git a/wpiunits/src/main/java/edu/wpi/first/units/Measure.java b/wpiunits/src/main/java/edu/wpi/first/units/Measure.java index 79e6b1b587..e5c2b31a1b 100644 --- a/wpiunits/src/main/java/edu/wpi/first/units/Measure.java +++ b/wpiunits/src/main/java/edu/wpi/first/units/Measure.java @@ -614,7 +614,7 @@ public interface Measure extends Comparable> { * @param divisor the measurement to divide by. * @return the division result */ - Measure divide(double divisor); + Measure div(double divisor); /** * Divides this measure by a dimensionless scalar and returns the result. @@ -622,7 +622,7 @@ public interface Measure extends Comparable> { * @param divisor the measurement to divide by. * @return the division result */ - Measure divide(Dimensionless divisor); + Measure div(Dimensionless divisor); /** * Divides this measurement by another measure and performs some dimensional analysis to reduce @@ -631,7 +631,7 @@ public interface Measure extends Comparable> { * @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 extends Comparable> { } 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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { * @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 extends Comparable> { /** * 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)); } /** diff --git a/wpiunits/src/main/java/edu/wpi/first/units/mutable/GenericMutableMeasureImpl.java b/wpiunits/src/main/java/edu/wpi/first/units/mutable/GenericMutableMeasureImpl.java index c5ae791650..c14187c000 100644 --- a/wpiunits/src/main/java/edu/wpi/first/units/mutable/GenericMutableMeasureImpl.java +++ b/wpiunits/src/main/java/edu/wpi/first/units/mutable/GenericMutableMeasureImpl.java @@ -68,12 +68,12 @@ public final class GenericMutableMeasureImpl } @Override - public Measure divide(double divisor) { + public Measure div(double divisor) { return ImmutableMeasure.ofBaseUnits(m_baseUnitMagnitude / divisor, m_unit); } @Override - public Measure divide(Dimensionless divisor) { + public Measure div(Dimensionless divisor) { return ImmutableMeasure.ofBaseUnits(m_baseUnitMagnitude / divisor.baseUnitMagnitude(), m_unit); } } diff --git a/wpiunits/src/test/java/edu/wpi/first/units/MeasureTest.java b/wpiunits/src/test/java/edu/wpi/first/units/MeasureTest.java index 2454aa75aa..25667d8f09 100644 --- a/wpiunits/src/test/java/edu/wpi/first/units/MeasureTest.java +++ b/wpiunits/src/test/java/edu/wpi/first/units/MeasureTest.java @@ -41,7 +41,7 @@ class MeasureTest { void testTimesConversionFactor() { Distance m = Units.Feet.of(10); - Per conversion = Units.Degrees.of(10).divide(Units.Feet.of(1)); + Per conversion = Units.Degrees.of(10).div(Units.Feet.of(1)); Angle result = m.timesConversionFactor(conversion); assertEquals(Units.Degrees.of(100), result); } @@ -53,7 +53,7 @@ class MeasureTest { // Using a complex compound unit here // (Per>, Distance>, Distance>) Per conversion = - Units.KilogramMetersSquaredPerSecond.of(1).divide(Units.Foot.one()); + Units.KilogramMetersSquaredPerSecond.of(1).div(Units.Foot.one()); AngularMomentum result = m.timesConversionFactor(conversion); assertEquals(Units.KilogramMetersSquaredPerSecond.of(1), result); @@ -71,7 +71,7 @@ class MeasureTest { @Test void testDivide() { Distance m = Units.Meters.of(1); - Distance m2 = m.divide(10); + Distance m2 = m.div(10); assertEquals(0.1, m2.magnitude(), 0); assertNotSame(m2, m); } @@ -121,7 +121,7 @@ class MeasureTest { // 144 Kg / (53 ms) = (1000 / 53) * 144 Kg/s = (144,000 / 53) Kg/s - var result = measure.divide(dt); + var result = measure.div(dt); assertEquals(144_000.0 / 53, result.baseUnitMagnitude(), 1e-5); assertEquals(Units.Kilograms.per(Units.Milliseconds), result.unit()); } @@ -141,13 +141,13 @@ class MeasureTest { // Dimensionless divide var m1 = Units.Meters.of(6); var m2 = Units.Value.of(3); - var result = m1.divide(m2); - assertEquals(2, m1.divide(m2).magnitude()); + var result = m1.div(m2); + assertEquals(2, m1.div(m2).magnitude()); assertEquals(Units.Meters, result.unit()); // Velocity divide var m3 = Units.Meters.of(8); var m4 = Units.Meters.per(Units.Second).of(4); - var time = m3.divide(m4); + var time = m3.div(m4); assertEquals(2, time.magnitude()); assertEquals(Units.Second, time.unit()); // PerUnit divide @@ -155,7 +155,7 @@ class MeasureTest { var m6 = Units.Volts.per(Units.Meter).of(2); // Voltage/(Voltage/Distance) -> Voltage * Distance/Voltage -> Distance - var dist = m5.divide(m6); + var dist = m5.div(m6); assertEquals(3, dist.magnitude()); assertEquals(Units.Meter, dist.unit()); }