Dataset refactoring after SequenceAlike simplification

Author: didalgolab

chartsy-core/src/main/java/one/chartsy/base/AbstractRingBuffer.java

@@ -4,7 +4,7 @@
  */
 package one.chartsy.base;
 
-public abstract class AbstractRingBuffer {
+public abstract class AbstractRingBuffer implements SequenceAlike {
 
 	protected final int capacity;
 	protected final int mask;
@@ -23,26 +23,36 @@ static int nextPowerOfTwo(int x) {
 		return 1 << -Integer.numberOfLeadingZeros(x - 1);
 	}
 
+	@Override
 	public final SequenceAlike.Order getOrder() {
 		return SequenceAlike.Order.INDEX_DESC;
 	}
 
 	/**
-	 * Returns the buffer's capacity, or {@code Integer.MAX_VALUE} if there is no intrinsic limit.
+	 * Gets the number of elements currently held in the buffer.
 	 *
-	 * @return the buffer's capacity
+	 * @return the number of elements held in the buffer
 	 */
-	public int capacity() {
-		return capacity;
+	@Override
+	public int length() {
+		return (int) Math.min(capacity(), nextWrite);
 	}
 
 	/**
-	 * Gets the number of elements currently held in the buffer.
+	 * Is the buffer currently empty?
+	 */
+	@Override
+	public boolean isEmpty() {
+		return length() == 0;
+	}
+
+	/**
+	 * Returns the buffer's capacity, or {@code Integer.MAX_VALUE} if there is no intrinsic limit.
 	 *
-	 * @return the number of elements held in the buffer
+	 * @return the buffer's capacity
 	 */
-	public int length() {
-		return (int) Math.min(capacity(), nextWrite);
+	public int capacity() {
+		return capacity;
 	}
 
 	/**
@@ -56,13 +66,6 @@ public int remainingCapacity() {
 		return (capacity == Integer.MAX_VALUE) ? Integer.MAX_VALUE : capacity - length();
 	}
 
-	/**
-	 * Is the buffer currently empty?
-	 */
-	public boolean isEmpty() {
-		return length() == 0;
-	}
-
 	/**
 	 * Is the buffer currently empty?
 	 */

chartsy-core/src/main/java/one/chartsy/base/Dataset.java

@@ -12,6 +12,8 @@
 import one.chartsy.util.Pair;
 
 import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
@@ -29,7 +31,7 @@
  *
  * @param <E> the type of elements stored in this dataset
  */
-public interface Dataset<E> extends SequenceAlike<E, Dataset<E>> {
+public interface Dataset<E> extends Iterable<E>, SequenceAlike {
 
     /**
      * Returns the element at the specified position in the dataset.  Depending
@@ -43,7 +45,7 @@ public interface Dataset<E> extends SequenceAlike<E, Dataset<E>> {
      */
     E get(int index);
 
-    @Override Stream<E> stream();
+    Stream<E> stream();
 
     @Override Iterator<E> iterator();
 
@@ -53,6 +55,12 @@ default Dataset<E> toImmutable() {
         return ImmutableDataset.from(this);
     }
 
+    default List<E> toImmutableList() {
+        List<E> list = new ArrayList<>(length());
+        forEach(list::add);
+        return Collections.unmodifiableList(list);
+    }
+
     default List<E> values() {
         return new Values<>(this);
     }

chartsy-core/src/main/java/one/chartsy/base/DoubleDataset.java

@@ -38,7 +38,6 @@ public interface DoubleDataset extends PrimitiveDataset<Double, DoubleDataset, S
 	 */
 	double get(int index);
 
-	@Override
 	default DoubleStream stream() {
 		return StreamSupport.doubleStream(spliterator(), false);
 	}

chartsy-core/src/main/java/one/chartsy/base/IntDataset.java

@@ -38,7 +38,6 @@ public interface IntDataset extends PrimitiveDataset<Integer, IntDataset, Splite
 	 */
 	int get(int index);
 
-	@Override
 	default IntStream stream() {
 		return StreamSupport.intStream(spliterator(), false);
 	}

chartsy-core/src/main/java/one/chartsy/base/LongDataset.java

@@ -38,7 +38,6 @@ public interface LongDataset extends PrimitiveDataset<Long, LongDataset, Spliter
 	 */
 	long get(int index);
 
-	@Override
 	default LongStream stream() {
 		return StreamSupport.longStream(spliterator(), false);
 	}

chartsy-core/src/main/java/one/chartsy/base/PrimitiveDataset.java

@@ -1,18 +1,25 @@
 package one.chartsy.base;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.Spliterator;
 
 public interface PrimitiveDataset<E,
 		T_SEQ extends PrimitiveDataset<E, T_SEQ, T_SPLITR>,
 		T_SPLITR extends Spliterator.OfPrimitive<E, ?, T_SPLITR>>
-		extends SequenceAlike<E, T_SEQ> {
+		extends SequenceAlike, Iterable<E> {
 
 	/**
 	 * Returns a primitive spliterator over the elements in the window.
 	 *
 	 * @return a primitive spliterator
 	 */
-	@Override
 	T_SPLITR spliterator();
 
+	default List<E> toImmutableList() {
+		List<E> list = new ArrayList<>(length());
+		forEach(list::add);
+		return Collections.unmodifiableList(list);
+	}
 }

chartsy-core/src/main/java/one/chartsy/base/SequenceAlike.java

@@ -4,10 +4,6 @@
  */
 package one.chartsy.base;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.BaseStream;
 import java.util.stream.DoubleStream;
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
@@ -19,7 +15,7 @@
  *
  * @author Mariusz Bernacki
  */
-public interface SequenceAlike<E, T_SEQ extends SequenceAlike<E, T_SEQ>> extends Iterable<E> {
+public interface SequenceAlike {
 
 	int length();
 
@@ -29,16 +25,8 @@ default boolean isUndefined(int index) {
 		return index < 0 || index >= length();
 	}
 
-	BaseStream<E, ?> stream();
-
 	Order getOrder();
 
-	default List<E> toImmutableList() {
-		List<E> list = new ArrayList<>(length());
-		forEach(list::add);
-		return Collections.unmodifiableList(list);
-	}
-
 	enum Order {
 		/** Specifies that encounter order is guaranteed to be ascending index order. */
 		INDEX_ASC,
@@ -47,12 +35,16 @@ enum Order {
 		/** Indicates that encounter order is unspecified or not known. */
 		UNSPECIFIED;
 
-		public IntStream indexes(SequenceAlike<?, ?> seq) {
+		public IntStream indexes(SequenceAlike seq) {
 			int length = seq.length();
 			IntStream stream = IntStream.range(0, length);
 			return (this == INDEX_DESC) ? stream.map(i -> length - i - 1) : stream;
 		}
 
+		public boolean isAscending() {
+			return this == INDEX_ASC;
+		}
+
 		public boolean isDescending() {
 			return this == INDEX_DESC;
 		}
@@ -101,71 +93,71 @@ public static void reverse(long[] arr) {
 			}
 		}
 
-		public <E> Stream<E> drop(int n, Stream<E> s, SequenceAlike<E, ?> seq) {
+		public <E> Stream<E> drop(int n, Stream<E> s, SequenceAlike seq) {
 			return switch (this) {
 				case INDEX_ASC -> s.skip(n);
 				case INDEX_DESC -> s.limit(Math.max(0, seq.length() - n));
 				default -> throw new UnsupportedOperationException("Operation `drop` not implemented for order " + this);
 			};
 		}
 
-		public DoubleStream drop(int n, DoubleStream s, SequenceAlike<Double, ?> seq) {
+		public DoubleStream drop(int n, DoubleStream s, SequenceAlike seq) {
 			return switch (this) {
 				case INDEX_ASC -> s.skip(n);
 				case INDEX_DESC -> s.limit(Math.max(0, seq.length() - n));
 				default -> throw new UnsupportedOperationException("Operation `drop` not implemented for order " + this);
 			};
 		}
 
-		public IntStream drop(int n, IntStream s, SequenceAlike<Integer, ?> seq) {
+		public IntStream drop(int n, IntStream s, SequenceAlike seq) {
 			return switch (this) {
 				case INDEX_ASC -> s.skip(n);
 				case INDEX_DESC -> s.limit(Math.max(0, seq.length() - n));
 				default -> throw new UnsupportedOperationException("Operation `drop` not implemented for order " + this);
 			};
 		}
 
-		public LongStream drop(int n, LongStream s, SequenceAlike<Long, ?> seq) {
+		public LongStream drop(int n, LongStream s, SequenceAlike seq) {
 			return switch (this) {
 				case INDEX_ASC -> s.skip(n);
 				case INDEX_DESC -> s.limit(Math.max(0, seq.length() - n));
 				default -> throw new UnsupportedOperationException("Operation `drop` not implemented for order " + this);
 			};
 		}
 
-		public <E> Stream<E> take(int maxCount, Stream<E> s, SequenceAlike<E, ?> seq) {
+		public <E> Stream<E> take(int maxCount, Stream<E> s, SequenceAlike seq) {
 			return switch (this) {
 				case INDEX_ASC -> s.limit(maxCount);
 				case INDEX_DESC -> s.skip(Math.max(0, seq.length() - maxCount));
 				default -> throw new UnsupportedOperationException("Operation `take` not implemented for order " + this);
 			};
 		}
 
-		public DoubleStream take(int maxCount, DoubleStream s, SequenceAlike<Double, ?> seq) {
+		public DoubleStream take(int maxCount, DoubleStream s, SequenceAlike seq) {
 			return switch (this) {
 				case INDEX_ASC -> s.limit(maxCount);
 				case INDEX_DESC -> s.skip(Math.max(0, seq.length() - maxCount));
 				default -> throw new UnsupportedOperationException("Operation `take` not implemented for order " + this);
 			};
 		}
 
-		public IntStream take(int maxCount, IntStream s, SequenceAlike<Integer, ?> seq) {
+		public IntStream take(int maxCount, IntStream s, SequenceAlike seq) {
 			return switch (this) {
 				case INDEX_ASC -> s.limit(maxCount);
 				case INDEX_DESC -> s.skip(Math.max(0, seq.length() - maxCount));
 				default -> throw new UnsupportedOperationException("Operation `take` not implemented for order " + this);
 			};
 		}
 
-		public LongStream take(int maxCount, LongStream s, SequenceAlike<Long, ?> seq) {
+		public LongStream take(int maxCount, LongStream s, SequenceAlike seq) {
 			return switch (this) {
 				case INDEX_ASC -> s.limit(maxCount);
 				case INDEX_DESC -> s.skip(Math.max(0, seq.length() - maxCount));
 				default -> throw new UnsupportedOperationException("Operation `take` not implemented for order " + this);
 			};
 		}
 
-		public <E> Stream<E> dropTake(int fromIndex, int maxCount, Stream<E> s, SequenceAlike<E, ?> seq) {
+		public <E> Stream<E> dropTake(int fromIndex, int maxCount, Stream<E> s, SequenceAlike seq) {
 			return switch (this) {
 				case INDEX_ASC -> s.skip(fromIndex).limit(maxCount);
 				case INDEX_DESC -> {
@@ -176,7 +168,7 @@ public <E> Stream<E> dropTake(int fromIndex, int maxCount, Stream<E> s, Sequence
 			};
 		}
 
-		public DoubleStream dropTake(int fromIndex, int maxCount, DoubleStream s, SequenceAlike<Double, ?> seq) {
+		public DoubleStream dropTake(int fromIndex, int maxCount, DoubleStream s, SequenceAlike seq) {
 			return switch (this) {
 				case INDEX_ASC -> s.skip(fromIndex).limit(maxCount);
 				case INDEX_DESC -> {
@@ -187,7 +179,7 @@ public DoubleStream dropTake(int fromIndex, int maxCount, DoubleStream s, Sequen
 			};
 		}
 
-		public IntStream dropTake(int fromIndex, int maxCount, IntStream s, SequenceAlike<Integer, ?> seq) {
+		public IntStream dropTake(int fromIndex, int maxCount, IntStream s, SequenceAlike seq) {
 			return switch (this) {
 				case INDEX_ASC -> s.skip(fromIndex).limit(maxCount);
 				case INDEX_DESC -> {
@@ -198,7 +190,7 @@ public IntStream dropTake(int fromIndex, int maxCount, IntStream s, SequenceAlik
 			};
 		}
 
-		public LongStream dropTake(int fromIndex, int maxCount, LongStream s, SequenceAlike<Long, ?> seq) {
+		public LongStream dropTake(int fromIndex, int maxCount, LongStream s, SequenceAlike seq) {
 			return switch (this) {
 				case INDEX_ASC -> s.skip(fromIndex).limit(maxCount);
 				case INDEX_DESC -> {

chartsy-core/src/main/java/one/chartsy/base/dataset/AbstractDataset.java

@@ -42,7 +42,7 @@ public Spliterator<E> spliterator() {
         return stream().spliterator();
     }
 
-    public static <E, T extends SequenceAlike<?, T>>
+    public static <E, T extends SequenceAlike>
     AbstractDataset<E> from(T origin, IndexedFunction<T, E> getter) {
         return new From<>(origin) {
             @Override
@@ -52,7 +52,7 @@ public E get(int index) {
         };
     }
 
-    public static <E, T extends SequenceAlike<?, T>>
+    public static <E, T extends SequenceAlike>
     AbstractDataset<E> from(T origin, IndexedFunction<T, E> getter, Function<T, Stream<E>> stream) {
         return new From<>(origin) {
             @Override
@@ -67,7 +67,7 @@ public Stream<E> stream() {
         };
     }
 
-    public static <E, T extends SequenceAlike<?, T>>
+    public static <E, T extends SequenceAlike>
     AbstractDataset<E> from(T origin, ToIntFunction<T> length, IndexedFunction<T, E> getter) {
         return new From<>(origin) {
             @Override
@@ -82,7 +82,7 @@ public E get(int index) {
         };
     }
 
-    public static <E, T extends SequenceAlike<?, T>>
+    public static <E, T extends SequenceAlike>
     AbstractDataset<E> from(T origin, ToIntFunction<T> length, IndexedFunction<T, E> getter, Function<T, Stream<E>> stream) {
         return new From<>(origin) {
             @Override
@@ -102,7 +102,7 @@ public Stream<E> stream() {
         };
     }
 
-    public static abstract class From<E, T extends SequenceAlike<?, T>> extends AbstractDataset<E> {
+    public static abstract class From<E, T extends SequenceAlike> extends AbstractDataset<E> {
         protected final T origin;
 
         public From(T origin) {