From b2a35e3456e5d0115f8df5afe58ba42d33ccd936 Mon Sep 17 00:00:00 2001
From: Raffaelbdl <raffaelbdl@gmail.com>
Date: Tue, 15 Jun 2021 17:30:30 +0200
Subject: [PATCH] random push

---
 __pycache__/config.cpython-38.pyc       | Bin 289 -> 300 bytes
 __pycache__/faceAnalysis.cpython-38.pyc | Bin 630 -> 651 bytes
 __pycache__/imageProcess.cpython-38.pyc | Bin 1298 -> 1402 bytes
 __pycache__/utils.cpython-38.pyc        | Bin 2083 -> 2302 bytes
 faceAnalysis.py                         |   6 ++++--
 game.py                                 |  10 +++++++---
 utils.py                                |   4 ++--
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/__pycache__/config.cpython-38.pyc b/__pycache__/config.cpython-38.pyc
index 471c95965035cdce13edb474b59abfc461665a7b..f667d52d50682fd90f0c34d5b6fd734bff3a0b9d 100644
GIT binary patch
delta 94
zcmZ3;w1$Z{l$V!_fq{YH<;D{UKPU1!azwGERuoto7*C8+VvXVmE-jkaAjZf(ak_yv
u4+8^35s3KZrk|0Yo2s8!T9TieSdy4mQmpTipIn-o3SuSar=(7NVhaEh!X5$u

delta 101
zcmZ3(w2+B6l$V!_fq{X6!@VQn;Y40Xo?BdLnMK7VzWFJsITOQ_q;IhYmlhOd7N_1~
z_e(7;DN4-IWPWMDz`#(%IdO`CEFXvkB7Rxu=jN5@C+mk6rxq3Kmt^MVmrQ(b3jhU2
BAK(B0

diff --git a/__pycache__/faceAnalysis.cpython-38.pyc b/__pycache__/faceAnalysis.cpython-38.pyc
index c2abc466fece5a4f3e797496771b33cc71240755..9f490d631e2138b55f30ba5a9d7f17d4f1f2cb74 100644
GIT binary patch
delta 302
zcmeyy(#^^n%FD~ez`($uzwJaq-bCIoMb0d)1>7ktsT|@A3mKz$Qh8HYQ#qQM7#UL7
zQrKG<qWC7ZJdD1@m71Ghl9`|9msE6%9m-zGP{hN)!0^jQKO;XkRX?$`BtJK?Br&g~
zSl=Z-ximKw#7fRjN!3qFOwLTq(M_!=C`v6Z&dkr#O-U_DO$HgLKY1OaoD?qu14A*`
zUCdleT#Q_d9E?SL3=9mK{F9$C%9q??OU}<r%S<m~W?*0_VgV7X3=9lWOeJYi+{KAy
zsVVWf`6;P6w^(xW6H|)V7#J9Cu@)3%=9Pd=0Xq|k0NHkn!zMRBr8FnijtOKp$TAK_
M2ozx!VB%r|0G_)}cK`qY

delta 255
zcmeBX{l>x@%FD~ez`(%JTT+`~GLbh-ks*t70apr3Du+13LdGcWRGt*pRE}mQMurr&
z6!sQ|DBg)J4?Ux}Qgic5GV}BNl8SDzL)j}CintjV7=BqfTg8MHrxq2*lw{`Sm&Bwc
zCTAw*=%!W_6r~myXXfYWrlgjnCWExcOg_LUCk4_~40Z)G7ZVpF7b6E_5ibJ+gC^hP
zAB^(8QEbWid1;yHMa&Eg3`Hy;f|Y@RA&M<GKP5G%IEpJLKQSd9%qe1HU|_h#T2Pdk
XR{}Ny>>?zBXL34|JS&p`BNr0@G}b|P

diff --git a/__pycache__/imageProcess.cpython-38.pyc b/__pycache__/imageProcess.cpython-38.pyc
index 781d95caa203cb8b26f3f98f4c0cff872bc74a59..53b4dad37b52bfc2af8772bb87fbf50f79d7c6ff 100644
GIT binary patch
delta 589
zcmbQl^^1!yl$V!_fq{YH<;D{Uk(?9x9P2q!SW;M97^B!z*izVA7@{~*7=sx!IbVWQ
z`GvS8vw#>-EX2UT0MhQvz`#(<!N|an&QQye&QQx*!mxm`gdvM5i#df+oM9njEgO;u
z6Ig`3gkb?o4MPb-7VAQ$T8<jF1#C4ODa`dLEDM=yIcqpw7-HAda@BCfu+(zb^3?Ly
z^3^aEHI*<dV6S1Q;jZCHW2)h<;T317;i=&hXGmj8VNGFM$jZo2!%@Qn5o-mh0IO+b
zN@J2_sO7H#sRpaZkQ1n3S-?>vu+Wu}k)ejM$ftyJ0auN{LdIIb5{3obH4HU^5KBuK
zvUpP1!IrTzGSsjx;HVK?$jHc0=u^Wyfw73ChBcU>hGlapBL}0W&@I-?+{E<MD4z17
z%#u{s-29Tv{JbbWFfS-Ixg;?!Jty@RZ&7MVX;B_bnlmjiIkng)v$*6IPbx&q<e5zA
zN<R7-`MIh3iKQj^xrrr-c_qdAF8Rr&xv3yla(+sx{$v4WX-56YI?PHs8lV_rW?^Ju
z7Ge})=40ez=3wMuW?@ufmSL1(<YH!F<YJUz<Y8iCU}4-`z%0(ls6DxZMaGCZB*aaV
zvxuF6f#DWwUTJPY<t?VXf?GTwH#z1d=2RAE78eOHFfc^1m1O3oW|l-vzQSV5r~&|?
CTalsw

delta 485
zcmeyxHHnKal$V!_fq{X+WmZSRVvdP?j`i#*%qc7_j8W_<tSM|Q3{e~@jKK_=94|qt
z{6dnMKr|HdGcYiKbUQOJFciOGU|>jRsAVc)Sio4qkj0e6oWdy1u#mBq8A*f*EW%R4
zuz;n8p@boebs<wNYYp=Pwi;HDwF{YR>)C49To_{K)w0*H$FS6L)N<Bx)pD0GEMTu;
zsNtyLOk=9ysNoW4sNt;P7H3Ff0=aS_D<eY<YYitvtQDjJtfrMIjY*QBmZt`!8mt~e
zj<<$s0Y?q*LPkc08pa}z5>AZ;Tp(^OUkSqk?iz*~K8U3y3|TxW;2>GZ&d5;cQNy%(
z5+etr4F4_G%-qEE)LT5|MVTe3uDSUonfZCQIMWi7Qzt)WN*Azlwu%WYPAw{qDap*u
zFNv9)!z|4hGr5CVNl6YAjLa;|LX1Mpe2jd|9E?27O3X5hGK^fzER0-?a!i}AF^e-Y
zs!x8$B4fZ9qRCmr&cMKMi#4w_x1jPCQ(i$756B+Jyu_T!;>_YA0gx<PNoH<pX34F|
JHmtUc3IKtUa#;WX

diff --git a/__pycache__/utils.cpython-38.pyc b/__pycache__/utils.cpython-38.pyc
index 57fbdac2f0607c0440babc0ab57b50f66387e555..9809462551379d39029aa2917c6bf08efa505b07 100644
GIT binary patch
delta 887
zcmZ21@K2C0l$V!_fq{WRZ~KXa#oQD5WEcx3YKO`5v@k^RrSL*vI!hX33SSC;3u6?2
z3S%&XrohA*uN7VOGxBp&^%F}=@^ceQ67x!m^<DClOLJ2}tmOQZ)XCEr<D^&^7#N%x
z7#NCW7#J987)lrxFxD`pGcIIoo-Dv5!N@e(h{>9nxkz|&0n-A;sL6uN$&7-NOPQnj
znZ=k?7`YgQ7`YgEn2Ho8-)DAkh+=ijOE0R7Vt2_bPA@GkiDGd}O)QFH^++rzsElF`
zPE3hn4=ybz$}CQeV)sieEh$RO(PX^Enwgi9TA|5wYjQk`E~Dn;UKa6sWd;U@WJZwB
zp_rM0fdTGV4F(2=bcR~S8U`1JSb<um8pax?1q=%r%o%DK3pq*{vzTfaQy5d2dYOV5
zG@1R1Kn7_t-eO6t$Sl@mzQtCOpOaZ!QY6U0z;KJTxFj(-Ta!6T03_z0=2%peSefdX
zo0y&&#R?Kiy~P+&#K*wE03rB6nz+H5z>13XK*7fWawa1SBL^cNV-eVSvu1+8PWxn#
z%R#arEW*IR08$DLa-Yd(SX3DIP5#JYQeVPa!<E8R!zsZa!qCjv$|T89!;!*(Dayo9
z%Tvo+!;UJG!T`~MO_YhDmamq-hIs*74bMVGMur-e1#C6EU>55Fwi-S#%b0BeTMa*m
zS*TFLUc=nXSSwJ%Uc=JNSSwh<Uc=hVSSwV*Uc=VRSSwt@l*PP&rG#Vhc~*Hwj>+#?
zjd(e4F;`_46tRN>NpP|ro1`FfW?soHw#0&h)VvgMcuWpuOJglkXJBBMypOFd*%TCL
zppau=;$q}t5@Y0I=3x|KGGa7h<N`w;CJsgpFcx40u^?oTAp--0rob)Mywco)N^k@g
zi7_xRL<#05mK5aVm*iw7=@nFhSW%Ogvm1yCgPf!QB0wn$?2;nG$<Nu<B*0O@$ic|N
T$iv9N%)!mU$|1<X%E1l*tFpyo

delta 704
zcmew-xLANMl$V!_fq{XcRj4arHP=Kw8ODr>+F|0{DcmXC=`3lCDLg5>EsRloDU87k
zntT%%ycRas&&?~*Pu34DPAw|dFUic!FPXfCG0u*afq}u9fq|h|j)8%phG79i3F88$
z8pd?Sg^UXsQy5biQW#p9(wHO}f*CZK{E8SE7#K8}Z?P8?rKV&imrS;0vSwx~5}91h
zw1Dx}WEtjUMxn_K%+dTzVoWNGT#Q1DT#P(SMM{%jF*`WiVs*?*FRHx7?vh!YURqpo
zi^VN9vFH}7M`A%i<t^sm#FSg?!KDR7nZ>EM*!@yVONtV6G#PKPX6B`&R%kLsP0nJ`
zb<hC0l@H{1Mm9z!1~B~3!c?Tqz`&3`YbF@jCo_W-K(Pn|0|PtEmoAehv#Kzzo4kY7
zq`rnLg{g*9f<c6#l}VDJh9iXmRfLJ5mZz4th8-aa3JZ`*bP*<oTE1HT8s-J8H9QL$
z85wF=7O>Xvf?2E!SZnyeEVc!#HT)n}p+X7M0=61$=7o&40$?V~LdIG_FpG5|W33RF
z#kP>KR=9*Ii+KS{3H#)EZ1RlkllQS1@p9Z^uF5PZ0{N&&X!2h+Nj|p3f`Zh%lv}LD
zC5g$|lhxVNm~SygOrFHvmaGQ~EfB%L#Kp+PB*w_a%)=<eq{XPk$OVQxU~!O~03!z@
z2NQ%WG6h95|1H+M(%gc|A|VC_h9U_D28LULxrrqOIr$|ynMryDl_1uw$<-VN0-!K1
lQUWOh#Y2(l<O3XPVjyiCj2w(Sj694S%pBYttQ-OyYyhfCpbr25

diff --git a/faceAnalysis.py b/faceAnalysis.py
index bbea9d3..22660aa 100644
--- a/faceAnalysis.py
+++ b/faceAnalysis.py
@@ -5,7 +5,9 @@ import cv2
 from utils import *
 from config import emotions, input_shape, modelName
 
-model = keras.models.load_model("models/"+modelName)	#Load our model
+#model = tf.keras.models.load_model("models/"+modelName)	#Load our model
+model = tf.saved_model.load("models/"+modelName)
+
 print('Model used:', modelName)
 
 def detectEmotion(face):
@@ -16,4 +18,4 @@ def detectEmotion(face):
 	emotionVect = predir(model, face)
 	emotionNbr = np.argmax(emotionVect)			 
 	emotion = emotions[emotionNbr]
-	return emotion
\ No newline at end of file
+	return emotion
diff --git a/game.py b/game.py
index 9ae9591..771db3e 100644
--- a/game.py
+++ b/game.py
@@ -3,9 +3,10 @@ import cv2
 import imageProcess as ip
 import faceAnalysis as fa
 import random
+from time import sleep
 from config import emotions
 
-cap = cv2.VideoCapture(0)   #0 means we capture the first camera, your webcam probably
+cap = cv2.VideoCapture(4)   #0 means we capture the first camera, your webcam probably
 score = 0
 N = 15
 
@@ -32,9 +33,12 @@ while cap.isOpened():		 #or while 1. cap.isOpened() is false if there is a probl
         smiley, emotion = smileyRandom(emotion)
 
 
-    cv2.imshow("Caméra", frame)  			#Show you making emotional faces
+    cv2.imshow("Camera", frame)  			#Show you making emotional faces
     cv2.putText(smiley, "Score: "+str(score), (40,40), cv2.FONT_HERSHEY_SIMPLEX, 1, (0,0,255), 2)
     cv2.imshow("Smiley", smiley)            #Show the smiley to mimic
+    #sleep(0.5)
+    
+   
 
     if cv2.waitKey(1) & 0xFF == ord('q'):			#If you press Q, stop the while and so the capture
         break   
@@ -45,4 +49,4 @@ while cap.isOpened():		 #or while 1. cap.isOpened() is false if there is a probl
 
 
 cap.release()
-cv2.destroyAllWindows()
\ No newline at end of file
+cv2.destroyAllWindows()
diff --git a/utils.py b/utils.py
index 1df51ee..fb5b0eb 100644
--- a/utils.py
+++ b/utils.py
@@ -18,8 +18,8 @@ def afficher(image):
 
 def predir(modele, image):
     # Return output of image from modele
-    return modele.predict(np.array([image]))[0, :]
-
+    #return modele.predict(np.array([image]))[0, :]
+    return modele(np.array([image]))[0, :]
 
 def normAndResize(image, input_shape):
     # For an array image of shape (a,b,c) or (a,b), transform it into (h,l,p). Also normalize it.
-- 
GitLab