SCRIPT: wpiformat

wpimath/src/main/native/cpp/controller/LTVDifferentialDriveController.cpp

@@ -7,8 +7,8 @@
 #include <cmath>
 
 #include "wpi/math/linalg/DARE.hpp"
-#include "wpi/math/util/MathUtil.hpp"
 #include "wpi/math/system/Discretization.hpp"
+#include "wpi/math/util/MathUtil.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/estimator/MecanumDrivePoseEstimator.cpp

@@ -4,11 +4,10 @@
 
 #include "wpi/math/estimator/MecanumDrivePoseEstimator.hpp"
 
-#include "wpi/util/timestamp.h"
-
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/estimator/AngleStatistics.hpp"
 #include "wpi/math/util/MathShared.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/estimator/MecanumDrivePoseEstimator3d.cpp

@@ -4,11 +4,10 @@
 
 #include "wpi/math/estimator/MecanumDrivePoseEstimator3d.hpp"
 
-#include "wpi/util/timestamp.h"
-
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/estimator/AngleStatistics.hpp"
 #include "wpi/math/util/MathShared.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/geometry/proto/Ellipse2dProto.cpp

@@ -5,7 +5,6 @@
 #include "wpi/math/geometry/proto/Ellipse2dProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/geometry2d.npb.h"
 
 std::optional<frc::Ellipse2d> wpi::Protobuf<frc::Ellipse2d>::Unpack(

wpimath/src/main/native/cpp/geometry/proto/Pose2dProto.cpp

@@ -5,7 +5,6 @@
 #include "wpi/math/geometry/proto/Pose2dProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/geometry2d.npb.h"
 
 std::optional<frc::Pose2d> wpi::Protobuf<frc::Pose2d>::Unpack(

wpimath/src/main/native/cpp/geometry/proto/Pose3dProto.cpp

@@ -4,10 +4,9 @@
 
 #include "wpi/math/geometry/proto/Pose3dProto.hpp"
 
+#include "wpi/math/geometry/Pose3d.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
-#include "wpi/math/geometry/Pose3d.hpp"
 #include "wpimath/protobuf/geometry3d.npb.h"
 
 std::optional<frc::Pose3d> wpi::Protobuf<frc::Pose3d>::Unpack(

wpimath/src/main/native/cpp/geometry/proto/Rectangle2dProto.cpp

@@ -5,7 +5,6 @@
 #include "wpi/math/geometry/proto/Rectangle2dProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/geometry2d.npb.h"
 
 std::optional<frc::Rectangle2d> wpi::Protobuf<frc::Rectangle2d>::Unpack(

wpimath/src/main/native/cpp/geometry/proto/Rotation3dProto.cpp

@@ -5,7 +5,6 @@
 #include "wpi/math/geometry/proto/Rotation3dProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/geometry3d.npb.h"
 
 std::optional<frc::Rotation3d> wpi::Protobuf<frc::Rotation3d>::Unpack(

wpimath/src/main/native/cpp/geometry/proto/Transform2dProto.cpp

@@ -5,7 +5,6 @@
 #include "wpi/math/geometry/proto/Transform2dProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/geometry2d.npb.h"
 
 std::optional<frc::Transform2d> wpi::Protobuf<frc::Transform2d>::Unpack(

wpimath/src/main/native/cpp/geometry/proto/Transform3dProto.cpp

@@ -5,7 +5,6 @@
 #include "wpi/math/geometry/proto/Transform3dProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/geometry3d.npb.h"
 
 std::optional<frc::Transform3d> wpi::Protobuf<frc::Transform3d>::Unpack(

wpimath/src/main/native/cpp/jni/ArmFeedforwardJNI.cpp

@@ -4,10 +4,9 @@
 
 #include <jni.h>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "org_wpilib_math_jni_ArmFeedforwardJNI.h"
 #include "wpi/math/controller/ArmFeedforward.hpp"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 

wpimath/src/main/native/cpp/jni/DAREJNI.cpp

@@ -7,12 +7,11 @@
 #include <stdexcept>
 #include <string>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "Exceptions.hpp"
 #include "org_wpilib_math_jni_DAREJNI.h"
-#include "wpi/math/linalg/DARE.hpp"
 #include "wpi/math/fmt/Eigen.hpp"
+#include "wpi/math/linalg/DARE.hpp"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 

wpimath/src/main/native/cpp/jni/EigenJNI.cpp

@@ -8,9 +8,9 @@
 #include <Eigen/Core>
 #include <Eigen/QR>
 #include <unsupported/Eigen/MatrixFunctions>
-#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_math_jni_EigenJNI.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 

wpimath/src/main/native/cpp/jni/Ellipse2dJNI.cpp

@@ -4,11 +4,10 @@
 
 #include <jni.h>
 
-#include "wpi/util/array.hpp"
-#include "wpi/util/jni_util.hpp"
-
 #include "org_wpilib_math_jni_Ellipse2dJNI.h"
 #include "wpi/math/geometry/Ellipse2d.hpp"
+#include "wpi/util/array.hpp"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 

wpimath/src/main/native/cpp/jni/StateSpaceUtilJNI.cpp

@@ -5,10 +5,10 @@
 #include <jni.h>
 
 #include <Eigen/Core>
-#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_math_jni_StateSpaceUtilJNI.h"
 #include "wpi/math/util/StateSpaceUtil.hpp"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 

wpimath/src/main/native/cpp/jni/Transform3dJNI.cpp

@@ -4,8 +4,6 @@
 
 #include <jni.h>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "org_wpilib_math_jni_Transform3dJNI.h"
 #include "wpi/math/geometry/Quaternion.hpp"
 #include "wpi/math/geometry/Rotation3d.hpp"
@@ -13,6 +11,7 @@
 #include "wpi/math/geometry/Twist3d.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 

wpimath/src/main/native/cpp/jni/Twist3dJNI.cpp

@@ -4,13 +4,12 @@
 
 #include <jni.h>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "org_wpilib_math_jni_Twist3dJNI.h"
 #include "wpi/math/geometry/Transform3d.hpp"
 #include "wpi/math/geometry/Twist3d.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 

wpimath/src/main/native/cpp/kinematics/proto/MecanumDriveKinematicsProto.cpp

@@ -5,7 +5,6 @@
 #include "wpi/math/kinematics/proto/MecanumDriveKinematicsProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/kinematics.npb.h"
 
 std::optional<frc::MecanumDriveKinematics>

wpimath/src/main/native/cpp/kinematics/proto/SwerveModulePositionProto.cpp

@@ -5,7 +5,6 @@
 #include "wpi/math/kinematics/proto/SwerveModulePositionProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/kinematics.npb.h"
 
 std::optional<frc::SwerveModulePosition>

wpimath/src/main/native/cpp/kinematics/proto/SwerveModuleStateProto.cpp

@@ -5,7 +5,6 @@
 #include "wpi/math/kinematics/proto/SwerveModuleStateProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/kinematics.npb.h"
 
 std::optional<frc::SwerveModuleState>

wpimath/src/main/native/cpp/spline/proto/CubicHermiteSplineProto.cpp

@@ -5,7 +5,6 @@
 #include "wpi/math/spline/proto/CubicHermiteSplineProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/spline.npb.h"
 
 std::optional<frc::CubicHermiteSpline>

wpimath/src/main/native/cpp/spline/proto/QuinticHermiteSplineProto.cpp

@@ -5,7 +5,6 @@
 #include "wpi/math/spline/proto/QuinticHermiteSplineProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/spline.npb.h"
 
 std::optional<frc::QuinticHermiteSpline>

wpimath/src/main/native/cpp/trajectory/TrajectoryGenerator.cpp

@@ -7,11 +7,10 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/print.hpp"
-
 #include "wpi/math/spline/SplineHelper.hpp"
 #include "wpi/math/spline/SplineParameterizer.hpp"
 #include "wpi/math/trajectory/TrajectoryParameterizer.hpp"
+#include "wpi/util/print.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/trajectory/proto/TrajectoryProto.cpp

@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/trajectory.npb.h"
 
 std::optional<frc::Trajectory> wpi::Protobuf<frc::Trajectory>::Unpack(

wpimath/src/main/native/cpp/trajectory/proto/TrajectoryStateProto.cpp

@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/trajectory.npb.h"
 
 std::optional<frc::Trajectory::State>

wpimath/src/main/native/cpp/util/MathShared.cpp

@@ -7,11 +7,10 @@
 #include <memory>
 #include <utility>
 
+#include "wpi/units/time.hpp"
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/timestamp.h"
 
-#include "wpi/units/time.hpp"
-
 using namespace wpi::math;
 
 namespace {