latest of is now a specialization of a pick expression. Small fixes

Author: andreacalia

src/java/org/tensorics/core/expressions/LatestOfExpression.java

@@ -6,27 +6,26 @@
 
 import java.util.List;
 
+import org.tensorics.core.iterable.expressions.PickExpression;
 import org.tensorics.core.tree.domain.Expression;
 
-import com.google.common.collect.Iterables;
-
 /**
  * Expression that given an {@link Expression} of {@link List} of T, it gets the latest. Especially usefull for buffers.
  * 
  * @param <T>
  */
-public class LatestOfExpression<T> extends ConversionOperationExpression<Iterable<T>, T> {
+public class LatestOfExpression<T> extends PickExpression<T> {
 
     private static final long serialVersionUID = 6562010523280754793L;
 
-    private final Expression<Iterable<T>> bufferExpression;
+    private final Expression<? extends Iterable<T>> bufferExpression;
 
-    private LatestOfExpression(Expression<Iterable<T>> source) {
-        super(Iterables::getLast, source);
+    private LatestOfExpression(Expression<? extends Iterable<T>> source) {
+        super(source, 0, Mode.FROM_END);
         bufferExpression = source;
     }
 
-    public static <T> LatestOfExpression<T> latestOf(Expression<Iterable<T>> source) {
+    public static <T> LatestOfExpression<T> latestOf(Expression<? extends Iterable<T>> source) {
         return new LatestOfExpression<>(source);
     }
 

src/java/org/tensorics/core/iterable/expressions/PickExpression.java

@@ -33,7 +33,7 @@ public class PickExpression<T> extends AbstractDeferredExpression<T> implements
     private final int offset;
     private final Mode mode;
 
-    private PickExpression(Expression<? extends Iterable<T>> iterable, int offset, Mode mode) {
+    protected PickExpression(Expression<? extends Iterable<T>> iterable, int offset, Mode mode) {
         super();
         this.iterable = iterable;
         this.offset = offset;

src/java/org/tensorics/core/resolve/domain/DetailedExpressionResult.java

@@ -15,7 +15,7 @@ public class DetailedExpressionResult<R, E extends Expression<R>> {
     private final R value;
     private final ResolvingContext context;
 
-    private DetailedExpressionResult(E rootExpression, R value, ResolvingContext context) {
+    protected DetailedExpressionResult(E rootExpression, R value, ResolvingContext context) {
         super();
         this.rootExpression = requireNonNull(rootExpression, "rootExpression must not be null");
         this.value = requireNonNull(value, "value must not be null");

src/java/org/tensorics/core/resolve/resolvers/Resolvers.java

@@ -49,7 +49,6 @@ public static ResolverRepository defaultRepository() {
     public static ResolverRepository defaultRepositoryWithAdditional(Resolver<?, ?>... resolvers) {
         List<Resolver<?, ?>> allResolvers = createDefaultResolvers();
         allResolvers.addAll(Arrays.asList(resolvers));
-        System.err.println("Resolvers: " + allResolvers);
         return repositoryWithResolvers(allResolvers);
     }
 
@@ -70,6 +69,7 @@ private static ResolverRepository repositoryWithResolvers(List<Resolver<?, ?>> r
         resolvers.add(new BinaryPredicateIterableResolver<>());
         resolvers.add(new FunctionalExpressionResolver<>());
         resolvers.add(new IterableExpressionToIterableResolver<>());
+        resolvers.add(new PickResolver<>());
         return resolvers;
     }