isConjunction, isDisjunction

Author: LukasMolzberger

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

@@ -137,7 +137,7 @@ private boolean convert() {
             }
         } else {
             for (Synapse s : modifiedSynapses) {
-                if (s.isDisjunction && !s.isRecurrent()) {
+                if (s.isDisjunction() && !s.isRecurrent()) {
                     NodeContext nlNodeContext = expandNode(nodeContext, s);
                     outputNode.addInput(nlNodeContext.getSynapseIds(), threadId, nlNodeContext.node, false);
                 }

src/main/java/network/aika/neuron/Synapse.java

@@ -114,9 +114,8 @@ public class Synapse implements Writable {
 
     public boolean toBeDeleted;
 
-
-    public boolean isConjunction;
-    public boolean isDisjunction;
+    private boolean isConjunction;
+    private boolean isDisjunction;
 
 
     public Synapse() {
@@ -194,6 +193,14 @@ public void setInactive(boolean inactive) {
         this.inactive = inactive;
     }
 
+    public boolean isConjunction() {
+        return isConjunction;
+    }
+
+    public boolean isDisjunction() {
+        return isDisjunction;
+    }
+
     public void link() {
         INeuron in = input.get();
         INeuron out = output.get();

src/main/java/network/aika/neuron/relation/Relation.java

@@ -137,7 +137,7 @@ public boolean isConvertible() {
     public static void addRelation(Map<Integer, Relation> relMap, Integer synId, Integer targetSynId, Neuron n, Relation r) {
         if(targetSynId == OUTPUT) {
             Synapse s = n.getSynapseById(synId);
-            if(s == null || (r.isExact() && s.isDisjunction && !s.isInactive())) {
+            if(s == null || (r.isExact() && s.isDisjunction() && !s.isInactive())) {
                 return;
             }
         }