diff options
| author | Camil Staps | 2015-05-20 10:52:08 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-05-20 10:52:08 +0200 |
| commit | 30da5953597d43dfb9a5fce56615ce3682a522ef (patch) | |
| tree | 569088082b1a2bb95476041addccbbeb5c0234d0 /app/src | |
| parent | Merge branch 'master' into app (diff) | |
merge fix
Diffstat (limited to 'app/src')
| -rwxr-xr-x | app/src/main/java/org/rssin/neurons/NeuralNetwork.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/src/main/java/org/rssin/neurons/NeuralNetwork.java b/app/src/main/java/org/rssin/neurons/NeuralNetwork.java index f5ee569..7c2e447 100755 --- a/app/src/main/java/org/rssin/neurons/NeuralNetwork.java +++ b/app/src/main/java/org/rssin/neurons/NeuralNetwork.java @@ -25,11 +25,7 @@ class NeuralNetwork { public int addInput() {
int result = 0;
for (int i = 0; i < hiddenNodes.length; i++) {
-<<<<<<< HEAD result = hiddenNodes[i].addWeight();
-======= - //result = hiddenNodes[i].AddWeight();
->>>>>>> 7336ef600f6bd472b9aa1d59ad6418ff5c543044 }
return result;
|