Skip to content

Commit 64c963d

Browse files
fix
1 parent a072fa6 commit 64c963d

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

src/main/java/network/aika/Converter.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ private boolean convert() {
116116
noFurtherRefinement = true;
117117
break;
118118
}
119-
120119
}
121120

122121
outputNode.removeParents(threadId);
@@ -178,7 +177,7 @@ private List<Synapse> prepareCandidates() {
178177
for(Map.Entry<Integer, Relation> me: syn.relations.entrySet()) {
179178
Integer relId = me.getKey();
180179
Relation rel = me.getValue();
181-
if(rel.convertible() && !alreadyCollected.contains(relId)) {
180+
if(rel.isConvertible() && !alreadyCollected.contains(relId)) {
182181
Synapse rs = syn.output.getSynapseById(relId);
183182
if(rs != null) {
184183
relatedSyns.put(relId, rs);

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ private Refinement createRefinement(RefValue firstRV, Refinement secondRef, Rela
209209

210210

211211
public RefValue extend(int threadId, Document doc, Refinement firstRef, PatternDiscovery.Config patterDiscoverConfig) {
212-
if(firstRef.relations.size() == 0) return null;
212+
if(!firstRef.isConvertible()) return null;
213213

214214
RefValue firstRV = getAndChild(firstRef);
215215
if(firstRV != null) {
@@ -402,6 +402,12 @@ public Refinement(RelationsMap relations, Provider<InputNode> input) {
402402
this.input = input;
403403
}
404404

405+
public boolean isConvertible() {
406+
for(Relation rel: relations.relations) {
407+
if(rel != null && rel.isConvertible()) return true;
408+
}
409+
return false;
410+
}
405411

406412
public String toString() {
407413
StringBuilder sb = new StringBuilder();

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ void removeAndChild(AndNode.Refinement ref) {
146146

147147

148148
public RefValue extend(int threadId, Document doc, Refinement ref, PatternDiscovery.Config patterDiscoveryConfig) {
149-
if(ref.relations.size() == 0) return null;
149+
if(!ref.isConvertible()) return null;
150150

151151
Relation rel = ref.relations.get(0);
152152
if(rel == null) {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ public Stream<Activation> getActivations(INeuron n, Activation linkedAct) {
132132
}
133133

134134
@Override
135-
public boolean convertible() {
135+
public boolean isConvertible() {
136136
for(Relation rel: relations) {
137-
if(rel.convertible()) return true;
137+
if(rel.isConvertible()) return true;
138138
}
139139

140140
return false;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void readFields(DataInput in, Model m) throws IOException {
129129
public abstract Stream<Activation> getActivations(INeuron n, Activation linkedAct);
130130

131131

132-
public boolean convertible() {
132+
public boolean isConvertible() {
133133
return !optional && follow;
134134
}
135135

@@ -278,7 +278,7 @@ public Stream<Activation> getActivations(INeuron n, Activation linkedAct) {
278278
}
279279

280280
@Override
281-
public boolean convertible() {
281+
public boolean isConvertible() {
282282
return true;
283283
}
284284

0 commit comments

Comments
 (0)