- moved queue and fields to a separate module

Author: lukas.molzberger

core/pom.xml

@@ -19,6 +19,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>network.aika</groupId>
+            <artifactId>fields</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>

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

@@ -20,7 +20,6 @@
 import network.aika.debugger.EventListener;
 import network.aika.debugger.EventType;
 import network.aika.callbacks.InstantiationCallback;
-import network.aika.elements.Timestamp;
 import network.aika.elements.activations.Activation;
 import network.aika.elements.Element;
 import network.aika.elements.activations.types.PatternActivation;
@@ -30,8 +29,9 @@
 import network.aika.elements.neurons.NeuronProvider;
 import network.aika.fields.Field;
 import network.aika.queue.Queue;
-import network.aika.text.Range;
+import network.aika.queue.Timestamp;
 import network.aika.queue.Step;
+import network.aika.text.Range;
 import network.aika.text.TextReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,8 +41,8 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import static network.aika.elements.Timestamp.MIN;
-import static network.aika.elements.Timestamp.NOT_SET;
+import static network.aika.queue.Timestamp.MIN;
+import static network.aika.queue.Timestamp.NOT_SET;
 import static network.aika.elements.activations.StateType.*;
 
 /**
@@ -100,6 +100,11 @@ public Long getId() {
         return id;
     }
 
+    @Override
+    public long getTimeout() {
+        return getConfig().getTimeout();
+    }
+
     public void process(Predicate<Step> filter) {
         super.process(filter);
 

core/src/main/java/network/aika/Model.java

@@ -70,6 +70,11 @@ public Model(SuspensionCallback sc) {
         suspensionCallback = sc;
     }
 
+    @Override
+    public long getTimeout() {
+        return config.getTimeout();
+    }
+
     public Supplier<Writable> getCustomDataInstanceSupplier() {
         return customDataInstanceSupplier;
     }

core/src/main/java/network/aika/elements/Element.java

@@ -19,6 +19,7 @@
 import network.aika.Config;
 import network.aika.Model;
 import network.aika.fields.FieldObject;
+import network.aika.queue.Timestamp;
 
 /**
  * An Element is either a node (Activation) or an edge (Link) in the Activation graph.

core/src/main/java/network/aika/elements/activations/Activation.java

@@ -19,7 +19,6 @@
 import network.aika.Model;
 import network.aika.Document;
 import network.aika.elements.Element;
-import network.aika.elements.Timestamp;
 import network.aika.elements.Type;
 import network.aika.elements.activations.bsslots.BSSlotDefinition;
 import network.aika.elements.activations.bsslots.BindingSignalSlot;
@@ -31,11 +30,11 @@
 import network.aika.ActivationFunction;
 import network.aika.elements.neurons.Neuron;
 import network.aika.elements.neurons.NeuronProvider;
-import network.aika.elements.neurons.RefType;
 import network.aika.elements.synapses.*;
 import network.aika.elements.synapses.slots.SynapseSlot;
 import network.aika.enums.Scope;
 import network.aika.queue.Queue;
+import network.aika.queue.Timestamp;
 import network.aika.queue.steps.InactiveLinks;
 import network.aika.text.TextReference;
 import network.aika.text.Range;
@@ -45,13 +44,13 @@
 import java.util.stream.Stream;
 
 import static network.aika.debugger.EventType.*;
-import static network.aika.elements.Timestamp.NOT_SET;
 import static network.aika.elements.activations.StateType.PRE_FEEDBACK;
 import static network.aika.elements.activations.StateType.INNER_FEEDBACK;
 import static network.aika.elements.neurons.RefType.TEMPLATE;
 import static network.aika.fields.link.FieldLink.linkAndConnect;
 import static network.aika.fields.Fields.*;
 import static network.aika.queue.Phase.*;
+import static network.aika.queue.Timestamp.NOT_SET;
 import static network.aika.text.TextReference.join;
 import static network.aika.utils.Utils.TOLERANCE;
 

core/src/main/java/network/aika/elements/activations/State.java

@@ -17,16 +17,16 @@
 package network.aika.elements.activations;
 
 import network.aika.Document;
-import network.aika.elements.Timestamp;
 import network.aika.fields.*;
 import network.aika.fields.link.AbstractFieldLink;
 import network.aika.queue.Queue;
+import network.aika.queue.Timestamp;
 import network.aika.queue.steps.Fired;
 
 import static network.aika.debugger.EventType.UPDATE;
-import static network.aika.elements.Timestamp.NOT_SET;
 import static network.aika.fields.Fields.func;
 import static network.aika.fields.Fields.isTrue;
+import static network.aika.queue.Timestamp.NOT_SET;
 import static network.aika.queue.Phase.INFERENCE;
 import static network.aika.utils.Utils.TOLERANCE;
 

core/src/main/java/network/aika/elements/activations/types/BindingActivation.java

@@ -26,7 +26,6 @@
 import network.aika.elements.synapses.slots.SynapseSlot;
 import network.aika.elements.synapses.types.InnerPositiveFeedbackSynapse;
 import network.aika.elements.synapses.types.RelationInputSynapse;
-import network.aika.enums.Scope;
 import network.aika.fields.*;
 import network.aika.elements.neurons.types.BindingNeuron;
 import network.aika.queue.steps.Anneal;

core/src/main/java/network/aika/elements/links/Link.java

@@ -21,7 +21,6 @@
 import network.aika.elements.Element;
 import network.aika.elements.Type;
 import network.aika.elements.activations.Activation;
-import network.aika.elements.Timestamp;
 import network.aika.elements.activations.bsslots.BindingSignalSlot;
 import network.aika.elements.activations.StateType;
 import network.aika.elements.activations.bsslots.SingleBSSlot;
@@ -34,6 +33,7 @@
 import network.aika.elements.synapses.Synapse;
 import network.aika.fields.link.FieldLink;
 import network.aika.queue.Queue;
+import network.aika.queue.Timestamp;
 import network.aika.queue.steps.LinkUpdate;
 import network.aika.visitor.Visitor;
 

core/src/main/java/network/aika/elements/links/types/InhibitoryCategoryInputLink.java

@@ -16,7 +16,6 @@
  */
 package network.aika.elements.links.types;
 
