Merge remote-tracking branch 'origin/master' into range-refactoring

Author: Lukas Molzberger

pom.xml

@@ -5,7 +5,7 @@
     <groupId>org.aika-software</groupId>
     <artifactId>aika</artifactId>
     <packaging>jar</packaging>
-    <version>0.21-SNAPSHOT</version>
+    <version>0.21-RC2</version>
     <name>aika</name>
     <url>http://aika.network</url>
     <description>An artificial intelligence for knowledge acquisition</description>

src/main/java/network/aika/Converter.java

@@ -229,7 +229,8 @@ private void initInputNodesAndComputeWeightSums() {
                     sumDelta[s.isRecurrent ? RECURRENT : DIRECT][s.getNewWeight() <= 0.0 ? NEGATIVE : POSITIVE] += (s.limit + s.limitDelta) * s.getNewWeight();
 
                     if(in.isPassiveInputNeuron() && !s.isNegative()) {
-                        posPassiveSumDelta += ((s.limit + s.limitDelta) * s.getNewWeight()) - (s.limit * s.weight);
+                        posPassiveSumDelta -= !s.isNegative() ? (s.limit * s.weight) : 0.0;
+                        posPassiveSumDelta += s.getNewWeight() > 0.0 ? ((s.limit + s.limitDelta) * s.getNewWeight()) : 0.0;
                     }
 
                     if (s.isConjunction(false, true) && !s.isConjunction(true, true)) {