Fixed wrongly determined classes for tensorbackeds

Author: Kajetan Fuchsberger

src/java/org/tensorics/core/tensorbacked/Tensorbackeds.java

@@ -22,8 +22,6 @@
 
 package org.tensorics.core.tensorbacked;
 
-import static org.tensorics.core.util.Classes.classOf;
-
 import java.util.Set;
 
 import org.tensorics.core.quantity.QuantifiedValue;
@@ -34,7 +32,17 @@
 import org.tensorics.core.tensor.lang.QuantityTensors;
 import org.tensorics.core.tensor.lang.TensorStructurals;
 import org.tensorics.core.tensorbacked.annotation.Dimensions;
-import org.tensorics.core.tensorbacked.dimtyped.*;
+import org.tensorics.core.tensorbacked.dimtyped.DimtypedTensorbackedBuilderImpl;
+import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked1d;
+import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked1dBuilder;
+import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked2d;
+import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked2dBuilder;
+import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked3d;
+import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked3dBuilder;
+import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked4d;
+import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked4dBuilder;
+import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked5d;
+import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked5dBuilder;
 import org.tensorics.core.tensorbacked.lang.OngoingTensorbackedConstruction;
 import org.tensorics.core.tensorbacked.lang.OngoingTensorbackedFiltering;
 import org.tensorics.core.units.Unit;
@@ -281,12 +289,12 @@ public static <TB extends Tensorbacked<E>, TBOUT extends Tensorbacked<E>, E> TBO
     }
 
     public static final <V, TB extends Tensorbacked<V>> TB stripContext(TB tensorbacked) {
-        TB toReturn = builderFor(classOf(tensorbacked)).putAll(tensorbacked.tensor()).build();
+        TB toReturn = builderFor(TensorbackedInternals.classOf(tensorbacked)).putAll(tensorbacked.tensor()).build();
         return toReturn;
     }
 
     public static <V, TB extends Tensorbacked<V>> TB setContext(TB tensorbacked, Position context) {
-        return builderFor(classOf(tensorbacked)).context(context).putAll(tensorbacked.tensor()).build();
+        return builderFor(TensorbackedInternals.classOf(tensorbacked)).context(context).putAll(tensorbacked.tensor()).build();
     }
 
     public static final <V, TB extends Tensorbacked<V>> OngoingTensorbackedFiltering<V, TB> filter(TB tensorbacked) {

src/java/org/tensorics/core/tensorbacked/lang/OngoingQuantifiedTensorBackedOperation.java

@@ -33,6 +33,7 @@
 import org.tensorics.core.tensor.Tensor;
 import org.tensorics.core.tensor.operations.ElementBinaryOperation;
 import org.tensorics.core.tensorbacked.Tensorbacked;
+import org.tensorics.core.tensorbacked.TensorbackedInternals;
 
 /**
  * Part of the tensorics fluent API that provides methods to describe the right hand part of binary operations on tensor
@@ -113,12 +114,8 @@ public QTB elementDividedByV(QuantifiedValue<S> value) {
     private QTB evaluate(Tensor<QuantifiedValue<S>> right, BinaryOperation<QuantifiedValue<S>> operation) {
         Tensor<QuantifiedValue<S>> perform = new ElementBinaryOperation<>(operation,
                 pseudoField.environment().options()).perform(left.tensor(), right);
-        return createBackedByTensor(classOf(left), perform);
-    }
-
-    @SuppressWarnings("unchecked")
-    private Class<QTB> classOf(QTB tensorBacked) {
-        return (Class<QTB>) tensorBacked.getClass();
+        return createBackedByTensor(TensorbackedInternals.classOf(left), perform);
     }
 
+    
 }

src/java/org/tensorics/core/tensorbacked/lang/OngoingTensorbackedFiltering.java

@@ -21,8 +21,6 @@
 // @formatter:on
 package org.tensorics.core.tensorbacked.lang;
 
-import static org.tensorics.core.util.Classes.classOf;
-
 import org.tensorics.core.tensor.lang.TensorStructurals;
 import org.tensorics.core.tensorbacked.Tensorbacked;
 import org.tensorics.core.tensorbacked.TensorbackedInternals;
@@ -39,7 +37,7 @@ public OngoingTensorbackedFiltering(TB tensorbacked) {
     }
 
     public <C extends Comparable<C>> TB by(Class<C> coordinateClass, Range<C> coordinateRange) {
-        return TensorbackedInternals.createBackedByTensor(classOf(tensorbacked),
+        return TensorbackedInternals.createBackedByTensor(TensorbackedInternals.classOf(tensorbacked),
                 TensorStructurals.filter(tensorbacked.tensor()).by(coordinateClass, coordinateRange));
     }
 

src/java/org/tensorics/core/tensorbacked/lang/QuantityTensorbackedSupport.java

@@ -54,9 +54,7 @@ public <QTB extends Tensorbacked<QuantifiedValue<V>>> OngoingQuantifiedTensorBac
     public <QTB extends Tensorbacked<QuantifiedValue<V>>> QTB negativeOf(QTB tensorBacked) {
         Tensor<QuantifiedValue<V>> perform = new ElementUnaryOperation<>(pseudoField.additiveInversion())
                 .perform(tensorBacked.tensor());
-        /* safe cast since we ensure QTB as a type in the argument! */
-        @SuppressWarnings("unchecked")
-        Class<QTB> tensorBackedClass = (Class<QTB>) tensorBacked.getClass();
+        Class<QTB> tensorBackedClass = TensorbackedInternals.classOf(tensorBacked);
         return TensorbackedInternals.createBackedByTensor(tensorBackedClass, perform);
     }
 

src/java/org/tensorics/core/tensorbacked/lang/TensorbackedExpressionSupport.java

@@ -49,7 +49,7 @@ public final <TB extends Tensorbacked<V>> Expression<TB> elementNegativeOfTB(Exp
 
     public final <TB extends Tensorbacked<V>> OngoingDeferredTensorBackedOperation<V, TB> calculateTB(
             Class<TB> resultClass, Expression<TB> left) {
-        return new OngoingDeferredTensorBackedOperation<V, TB>(environment, resultClass, left);
+        return new OngoingDeferredTensorBackedOperation<>(environment, resultClass, left);
     }
 
 }

src/java/org/tensorics/core/util/Classes.java

@@ -70,11 +70,4 @@ public static Multiset<Class<?>> classesOf(Iterable<?> coordinates) {
         return builder.build();
     }
 
-    public static <T> Class<T> classOf(T object) {
-        @SuppressWarnings("unchecked")
-        /* This cast is always safe, right? */
-        Class<T> toReturn = (Class<T>) object.getClass();
-        return toReturn;
-    }
-
 }

src/test/org/tensorics/core/util/ClassesTest.java

@@ -22,7 +22,6 @@
 
 package org.tensorics.core.util;
 
-import static org.junit.Assert.assertNotNull;
 import static org.tensorics.core.testing.TestUtil.assertUtilityClass;
 
 import org.junit.Test;
@@ -34,19 +33,7 @@ public void verifyUtilityClass() {
         assertUtilityClass(Classes.class);
     }
 
-    @Test
-    public void classOfLastClassDoesNotThrow() {
-        ChildClass object = new ChildClass();
-        Class<ChildClass> theClass = Classes.classOf(object);
-        assertNotNull(theClass);
-    }
-
-    @Test
-    public void classOfParentClassDoesNotThrow() {
-        ParentClass object = new ChildClass();
-        Class<ParentClass> theClass = Classes.classOf(object);
-        assertNotNull(theClass);
-    }
+   
 
     private class ParentClass {
         /* Only for testing the hierarchy */