Example Usage: BaseMeasurement = Limelight, FastMeasurement = Encoders - * - * @author Myles Pasetsky - */ -public class IFuser implements IStream { - - private final Number mFilterRC; - - private final IStream mBase; - private final IStream mFast; - - private IFilter mBaseFilter; - private IFilter mFastFilter; - - private double mFastOffset; - - /** - * Create an IFuser with an RC, Base/Fast Measurement stream - * - * @param rc RC value for the lowpass / highpass filters - * @param baseMeasurement a stream that returns the slow, but accurate measurement values - * @param fastMeasurement a stream that returns faster, less accurate measurement values - */ - public IFuser(Number rc, IStream baseMeasurement, IStream fastMeasurement) { - mBase = baseMeasurement; - mFast = fastMeasurement; - - mFilterRC = rc; - - reset(); - } - - /** Resets the IFuser so that it can ignore any previous data / reset its initial read */ - public void reset() { - mBaseFilter = new LowPassFilter(mFilterRC); - mFastFilter = new HighPassFilter(mFilterRC); - - mFastOffset = mBase.get() - mFast.get(); - } - - private double getBase() { - return mBaseFilter.get(mBase.get()); - } - - private double getFast() { - return mFastFilter.get(mFast.get() + mFastOffset); - } - - /** Get the result of merging the two datastreams together */ - public double get() { - return getBase() + getFast(); - } -} diff --git a/src/com/stuypulse/stuylib/streams/angles/AFuser.java b/src/com/stuypulse/stuylib/streams/angles/AFuser.java index 1696d8fe..0a4dbd9a 100644 --- a/src/com/stuypulse/stuylib/streams/angles/AFuser.java +++ b/src/com/stuypulse/stuylib/streams/angles/AFuser.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/angles/AStick.java b/src/com/stuypulse/stuylib/streams/angles/AStick.java index 2c467de7..78060a1f 100644 --- a/src/com/stuypulse/stuylib/streams/angles/AStick.java +++ b/src/com/stuypulse/stuylib/streams/angles/AStick.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/angles/AStream.java b/src/com/stuypulse/stuylib/streams/angles/AStream.java index de323e40..74d3f6e6 100644 --- a/src/com/stuypulse/stuylib/streams/angles/AStream.java +++ b/src/com/stuypulse/stuylib/streams/angles/AStream.java @@ -1,12 +1,12 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ package com.stuypulse.stuylib.streams.angles; import com.stuypulse.stuylib.math.Angle; -import com.stuypulse.stuylib.streams.IStream; import com.stuypulse.stuylib.streams.angles.filters.AFilter; +import com.stuypulse.stuylib.streams.numbers.IStream; import com.stuypulse.stuylib.streams.vectors.VStream; import java.util.function.Supplier; diff --git a/src/com/stuypulse/stuylib/streams/angles/FilteredAStream.java b/src/com/stuypulse/stuylib/streams/angles/FilteredAStream.java index 32170c96..f4c64b1b 100644 --- a/src/com/stuypulse/stuylib/streams/angles/FilteredAStream.java +++ b/src/com/stuypulse/stuylib/streams/angles/FilteredAStream.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/angles/PollingAStream.java b/src/com/stuypulse/stuylib/streams/angles/PollingAStream.java index feb1e258..d80e2fdb 100644 --- a/src/com/stuypulse/stuylib/streams/angles/PollingAStream.java +++ b/src/com/stuypulse/stuylib/streams/angles/PollingAStream.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/angles/filters/AFilter.java b/src/com/stuypulse/stuylib/streams/angles/filters/AFilter.java index 2896e6b0..ad78f8ee 100644 --- a/src/com/stuypulse/stuylib/streams/angles/filters/AFilter.java +++ b/src/com/stuypulse/stuylib/streams/angles/filters/AFilter.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/angles/filters/AFilterGroup.java b/src/com/stuypulse/stuylib/streams/angles/filters/AFilterGroup.java index 03f0a5cd..2fecccec 100644 --- a/src/com/stuypulse/stuylib/streams/angles/filters/AFilterGroup.java +++ b/src/com/stuypulse/stuylib/streams/angles/filters/AFilterGroup.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/angles/filters/AHighPassFilter.java b/src/com/stuypulse/stuylib/streams/angles/filters/AHighPassFilter.java index 9406ee55..bfcf546e 100644 --- a/src/com/stuypulse/stuylib/streams/angles/filters/AHighPassFilter.java +++ b/src/com/stuypulse/stuylib/streams/angles/filters/AHighPassFilter.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/angles/filters/ALowPassFilter.java b/src/com/stuypulse/stuylib/streams/angles/filters/ALowPassFilter.java index 2c93731c..9307f19c 100644 --- a/src/com/stuypulse/stuylib/streams/angles/filters/ALowPassFilter.java +++ b/src/com/stuypulse/stuylib/streams/angles/filters/ALowPassFilter.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/angles/filters/AMotionProfile.java b/src/com/stuypulse/stuylib/streams/angles/filters/AMotionProfile.java index e9203899..4325ce59 100644 --- a/src/com/stuypulse/stuylib/streams/angles/filters/AMotionProfile.java +++ b/src/com/stuypulse/stuylib/streams/angles/filters/AMotionProfile.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/angles/filters/ARateLimit.java b/src/com/stuypulse/stuylib/streams/angles/filters/ARateLimit.java index 1cafbdca..02d1f4b4 100644 --- a/src/com/stuypulse/stuylib/streams/angles/filters/ARateLimit.java +++ b/src/com/stuypulse/stuylib/streams/angles/filters/ARateLimit.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/booleans/BStream.java b/src/com/stuypulse/stuylib/streams/booleans/BStream.java index 985cb11b..2f284b92 100644 --- a/src/com/stuypulse/stuylib/streams/booleans/BStream.java +++ b/src/com/stuypulse/stuylib/streams/booleans/BStream.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ @@ -8,6 +8,7 @@ import edu.wpi.first.wpilibj.DigitalInput; import edu.wpi.first.wpilibj2.command.button.Trigger; + import java.util.function.BooleanSupplier; /** diff --git a/src/com/stuypulse/stuylib/streams/booleans/FilteredBStream.java b/src/com/stuypulse/stuylib/streams/booleans/FilteredBStream.java index 574788fe..f236deeb 100644 --- a/src/com/stuypulse/stuylib/streams/booleans/FilteredBStream.java +++ b/src/com/stuypulse/stuylib/streams/booleans/FilteredBStream.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/booleans/PollingBStream.java b/src/com/stuypulse/stuylib/streams/booleans/PollingBStream.java index 805a5c5f..a34cfd9b 100644 --- a/src/com/stuypulse/stuylib/streams/booleans/PollingBStream.java +++ b/src/com/stuypulse/stuylib/streams/booleans/PollingBStream.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/booleans/filters/BButton.java b/src/com/stuypulse/stuylib/streams/booleans/filters/BButton.java index 5227eb1a..b0199fd0 100644 --- a/src/com/stuypulse/stuylib/streams/booleans/filters/BButton.java +++ b/src/com/stuypulse/stuylib/streams/booleans/filters/BButton.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/booleans/filters/BButtonRC.java b/src/com/stuypulse/stuylib/streams/booleans/filters/BButtonRC.java index ffd68d22..c1dc5d84 100644 --- a/src/com/stuypulse/stuylib/streams/booleans/filters/BButtonRC.java +++ b/src/com/stuypulse/stuylib/streams/booleans/filters/BButtonRC.java @@ -1,10 +1,10 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ package com.stuypulse.stuylib.streams.booleans.filters; -import com.stuypulse.stuylib.streams.filters.HighPassFilter; +import com.stuypulse.stuylib.streams.numbers.filters.HighPassFilter; /** * A simple boolean filter that returns true when a boolean stream changes depending on the type. diff --git a/src/com/stuypulse/stuylib/streams/booleans/filters/BDebounce.java b/src/com/stuypulse/stuylib/streams/booleans/filters/BDebounce.java index df82c1b7..13b9f31d 100644 --- a/src/com/stuypulse/stuylib/streams/booleans/filters/BDebounce.java +++ b/src/com/stuypulse/stuylib/streams/booleans/filters/BDebounce.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/booleans/filters/BDebounceRC.java b/src/com/stuypulse/stuylib/streams/booleans/filters/BDebounceRC.java index 639ae35e..750090c9 100644 --- a/src/com/stuypulse/stuylib/streams/booleans/filters/BDebounceRC.java +++ b/src/com/stuypulse/stuylib/streams/booleans/filters/BDebounceRC.java @@ -1,10 +1,10 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ package com.stuypulse.stuylib.streams.booleans.filters; -import com.stuypulse.stuylib.streams.filters.LowPassFilter; +import com.stuypulse.stuylib.streams.numbers.filters.LowPassFilter; /** * An RC Debounce class takes the average of the past few boolean values to remove noise. diff --git a/src/com/stuypulse/stuylib/streams/booleans/filters/BFilter.java b/src/com/stuypulse/stuylib/streams/booleans/filters/BFilter.java index 874670f2..c7cbf44e 100644 --- a/src/com/stuypulse/stuylib/streams/booleans/filters/BFilter.java +++ b/src/com/stuypulse/stuylib/streams/booleans/filters/BFilter.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/booleans/filters/BFilterGroup.java b/src/com/stuypulse/stuylib/streams/booleans/filters/BFilterGroup.java index 08e21120..07910017 100644 --- a/src/com/stuypulse/stuylib/streams/booleans/filters/BFilterGroup.java +++ b/src/com/stuypulse/stuylib/streams/booleans/filters/BFilterGroup.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/FilteredIStream.java b/src/com/stuypulse/stuylib/streams/numbers/FilteredIStream.java similarity index 84% rename from src/com/stuypulse/stuylib/streams/FilteredIStream.java rename to src/com/stuypulse/stuylib/streams/numbers/FilteredIStream.java index d1b664d9..7a477af5 100644 --- a/src/com/stuypulse/stuylib/streams/FilteredIStream.java +++ b/src/com/stuypulse/stuylib/streams/numbers/FilteredIStream.java @@ -1,10 +1,10 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams; +package com.stuypulse.stuylib.streams.numbers; -import com.stuypulse.stuylib.streams.filters.IFilter; +import com.stuypulse.stuylib.streams.numbers.filters.IFilter; /** * Takes an {@link IStream} and a {@link IFilter} and makes a {@link FilteredIStream} diff --git a/src/com/stuypulse/stuylib/streams/IStream.java b/src/com/stuypulse/stuylib/streams/numbers/IStream.java similarity index 94% rename from src/com/stuypulse/stuylib/streams/IStream.java rename to src/com/stuypulse/stuylib/streams/numbers/IStream.java index 3ac7b428..0a9fdaa6 100644 --- a/src/com/stuypulse/stuylib/streams/IStream.java +++ b/src/com/stuypulse/stuylib/streams/numbers/IStream.java @@ -1,12 +1,12 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams; +package com.stuypulse.stuylib.streams.numbers; import com.stuypulse.stuylib.streams.angles.AStream; import com.stuypulse.stuylib.streams.booleans.BStream; -import com.stuypulse.stuylib.streams.filters.IFilter; +import com.stuypulse.stuylib.streams.numbers.filters.IFilter; import java.util.function.DoubleSupplier; diff --git a/src/com/stuypulse/stuylib/streams/NumberStream.java b/src/com/stuypulse/stuylib/streams/numbers/NumberStream.java similarity index 91% rename from src/com/stuypulse/stuylib/streams/NumberStream.java rename to src/com/stuypulse/stuylib/streams/numbers/NumberStream.java index 258f5ebe..94adab15 100644 --- a/src/com/stuypulse/stuylib/streams/NumberStream.java +++ b/src/com/stuypulse/stuylib/streams/numbers/NumberStream.java @@ -1,8 +1,8 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams; +package com.stuypulse.stuylib.streams.numbers; /** * A number which reads from a streams. diff --git a/src/com/stuypulse/stuylib/streams/PollingIStream.java b/src/com/stuypulse/stuylib/streams/numbers/PollingIStream.java similarity index 90% rename from src/com/stuypulse/stuylib/streams/PollingIStream.java rename to src/com/stuypulse/stuylib/streams/numbers/PollingIStream.java index 56e42512..2ea613ee 100644 --- a/src/com/stuypulse/stuylib/streams/PollingIStream.java +++ b/src/com/stuypulse/stuylib/streams/numbers/PollingIStream.java @@ -1,8 +1,8 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams; +package com.stuypulse.stuylib.streams.numbers; import edu.wpi.first.wpilibj.Notifier; diff --git a/src/com/stuypulse/stuylib/streams/filters/Derivative.java b/src/com/stuypulse/stuylib/streams/numbers/filters/Derivative.java similarity index 84% rename from src/com/stuypulse/stuylib/streams/filters/Derivative.java rename to src/com/stuypulse/stuylib/streams/numbers/filters/Derivative.java index 83e0ec28..5c504d83 100644 --- a/src/com/stuypulse/stuylib/streams/filters/Derivative.java +++ b/src/com/stuypulse/stuylib/streams/numbers/filters/Derivative.java @@ -1,8 +1,8 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams.filters; +package com.stuypulse.stuylib.streams.numbers.filters; import com.stuypulse.stuylib.util.StopWatch; diff --git a/src/com/stuypulse/stuylib/streams/filters/HighPassFilter.java b/src/com/stuypulse/stuylib/streams/numbers/filters/HighPassFilter.java similarity index 82% rename from src/com/stuypulse/stuylib/streams/filters/HighPassFilter.java rename to src/com/stuypulse/stuylib/streams/numbers/filters/HighPassFilter.java index bf1851a0..15f77618 100644 --- a/src/com/stuypulse/stuylib/streams/filters/HighPassFilter.java +++ b/src/com/stuypulse/stuylib/streams/numbers/filters/HighPassFilter.java @@ -1,8 +1,8 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams.filters; +package com.stuypulse.stuylib.streams.numbers.filters; /** * Implementation for of a real time IIR HighPassFilter diff --git a/src/com/stuypulse/stuylib/streams/filters/IFilter.java b/src/com/stuypulse/stuylib/streams/numbers/filters/IFilter.java similarity index 95% rename from src/com/stuypulse/stuylib/streams/filters/IFilter.java rename to src/com/stuypulse/stuylib/streams/numbers/filters/IFilter.java index 974c0fbd..044b4a53 100644 --- a/src/com/stuypulse/stuylib/streams/filters/IFilter.java +++ b/src/com/stuypulse/stuylib/streams/numbers/filters/IFilter.java @@ -1,8 +1,8 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams.filters; +package com.stuypulse.stuylib.streams.numbers.filters; /** * This is the Filter interface class that gives a definition for how to implement a filter. diff --git a/src/com/stuypulse/stuylib/streams/filters/IFilterGroup.java b/src/com/stuypulse/stuylib/streams/numbers/filters/IFilterGroup.java similarity index 87% rename from src/com/stuypulse/stuylib/streams/filters/IFilterGroup.java rename to src/com/stuypulse/stuylib/streams/numbers/filters/IFilterGroup.java index 9aa6dae6..29e7d533 100644 --- a/src/com/stuypulse/stuylib/streams/filters/IFilterGroup.java +++ b/src/com/stuypulse/stuylib/streams/numbers/filters/IFilterGroup.java @@ -1,8 +1,8 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams.filters; +package com.stuypulse.stuylib.streams.numbers.filters; /** * A class that lets you combine multiple stream filters into one stream filter diff --git a/src/com/stuypulse/stuylib/streams/filters/Integral.java b/src/com/stuypulse/stuylib/streams/numbers/filters/Integral.java similarity index 83% rename from src/com/stuypulse/stuylib/streams/filters/Integral.java rename to src/com/stuypulse/stuylib/streams/numbers/filters/Integral.java index 681113c3..71c457c7 100644 --- a/src/com/stuypulse/stuylib/streams/filters/Integral.java +++ b/src/com/stuypulse/stuylib/streams/numbers/filters/Integral.java @@ -1,8 +1,8 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams.filters; +package com.stuypulse.stuylib.streams.numbers.filters; import com.stuypulse.stuylib.util.StopWatch; diff --git a/src/com/stuypulse/stuylib/streams/filters/LowPassFilter.java b/src/com/stuypulse/stuylib/streams/numbers/filters/LowPassFilter.java similarity index 92% rename from src/com/stuypulse/stuylib/streams/filters/LowPassFilter.java rename to src/com/stuypulse/stuylib/streams/numbers/filters/LowPassFilter.java index b56c7ccc..b3c0809d 100644 --- a/src/com/stuypulse/stuylib/streams/filters/LowPassFilter.java +++ b/src/com/stuypulse/stuylib/streams/numbers/filters/LowPassFilter.java @@ -1,8 +1,8 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams.filters; +package com.stuypulse.stuylib.streams.numbers.filters; import com.stuypulse.stuylib.math.SLMath; import com.stuypulse.stuylib.util.StopWatch; diff --git a/src/com/stuypulse/stuylib/streams/filters/MedianFilter.java b/src/com/stuypulse/stuylib/streams/numbers/filters/MedianFilter.java similarity index 95% rename from src/com/stuypulse/stuylib/streams/filters/MedianFilter.java rename to src/com/stuypulse/stuylib/streams/numbers/filters/MedianFilter.java index b17f7a89..cc0eb93c 100644 --- a/src/com/stuypulse/stuylib/streams/filters/MedianFilter.java +++ b/src/com/stuypulse/stuylib/streams/numbers/filters/MedianFilter.java @@ -1,8 +1,8 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams.filters; +package com.stuypulse.stuylib.streams.numbers.filters; import java.util.ArrayList; import java.util.Collections; diff --git a/src/com/stuypulse/stuylib/streams/filters/MotionProfile.java b/src/com/stuypulse/stuylib/streams/numbers/filters/MotionProfile.java similarity index 97% rename from src/com/stuypulse/stuylib/streams/filters/MotionProfile.java rename to src/com/stuypulse/stuylib/streams/numbers/filters/MotionProfile.java index e117c8fd..40b07108 100644 --- a/src/com/stuypulse/stuylib/streams/filters/MotionProfile.java +++ b/src/com/stuypulse/stuylib/streams/numbers/filters/MotionProfile.java @@ -1,8 +1,8 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams.filters; +package com.stuypulse.stuylib.streams.numbers.filters; import com.stuypulse.stuylib.math.SLMath; import com.stuypulse.stuylib.util.StopWatch; diff --git a/src/com/stuypulse/stuylib/streams/filters/MovingAverage.java b/src/com/stuypulse/stuylib/streams/numbers/filters/MovingAverage.java similarity index 91% rename from src/com/stuypulse/stuylib/streams/filters/MovingAverage.java rename to src/com/stuypulse/stuylib/streams/numbers/filters/MovingAverage.java index 39cba441..35ff10ea 100644 --- a/src/com/stuypulse/stuylib/streams/filters/MovingAverage.java +++ b/src/com/stuypulse/stuylib/streams/numbers/filters/MovingAverage.java @@ -1,8 +1,8 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams.filters; +package com.stuypulse.stuylib.streams.numbers.filters; import java.util.LinkedList; import java.util.Queue; diff --git a/src/com/stuypulse/stuylib/streams/filters/RateLimit.java b/src/com/stuypulse/stuylib/streams/numbers/filters/RateLimit.java similarity index 91% rename from src/com/stuypulse/stuylib/streams/filters/RateLimit.java rename to src/com/stuypulse/stuylib/streams/numbers/filters/RateLimit.java index 72584cd7..91b69ffd 100644 --- a/src/com/stuypulse/stuylib/streams/filters/RateLimit.java +++ b/src/com/stuypulse/stuylib/streams/numbers/filters/RateLimit.java @@ -1,8 +1,8 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams.filters; +package com.stuypulse.stuylib.streams.numbers.filters; import com.stuypulse.stuylib.math.SLMath; import com.stuypulse.stuylib.util.StopWatch; diff --git a/src/com/stuypulse/stuylib/streams/filters/TimedMovingAverage.java b/src/com/stuypulse/stuylib/streams/numbers/filters/TimedMovingAverage.java similarity index 97% rename from src/com/stuypulse/stuylib/streams/filters/TimedMovingAverage.java rename to src/com/stuypulse/stuylib/streams/numbers/filters/TimedMovingAverage.java index 0924417b..4ecd2cf8 100644 --- a/src/com/stuypulse/stuylib/streams/filters/TimedMovingAverage.java +++ b/src/com/stuypulse/stuylib/streams/numbers/filters/TimedMovingAverage.java @@ -1,8 +1,8 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams.filters; +package com.stuypulse.stuylib.streams.numbers.filters; import com.stuypulse.stuylib.util.StopWatch; diff --git a/src/com/stuypulse/stuylib/streams/filters/WeightedMovingAverage.java b/src/com/stuypulse/stuylib/streams/numbers/filters/WeightedMovingAverage.java similarity index 91% rename from src/com/stuypulse/stuylib/streams/filters/WeightedMovingAverage.java rename to src/com/stuypulse/stuylib/streams/numbers/filters/WeightedMovingAverage.java index b50ff15a..ba085bcf 100644 --- a/src/com/stuypulse/stuylib/streams/filters/WeightedMovingAverage.java +++ b/src/com/stuypulse/stuylib/streams/numbers/filters/WeightedMovingAverage.java @@ -1,8 +1,8 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ -package com.stuypulse.stuylib.streams.filters; +package com.stuypulse.stuylib.streams.numbers.filters; /** * Implementation of Weighted Moving Average. In a Weighted moving average, each value in the diff --git a/src/com/stuypulse/stuylib/streams/filters/readme.md b/src/com/stuypulse/stuylib/streams/numbers/filters/readme.md similarity index 100% rename from src/com/stuypulse/stuylib/streams/filters/readme.md rename to src/com/stuypulse/stuylib/streams/numbers/filters/readme.md diff --git a/src/com/stuypulse/stuylib/streams/vectors/FilteredVStream.java b/src/com/stuypulse/stuylib/streams/vectors/FilteredVStream.java index 19688a7e..ed3136ac 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/FilteredVStream.java +++ b/src/com/stuypulse/stuylib/streams/vectors/FilteredVStream.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/vectors/PollingVStream.java b/src/com/stuypulse/stuylib/streams/vectors/PollingVStream.java index b015b9f7..3bbc5ce0 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/PollingVStream.java +++ b/src/com/stuypulse/stuylib/streams/vectors/PollingVStream.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/vectors/VFuser.java b/src/com/stuypulse/stuylib/streams/vectors/VFuser.java index af3e40a2..ae4a8196 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/VFuser.java +++ b/src/com/stuypulse/stuylib/streams/vectors/VFuser.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/vectors/VStream.java b/src/com/stuypulse/stuylib/streams/vectors/VStream.java index fe5977ba..2db44bae 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/VStream.java +++ b/src/com/stuypulse/stuylib/streams/vectors/VStream.java @@ -1,12 +1,12 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ package com.stuypulse.stuylib.streams.vectors; import com.stuypulse.stuylib.math.Vector2D; -import com.stuypulse.stuylib.streams.IStream; import com.stuypulse.stuylib.streams.angles.AStream; +import com.stuypulse.stuylib.streams.numbers.IStream; import com.stuypulse.stuylib.streams.vectors.filters.VFilter; import java.util.function.Supplier; diff --git a/src/com/stuypulse/stuylib/streams/vectors/filters/VClamp.java b/src/com/stuypulse/stuylib/streams/vectors/filters/VClamp.java index 0d8542aa..1681e196 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/filters/VClamp.java +++ b/src/com/stuypulse/stuylib/streams/vectors/filters/VClamp.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/vectors/filters/VDeadZone.java b/src/com/stuypulse/stuylib/streams/vectors/filters/VDeadZone.java index 04e57be4..0acfd4d8 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/filters/VDeadZone.java +++ b/src/com/stuypulse/stuylib/streams/vectors/filters/VDeadZone.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/vectors/filters/VDerivative.java b/src/com/stuypulse/stuylib/streams/vectors/filters/VDerivative.java index 29bb4a0c..5afe69f5 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/filters/VDerivative.java +++ b/src/com/stuypulse/stuylib/streams/vectors/filters/VDerivative.java @@ -1,10 +1,10 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ package com.stuypulse.stuylib.streams.vectors.filters; -import com.stuypulse.stuylib.streams.filters.Derivative; +import com.stuypulse.stuylib.streams.numbers.filters.Derivative; /** * Filter that takes the derivative of a VStream with respect to time. diff --git a/src/com/stuypulse/stuylib/streams/vectors/filters/VFilter.java b/src/com/stuypulse/stuylib/streams/vectors/filters/VFilter.java index 851b9c8d..c5493a8b 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/filters/VFilter.java +++ b/src/com/stuypulse/stuylib/streams/vectors/filters/VFilter.java @@ -1,11 +1,11 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ package com.stuypulse.stuylib.streams.vectors.filters; import com.stuypulse.stuylib.math.Vector2D; -import com.stuypulse.stuylib.streams.filters.IFilter; +import com.stuypulse.stuylib.streams.numbers.filters.IFilter; /** * This is the VFilter interface class that gives a definition for how to implement a filter. diff --git a/src/com/stuypulse/stuylib/streams/vectors/filters/VFilterGroup.java b/src/com/stuypulse/stuylib/streams/vectors/filters/VFilterGroup.java index 95eb5907..31427800 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/filters/VFilterGroup.java +++ b/src/com/stuypulse/stuylib/streams/vectors/filters/VFilterGroup.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/vectors/filters/VHighPassFilter.java b/src/com/stuypulse/stuylib/streams/vectors/filters/VHighPassFilter.java index 5bfc4dd1..660a2005 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/filters/VHighPassFilter.java +++ b/src/com/stuypulse/stuylib/streams/vectors/filters/VHighPassFilter.java @@ -1,10 +1,10 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ package com.stuypulse.stuylib.streams.vectors.filters; -import com.stuypulse.stuylib.streams.filters.HighPassFilter; +import com.stuypulse.stuylib.streams.numbers.filters.HighPassFilter; /** * A filter that applies a HighPassFilter to a VStream diff --git a/src/com/stuypulse/stuylib/streams/vectors/filters/VIntegral.java b/src/com/stuypulse/stuylib/streams/vectors/filters/VIntegral.java index 26fa3d24..6cad277c 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/filters/VIntegral.java +++ b/src/com/stuypulse/stuylib/streams/vectors/filters/VIntegral.java @@ -1,10 +1,10 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ package com.stuypulse.stuylib.streams.vectors.filters; -import com.stuypulse.stuylib.streams.filters.Integral; +import com.stuypulse.stuylib.streams.numbers.filters.Integral; /** * A filter that integrates a VStream with respect to time. diff --git a/src/com/stuypulse/stuylib/streams/vectors/filters/VLowPassFilter.java b/src/com/stuypulse/stuylib/streams/vectors/filters/VLowPassFilter.java index 047a447c..c6be2c89 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/filters/VLowPassFilter.java +++ b/src/com/stuypulse/stuylib/streams/vectors/filters/VLowPassFilter.java @@ -1,10 +1,10 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ package com.stuypulse.stuylib.streams.vectors.filters; -import com.stuypulse.stuylib.streams.filters.LowPassFilter; +import com.stuypulse.stuylib.streams.numbers.filters.LowPassFilter; /** * A filter that applies a LowPassFilter to a VStream diff --git a/src/com/stuypulse/stuylib/streams/vectors/filters/VMotionProfile.java b/src/com/stuypulse/stuylib/streams/vectors/filters/VMotionProfile.java index 6ebb916f..e600c6ab 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/filters/VMotionProfile.java +++ b/src/com/stuypulse/stuylib/streams/vectors/filters/VMotionProfile.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/vectors/filters/VMovingAverage.java b/src/com/stuypulse/stuylib/streams/vectors/filters/VMovingAverage.java index e564129c..bcf99155 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/filters/VMovingAverage.java +++ b/src/com/stuypulse/stuylib/streams/vectors/filters/VMovingAverage.java @@ -1,10 +1,10 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ package com.stuypulse.stuylib.streams.vectors.filters; -import com.stuypulse.stuylib.streams.filters.MovingAverage; +import com.stuypulse.stuylib.streams.numbers.filters.MovingAverage; /** * A filter that takes a moving average of a VStream diff --git a/src/com/stuypulse/stuylib/streams/vectors/filters/VRateLimit.java b/src/com/stuypulse/stuylib/streams/vectors/filters/VRateLimit.java index 77c9d4b3..87274f5d 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/filters/VRateLimit.java +++ b/src/com/stuypulse/stuylib/streams/vectors/filters/VRateLimit.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/streams/vectors/filters/VTimedMovingAverage.java b/src/com/stuypulse/stuylib/streams/vectors/filters/VTimedMovingAverage.java index 62ea9cce..bf46e27e 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/filters/VTimedMovingAverage.java +++ b/src/com/stuypulse/stuylib/streams/vectors/filters/VTimedMovingAverage.java @@ -1,10 +1,10 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ package com.stuypulse.stuylib.streams.vectors.filters; -import com.stuypulse.stuylib.streams.filters.TimedMovingAverage; +import com.stuypulse.stuylib.streams.numbers.filters.TimedMovingAverage; /** * A filter that takes a timed moving average of a VStream diff --git a/src/com/stuypulse/stuylib/streams/vectors/filters/VWeightedMovingAverage.java b/src/com/stuypulse/stuylib/streams/vectors/filters/VWeightedMovingAverage.java index 32195847..b0c362e0 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/filters/VWeightedMovingAverage.java +++ b/src/com/stuypulse/stuylib/streams/vectors/filters/VWeightedMovingAverage.java @@ -1,10 +1,10 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ package com.stuypulse.stuylib.streams.vectors.filters; -import com.stuypulse.stuylib.streams.filters.WeightedMovingAverage; +import com.stuypulse.stuylib.streams.numbers.filters.WeightedMovingAverage; /** * A filter that takes a weighted moving average of a VStream diff --git a/src/com/stuypulse/stuylib/streams/vectors/filters/XYFilter.java b/src/com/stuypulse/stuylib/streams/vectors/filters/XYFilter.java index 819d7cde..5fd96114 100644 --- a/src/com/stuypulse/stuylib/streams/vectors/filters/XYFilter.java +++ b/src/com/stuypulse/stuylib/streams/vectors/filters/XYFilter.java @@ -1,11 +1,11 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ package com.stuypulse.stuylib.streams.vectors.filters; import com.stuypulse.stuylib.math.Vector2D; -import com.stuypulse.stuylib.streams.filters.IFilter; +import com.stuypulse.stuylib.streams.numbers.filters.IFilter; /** * A filter that applies separate IFilters to the x and y component of a VFilter diff --git a/src/com/stuypulse/stuylib/util/AngleVelocity.java b/src/com/stuypulse/stuylib/util/AngleVelocity.java index 51be988c..74c86b71 100644 --- a/src/com/stuypulse/stuylib/util/AngleVelocity.java +++ b/src/com/stuypulse/stuylib/util/AngleVelocity.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/util/Conversion.java b/src/com/stuypulse/stuylib/util/Conversion.java index 4e998d61..07e3eda3 100644 --- a/src/com/stuypulse/stuylib/util/Conversion.java +++ b/src/com/stuypulse/stuylib/util/Conversion.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/util/HashBuilder.java b/src/com/stuypulse/stuylib/util/HashBuilder.java index 9866545c..fd91d8b6 100644 --- a/src/com/stuypulse/stuylib/util/HashBuilder.java +++ b/src/com/stuypulse/stuylib/util/HashBuilder.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/util/StopWatch.java b/src/com/stuypulse/stuylib/util/StopWatch.java index a8b4315b..dbaf2a57 100644 --- a/src/com/stuypulse/stuylib/util/StopWatch.java +++ b/src/com/stuypulse/stuylib/util/StopWatch.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/util/plot/AngleSeries.java b/src/com/stuypulse/stuylib/util/plot/AngleSeries.java index 170ca33d..999ed103 100644 --- a/src/com/stuypulse/stuylib/util/plot/AngleSeries.java +++ b/src/com/stuypulse/stuylib/util/plot/AngleSeries.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/util/plot/FuncSeries.java b/src/com/stuypulse/stuylib/util/plot/FuncSeries.java index e46239f4..0ca6b8bc 100644 --- a/src/com/stuypulse/stuylib/util/plot/FuncSeries.java +++ b/src/com/stuypulse/stuylib/util/plot/FuncSeries.java @@ -1,10 +1,10 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ package com.stuypulse.stuylib.util.plot; -import com.stuypulse.stuylib.streams.filters.IFilter; +import com.stuypulse.stuylib.streams.numbers.filters.IFilter; import java.util.ArrayList; import java.util.List; diff --git a/src/com/stuypulse/stuylib/util/plot/KeyTracker.java b/src/com/stuypulse/stuylib/util/plot/KeyTracker.java index 390ee63b..018c6a43 100644 --- a/src/com/stuypulse/stuylib/util/plot/KeyTracker.java +++ b/src/com/stuypulse/stuylib/util/plot/KeyTracker.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/util/plot/MouseTracker.java b/src/com/stuypulse/stuylib/util/plot/MouseTracker.java index 2633e775..5bbb4c86 100644 --- a/src/com/stuypulse/stuylib/util/plot/MouseTracker.java +++ b/src/com/stuypulse/stuylib/util/plot/MouseTracker.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/util/plot/Playground.java b/src/com/stuypulse/stuylib/util/plot/Playground.java index 3cbe468e..da76d8d7 100644 --- a/src/com/stuypulse/stuylib/util/plot/Playground.java +++ b/src/com/stuypulse/stuylib/util/plot/Playground.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ @@ -6,7 +6,6 @@ import com.stuypulse.stuylib.math.Vector2D; import com.stuypulse.stuylib.math.interpolation.*; -import com.stuypulse.stuylib.streams.*; import com.stuypulse.stuylib.streams.angles.AFuser; import com.stuypulse.stuylib.streams.angles.AStream; import com.stuypulse.stuylib.streams.angles.filters.AHighPassFilter; @@ -15,7 +14,9 @@ import com.stuypulse.stuylib.streams.angles.filters.ARateLimit; import com.stuypulse.stuylib.streams.booleans.*; import com.stuypulse.stuylib.streams.booleans.filters.*; -import com.stuypulse.stuylib.streams.filters.*; +import com.stuypulse.stuylib.streams.numbers.*; +import com.stuypulse.stuylib.streams.numbers.IStream; +import com.stuypulse.stuylib.streams.numbers.filters.*; import com.stuypulse.stuylib.streams.vectors.*; import com.stuypulse.stuylib.streams.vectors.filters.*; import com.stuypulse.stuylib.util.plot.FuncSeries.Domain; diff --git a/src/com/stuypulse/stuylib/util/plot/Plot.java b/src/com/stuypulse/stuylib/util/plot/Plot.java index 38829b50..1b12e7ba 100644 --- a/src/com/stuypulse/stuylib/util/plot/Plot.java +++ b/src/com/stuypulse/stuylib/util/plot/Plot.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/util/plot/Series.java b/src/com/stuypulse/stuylib/util/plot/Series.java index ea28f900..ed142254 100644 --- a/src/com/stuypulse/stuylib/util/plot/Series.java +++ b/src/com/stuypulse/stuylib/util/plot/Series.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/util/plot/Settings.java b/src/com/stuypulse/stuylib/util/plot/Settings.java index e1e0f1a6..29587bf6 100644 --- a/src/com/stuypulse/stuylib/util/plot/Settings.java +++ b/src/com/stuypulse/stuylib/util/plot/Settings.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/src/com/stuypulse/stuylib/util/plot/TimeSeries.java b/src/com/stuypulse/stuylib/util/plot/TimeSeries.java index dbc8c459..95a39647 100644 --- a/src/com/stuypulse/stuylib/util/plot/TimeSeries.java +++ b/src/com/stuypulse/stuylib/util/plot/TimeSeries.java @@ -1,10 +1,10 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ package com.stuypulse.stuylib.util.plot; -import com.stuypulse.stuylib.streams.IStream; +import com.stuypulse.stuylib.streams.numbers.IStream; import java.util.ArrayList; import java.util.LinkedList; diff --git a/src/com/stuypulse/stuylib/util/plot/XYSeries.java b/src/com/stuypulse/stuylib/util/plot/XYSeries.java index 800297b4..b29683ae 100644 --- a/src/com/stuypulse/stuylib/util/plot/XYSeries.java +++ b/src/com/stuypulse/stuylib/util/plot/XYSeries.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2023 StuyPulse Robotics. All rights reserved. */ +/* Copyright (c) 2024 StuyPulse Robotics. All rights reserved. */ /* This work is licensed under the terms of the MIT license */ /* found in the root directory of this project. */ diff --git a/vendordeps/WPILibNewCommands.json b/vendordeps/WPILibNewCommands.json index 83de291e..3391721a 100644 --- a/vendordeps/WPILibNewCommands.json +++ b/vendordeps/WPILibNewCommands.json @@ -1,37 +1,39 @@ { "fileName": "WPILibNewCommands.json", "name": "WPILib-New-Commands", - "version": "2020.0.0", + "version": "1.0.0", "uuid": "111e20f7-815e-48f8-9dd6-e675ce75b266", + "frcYear": "2024", "mavenUrls": [], "jsonUrl": "", "javaDependencies": [ - { - "groupId": "edu.wpi.first.wpilibNewCommands", - "artifactId": "wpilibNewCommands-java", - "version": "wpilib" - } + { + "groupId": "edu.wpi.first.wpilibNewCommands", + "artifactId": "wpilibNewCommands-java", + "version": "wpilib" + } ], "jniDependencies": [], "cppDependencies": [ - { - "groupId": "edu.wpi.first.wpilibNewCommands", - "artifactId": "wpilibNewCommands-cpp", - "version": "wpilib", - "libName": "wpilibNewCommands", - "headerClassifier": "headers", - "sourcesClassifier": "sources", - "sharedLibrary": true, - "skipInvalidPlatforms": true, - "binaryPlatforms": [ - "linuxathena", - "linuxraspbian", - "linuxaarch64bionic", - "windowsx86-64", - "windowsx86", - "linuxx86-64", - "osxx86-64" - ] - } + { + "groupId": "edu.wpi.first.wpilibNewCommands", + "artifactId": "wpilibNewCommands-cpp", + "version": "wpilib", + "libName": "wpilibNewCommands", + "headerClassifier": "headers", + "sourcesClassifier": "sources", + "sharedLibrary": true, + "skipInvalidPlatforms": true, + "binaryPlatforms": [ + "linuxathena", + "linuxarm32", + "linuxarm64", + "windowsx86-64", + "windowsx86", + "linuxx86-64", + "osxuniversal" + ] + } ] -} \ No newline at end of file + } + \ No newline at end of file