move files according to class name

* drop unnecessary includes

10 files changed, 14 insertions, 16 deletions

diff --git a/eval/CMakeLists.txt b/eval/CMakeLists.txt
index 8d6f48adb21..051cf777f2c 100644
--- a/eval/CMakeLists.txt
+++ b/eval/CMakeLists.txt
@@ -45,7 +45,6 @@ vespa_define_module(
     src/tests/instruction/dense_replace_type_function
     src/tests/instruction/dense_simple_expand_function
     src/tests/instruction/dense_simple_join_function
-    src/tests/instruction/dense_simple_map_function
     src/tests/instruction/dense_single_reduce_function
     src/tests/instruction/dense_tensor_create_function
     src/tests/instruction/dense_tensor_peek_function
@@ -62,6 +61,7 @@ vespa_define_module(
     src/tests/instruction/index_lookup_table
     src/tests/instruction/join_with_number
     src/tests/instruction/mixed_inner_product_function
+    src/tests/instruction/mixed_map_function
     src/tests/instruction/pow_as_map_optimizer
     src/tests/instruction/remove_trivial_dimension_optimizer
     src/tests/instruction/vector_from_doubles_function
diff --git a/eval/src/tests/instruction/dense_simple_map_function/CMakeLists.txt b/eval/src/tests/instruction/dense_simple_map_function/CMakeLists.txt
deleted file mode 100644
index 8d3bb8c92aa..00000000000
--- a/eval/src/tests/instruction/dense_simple_map_function/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(eval_dense_simple_map_function_test_app TEST
-    SOURCES
-    dense_simple_map_function_test.cpp
-    DEPENDS
-    vespaeval
-    GTest::GTest
-)
-vespa_add_test(NAME eval_dense_simple_map_function_test_app COMMAND eval_dense_simple_map_function_test_app)
diff --git a/eval/src/tests/instruction/mixed_map_function/CMakeLists.txt b/eval/src/tests/instruction/mixed_map_function/CMakeLists.txt
new file mode 100644
index 00000000000..4457773ed6c
--- /dev/null
+++ b/eval/src/tests/instruction/mixed_map_function/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(eval_mixed_map_function_test_app TEST
+    SOURCES
+    mixed_map_function_test.cpp
+    DEPENDS
+    vespaeval
+    GTest::GTest
+)
+vespa_add_test(NAME eval_mixed_map_function_test_app COMMAND eval_mixed_map_function_test_app)
diff --git a/eval/src/tests/instruction/dense_simple_map_function/dense_simple_map_function_test.cpp b/eval/src/tests/instruction/mixed_map_function/mixed_map_function_test.cpp
index d83a8b141a8..2723414f694 100644
--- a/eval/src/tests/instruction/dense_simple_map_function/dense_simple_map_function_test.cpp
+++ b/eval/src/tests/instruction/mixed_map_function/mixed_map_function_test.cpp
@@ -1,7 +1,7 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/eval/eval/tensor_function.h>
-#include <vespa/eval/instruction/dense_simple_map_function.h>
+#include <vespa/eval/instruction/mixed_map_function.h>
 #include <vespa/eval/eval/test/eval_fixture.h>
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/vespalib/gtest/gtest.h>
diff --git a/eval/src/tests/instruction/pow_as_map_optimizer/pow_as_map_optimizer_test.cpp b/eval/src/tests/instruction/pow_as_map_optimizer/pow_as_map_optimizer_test.cpp
index 920198f67d7..b4bf9ec5ef6 100644
--- a/eval/src/tests/instruction/pow_as_map_optimizer/pow_as_map_optimizer_test.cpp
+++ b/eval/src/tests/instruction/pow_as_map_optimizer/pow_as_map_optimizer_test.cpp
@@ -2,7 +2,6 @@
 
 #include <vespa/eval/eval/fast_value.h>
 #include <vespa/eval/eval/tensor_function.h>
-#include <vespa/eval/instruction/dense_simple_map_function.h>
 #include <vespa/eval/eval/test/eval_fixture.h>
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/vespalib/gtest/gtest.h>
diff --git a/eval/src/vespa/eval/eval/optimize_tensor_function.cpp b/eval/src/vespa/eval/eval/optimize_tensor_function.cpp
index b50e30576a1..f50e3b187f0 100644
--- a/eval/src/vespa/eval/eval/optimize_tensor_function.cpp
+++ b/eval/src/vespa/eval/eval/optimize_tensor_function.cpp
@@ -18,7 +18,7 @@
 #include <vespa/eval/instruction/dense_simple_join_function.h>
 #include <vespa/eval/instruction/join_with_number_function.h>
 #include <vespa/eval/instruction/pow_as_map_optimizer.h>
-#include <vespa/eval/instruction/dense_simple_map_function.h>
+#include <vespa/eval/instruction/mixed_map_function.h>
 #include <vespa/eval/instruction/vector_from_doubles_function.h>
 #include <vespa/eval/instruction/dense_tensor_create_function.h>
 #include <vespa/eval/instruction/dense_tensor_peek_function.h>
diff --git a/eval/src/vespa/eval/instruction/CMakeLists.txt b/eval/src/vespa/eval/instruction/CMakeLists.txt
index 4b3b357e2b9..fdb4bd2b5cb 100644
--- a/eval/src/vespa/eval/instruction/CMakeLists.txt
+++ b/eval/src/vespa/eval/instruction/CMakeLists.txt
@@ -11,7 +11,6 @@ vespa_add_library(eval_instruction OBJECT
     dense_multi_matmul_function.cpp
     dense_simple_expand_function.cpp
     dense_simple_join_function.cpp
-    dense_simple_map_function.cpp
     dense_single_reduce_function.cpp
     dense_tensor_create_function.cpp
     dense_tensor_peek_function.cpp
@@ -29,6 +28,7 @@ vespa_add_library(eval_instruction OBJECT
     index_lookup_table.cpp
     join_with_number_function.cpp
     mixed_inner_product_function.cpp
+    mixed_map_function.cpp
     pow_as_map_optimizer.cpp
     remove_trivial_dimension_optimizer.cpp
     replace_type_function.cpp
diff --git a/eval/src/vespa/eval/instruction/dense_simple_map_function.cpp b/eval/src/vespa/eval/instruction/mixed_map_function.cpp
index 4ca05b74886..06b53006952 100644
--- a/eval/src/vespa/eval/instruction/dense_simple_map_function.cpp
+++ b/eval/src/vespa/eval/instruction/mixed_map_function.cpp
@@ -1,6 +1,6 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include "dense_simple_map_function.h"
+#include "mixed_map_function.h"
 #include <vespa/vespalib/util/typify.h>
 #include <vespa/eval/eval/value.h>
 #include <vespa/eval/eval/operation.h>
diff --git a/eval/src/vespa/eval/instruction/dense_simple_map_function.h b/eval/src/vespa/eval/instruction/mixed_map_function.h
index 3f3b821d15e..3f3b821d15e 100644
--- a/eval/src/vespa/eval/instruction/dense_simple_map_function.h
+++ b/eval/src/vespa/eval/instruction/mixed_map_function.h
diff --git a/eval/src/vespa/eval/instruction/pow_as_map_optimizer.cpp b/eval/src/vespa/eval/instruction/pow_as_map_optimizer.cpp
index 00fbc1c642b..aa33e98c939 100644
--- a/eval/src/vespa/eval/instruction/pow_as_map_optimizer.cpp
+++ b/eval/src/vespa/eval/instruction/pow_as_map_optimizer.cpp
@@ -1,7 +1,6 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "pow_as_map_optimizer.h"
-#include "dense_simple_map_function.h"
 #include <vespa/eval/eval/operation.h>
 
 namespace vespalib::eval {