From 99d3b2f8310a7d28411f65e3cd8b710b30c93897 Mon Sep 17 00:00:00 2001
From: mirimatcode <mirimatcode@gmail.com>
Date: Sat, 25 Jan 2025 18:45:01 +0100
Subject: [PATCH] ritorno a rette percettroni aggiustamento formule retta

---
 grafico.h       |   4 ++--
 layer_multi     | Bin 25688 -> 25688 bytes
 layer_multi.c   |  35 +++++++++++++++++++----------------
 layer_singolo   | Bin 21592 -> 21592 bytes
 layer_singolo.c |   2 +-
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/grafico.h b/grafico.h
index fe7c939..a480725 100644
--- a/grafico.h
+++ b/grafico.h
@@ -94,8 +94,8 @@ void disegna_legenda(int multi_layer) {
         textout_ex(screen, font, "Percettrone", 0 + 10, 0 + 10, colore_rosso, -1);
     else {
         textout_ex(screen, font, "Percettrone 1", 0 + 10, 0 + 10, colore_rosso, -1);
-        //textout_ex(screen, font, "Percettrone 2", 0 + 10, 0 + 20, colore_verde, -1);
-        textout_ex(screen, font, "Percettrone out", 0 + 10, 0 + 20, colore_blu, -1);
+        textout_ex(screen, font, "Percettrone 2", 0 + 10, 0 + 20, colore_verde, -1);
+        textout_ex(screen, font, "Percettrone out", 0 + 10, 0 + 30, colore_blu, -1);
     }
 }
 
diff --git a/layer_multi b/layer_multi
index ec241890757b3c43ec74d80cec0110ab02437c44..e889fafae804ab81ec715422d3e9708fe5b63df9 100755
GIT binary patch
delta 4088
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
O<Awh8o;AzwN&W|LWzypS

delta 3810
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

diff --git a/layer_multi.c b/layer_multi.c
index 24ec522..543e53f 100644
--- a/layer_multi.c
+++ b/layer_multi.c
@@ -82,9 +82,9 @@ void main()
     // Contatore per fermare il percettrone, se vale 4 significa che ha indovinato tutte e 4 le combinazioni
     int corrette = 0;
 
-    //Retta *rette_p_ext_1 = (Retta *)malloc(sizeof(Retta));
-    //Retta *rette_p_ext_2 = (Retta *)malloc(sizeof(Retta));
-    Retta *rette_layer_uno = (Retta *)malloc(sizeof(Retta));
+    Retta *rette_p_ext_1 = (Retta *)malloc(sizeof(Retta));
+    Retta *rette_p_ext_2 = (Retta *)malloc(sizeof(Retta));
+    //Retta *rette_layer_uno = (Retta *)malloc(sizeof(Retta));
     Retta *rette_pout = (Retta *)malloc(sizeof(Retta));
 
     // Soglia sigmoide
