mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
[wpimath] Remove units from trapezoid profile classes (#7276)
This commit is contained in:
@@ -6,10 +6,6 @@ package edu.wpi.first.math.trajectory;
|
||||
|
||||
import edu.wpi.first.math.MathSharedStore;
|
||||
import edu.wpi.first.math.MathUsageId;
|
||||
import edu.wpi.first.units.Measure;
|
||||
import edu.wpi.first.units.PerUnit;
|
||||
import edu.wpi.first.units.TimeUnit;
|
||||
import edu.wpi.first.units.Unit;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
@@ -72,20 +68,6 @@ public class TrapezoidProfile {
|
||||
this.maxAcceleration = maxAcceleration;
|
||||
MathSharedStore.reportUsage(MathUsageId.kTrajectory_TrapezoidProfile, 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs constraints for a TrapezoidProfile.
|
||||
*
|
||||
* @param <U> Unit type.
|
||||
* @param maxVelocity maximum velocity
|
||||
* @param maxAcceleration maximum acceleration
|
||||
*/
|
||||
public <U extends Unit> Constraints(
|
||||
Measure<? extends PerUnit<? extends U, TimeUnit>> maxVelocity,
|
||||
Measure<? extends PerUnit<? extends PerUnit<? extends U, TimeUnit>, TimeUnit>>
|
||||
maxAcceleration) {
|
||||
this(maxVelocity.baseUnitMagnitude(), maxAcceleration.baseUnitMagnitude());
|
||||
}
|
||||
}
|
||||
|
||||
/** Profile state. */
|
||||
@@ -110,18 +92,6 @@ public class TrapezoidProfile {
|
||||
this.velocity = velocity;
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs constraints for a Trapezoid Profile.
|
||||
*
|
||||
* @param <U> Unit type.
|
||||
* @param position The position at this state.
|
||||
* @param velocity The velocity at this state.
|
||||
*/
|
||||
public <U extends Unit> State(
|
||||
Measure<U> position, Measure<? extends PerUnit<? extends U, TimeUnit>> velocity) {
|
||||
this(position.baseUnitMagnitude(), velocity.baseUnitMagnitude());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object other) {
|
||||
return other instanceof State rhs
|
||||
|
||||
Reference in New Issue
Block a user