moved search node

Author: Lukas Molzberger

src/main/java/org/aika/Document.java

@@ -21,8 +21,8 @@
 import org.aika.lattice.Node.ThreadState;
 import org.aika.neuron.*;
 import org.aika.neuron.activation.*;
-import org.aika.SearchNode.Weight;
-import org.aika.SearchNode.Decision;
+import org.aika.neuron.activation.SearchNode.Weight;
+import org.aika.neuron.activation.SearchNode.Decision;
 import org.aika.training.SupervisedTraining;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,7 +31,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.aika.SearchNode.Decision.UNKNOWN;
+import static org.aika.neuron.activation.SearchNode.Decision.UNKNOWN;
 
 
 /**

src/main/java/org/aika/neuron/INeuron.java

@@ -20,8 +20,8 @@
 import org.aika.*;
 import org.aika.neuron.activation.Activation;
 import org.aika.neuron.activation.Activation.State;
-import org.aika.SearchNode;
-import org.aika.SearchNode.Weight;
+import org.aika.neuron.activation.SearchNode;
+import org.aika.neuron.activation.SearchNode.Weight;
 import org.aika.lattice.InputNode;
 import org.aika.lattice.NodeActivation;
 import org.aika.lattice.OrNode;

src/main/java/org/aika/neuron/activation/Activation.java

@@ -1,21 +1,20 @@
 package org.aika.neuron.activation;
 
 import org.aika.Document;
-import org.aika.SearchNode;
 import org.aika.Utils;
 import org.aika.lattice.Node;
 import org.aika.lattice.NodeActivation;
 import org.aika.lattice.OrNode;
 import org.aika.neuron.*;
 import org.aika.neuron.activation.Linker.Direction;
-import org.aika.SearchNode.Weight;
-import org.aika.SearchNode.Decision;
+import org.aika.neuron.activation.SearchNode.Weight;
+import org.aika.neuron.activation.SearchNode.Decision;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.*;
 
-import static org.aika.SearchNode.Decision.SELECTED;
+import static org.aika.neuron.activation.SearchNode.Decision.SELECTED;
 import static org.aika.neuron.activation.Activation.State.DIR;
 import static org.aika.neuron.activation.Activation.State.REC;
 import static org.aika.neuron.activation.Activation.SynapseActivation.INPUT_COMP;
@@ -71,7 +70,6 @@ public final class Activation extends NodeActivation<OrNode> {
     public Double inputValue;
 
 
-
     public Decision inputDecision = Decision.UNKNOWN;
     public Decision decision = Decision.UNKNOWN;
     public Decision finalDecision = Decision.UNKNOWN;

src/main/java/org/aika/neuron/activation/Candidate.java

@@ -1,8 +1,7 @@
 package org.aika.neuron.activation;
 
-import org.aika.SearchNode;
 import org.aika.Utils;
-import org.aika.SearchNode.Decision;
+import org.aika.neuron.activation.SearchNode.Decision;
 
 
 

src/main/java/org/aika/SearchNode.java renamed to src/main/java/org/aika/neuron/activation/SearchNode.java

@@ -14,21 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aika;
+package org.aika.neuron.activation;
 
 
-import org.aika.neuron.activation.Activation;
+import org.aika.Document;
+import org.aika.Utils;
 import org.aika.neuron.activation.Activation.StateChange;
 import org.aika.neuron.activation.Activation.SynapseActivation;
 import org.aika.neuron.INeuron;
-import org.aika.neuron.activation.Candidate;
-import org.aika.neuron.activation.Conflicts;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.aika.SearchNode.Decision.SELECTED;
-import static org.aika.SearchNode.Decision.EXCLUDED;
-import static org.aika.SearchNode.Decision.UNKNOWN;
+import static org.aika.neuron.activation.SearchNode.Decision.SELECTED;
+import static org.aika.neuron.activation.SearchNode.Decision.EXCLUDED;
+import static org.aika.neuron.activation.SearchNode.Decision.UNKNOWN;
 import static org.aika.neuron.activation.Activation.ACTIVATION_ID_COMP;
 import static org.aika.neuron.activation.Activation.Mode.NEW;
 
@@ -58,11 +57,11 @@ public class SearchNode implements Comparable<SearchNode> {
 
     public int id;
 
-    public SearchNode excludedParent;
-    public SearchNode selectedParent;
+    SearchNode excludedParent;
+    SearchNode selectedParent;
 
-    public long visited;
-    Candidate candidate;
+    long visited;
+    public Candidate candidate;
     int level;
 
     DebugState debugState;
@@ -88,7 +87,7 @@ public enum DebugState {
     }
 
     Weight weightDelta = Weight.ZERO;
-    Weight accumulatedWeight = Weight.ZERO;
+    public Weight accumulatedWeight = Weight.ZERO;
 
     public Map<Activation, StateChange> modifiedActs = new TreeMap<>(ACTIVATION_ID_COMP);
 

src/main/java/org/aika/training/MetaNetwork.java

@@ -30,7 +30,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static org.aika.SearchNode.Decision.UNKNOWN;
+import static org.aika.neuron.activation.SearchNode.Decision.UNKNOWN;
 
 
 /**