- fixes

Author: lukas.molzberger

fields/src/main/java/network/aika/fielddefs/Type.java

@@ -40,6 +40,7 @@ public abstract class Type<T extends Type<T, O>, O extends Obj<T, O>> {
     protected Class<? extends O> clazz;
 
     protected List<T> parents = new ArrayList<>();
+    protected List<T> children = new ArrayList<>();
 
     Map<FieldTag, FieldDefinition<T, O>> fieldDefinitions = new TreeMap<>(FIELD_TAG_COMPARATOR);
     Map<FieldTag, FieldInputDefinition<T, O>> fieldInputDefinitions = new TreeMap<>(FIELD_TAG_COMPARATOR);
@@ -51,7 +52,14 @@ public Type(TypeRegistry registry, String name, Class<? extends O> clazz) {
         registry.register(this);
     }
 
+    public boolean isAbstract() {
+        return !children.isEmpty();
+    }
+
     protected O instantiate(List<Class<?>> parameterTypes, List<Object> parameters) {
+        if(isAbstract())
+            throw new RuntimeException("Unable to instantiate abstract type " + name);
+
         try {
             O instance = clazz.getConstructor(parameterTypes.toArray(new Class[0]))
                     .newInstance(parameters.toArray(new Object[0]));
@@ -121,6 +129,7 @@ public Class<? extends O> getClazz() {
 
     public T addParent(T p) {
         parents.add(p);
+        p.children.add((T) this);
 
         return (T) this;
     }
@@ -129,6 +138,10 @@ public List<T> getParents() {
         return parents;
     }
 
+    public List<T> getChildren() {
+        return children;
+    }
+
     public void instantiateFields(O o) {
         Map<FieldTag, FieldDefinition<T, O>> fieldDefs = new HashMap<>();
         collectFieldDefinitions(fieldDefs);

model/src/main/java/network/aika/model/BindingDef.java

@@ -115,11 +115,11 @@ public void initNodes() {
 
         sum(activation, UPDATE_VALUE);
 
-        activation.getState(NON_FEEDBACK).getField(NET)
-                .out(o -> o.getActivation().getState(OUTER_FEEDBACK).getFieldInput(NET), varLink());
+        activation.getState(OUTER_FEEDBACK).getField(NET)
+                .in(o -> o.getActivation().getState(NON_FEEDBACK).getFieldOutput(NET), varLink());
 
-        outerFeedbackState.state.getField(NET)
-                .out(o -> o.getActivation().getState(INNER_FEEDBACK).getFieldInput(NET), varLink());
+        activation.getState(INNER_FEEDBACK).getField(NET)
+                .in(o -> o.getActivation().getState(OUTER_FEEDBACK).getFieldOutput(NET), varLink());
 
 
         neuron = new NeuronDefinition(

model/src/test/java/network/aika/model/TypeModelTest.java

@@ -61,7 +61,7 @@ public void testTypeModel() {
 
         Synapse synapse = typeModel
                 .getBinding()
-                .getSynapse()
+                .getInputObjectSynapse()
                 .instantiate(inputNeuron, outputNeuron)
                 .setWeight(10.0)
                 .setPropagable(true);