diff --git a/ketrface/cluster.py b/ketrface/cluster.py index 87aee24..e269896 100644 --- a/ketrface/cluster.py +++ b/ketrface/cluster.py @@ -124,14 +124,15 @@ print('Loading faces from database') faces = load_faces(db_path = db_path) minPts = max(len(faces) / 500, 5) -eps = 0.185 +eps = 0.25 +#eps = 0.185 print(f'Scanning {len(faces)} faces for clusters (minPts: {minPts}, eps: {eps})') identities = DBSCAN(faces, minPts = minPts, eps = eps) print(f'{len(identities)} clusters grouped') # Compute average center for all clusters identities = update_cluster_averages(identities) -epoch_prune = True +epoch_prune = True merge_identities = True if epoch_prune: diff --git a/ketrface/ketrface/db.py b/ketrface/ketrface/db.py index b3e8a96..17f02a3 100644 --- a/ketrface/ketrface/db.py +++ b/ketrface/ketrface/db.py @@ -99,7 +99,7 @@ def load_faces(db_path ): FROM faces INNER JOIN photos ON (photos.duplicate == 0 OR photos.duplicate IS NULL) JOIN facedescriptors ON (faces.descriptorId=facedescriptors.id) - WHERE faces.identityId IS null AND faces.faceConfidence>0.99 + WHERE faces.identityId IS null AND faces.photoId=photos.id ''') for row in res.fetchall(): diff --git a/server/app.js b/server/app.js index 5526751..51abf1c 100755 --- a/server/app.js +++ b/server/app.js @@ -91,7 +91,7 @@ app.use(function(req, res, next){ }); }); -let dbPath = { ...config.get("sessions.db") }; +let dbPath = config.get("sessions.db"); let configPath = process.env.NODE_CONFIG_DIR; if (configPath) { configPath = configPath.replace(/config/, '');