From fb98651ec8775d2347a3e42310e14d1b59c38a42 Mon Sep 17 00:00:00 2001
From: Arne Juul <arnej@verizonmedia.com>
Date: Fri, 23 Apr 2021 12:31:21 +0000
Subject: Reapply "Lesters/resolve cell types for rename and slice"

This reverts commit 49d9016a9e50fd9032b10520c71dc5b05ab8b215.
---
 vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java')

diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java
index 275b546c0aa..fc1e7737d83 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java
@@ -5,6 +5,7 @@ import com.google.common.collect.ImmutableList;
 import com.yahoo.tensor.Tensor;
 import com.yahoo.tensor.TensorAddress;
 import com.yahoo.tensor.TensorType;
+import com.yahoo.tensor.TypeResolver;
 import com.yahoo.tensor.evaluation.EvaluationContext;
 import com.yahoo.tensor.evaluation.Name;
 import com.yahoo.tensor.evaluation.TypeContext;
@@ -76,10 +77,7 @@ public class Rename<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMET
     }
 
     private TensorType type(TensorType type) {
-        TensorType.Builder builder = new TensorType.Builder(type.valueType());
-        for (TensorType.Dimension dimension : type.dimensions())
-            builder.dimension(dimension.withName(fromToMap.getOrDefault(dimension.name(), dimension.name())));
-        return builder.build();
+        return TypeResolver.rename(type, fromDimensions, toDimensions);
     }
 
     @Override
-- 
cgit v1.2.3