@@ -100,9 +100,9 @@ void main()
             for (int z = 0; z < i; z++)
             {
                 cls(tipo, 1);
-                //traccia_retta(rette_p_ext_1[z].m, rette_p_ext_1[z].q, colore_rosso);
-                //traccia_retta(rette_p_ext_2[z].m, rette_p_ext_2[z].q, colore_verde);
-                traccia_retta(rette_layer_uno[z].m, rette_layer_uno[z].q, colore_rosso);
+                traccia_retta(rette_p_ext_1[z].m, rette_p_ext_1[z].q, colore_rosso);
+                traccia_retta(rette_p_ext_2[z].m, rette_p_ext_2[z].q, colore_verde);
+                //traccia_retta(rette_layer_uno[z].m, rette_layer_uno[z].q, colore_rosso);
                 traccia_retta(rette_pout[z].m, rette_pout[z].q, colore_blu);
                 //printf("Sto tracciando la retta p1 con coefficiente: %f e intercetta: %f\n", rette_p_ext_1[z].m, rette_p_ext_1[z].q);
                 //printf("Sto tracciando la retta p2 con coefficiente: %f e intercetta: %f\n", rette_p_ext_2[z].m, rette_p_ext_2[z].q);
@@ -170,23 +170,26 @@ void main()
             // Prevengo la divisione per zero
             if(p_ext_1.w2 != 0 && p_ext_2.w2 != 0 && pout.w2 !=0)
             {
-                // rette_p_ext_1[i].m = -(p_ext_1.w1 * x[j][0]) / p_ext_1.w2;
-                // rette_p_ext_1[i].q = -(p_ext_1.bias / p_ext_1.w2);
-                // rette_p_ext_2[i].m = -(p_ext_2.w1 * x[j][0]) / p_ext_2.w2;
-                // rette_p_ext_2[i].q = -(p_ext_2.bias / p_ext_2.w2);
+                rette_p_ext_1[i].m = -(p_ext_1.w1 / p_ext_1.w2);
+                rette_p_ext_1[i].q = -(p_ext_1.bias / p_ext_1.w2);
+                rette_p_ext_2[i].m = -(p_ext_2.w1 / p_ext_2.w2);
+                rette_p_ext_2[i].q = -(p_ext_2.bias / p_ext_2.w2);
 
-                rette_pout[i].m = -(pout.w1 * x[j][0]) / pout.w2;
+                /* rette_pout[i].m = -(pout.w1 * x[j][0]) / pout.w2;
+                rette_pout[i].q = -(pout.bias / pout.w2); */
+
+                rette_pout[i].m = -(pout.w1) / pout.w2;
                 rette_pout[i].q = -(pout.bias / pout.w2);
 
                 // somma delle rette (m1 + m2)x + (q1 + q2)
-                rette_layer_uno[i].m = rette_pout[i].m - ((-(p_ext_1.w1 * x[j][0]) / p_ext_1.w2) + (-(p_ext_2.w1 * x[j][0]) / p_ext_2.w2));
-                rette_layer_uno[i].q = rette_pout[i].q - ((-(p_ext_1.bias / p_ext_1.w2)) - (-(p_ext_2.bias / p_ext_2.w2)));
+                /* rette_layer_uno[i].m = 
+                rette_layer_uno[i].q = -(p_ext_1.bias / p_ext_1.w2); */
 
                 if (corrette != 4)
                 {
-                    /* rette_p_ext_1 = (Retta *)realloc(rette_p_ext_1, sizeof(Retta) * (i + 2));
-                    rette_p_ext_2 = (Retta *)realloc(rette_p_ext_2, sizeof(Retta) * (i + 2)); */
-                    rette_layer_uno = (Retta *)realloc(rette_layer_uno, sizeof(Retta) * (i + 2));
+                    rette_p_ext_1 = (Retta *)realloc(rette_p_ext_1, sizeof(Retta) * (i + 2));
+                    rette_p_ext_2 = (Retta *)realloc(rette_p_ext_2, sizeof(Retta) * (i + 2));
+                    //rette_layer_uno = (Retta *)realloc(rette_layer_uno, sizeof(Retta) * (i + 2));
                     rette_pout = (Retta *)realloc(rette_pout, sizeof(Retta) * (i + 2));
                 }
             }
diff --git a/layer_singolo b/layer_singolo
index 5acb08fd20fb8a91abd11f69b720ae2d6695498b..365abc2b725476cf9c51ff2c71a35607ffc23faf 100755
GIT binary patch
delta 314
zcmcbyg7L-*#tj^doCl>Dz~JC!LB?_>k$pSouRg$1<95I3xHs<<v-Ld+B?~ssVP;Wc
z`op?;k!l+wqw{1<^`DH<la)10m>8HR8)%Ad&eI5DVsbq&Sw>r#-JP9*A&ozLvXHhe
zlQ8>aM{UE@4^RL9_vm!(Xl||f|NlQ@^Ij0e%-{F<&;S3;ttB9_Zr0VR3=EcF4u8+;
z-~azl@aT5^k>a7vqN)LOUkU4rETAbT5A(~nfSvo9U+$Mjx2P;om*Kbns=O+jFKX+v
zOy0nwu*rahnbBc0t8qS)tN|NPu_K>A8<R6H8?!bW4?72g08prgiGe|2^F-5p4#q8;
w8STVbfs~}PJR{?R&6Y0HnHdc>Uvyv2!6-brGC-emi#FIshAo>n1}tX=0Px{!vj6}9

delta 337
zcmcbyg7L-*#tj^doDZcLz~JF#LB?_>5wFnAY&%kJ2dCZ^x}-nvz-i8gpX{6GFtaEz
z$*^r+q}s;Fm^oQf{U>ANWMvH#CN<{C2AZOq^E85(EPW4jx7Pgs|KDSVN3Y0HkeMF6
ztm<kE4BaeDY5eaGeB##v;>d%a`RjNc*clko_`?r=;ur8eG5Noi81pCoxXEv{beZ0=
zO_tU+WIQ$5S6kfu?4SStn_EkOhB9`uwyH8PSb{nHJ*~h0|DWK|?fN6dLz_ia187$X
z>kF5s|NoynoHpSzzuYg6ZqdIg3=D?f{;R%K-n>y;pJkH)3o~QFW>({TCfP7Hpbkeq
zfi@;*UN+`HHXe2k1_7W@4HE-{!RCpk`5cT_HZ$6ZvjQneXL&}(1Dh>frZY2!ZNBKf
ZoP*JLa%F%%=M`<B4j{O)d1JtGW&lAGc5VOw

diff --git a/layer_singolo.c b/layer_singolo.c
index 43cef75..7518fe5 100644
--- a/layer_singolo.c
+++ b/layer_singolo.c
@@ -136,7 +136,7 @@ void main()
                 correggi_pesi(&p, gradiente_w1, gradiente_w2, gradiente_bias);
             }
 
-            rette[i].m = -(p.w1 * x[j][0]) / p.w2;
+            rette[i].m = -(p.w1 / p.w2);
             rette[i].q = -(p.bias / p.w2);
 
             if (corrette != 4)