From 645a8baf2c659b89e1d5990f7b3e73190f7141cf Mon Sep 17 00:00:00 2001
From: lluni <llunii+gitea@pm.me>
Date: Sat, 21 May 2022 23:32:07 +0200
Subject: [PATCH] Commented out not yet working code

---
 .idea/workspace.xml                | 37 ++++++++++--------------------
 src/main/java/ActivationLayer.java | 10 ++++----
 src/main/java/FCLayer.java         |  2 +-
 src/main/java/Layer.java           |  2 +-
 src/main/java/Network.java         | 15 ++++++------
 5 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5d270db..7688800 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,24 +5,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="75a8c215-b746-4a4d-aa16-f3223c12b1ed" name="Changes" comment="Initial commit">
-      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.jar" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/gradlew" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/gradlew.bat" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/settings.gradle" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/ActivationLayer.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/ExampleXOR.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/FCLayer.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/GradientDescent.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Layer.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Network.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/ActivationLayer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ActivationLayer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/FCLayer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/FCLayer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Layer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Layer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Network.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Network.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -53,14 +40,14 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "project.structure.last.edited": "Project",
-    "project.structure.proportion": "0.15",
-    "project.structure.side.proportion": "0.2"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;
   }
-}]]></component>
+}</component>
   <component name="RunManager">
     <configuration name="ExampleXOR" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="ExampleXOR" />
diff --git a/src/main/java/ActivationLayer.java b/src/main/java/ActivationLayer.java
index 1e106d0..e9598ca 100644
--- a/src/main/java/ActivationLayer.java
+++ b/src/main/java/ActivationLayer.java
@@ -1,17 +1,17 @@
 import org.ejml.simple.SimpleMatrix;
 
-import java.util.function.Function;
-
 public class ActivationLayer extends Layer {
+    /* custom activation functions not yet supported
     Function<SimpleMatrix, SimpleMatrix> activation;
     Function<SimpleMatrix, SimpleMatrix> activationPrime;
 
-    public ActivationLayer() {}
-
     public ActivationLayer(Function<SimpleMatrix, SimpleMatrix> activation, Function<SimpleMatrix, SimpleMatrix> activationPrime) {
         this.activation = activation;
         this.activationPrime = activationPrime;
     }
+    */
+
+    public ActivationLayer() {}
 
     @Override
     public SimpleMatrix forwardPropagation(SimpleMatrix input) {
@@ -21,7 +21,7 @@ public class ActivationLayer extends Layer {
     }
 
     @Override
-    public SimpleMatrix backwardPropagation(SimpleMatrix outputError, Double learningRate) {
+    public SimpleMatrix backwardPropagation(SimpleMatrix outputError, double learningRate) {
         return tanhPrime(this.input).elementMult(outputError);
     }
 
diff --git a/src/main/java/FCLayer.java b/src/main/java/FCLayer.java
index 6e07284..e25a8c6 100644
--- a/src/main/java/FCLayer.java
+++ b/src/main/java/FCLayer.java
@@ -22,7 +22,7 @@ public class FCLayer extends Layer {
     }
 
     @Override
-    public SimpleMatrix backwardPropagation(SimpleMatrix outputError, Double learningRate) {
+    public SimpleMatrix backwardPropagation(SimpleMatrix outputError, double learningRate) {
         SimpleMatrix inputError = outputError.mult(this.weights.transpose());
         SimpleMatrix weightsError = this.input.transpose().mult(outputError);
 
diff --git a/src/main/java/Layer.java b/src/main/java/Layer.java
index 16f5d7e..710c293 100644
--- a/src/main/java/Layer.java
+++ b/src/main/java/Layer.java
@@ -6,5 +6,5 @@ public abstract class Layer {
 
     public abstract SimpleMatrix forwardPropagation(SimpleMatrix inputs);
 
-    public abstract SimpleMatrix backwardPropagation(SimpleMatrix outputError, Double learningRate);
+    public abstract SimpleMatrix backwardPropagation(SimpleMatrix outputError, double learningRate);
 }
diff --git a/src/main/java/Network.java b/src/main/java/Network.java
index b8df682..404483b 100644
--- a/src/main/java/Network.java
+++ b/src/main/java/Network.java
@@ -1,14 +1,21 @@
 import org.ejml.simple.SimpleMatrix;
 
 import java.util.ArrayList;
-import java.util.function.Function;
 
 public class Network {
 
     ArrayList<Layer> layers;
+
+    /* custom loss functions not yet supported
     Function<SimpleMatrix, Double> loss;
     Function<SimpleMatrix, Double> lossPrime;
 
+    public void use(Function<SimpleMatrix, Double> loss, Function<SimpleMatrix, Double> lossPrime) {
+        this.loss = loss;
+        this.lossPrime = lossPrime;
+    }
+    */
+
     public Network() {
         layers = new ArrayList<>();
     }
@@ -17,13 +24,7 @@ public class Network {
         layers.add(layer);
     }
 
-    public void use(Function<SimpleMatrix, Double> loss, Function<SimpleMatrix, Double> lossPrime) {
-        this.loss = loss;
-        this.lossPrime = lossPrime;
-    }
-
     public ArrayList<SimpleMatrix> predict(SimpleMatrix[] inputs) {
-        int samples = inputs.length;
         ArrayList<SimpleMatrix> result = new ArrayList<>();
         SimpleMatrix output;