minor refactoring

Author: LukasMolzberger

src/main/java/network/aika/Document.java

@@ -24,7 +24,7 @@
 import network.aika.neuron.activation.Activation;
 import network.aika.neuron.activation.Activation.Link;
 import network.aika.neuron.activation.Candidate;
-import network.aika.neuron.range.Position;
+import network.aika.neuron.activation.Position;
 import network.aika.neuron.activation.SearchNode;
 import network.aika.lattice.Node.ThreadState;
 import network.aika.neuron.activation.*;

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

@@ -22,7 +22,7 @@
 import network.aika.Provider;
 import network.aika.neuron.INeuron;
 import network.aika.neuron.Neuron;
-import network.aika.neuron.range.Position;
+import network.aika.neuron.activation.Position;
 import network.aika.neuron.relation.Relation;
 import network.aika.neuron.activation.Activation;
 import network.aika.PatternDiscovery;

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

@@ -22,8 +22,7 @@
 import network.aika.neuron.Neuron;
 import network.aika.neuron.Synapse;
 import network.aika.neuron.activation.Activation;
-import network.aika.neuron.activation.Linker;
-import network.aika.neuron.range.Position;
+import network.aika.neuron.activation.Position;
 import network.aika.PatternDiscovery;
 import network.aika.Document;
 import network.aika.neuron.relation.Relation;

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

@@ -20,7 +20,7 @@
 import network.aika.*;
 import network.aika.lattice.OrNode;
 import network.aika.neuron.activation.Activation;
-import network.aika.neuron.range.Position;
+import network.aika.neuron.activation.Position;
 import network.aika.neuron.activation.SearchNode;
 import network.aika.lattice.InputNode;
 import network.aika.neuron.relation.Relation;

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

@@ -19,7 +19,7 @@
 
 import network.aika.*;
 import network.aika.neuron.activation.Activation;
-import network.aika.neuron.range.Position;
+import network.aika.neuron.activation.Position;
 import network.aika.neuron.relation.Relation;
 
 import java.util.*;

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

@@ -10,7 +10,6 @@
 import network.aika.neuron.Neuron;
 import network.aika.neuron.Synapse;
 import network.aika.neuron.activation.SearchNode.Decision;
-import network.aika.neuron.range.Position;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -1,8 +1,5 @@
 package network.aika.neuron.activation;
 
-import network.aika.neuron.activation.Activation.Link;
-import network.aika.neuron.range.Position;
-
 import java.util.Iterator;
 import java.util.Map;
 

src/main/java/network/aika/neuron/activation/Linker.java

@@ -19,15 +19,13 @@
 import network.aika.Document;
 import network.aika.lattice.OrNode;
 import network.aika.neuron.INeuron;
-import network.aika.neuron.range.Position;
 import network.aika.neuron.relation.Relation;
 import network.aika.neuron.Synapse;
 import network.aika.neuron.activation.Activation.Link;
 
 import java.util.*;
 
 import static network.aika.neuron.Synapse.OUTPUT;
-import static network.aika.neuron.Synapse.VARIABLE;
 import static network.aika.neuron.activation.SearchNode.Decision;
 
 /**

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

@@ -4,8 +4,7 @@
 import network.aika.neuron.INeuron;
 import network.aika.neuron.Neuron;
 import network.aika.neuron.activation.Activation;
-import network.aika.neuron.activation.Linker;
-import network.aika.neuron.range.Position;
+import network.aika.neuron.activation.Position;
 
 import java.io.DataInput;
 import java.io.DataOutput;

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

@@ -4,7 +4,7 @@
 import network.aika.neuron.INeuron;
 import network.aika.neuron.Neuron;
 import network.aika.neuron.activation.Activation;
-import network.aika.neuron.range.Position;
+import network.aika.neuron.activation.Position;
 
 import java.io.DataInput;
 import java.io.DataOutput;

src/test/java/network/aika/network/NegationTest.java

@@ -22,14 +22,14 @@
 import network.aika.neuron.INeuron;
 import network.aika.neuron.Neuron;
 import network.aika.neuron.Synapse;
-import network.aika.neuron.range.Position;
+import network.aika.neuron.activation.Position;
 import network.aika.lattice.OrNode;
 import network.aika.neuron.relation.Relation;
 import org.junit.Assert;
 import org.junit.Test;
 
 import static network.aika.neuron.Synapse.OUTPUT;
-import static network.aika.neuron.range.Position.Operator.GREATER_THAN;
+import static network.aika.neuron.activation.Position.Operator.GREATER_THAN;
 import static network.aika.neuron.relation.Relation.*;
 
 /**

src/test/java/network/aika/network/OverlappingOrTest.java

@@ -21,7 +21,7 @@
 import network.aika.Model;
 import network.aika.neuron.Neuron;
 import network.aika.neuron.Synapse;
-import network.aika.neuron.range.Position.Operator;
+import network.aika.neuron.activation.Position.Operator;
 import network.aika.neuron.INeuron;
 import network.aika.neuron.relation.Relation;
 import org.junit.Assert;