From 574c6704823f31b200e73dc51ac9ec6e18744674 Mon Sep 17 00:00:00 2001
From: TreetopFlyer <seth111@gmail.com>
Date: Wed, 28 Jul 2021 16:40:58 -0400
Subject: [PATCH] test passing but still bad labels

---
 m.test.js  |  9 +++++++++
 nn.test.js | 14 ++++++++------
 nn.ts      | 10 ++++++----
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/m.test.js b/m.test.js
index e5e9245..09d9042 100644
--- a/m.test.js
+++ b/m.test.js
@@ -136,6 +136,15 @@ Deno.test("Batch.Scale", ()=>
     assertEquals(t[0].length, 2, "correct dimensions");
     assertEquals(t[1][0], 1.5, "correct placement");
 });
+Deno.test("Batch.Subtract", ()=>
+{
+    const c = [[1, 2], [3, 4]];
+    const s = [[0.5, 0.5], [0.5, 0.5]];
+    const t = M.Batch.Subtract(c, s);
+    assertEquals(t.length,    2,   "correct count");
+    assertEquals(t[0].length, 2,   "correct dimensions");
+    assertEquals(t[1][0],     2.5, "correct placement");
+});
 Deno.test("Batch.Sigmoid", ()=>
 {
     const m = [[-1000, 1000]];
diff --git a/nn.test.js b/nn.test.js
index 608fd61..b7e7dff 100644
--- a/nn.test.js
+++ b/nn.test.js
@@ -31,8 +31,8 @@ Deno.test("NN.Label", ()=>
 Deno.test("NN.Backward", ()=>
 {
 
-    let layer1 = M.Create.Box([0, 0, 0], [1, 1, 1], 4);
-    let layer2 = M.Create.Box([0, 0, 0, 0, 0], [1, 1, 1, 1, 1], 1);
+    let layer1 = M.Create.Box([0, 0, 0], [1, 1, 1], 2);
+    let layer2 = M.Create.Box([0, 0, 0], [1, 1, 1], 1);
     let copy1 = M.Create.Clone(layer1);
     let copy2 = M.Create.Clone(layer2);
 
@@ -41,16 +41,18 @@ Deno.test("NN.Backward", ()=>
 
     for(let i=0; i<100; i++)
     {
-        Backward(stages, layers, training[1], 0.01);
+        Backward(stages, layers, training[1], 0.1);
     }
-    console.log(layer1, copy1);
-    assert(layer1[0][0] != copy1[0][0], "first matrix has changed");
-    assert(layer1[1][0] != copy2[1][0], "second matrix has changed");
+
+    assert(layers[0][0][0] != copy1[0][0], "first matrix has changed");
+    assert(layers[1][0][0] != copy2[0][0], "second matrix has changed");
 });
 
+
 Deno.test("NN.Forward", ()=>
 {
     console.log(Forward(stages, layers));
     console.log(training[1]);
 });
 
+
diff --git a/nn.ts b/nn.ts
index 62ec50b..d902636 100644
--- a/nn.ts
+++ b/nn.ts
@@ -28,24 +28,26 @@ const Forward = (inStages:N, inLayers:N):Cloud.M =>
     inStages[i+1] = process(i);
     return inStages[i+1];
 };
-const Backward = (inStages:N, inLayers:N, inGoals:Cloud.M, inRate:number):void =>
+const Backward = (inStages:N, inLayers:N, inGoals:Cloud.M, inRate:number):N =>
 {
     let i:number;
     let errorBack:Cloud.M = M.Batch.Subtract(Forward(inStages, inLayers), inGoals);
 
     for(i=inLayers.length-1; i>=0; i--)
     {
-        let layerMatrix:Cloud.M = inLayers[i];
         let  layerInput:Cloud.M = inStages[i];
         let layerOutput:Cloud.M = inStages[i+1];
         let errorScaled:Cloud.M = M.Batch.Multiply(errorBack, M.Batch.Derivative(layerOutput));
 
-        errorBack = M.Batch.Affine(errorScaled, M.Create.Transpose(layerMatrix));
+        errorBack = M.Batch.Affine(errorScaled, M.Create.Transpose(inLayers[i]));
+
         errorScaled.forEach((inScaledError:Cloud.V, inIndex:number)=> {
             const deltas = M.Batch.Scale(M.Create.Outer(layerInput[inIndex], inScaledError), inRate);
-            layerMatrix = M.Batch.Subtract(layerMatrix, deltas);
+            inLayers[i] = M.Batch.Subtract(inLayers[i], deltas);
         });
+
     }
+    return inLayers;
 };
 
 export { Label, Forward, Backward };