Merge branch 'dev' of github.com:vitrivr/cottontaildb into dev

vitrivr · May 1, 2024 · 0d695e5 · 0d695e5
2 parents 3001bce + 5f77827
commit 0d695e5
Show file tree

Hide file tree

Showing 27 changed files with 280 additions and 553 deletions.
diff --git a/...vitrivr/cottontail/utilities/math/Half.kt → ...otlin/org/vitrivr/cottontail/math/Half.kt b/...vitrivr/cottontail/utilities/math/Half.kt → ...otlin/org/vitrivr/cottontail/math/Half.kt
@@ -18,10 +18,10 @@
 // Operators +, *, / based on http://half.sourceforge.net/ by Christian Rau
 // and licensed under MIT
 
-package org.vitrivr.cottontail.utilities.math
+package org.vitrivr.cottontail.math
 
-import org.vitrivr.cottontail.utilities.math.Half.Companion.POSITIVE_INFINITY
-import org.vitrivr.cottontail.utilities.math.Half.Companion.POSITIVE_ZERO
+import org.vitrivr.cottontail.math.Half.Companion.POSITIVE_INFINITY
+import org.vitrivr.cottontail.math.Half.Companion.POSITIVE_ZERO
 
 /**
  * Converts the specified double-precision float value into a

diff --git a/...aildb-core/src/main/kotlin/org/vitrivr/cottontail/core/values/tablets/HalfVectorTablet.kt b/...aildb-core/src/main/kotlin/org/vitrivr/cottontail/core/values/tablets/HalfVectorTablet.kt
@@ -3,7 +3,7 @@ package org.vitrivr.cottontail.core.values.tablets
 import org.vitrivr.cottontail.core.types.Types
 import org.vitrivr.cottontail.core.values.FloatVectorValue
 import org.vitrivr.cottontail.core.values.HalfVectorValue
-import org.vitrivr.cottontail.utilities.math.Half
+import org.vitrivr.cottontail.math.Half
 
 /**
  * A [AbstractTablet] implementation for [FloatVectorValue]s (half-precision).

diff --git a/cottontaildb-core/src/main/kotlin/org/vitrivr/cottontail/utilities/hashing/ValueFunnel.kt b/cottontaildb-core/src/main/kotlin/org/vitrivr/cottontail/utilities/hashing/ValueFunnel.kt
@@ -70,6 +70,10 @@ object ValueFunnel: Funnel<Value?> {
                 into.putInt(value.logicalSize)
                 value.data.forEach { into.putShort(it) }
             }
+            is HalfVectorValue -> {
+                into.putInt(from.logicalSize)
+                value.data.forEach { into.putFloat(it) }
+            }
             is FloatVectorValue -> {
                 into.putInt(value.logicalSize)
                 value.data.forEach { into.putFloat(it) }