diff --git "a/TFG_Ordo\303\261ez_Roger.docx" "b/TFG_Ordo\303\261ez_Roger.docx" index dcfb5e3..0bce294 100644 Binary files "a/TFG_Ordo\303\261ez_Roger.docx" and "b/TFG_Ordo\303\261ez_Roger.docx" differ diff --git a/actordata/Men in black/Linda Fiorentino.txt b/actordata/temp/Linda Fiorentino.txt similarity index 100% rename from actordata/Men in black/Linda Fiorentino.txt rename to actordata/temp/Linda Fiorentino.txt diff --git a/actordata/Men in black/Tommy Lee Jones.txt b/actordata/temp/Tommy Lee Jones.txt similarity index 100% rename from actordata/Men in black/Tommy Lee Jones.txt rename to actordata/temp/Tommy Lee Jones.txt diff --git a/actordata/Men in black/Vincent D'Onofrio.txt b/actordata/temp/Vincent D'Onofrio.txt similarity index 100% rename from actordata/Men in black/Vincent D'Onofrio.txt rename to actordata/temp/Vincent D'Onofrio.txt diff --git a/actordata/Men in black/Will Smith.txt b/actordata/temp/Will Smith.txt similarity index 100% rename from actordata/Men in black/Will Smith.txt rename to actordata/temp/Will Smith.txt diff --git a/intepreter.py b/intepreter.py deleted file mode 100644 index 32fe7f3..0000000 --- a/intepreter.py +++ /dev/null @@ -1,30 +0,0 @@ -import calculos as c -import os - -movie="Men in black" -m="moviesdata" -g="actordata" -s='/' -apidata=os.listdir(m+s+movie) -actordata=os.listdir(g+s+movie) -print(movie) -print(apidata) -print(actordata) -DM=0.0 # 0.0 distancia minima posible -AM=1.0 # 1.0 angle maxim posible -for unkownactor in apidata: - act=c.extraerSublistaArchivo(m+s+movie+s+unkownactor) - print("\n") - print('{} subcaras para el actor {}'.format(len(act),unkownactor.strip('.txt'))) - for subactor in actordata: - currentactor=c.extraerSublistaArchivo(g+s+movie+s+subactor) - count=0 - for subcara in act: - for caratest in currentactor: - if(c.similitudCoseno(caratest,subcara)>AM): - if(c.distanciaEuclidea(caratest,subcara)0): - print('{} true per {}, {} vegades'.format(subactor.strip('.txt'),unkownactor.strip('.txt'),count)) - else: - print("no hi han cares valides per els coeficients AM : {} i DM: {} per l'actor {}".format(AM,DM,subactor.strip('.txt'))) \ No newline at end of file diff --git a/intepreter_AM.py b/intepreter_AM.py new file mode 100644 index 0000000..4e558bd --- /dev/null +++ b/intepreter_AM.py @@ -0,0 +1,54 @@ +import calculos as c +import os + +import matplotlib.pyplot as plt +import numpy as np + +movie="Men in black" +m="moviesdata" +g="actordata" +s='/' +apidata=os.listdir(m+s+movie) +actordata=os.listdir(g+s+movie) +print(movie) +print(apidata) +print(actordata) +DM=2 # 0.0 distancia minima posible +AM=1 # 1.0 angle maxim posible + +x=[] +y=[] +while AM>=0: + + AM=AM-0.01 + # DM=1.2 + x.append(AM) + + for unkownactor in apidata: + act=c.extraerSublistaArchivo(m+s+movie+s+unkownactor) + # print("\n") + # print('{} subcaras para el actor {}'.format(len(act),unkownactor.strip('.txt'))) + for subactor in actordata: + currentactor=c.extraerSublistaArchivo(g+s+movie+s+subactor) + count=0 + for subcara in act: + for caratest in currentactor: + if(c.similitudCoseno(caratest,subcara)>AM): + if(c.distanciaEuclidea(caratest,subcara)0): + print('{} true per {}, {} vegades amb AM: {}'.format(subactor.strip('.txt'),unkownactor.strip('.txt'),count,AM)) + y.append(count) + else: + y.append(0) + # pass + # print("no hi han cares valides per els coeficients AM : {} i DM: {} per l'actor {}".format(AM,DM,subactor.strip('.txt'))) + # DM=50 +# plt.style.use('bmh') + +plt.plot(x,y) +plt.title(actordata[0].strip(".txt")) +plt.xlabel("Coeficiente AM") +plt.ylabel("Verdaderos positivos") +plt.grid() +plt.show() diff --git a/intepreter_DM.py b/intepreter_DM.py new file mode 100644 index 0000000..fa42531 --- /dev/null +++ b/intepreter_DM.py @@ -0,0 +1,54 @@ +import calculos as c +import os + +import matplotlib.pyplot as plt +import numpy as np + +movie="Men in black" +m="moviesdata" +g="actordata" +s='/' +apidata=os.listdir(m+s+movie) +actordata=os.listdir(g+s+movie) +print(movie) +print(apidata) +print(actordata) +DM=0.0 # 0.0 distancia minima posible +AM=0 # 1.0 angle maxim posible + +x=[] +y=[] +while DM<2: + + DM=DM+0.01 + # DM=1.2 + x.append(DM) + + for unkownactor in apidata: + act=c.extraerSublistaArchivo(m+s+movie+s+unkownactor) + # print("\n") + # print('{} subcaras para el actor {}'.format(len(act),unkownactor.strip('.txt'))) + for subactor in actordata: + currentactor=c.extraerSublistaArchivo(g+s+movie+s+subactor) + count=0 + for subcara in act: + for caratest in currentactor: + if(c.similitudCoseno(caratest,subcara)>AM): + if(c.distanciaEuclidea(caratest,subcara)0): + print('{} true per {}, {} vegades amb DM: {}'.format(subactor.strip('.txt'),unkownactor.strip('.txt'),count,DM)) + y.append(count) + else: + y.append(0) + # pass + # print("no hi han cares valides per els coeficients AM : {} i DM: {} per l'actor {}".format(AM,DM,subactor.strip('.txt'))) + # DM=50 +# plt.style.use('bmh') + +plt.plot(x,y) +plt.title(actordata[0].strip(".txt")) +plt.xlabel("Coeficiente DM") +plt.ylabel("Verdaderos positivos") +plt.grid() +plt.show() diff --git a/intepreter_DM_AM.py b/intepreter_DM_AM.py new file mode 100644 index 0000000..51369a3 --- /dev/null +++ b/intepreter_DM_AM.py @@ -0,0 +1,89 @@ +import calculos as c +import os + +import matplotlib.pyplot as plt +import numpy as np + +movie="Men in black" +m="moviesdata" +g="actordata" +s='/' +apidata=os.listdir(m+s+movie) +actordata=os.listdir(g+s+movie) +print(movie) +print(apidata) +print(actordata) +DM=0.0 # 0.0 distancia minima posible +AM=0 # 1.0 angle maxim posible + +x=[] +y=[] +DM=0.0 # 0.0 distancia minima posible +AM=0 # 1.0 angle maxim posible +while DM<2: + + DM=DM+0.01 + # DM=1.2 + x.append(DM) + + for unkownactor in apidata: + act=c.extraerSublistaArchivo(m+s+movie+s+unkownactor) + # print("\n") + # print('{} subcaras para el actor {}'.format(len(act),unkownactor.strip('.txt'))) + for subactor in actordata: + currentactor=c.extraerSublistaArchivo(g+s+movie+s+subactor) + count=0 + for subcara in act: + for caratest in currentactor: + if(c.similitudCoseno(caratest,subcara)>AM): + if(c.distanciaEuclidea(caratest,subcara)0): + print('{} true per {}, {} vegades amb DM: {}'.format(subactor.strip('.txt'),unkownactor.strip('.txt'),count,DM)) + y.append(count) + else: + y.append(0) + # pass + # print("no hi han cares valides per els coeficients AM : {} i DM: {} per l'actor {}".format(AM,DM,subactor.strip('.txt'))) + # DM=50 +# plt.style.use('bmh') +n=[] +z=[] +DM=2 # 0.0 distancia minima posible +AM=1 # 1.0 angle maxim posible +while AM>=0: + + AM=AM-0.01 + # DM=1.2 + n.append(AM) + + for unkownactor in apidata: + act=c.extraerSublistaArchivo(m+s+movie+s+unkownactor) + # print("\n") + # print('{} subcaras para el actor {}'.format(len(act),unkownactor.strip('.txt'))) + for subactor in actordata: + currentactor=c.extraerSublistaArchivo(g+s+movie+s+subactor) + count=0 + for subcara in act: + for caratest in currentactor: + if(c.similitudCoseno(caratest,subcara)>AM): + if(c.distanciaEuclidea(caratest,subcara)0): + print('{} true per {}, {} vegades amb AM: {}'.format(subactor.strip('.txt'),unkownactor.strip('.txt'),count,AM)) + z.append(count) + else: + z.append(0) + # pass + # print("no hi han cares valides per els coeficients AM : {} i DM: {} per l'actor {}".format(AM,DM,subactor.strip('.txt'))) + # DM=50 +# plt.style.use('bmh') + +plt.plot(x,y,label="DM") +plt.plot(n,z,label="AM") +plt.title(actordata[0].strip(".txt")) +plt.xlabel("Coeficiente DM AM") +plt.ylabel("Verdaderos positivos") +plt.grid() +plt.legend() +plt.show() diff --git a/moviesdata/Men in black/00.txt b/moviesdata/temp/00.txt similarity index 100% rename from moviesdata/Men in black/00.txt rename to moviesdata/temp/00.txt diff --git a/moviesdata/Men in black/01.txt b/moviesdata/temp/01.txt similarity index 100% rename from moviesdata/Men in black/01.txt rename to moviesdata/temp/01.txt diff --git a/moviesdata/Men in black/02.txt b/moviesdata/temp/02.txt similarity index 100% rename from moviesdata/Men in black/02.txt rename to moviesdata/temp/02.txt diff --git a/moviesdata/Men in black/03.txt b/moviesdata/temp/03.txt similarity index 100% rename from moviesdata/Men in black/03.txt rename to moviesdata/temp/03.txt diff --git a/moviesdata/Men in black/04.txt b/moviesdata/temp/04.txt similarity index 100% rename from moviesdata/Men in black/04.txt rename to moviesdata/temp/04.txt diff --git a/moviesdata/Men in black/06.txt b/moviesdata/temp/06.txt similarity index 100% rename from moviesdata/Men in black/06.txt rename to moviesdata/temp/06.txt diff --git a/moviesdata/Men in black/07.txt b/moviesdata/temp/07.txt similarity index 100% rename from moviesdata/Men in black/07.txt rename to moviesdata/temp/07.txt diff --git a/moviesdata/Men in black/08.txt b/moviesdata/temp/08.txt similarity index 100% rename from moviesdata/Men in black/08.txt rename to moviesdata/temp/08.txt diff --git a/moviesdata/Men in black/09.txt b/moviesdata/temp/09.txt similarity index 100% rename from moviesdata/Men in black/09.txt rename to moviesdata/temp/09.txt diff --git a/moviesdata/Men in black/10.txt b/moviesdata/temp/10.txt similarity index 100% rename from moviesdata/Men in black/10.txt rename to moviesdata/temp/10.txt diff --git a/moviesdata/Men in black/11.txt b/moviesdata/temp/11.txt similarity index 100% rename from moviesdata/Men in black/11.txt rename to moviesdata/temp/11.txt diff --git a/moviesdata/Men in black/12.txt b/moviesdata/temp/12.txt similarity index 100% rename from moviesdata/Men in black/12.txt rename to moviesdata/temp/12.txt diff --git a/moviesdata/Men in black/13.txt b/moviesdata/temp/13.txt similarity index 100% rename from moviesdata/Men in black/13.txt rename to moviesdata/temp/13.txt diff --git a/moviesdata/Men in black/14.txt b/moviesdata/temp/14.txt similarity index 100% rename from moviesdata/Men in black/14.txt rename to moviesdata/temp/14.txt diff --git a/moviesdata/Men in black/15.txt b/moviesdata/temp/15.txt similarity index 100% rename from moviesdata/Men in black/15.txt rename to moviesdata/temp/15.txt diff --git a/moviesdata/Men in black/16.txt b/moviesdata/temp/16.txt similarity index 100% rename from moviesdata/Men in black/16.txt rename to moviesdata/temp/16.txt diff --git a/moviesdata/Men in black/17.txt b/moviesdata/temp/17.txt similarity index 100% rename from moviesdata/Men in black/17.txt rename to moviesdata/temp/17.txt diff --git a/moviesdata/Men in black/18.txt b/moviesdata/temp/18.txt similarity index 100% rename from moviesdata/Men in black/18.txt rename to moviesdata/temp/18.txt diff --git a/moviesdata/Men in black/19.txt b/moviesdata/temp/19.txt similarity index 100% rename from moviesdata/Men in black/19.txt rename to moviesdata/temp/19.txt diff --git a/moviesdata/Men in black/20.txt b/moviesdata/temp/20.txt similarity index 100% rename from moviesdata/Men in black/20.txt rename to moviesdata/temp/20.txt diff --git a/moviesdata/Men in black/21.txt b/moviesdata/temp/21.txt similarity index 100% rename from moviesdata/Men in black/21.txt rename to moviesdata/temp/21.txt diff --git a/moviesdata/Men in black/22.txt b/moviesdata/temp/22.txt similarity index 100% rename from moviesdata/Men in black/22.txt rename to moviesdata/temp/22.txt diff --git a/moviesdata/Men in black/23.txt b/moviesdata/temp/23.txt similarity index 100% rename from moviesdata/Men in black/23.txt rename to moviesdata/temp/23.txt diff --git a/moviesdata/Men in black/24.txt b/moviesdata/temp/24.txt similarity index 100% rename from moviesdata/Men in black/24.txt rename to moviesdata/temp/24.txt diff --git a/moviesdata/Men in black/25.txt b/moviesdata/temp/25.txt similarity index 100% rename from moviesdata/Men in black/25.txt rename to moviesdata/temp/25.txt diff --git a/moviesdata/Men in black/26.txt b/moviesdata/temp/26.txt similarity index 100% rename from moviesdata/Men in black/26.txt rename to moviesdata/temp/26.txt diff --git a/moviesdata/Men in black/27.txt b/moviesdata/temp/27.txt similarity index 100% rename from moviesdata/Men in black/27.txt rename to moviesdata/temp/27.txt diff --git a/moviesdata/Men in black/28.txt b/moviesdata/temp/28.txt similarity index 100% rename from moviesdata/Men in black/28.txt rename to moviesdata/temp/28.txt diff --git a/moviesdata/Men in black/29.txt b/moviesdata/temp/29.txt similarity index 100% rename from moviesdata/Men in black/29.txt rename to moviesdata/temp/29.txt diff --git a/moviesdata/Men in black/30.txt b/moviesdata/temp/30.txt similarity index 100% rename from moviesdata/Men in black/30.txt rename to moviesdata/temp/30.txt diff --git a/moviesdata/Men in black/31.txt b/moviesdata/temp/31.txt similarity index 100% rename from moviesdata/Men in black/31.txt rename to moviesdata/temp/31.txt diff --git a/moviesdata/Men in black/32.txt b/moviesdata/temp/32.txt similarity index 100% rename from moviesdata/Men in black/32.txt rename to moviesdata/temp/32.txt diff --git a/moviesdata/Men in black/33.txt b/moviesdata/temp/33.txt similarity index 100% rename from moviesdata/Men in black/33.txt rename to moviesdata/temp/33.txt diff --git a/moviesdata/Men in black/34.txt b/moviesdata/temp/34.txt similarity index 100% rename from moviesdata/Men in black/34.txt rename to moviesdata/temp/34.txt diff --git a/moviesdata/Men in black/35.txt b/moviesdata/temp/35.txt similarity index 100% rename from moviesdata/Men in black/35.txt rename to moviesdata/temp/35.txt diff --git a/moviesdata/Men in black/36.txt b/moviesdata/temp/36.txt similarity index 100% rename from moviesdata/Men in black/36.txt rename to moviesdata/temp/36.txt diff --git a/moviesdata/Men in black/37.txt b/moviesdata/temp/37.txt similarity index 100% rename from moviesdata/Men in black/37.txt rename to moviesdata/temp/37.txt diff --git a/moviesdata/Men in black/38.txt b/moviesdata/temp/38.txt similarity index 100% rename from moviesdata/Men in black/38.txt rename to moviesdata/temp/38.txt diff --git a/moviesdata/Men in black/39.txt b/moviesdata/temp/39.txt similarity index 100% rename from moviesdata/Men in black/39.txt rename to moviesdata/temp/39.txt diff --git a/moviesdata/Men in black/40.txt b/moviesdata/temp/40.txt similarity index 100% rename from moviesdata/Men in black/40.txt rename to moviesdata/temp/40.txt diff --git a/moviesdata/Men in black/41.txt b/moviesdata/temp/41.txt similarity index 100% rename from moviesdata/Men in black/41.txt rename to moviesdata/temp/41.txt diff --git a/moviesdata/Men in black/42.txt b/moviesdata/temp/42.txt similarity index 100% rename from moviesdata/Men in black/42.txt rename to moviesdata/temp/42.txt diff --git a/moviesdata/Men in black/43.txt b/moviesdata/temp/43.txt similarity index 100% rename from moviesdata/Men in black/43.txt rename to moviesdata/temp/43.txt diff --git a/moviesdata/Men in black/44.txt b/moviesdata/temp/44.txt similarity index 100% rename from moviesdata/Men in black/44.txt rename to moviesdata/temp/44.txt diff --git a/moviesdata/Men in black/45.txt b/moviesdata/temp/45.txt similarity index 100% rename from moviesdata/Men in black/45.txt rename to moviesdata/temp/45.txt diff --git a/moviesdata/Men in black/46.txt b/moviesdata/temp/46.txt similarity index 100% rename from moviesdata/Men in black/46.txt rename to moviesdata/temp/46.txt diff --git a/moviesdata/Men in black/47.txt b/moviesdata/temp/47.txt similarity index 100% rename from moviesdata/Men in black/47.txt rename to moviesdata/temp/47.txt diff --git a/moviesdata/Men in black/48.txt b/moviesdata/temp/48.txt similarity index 100% rename from moviesdata/Men in black/48.txt rename to moviesdata/temp/48.txt diff --git a/moviesdata/Men in black/49.txt b/moviesdata/temp/49.txt similarity index 100% rename from moviesdata/Men in black/49.txt rename to moviesdata/temp/49.txt diff --git a/moviesdata/Men in black/50.txt b/moviesdata/temp/50.txt similarity index 100% rename from moviesdata/Men in black/50.txt rename to moviesdata/temp/50.txt diff --git a/moviesdata/Men in black/51.txt b/moviesdata/temp/51.txt similarity index 100% rename from moviesdata/Men in black/51.txt rename to moviesdata/temp/51.txt