liuyu/pgvector
1
0
Fork 0
mirror of https://github.com/pgvector/pgvector.git synced 2026-07-09 22:30:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improved naming [skip ci]

Browse Source
This commit is contained in:
Andrew Kane
2024-04-24 18:16:54 -07:00
parent 0f4c2407dd
commit 52bfedddc2
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/ivfkmeans.c
View File

@@ -15,8 +15,8 @@
typedef struct KmeansState typedef struct KmeansState
{ {
void (*initNewCenter) (Pointer v, int dimensions); void (*initCenter) (Pointer v, int dimensions);
void (*setNewCenter) (Pointer v, float *x); void (*updateCenter) (Pointer v, float *x);
void (*sumCenter) (Pointer v, float *x); void (*sumCenter) (Pointer v, float *x);
int (*comp) (const void *a, const void *b); int (*comp) (const void *a, const void *b);
bool separateAgg; bool separateAgg;
@@ -163,7 +163,7 @@ SortVectorArray(VectorArray arr, KmeansState * kmeansstate)
} }
static void static void
VectorInitNewCenter(Pointer v, int dimensions) VectorInitCenter(Pointer v, int dimensions)
{ {
Vector *vec = (Vector *) v; Vector *vec = (Vector *) v;
@@ -172,7 +172,7 @@ VectorInitNewCenter(Pointer v, int dimensions)
} }
static void static void
HalfvecInitNewCenter(Pointer v, int dimensions) HalfvecInitCenter(Pointer v, int dimensions)
{ {
HalfVector *vec = (HalfVector *) v; HalfVector *vec = (HalfVector *) v;
@@ -181,7 +181,7 @@ HalfvecInitNewCenter(Pointer v, int dimensions)
} }
static void static void
BitInitNewCenter(Pointer v, int dimensions) BitInitCenter(Pointer v, int dimensions)
{ {
VarBit *vec = (VarBit *) v; VarBit *vec = (VarBit *) v;
@@ -190,7 +190,7 @@ BitInitNewCenter(Pointer v, int dimensions)
} }
static void static void
VectorSetNewCenter(Pointer v, float *x) VectorUpdateCenter(Pointer v, float *x)
{ {
Vector *newCenter = (Vector *) v; Vector *newCenter = (Vector *) v;
@@ -199,7 +199,7 @@ VectorSetNewCenter(Pointer v, float *x)
} }
static void static void
HalfvecSetNewCenter(Pointer v, float *x) HalfvecUpdateCenter(Pointer v, float *x)
{ {
HalfVector *newCenter = (HalfVector *) v; HalfVector *newCenter = (HalfVector *) v;
@@ -208,7 +208,7 @@ HalfvecSetNewCenter(Pointer v, float *x)
} }
static void static void
BitSetNewCenter(Pointer v, float *x) BitUpdateCenter(Pointer v, float *x)
{ {
VarBit *newCenter = (VarBit *) v; VarBit *newCenter = (VarBit *) v;
unsigned char *nx = VARBITS(newCenter); unsigned char *nx = VARBITS(newCenter);
@@ -257,8 +257,8 @@ QuickCenters(Relation index, VectorArray samples, VectorArray centers, KmeansSta
for (int i = 0; i < dimensions; i++) for (int i = 0; i < dimensions; i++)
x[i] = (float) RandomDouble(); x[i] = (float) RandomDouble();
kmeansstate->initNewCenter(center, dimensions); kmeansstate->initCenter(center, dimensions);
kmeansstate->setNewCenter(center, x); kmeansstate->updateCenter(center, x);
centers->length++; centers->length++;
} }
@@ -332,13 +332,13 @@ SumCenters(VectorArray samples, VectorArray aggCenters, int *closestCenters, Kme
* Set new centers * Set new centers
*/ */
static void static void
SetNewCenters(VectorArray aggCenters, VectorArray newCenters, KmeansState * kmeansstate) UpdateCenters(VectorArray aggCenters, VectorArray newCenters, KmeansState * kmeansstate)
{ {
for (int j = 0; j < aggCenters->length; j++) for (int j = 0; j < aggCenters->length; j++)
{ {
Vector *aggCenter = (Vector *) VectorArrayGet(aggCenters, j); Vector *aggCenter = (Vector *) VectorArrayGet(aggCenters, j);
kmeansstate->setNewCenter(VectorArrayGet(newCenters, j), aggCenter->x); kmeansstate->updateCenter(VectorArrayGet(newCenters, j), aggCenter->x);
} }
} }
@@ -398,7 +398,7 @@ ComputeNewCenters(VectorArray samples, VectorArray aggCenters, VectorArray newCe
/* Set new centers if different from agg centers */ /* Set new centers if different from agg centers */
if (kmeansstate->separateAgg) if (kmeansstate->separateAgg)
SetNewCenters(aggCenters, newCenters, kmeansstate); UpdateCenters(aggCenters, newCenters, kmeansstate);
/* Normalize if needed */ /* Normalize if needed */
if (normprocinfo != NULL) if (normprocinfo != NULL)
@@ -490,7 +490,7 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers, KmeansStat
newCenters->length = numCenters; newCenters->length = numCenters;
for (int j = 0; j < numCenters; j++) for (int j = 0; j < numCenters; j++)
kmeansstate->initNewCenter(VectorArrayGet(newCenters, j), dimensions); kmeansstate->initCenter(VectorArrayGet(newCenters, j), dimensions);
/* Initialize agg centers */ /* Initialize agg centers */
if (!kmeansstate->separateAgg) if (!kmeansstate->separateAgg)
@@ -504,7 +504,7 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers, KmeansStat
aggCenters->length = numCenters; aggCenters->length = numCenters;
for (int j = 0; j < numCenters; j++) for (int j = 0; j < numCenters; j++)
VectorInitNewCenter(VectorArrayGet(aggCenters, j), dimensions); VectorInitCenter(VectorArrayGet(aggCenters, j), dimensions);
} }
#ifdef IVFFLAT_MEMORY #ifdef IVFFLAT_MEMORY
@@ -747,8 +747,8 @@ InitKmeansState(KmeansState * kmeansstate, IvfflatType type)
{ {
if (type == IVFFLAT_TYPE_VECTOR) if (type == IVFFLAT_TYPE_VECTOR)
{ {
kmeansstate->initNewCenter = VectorInitNewCenter; kmeansstate->initCenter = VectorInitCenter;
kmeansstate->setNewCenter = VectorSetNewCenter; kmeansstate->updateCenter = VectorUpdateCenter;
kmeansstate->sumCenter = VectorSumCenter; kmeansstate->sumCenter = VectorSumCenter;
kmeansstate->comp = CompareVectors; kmeansstate->comp = CompareVectors;
kmeansstate->separateAgg = false; kmeansstate->separateAgg = false;
@@ -756,8 +756,8 @@ InitKmeansState(KmeansState * kmeansstate, IvfflatType type)
} }
else if (type == IVFFLAT_TYPE_HALFVEC) else if (type == IVFFLAT_TYPE_HALFVEC)
{ {
kmeansstate->initNewCenter = HalfvecInitNewCenter; kmeansstate->initCenter = HalfvecInitCenter;
kmeansstate->setNewCenter = HalfvecSetNewCenter; kmeansstate->updateCenter = HalfvecUpdateCenter;
kmeansstate->sumCenter = HalfvecSumCenter; kmeansstate->sumCenter = HalfvecSumCenter;
kmeansstate->comp = CompareHalfVectors; kmeansstate->comp = CompareHalfVectors;
kmeansstate->separateAgg = true; kmeansstate->separateAgg = true;
@@ -765,8 +765,8 @@ InitKmeansState(KmeansState * kmeansstate, IvfflatType type)
} }
else if (type == IVFFLAT_TYPE_BIT) else if (type == IVFFLAT_TYPE_BIT)
{ {
kmeansstate->initNewCenter = BitInitNewCenter; kmeansstate->initCenter = BitInitCenter;
kmeansstate->setNewCenter = BitSetNewCenter; kmeansstate->updateCenter = BitUpdateCenter;
kmeansstate->sumCenter = BitSumCenter; kmeansstate->sumCenter = BitSumCenter;
kmeansstate->comp = CompareBitVectors; kmeansstate->comp = CompareBitVectors;
kmeansstate->separateAgg = true; kmeansstate->separateAgg = true;