Skip to content

Commit 0001e18

Browse files
Fixed subtraction test
1 parent 0a51f17 commit 0001e18

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

python-tests/subtraction-test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def testSubtraction(self, linking_pos, test_name):
3232
typeB = aika.TestType(registry, "B")
3333

3434
a = typeA.inputField("a")
35-
b = typeB.inputField("b")
35+
b = typeA.inputField("b")
3636

3737
c = typeB.sub("c")
3838

src/fields/flattened_type.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ void FlattenedType::flatten() {
132132
resultsPerRelation[relatedType->getId()] = flattenPerType(rel, relatedType);
133133
}
134134

135+
// TODO: Check if resultsPerRelation is correctly filled.
136+
135137
if (!isAllNull(resultsPerRelation)) {
136138
FlattenedTypeRelation** tmp = new FlattenedTypeRelation*[resultsPerRelation.size()];
137139
for (int i = 0; i < resultsPerRelation.size(); i++) {
@@ -157,7 +159,7 @@ void FlattenedType::flatten() {
157159
FlattenedTypeRelation* FlattenedType::flattenPerType(Relation* relation, Type* relatedType) {
158160
std::vector<FieldLinkDefinition*> fieldLinks;
159161

160-
std::cout << "FlattenedType::flattenPerType begin " << relation->getRelationLabel() << " " << relatedType->getName() << std::endl;
162+
std::cout << "FlattenedType::flattenPerType begin rel:" << relation->getRelationLabel() << " relatedType:" << relatedType->getName() << std::endl;
161163

162164
for (int i = 0; i < numberOfFields; i++) {
163165
FieldDefinition** fdArray = fieldsReverse[i];
@@ -176,9 +178,9 @@ FlattenedTypeRelation* FlattenedType::flattenPerType(Relation* relation, Type* r
176178
}
177179
}
178180
}
179-
180-
std::cout << "FlattenedType::flattenPerType end fieldLinks " << fieldLinks.size() << std::endl;
181181
}
182+
183+
std::cout << "FlattenedType::flattenPerType end rel:" << relation->getRelationLabel() << " relatedType:" << relatedType->getName() << " numFieldLinks:" << fieldLinks.size() << std::endl;
182184

183185
return fieldLinks.empty() ?
184186
nullptr :

0 commit comments

Comments
 (0)