|
22 | 22 |
|
23 | 23 | package org.tensorics.core.tensorbacked;
|
24 | 24 |
|
25 |
| -import static org.tensorics.core.util.Classes.classOf; |
26 |
| - |
27 | 25 | import java.util.Set;
|
28 | 26 |
|
29 | 27 | import org.tensorics.core.quantity.QuantifiedValue;
|
|
34 | 32 | import org.tensorics.core.tensor.lang.QuantityTensors;
|
35 | 33 | import org.tensorics.core.tensor.lang.TensorStructurals;
|
36 | 34 | import org.tensorics.core.tensorbacked.annotation.Dimensions;
|
37 |
| -import org.tensorics.core.tensorbacked.dimtyped.*; |
| 35 | +import org.tensorics.core.tensorbacked.dimtyped.DimtypedTensorbackedBuilderImpl; |
| 36 | +import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked1d; |
| 37 | +import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked1dBuilder; |
| 38 | +import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked2d; |
| 39 | +import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked2dBuilder; |
| 40 | +import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked3d; |
| 41 | +import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked3dBuilder; |
| 42 | +import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked4d; |
| 43 | +import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked4dBuilder; |
| 44 | +import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked5d; |
| 45 | +import org.tensorics.core.tensorbacked.dimtyped.Tensorbacked5dBuilder; |
38 | 46 | import org.tensorics.core.tensorbacked.lang.OngoingTensorbackedConstruction;
|
39 | 47 | import org.tensorics.core.tensorbacked.lang.OngoingTensorbackedFiltering;
|
40 | 48 | import org.tensorics.core.units.Unit;
|
@@ -281,12 +289,12 @@ public static <TB extends Tensorbacked<E>, TBOUT extends Tensorbacked<E>, E> TBO
|
281 | 289 | }
|
282 | 290 |
|
283 | 291 | public static final <V, TB extends Tensorbacked<V>> TB stripContext(TB tensorbacked) {
|
284 |
| - TB toReturn = builderFor(classOf(tensorbacked)).putAll(tensorbacked.tensor()).build(); |
| 292 | + TB toReturn = builderFor(TensorbackedInternals.classOf(tensorbacked)).putAll(tensorbacked.tensor()).build(); |
285 | 293 | return toReturn;
|
286 | 294 | }
|
287 | 295 |
|
288 | 296 | public static <V, TB extends Tensorbacked<V>> TB setContext(TB tensorbacked, Position context) {
|
289 |
| - return builderFor(classOf(tensorbacked)).context(context).putAll(tensorbacked.tensor()).build(); |
| 297 | + return builderFor(TensorbackedInternals.classOf(tensorbacked)).context(context).putAll(tensorbacked.tensor()).build(); |
290 | 298 | }
|
291 | 299 |
|
292 | 300 | public static final <V, TB extends Tensorbacked<V>> OngoingTensorbackedFiltering<V, TB> filter(TB tensorbacked) {
|
|
0 commit comments