-import network.aika.elements.Type;
 import network.aika.elements.activations.CategoryActivation;
 import network.aika.elements.activations.types.InhibitoryActivation;
 import network.aika.elements.links.CategoryInputLink;
@@ -26,7 +25,6 @@
 import network.aika.elements.synapses.types.InhibitoryCategorySynapse;
 import network.aika.fields.Field;
 
-import static network.aika.elements.Type.*;
 import static network.aika.elements.activations.types.InhibitoryActivation.crossConnectFields;
 
 

core/src/main/java/network/aika/elements/neurons/Neuron.java

@@ -32,9 +32,9 @@
 import network.aika.fields.*;
 import network.aika.elements.activations.Activation;
 import network.aika.elements.Element;
-import network.aika.elements.Timestamp;
 import network.aika.elements.synapses.Synapse;
 import network.aika.queue.Queue;
+import network.aika.queue.Timestamp;
 import network.aika.queue.steps.Save;
 import network.aika.utils.Writable;
 import org.slf4j.Logger;
@@ -48,11 +48,11 @@
 import java.util.stream.Stream;
 
 import static network.aika.elements.neurons.NeuronTypeHolder.getHolder;
-import static network.aika.elements.Timestamp.MAX;
-import static network.aika.elements.Timestamp.MIN;
 import static network.aika.elements.neurons.RefType.*;
 import static network.aika.queue.Phase.TRAINING;
 import static network.aika.utils.Utils.TOLERANCE;
+import static network.aika.queue.Timestamp.MAX;
+import static network.aika.queue.Timestamp.MIN;
 
 /**
  *
@@ -473,7 +473,7 @@ public void readFields(DataInput in, Model m) throws Exception {
         if(in.readBoolean())
             label = in.readUTF();
 
-        bias.readFields(in, m);
+        bias.readFields(in);
 
         while (in.readBoolean()) {
             Synapse syn = Synapse.read(in, m);