24886: Adds query_entity_clusters opcode, MINOR

CMakeLists.txt

@@ -114,7 +114,6 @@ set(COMMON_SOURCE
     src/Amalgam/AssetManager.h
     src/Amalgam/BinaryPacking.cpp
     src/Amalgam/BinaryPacking.h
-    src/Amalgam/Conviction.h
     src/Amalgam/Cryptography.cpp
     src/Amalgam/Cryptography.h
     src/Amalgam/DateTimeFormat.cpp
@@ -128,6 +127,8 @@ set(COMMON_SOURCE
     src/Amalgam/entity/EntityManipulation.h
     src/Amalgam/entity/EntityQueries.cpp
     src/Amalgam/entity/EntityQueries.h
+	src/Amalgam/entity/EntityQueriesDensityFunctions.cpp
+	src/Amalgam/entity/EntityQueriesDensityFunctions.h
     src/Amalgam/entity/EntityQueriesStatistics.h
     src/Amalgam/entity/EntityQueryBuilder.h
     src/Amalgam/entity/EntityQueryCaches.cpp

src/Amalgam/Amalgam.vcxproj

@@ -562,6 +562,7 @@
     <ClCompile Include="entity\EntityExternalInterface.cpp" />
     <ClCompile Include="entity\EntityManipulation.cpp" />
     <ClCompile Include="entity\EntityQueries.cpp" />
+    <ClCompile Include="entity\EntityQueriesDensityFunctions.cpp" />
     <ClCompile Include="entity\EntityQueryCaches.cpp" />
     <ClCompile Include="entity\EntityWriteListener.cpp" />
     <ClCompile Include="evaluablenode\EvaluableNode.cpp" />
@@ -611,14 +612,14 @@
     <ClInclude Include="AssetManager.h" />
     <ClInclude Include="BinaryPacking.h" />
     <ClInclude Include="Concurrency.h" />
-    <ClInclude Include="Conviction.h" />
     <ClInclude Include="Cryptography.h" />
     <ClInclude Include="DateTimeFormat.h" />
     <ClInclude Include="DistanceReferencePair.h" />
     <ClInclude Include="entity\Entity.h" />
     <ClInclude Include="entity\EntityExternalInterface.h" />
     <ClInclude Include="entity\EntityManipulation.h" />
     <ClInclude Include="entity\EntityQueries.h" />
+    <ClInclude Include="entity\EntityQueriesDensityFunctions.h" />
     <ClInclude Include="entity\EntityQueriesStatistics.h" />
     <ClInclude Include="entity\EntityQueryBuilder.h" />
     <ClInclude Include="entity\EntityQueryCaches.h" />

src/Amalgam/Amalgam.vcxproj.filters

@@ -203,9 +203,6 @@
     <ClInclude Include="FilenameEscapeProcessor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Conviction.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="PartialSum.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -338,6 +335,9 @@
     <ClInclude Include="importexport\FileSupportYAML.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="entity\EntityQueriesDensityFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resource.rc">

src/Amalgam/KnnCache.h

@@ -151,6 +151,13 @@ class KnnCache
 			*positionLabelIds, index, top_k, radiusLabelId, from_indices, true, expand_to_first_nonzero_distance, out);
 	}
 
+	//returns the container for the knn cache for index
+	//note that this should only be called after PreCacheKnn has been called
+	std::vector<DistanceReferencePair<size_t>> &GetKnnCache(size_t index)
+	{
+		return cachedNeighbors[index];
+	}
+
 	//returns a pointer to the relevant indices of the cache
 	constexpr BitArrayIntegerSet *GetRelevantEntities()
 	{
@@ -169,6 +176,12 @@ class KnnCache
 		return relevantIndices->GetEndInteger();
 	}
 
+	//returns the generalized distance evaluator
+	inline GeneralizedDistanceEvaluator *GetDistanceEvaluator()
+	{
+		return distEvaluator;
+	}
+
 protected:
 	//cache of nearest neighbor results.  The index of cache is the entity, and the corresponding vector are its nearest neighbors.
 	std::vector<std::vector<DistanceReferencePair<size_t>>> cachedNeighbors;

src/Amalgam/Opcodes.cpp

@@ -289,6 +289,7 @@ void StringInternPool::InitializeStaticStrings()
 	EmplaceNodeTypeString(ENT_QUERY_ENTITY_DISTANCE_CONTRIBUTIONS, "query_entity_distance_contributions");
 	EmplaceNodeTypeString(ENT_QUERY_ENTITY_KL_DIVERGENCES, "query_entity_kl_divergences");
 	EmplaceNodeTypeString(ENT_QUERY_ENTITY_CUMULATIVE_NEAREST_ENTITY_WEIGHTS, "query_entity_cumulative_nearest_entity_weights");
+	EmplaceNodeTypeString(ENT_QUERY_ENTITY_CLUSTERS, "query_entity_clusters");
 
 	//entity access
 	EmplaceNodeTypeString(ENT_CONTAINS_LABEL, "contains_label");