fixes

LukasMolzberger · LukasMolzberger · commit 767eef187d9c · 2025-01-15T15:47:30.000+01:00
diff --git a/fields/src/main/java/network/aika/type/FlattenedType.java b/fields/src/main/java/network/aika/type/FlattenedType.java
@@ -24,7 +24,6 @@
 import network.aika.utils.ArrayUtils;
 
 import java.util.*;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
@@ -43,18 +42,20 @@ public class FlattenedType<
 
     private final short[] fields;
     private final FieldDefinition<T, O>[][] fieldsReverse;
+    private final int numberOfFields;
 
     private FlattenedTypeRelation<T, O, RT, RO>[][] mapping;
 
     @SuppressWarnings("unchecked")
-    private FlattenedType(Direction dir, T type, Map<FieldDefinition<T, O>, Short> fieldMappings) {
+    private FlattenedType(Direction dir, T type, Map<FieldDefinition<T, O>, Short> fieldMappings, int numberOfFields) {
         this.direction = dir;
         this.type = type;
+        this.numberOfFields = numberOfFields;
 
-        fields = new short[type.getTypeRegistry().getNumberOfFields()];
+        fields = new short[type.getTypeRegistry().getNumberOfFieldDefinitions()];
         Arrays.fill(fields, (short) -1);
 
-        fieldsReverse = new FieldDefinition[fieldMappings.size()][];
+        fieldsReverse = new FieldDefinition[numberOfFields][];
         for(Map.Entry<FieldDefinition<T, O>, Short> e: fieldMappings.entrySet()) {
             fields[e.getKey().getFieldId()] = e.getValue();
             fieldsReverse[e.getValue()] = new FieldDefinition[] {e.getKey()};
@@ -80,7 +81,7 @@ FlattenedType<T, O, RT, RO> createInputFlattenedType(T type, Set<FieldDefinition
             fieldMappings.put(fd, i);
         }
 
-       return new FlattenedType<>(Direction.INPUT, type, fieldMappings);
+       return new FlattenedType<>(Direction.INPUT, type, fieldMappings, requiredFields.size());
     }
 
     public static <
@@ -98,7 +99,7 @@ FlattenedType<T, O, RT, RO> createOutputFlattenedType(T type, Set<FieldDefinitio
             fieldMappings.put(fd, fieldIndex);
         }
 
-        return new FlattenedType<>(Direction.OUTPUT, type, fieldMappings);
+        return new FlattenedType<>(Direction.OUTPUT, type, fieldMappings, inputSide.numberOfFields);
     }
 
     @SuppressWarnings({"rawtypes", "unchecked"})
diff --git a/fields/src/main/java/network/aika/type/FlattenedTypeRelation.java b/fields/src/main/java/network/aika/type/FlattenedTypeRelation.java
@@ -24,7 +24,7 @@ public FlattenedTypeRelation(TypeRegistry registry, List<FieldLinkDefinition<T,
                         fl.getOriginFD().getFieldId())
                 );
 
-        this.fieldLinks = new FieldLinkDefinition[registry.getNumberOfFields()][];
+        this.fieldLinks = new FieldLinkDefinition[registry.getNumberOfFieldDefinitions()][];
         groupedByRelatedFD.forEach((id, list) ->
                         this.fieldLinks[id] = list.toArray(new FieldLinkDefinition[0])
                 );
diff --git a/fields/src/main/java/network/aika/type/TypeRegistry.java b/fields/src/main/java/network/aika/type/TypeRegistry.java
@@ -32,7 +32,7 @@ public interface TypeRegistry {
 
     <T extends Type<?, ?>> T getType(short typeId);
 
-    int getNumberOfFields();
+    int getNumberOfFieldDefinitions();
 
     void flattenTypeHierarchy();
 }
diff --git a/fields/src/main/java/network/aika/type/TypeRegistryImpl.java b/fields/src/main/java/network/aika/type/TypeRegistryImpl.java
@@ -56,7 +56,7 @@ public int createFieldId() {
     }
 
     @Override
-    public int getNumberOfFields() {
+    public int getNumberOfFieldDefinitions() {
         return fieldIdCounter;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public interface TypeRegistry {`
`32`	`32`
`33`	`33`	`<T extends Type<?, ?>> T getType(short typeId);`
`34`	`34`
`35`		`- int getNumberOfFields();`
	`35`	`+ int getNumberOfFieldDefinitions();`
`36`	`36`
`37`	`37`	`void flattenTypeHierarchy();`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public int createFieldId() {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Override`
`59`		`- public int getNumberOfFields() {`
	`59`	`+ public int getNumberOfFieldDefinitions() {`
`60`	`60`	`return fieldIdCounter;`
`61`	`61`	`}`
`62`	`62`