From b29da3748bfdfd280c3244850b683757032791a7 Mon Sep 17 00:00:00 2001 From: "huangzh30877.hbsy" Date: Tue, 30 Apr 2024 14:49:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BA=BA=E8=84=B8=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 8196 -> 6148 bytes .gitignore | 3 +- .../javavision/service/FaceService.java | 30 ++++++++++-------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.DS_Store b/.DS_Store index e1b69e7491f61d3dc29dce3b616c2ceb12137584..51f64eba84b5d115471df0a3dcf3eeaf5904d559 100644 GIT binary patch delta 111 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$SAxqU^g?P@MIo=$CI}TF4%lq yXa(cM(hG~(IXDEFfeL{@fE!4-g7j=G{LVa?U&a$;0s|AoG>`=ho8x)rFarS2_7v*? delta 435 zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aMAD6=tOH}hr%jz7$c**Q2SHn1?t zOy*&ET(8HF%TUIU=b4kAoRpKF1kwUDNES%z{Raaei-CcK0je%1-7q*gKeqrZ%J9_& zSuQu<#RX~x$C}%nMp<=79Z}^|Fyv7b6l5S7&Ioh|0|PTd5KPd}ce1Wy q+}zC5&CDgi4U}*N1^s40j_=Hq`9(Y@`}1&cFhXL5VRJms9A*GPs&Nzm diff --git a/.gitignore b/.gitignore index f1b67e9..4804871 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,5 @@ build/ .vscode/ /models/ -/images/ \ No newline at end of file +/images/ +.DS_Store \ No newline at end of file diff --git a/src/main/java/com/github/javpower/javavision/service/FaceService.java b/src/main/java/com/github/javpower/javavision/service/FaceService.java index 2e23d5f..ef10dba 100644 --- a/src/main/java/com/github/javpower/javavision/service/FaceService.java +++ b/src/main/java/com/github/javpower/javavision/service/FaceService.java @@ -79,21 +79,23 @@ public class FaceService { if(CollectionUtil.isNotEmpty(allJson)){ String path = getPath(file); List faceObjects = FaceDetectUtil.faceDetect(path); - FaceObject faceObject = faceObjects.get(0); - Float[] feature = faceObject.getFeature().toArray(new Float[0]); - FaceParam res=null; - float ff=0f; - for (FaceParam v : allJson) { - Float[] feature1 = v.getFeature().toArray(new Float[0]); - float v1 = FaceSimilarityCalculator.calculateCosineSimilarity(feature, feature1); - if(v1>ff){ - ff=v1; - res=v; + if (CollectionUtil.isNotEmpty(faceObjects)){ + FaceObject faceObject = faceObjects.get(0); + Float[] feature = faceObject.getFeature().toArray(new Float[0]); + FaceParam res=null; + float ff=0f; + for (FaceParam v : allJson) { + Float[] feature1 = v.getFeature().toArray(new Float[0]); + float v1 = FaceSimilarityCalculator.calculateCosineSimilarity(feature, feature1); + if(v1>ff){ + ff=v1; + res=v; + } + } + if(ff>0.8f){ + personObject.setPersonName(res.getPersonName()); + personObject.setPersonId(res.getPersonId()); } - } - if(ff>0.8f){ - personObject.setPersonName(res.getPersonName()); - personObject.setPersonId(res.getPersonId()); } } return personObject; -- Gitee From ea0cb34b5c197562d47bfc2123dfc84d74fb81e2 Mon Sep 17 00:00:00 2001 From: "huangzh30877.hbsy" Date: Tue, 30 Apr 2024 14:50:10 +0800 Subject: [PATCH 2/2] fix --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 51f64eba84b5d115471df0a3dcf3eeaf5904d559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKL5mYH6n<&DcDjpDP|@B7yq2}2?t1W2Ydv^%L=j!uPN#H7r<2l|+J#abPa=Bo z7x)jvvp>LtXF)+cc<>i^^`P%1Y0YfAcoC732QObH@4e*Z3rQvbz#3!U0Vo52g-Tf1 z#A1bzopecZs^tVC6MY2GhX^=~ptt008Vm!5f&YyG+Pj;ujr%r$1a+~0uZO(rh1^3s z9S&Dew|@%38o&m|1mNR7?;P@cbF^pJcib)?3`Gxc`g^vY0dF?dh}PrL=Y#0cI~r9R zX~6wIcntUT5!y6R0kh=Lg*clhdyY1JMhm}8mbs^|^*;0*+h6YN-IqBoV)YDH*)#d& zUQ&KV7-D_{@8=cWz`nt(^=*{aL?^e*8w8|&1@+j#9QEwyy0>6hY_ihJ~&nFE& zj{I1}y3$~ktWv97nNFQcPStjHYqP37b!yH|)!w;qaW*Sir_P?ce53Us97LR!0fpfO zBILNjIlRD%nzX(!l@C9@{kG`K^5p%q^J-aCoW3Z_R((k-pT5$#D(;~>ib5Xsv1Ohe zS=UC?q^zyAnUR@@VZbo(w-})F!A2#lD@-MdqXP@^1VAicvkGxk(qj-FflszZwq%|b%~}l3>XHo4CLi!neP8< zN5B8GLFUUaU>H~{23Vo#HXAr4b+;}}j_z6;wT((beyKzef`z({MTM^7GpIt)W>W>R Vt}vB|Ehy$kK+s?c!@xgf;1?8--KYQn -- Gitee