Skip to content

Commit

Permalink
Merge branch 'bkis-fix-380' into bkis-temp
Browse files Browse the repository at this point in the history
  • Loading branch information
@bkis
bkis committed Feb 15, 2022
2 parents 4545d94 + 5e34260 commit a87d3ce
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions src/main/java/de/unistuttgart/ims/coref/annotator/document/CoreferenceModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ protected Entity createEntity(String l) {
e.setLabel(l);
e.setFlags(new EmptyFSList<Flag>(documentModel.getJcas()));
e.setMembers(new FSArray<Entity>(documentModel.getJcas(), 0));
e.addToIndexes();
e.addToIndexes(getJCas());
return e;
}

Expand Down Expand Up @@ -257,8 +257,8 @@ protected synchronized void edit(CoreferenceModelOperation operation) {
for (; i < arr.size(); i++) {
arr.set(i, newMembers.get(i - oldSize));
}
arr.addToIndexes();
op.getEntityGroup().removeFromIndexes();
arr.addToIndexes(getJCas());
op.getEntityGroup().removeFromIndexes(getJCas());
op.getEntityGroup().setMembers(arr);
updateEntityGroupLabel(op.getEntityGroup());
fireEvent(Event.get(this, Event.Type.Add, op.getEntityGroup(), op.getEntities()));
Expand Down Expand Up @@ -454,7 +454,7 @@ protected void edit(RemoveMentionSurface op) {
fireEvent(Event.get(this, Type.Remove, m, ms));
mentions.add(m);
spans.add(new Span(ms));
ms.removeFromIndexes();
ms.removeFromIndexes(getJCas());
characterPosition2AnnotationMap.remove(ms);
});
op.setMention(mentions.toImmutable());
Expand Down Expand Up @@ -737,7 +737,7 @@ public void initialPainting() {
}
for (Mention mention : JCasUtil.select(documentModel.getJcas(), Mention.class)) {
entityMentionMap.put(mention.getEntity(), mention);
mention.getEntity().addToIndexes();
mention.getEntity().addToIndexes(getJCas());
registerAnnotation(mention);
fireEvent(Event.get(this, Event.Type.Add, mention.getEntity(), mention));

Expand All @@ -763,7 +763,7 @@ private Entity merge(Iterable<Entity> nodes) {
entityMentionMap.get(n).toSet().forEach(m -> moveTo(tgt, m));

entityMentionMap.removeAll(n);
n.removeFromIndexes();
n.removeFromIndexes(getJCas());
}
}
return biggest;
Expand Down Expand Up @@ -809,7 +809,7 @@ private void remove(Entity entity) {
for (Mention m : entityMentionMap.get(entity)) {
for (MentionSurface ms : m.getSurface())
characterPosition2AnnotationMap.remove(ms);
m.removeFromIndexes();
m.removeFromIndexes(getJCas());
// TODO: remove parts
}
for (Entity group : entityEntityGroupMap.get(entity)) {
Expand All @@ -822,7 +822,7 @@ private void remove(Entity entity) {

fireEvent(Event.get(this, Event.Type.Remove, null, entity));
entityMentionMap.removeAll(entity);
entity.removeFromIndexes();
entity.removeFromIndexes(getJCas());
Annotator.logger.traceExit();
}

Expand All @@ -831,7 +831,7 @@ private void remove(Mention m, boolean autoRemove) {
for (MentionSurface ms : m.getSurface())
characterPosition2AnnotationMap.remove(ms);
entityMentionMap.remove(entity, m);
m.removeFromIndexes();
m.removeFromIndexes(getJCas());
if (autoRemove && entityMentionMap.get(entity).isEmpty() && getPreferences()
.getBoolean(Constants.CFG_DELETE_EMPTY_ENTITIES, Defaults.CFG_DELETE_EMPTY_ENTITIES)) {
remove(entity);
Expand Down Expand Up @@ -869,7 +869,7 @@ protected void undo(AddSpanToMention op) {
MentionSurface ms = op.getMentionSurface();
UimaUtil.removeMentionSurface(ms.getMention(), ms);
fireEvent(Event.get(this, Event.Type.Remove, ms.getMention(), ms));
ms.removeFromIndexes();
ms.removeFromIndexes(getJCas());
characterPosition2AnnotationMap.remove(ms);
}

Expand Down Expand Up @@ -933,7 +933,7 @@ protected void undo(CoreferenceModelOperation operation) {
RemoveDuplicateMentionsInEntities op = (RemoveDuplicateMentionsInEntities) operation;

op.getFeatureStructures().forEach(m -> {
m.addToIndexes();
m.addToIndexes(getJCas());
entityMentionMap.put(m.getEntity(), m);
registerAnnotation(m);
fireEvent(Event.get(this, Type.Add, m.getEntity(), m));
Expand All @@ -943,7 +943,7 @@ protected void undo(CoreferenceModelOperation operation) {
} else if (operation instanceof RemoveEntities) {
RemoveEntities op = (RemoveEntities) operation;
op.getFeatureStructures().forEach(e -> {
e.addToIndexes();
e.addToIndexes(getJCas());
if (op.entityEntityGroupMap.containsKey(e)) {
for (Entity group : op.entityEntityGroupMap.get(e)) {
group.setMembers(UimaUtil.addTo(documentModel.getJcas(), group.getMembers(), e));
Expand All @@ -967,15 +967,15 @@ protected void undo(CoreferenceModelOperation operation) {
}
op.getEntityGroup().setMembers(newArr);
updateEntityGroupLabel(op.getEntityGroup());
newArr.addToIndexes();
oldArr.removeFromIndexes();
newArr.addToIndexes(getJCas());
oldArr.removeFromIndexes(getJCas());
} else if (operation instanceof RemoveSingletons) {
undo((RemoveSingletons) operation);
} else if (operation instanceof MergeEntities) {
MergeEntities op = (MergeEntities) operation;
for (Entity oldEntity : op.getEntities()) {
if (op.getEntity() != oldEntity) {
oldEntity.addToIndexes();
oldEntity.addToIndexes(getJCas());
fireEvent(Event.get(this, Event.Type.Add, null, oldEntity));
for (Mention m : op.getPreviousState().get(oldEntity)) {
moveTo(oldEntity, m);
Expand Down Expand Up @@ -1008,13 +1008,13 @@ private void undo(DuplicateMentions op) {

private void undo(RemoveMention op) {
if (op.isEntityAutoDeleted()) {
op.getEntity().addToIndexes();
op.getEntity().addToIndexes(getJCas());
fireEvent(Event.get(this, Event.Type.Add, null, op.getEntity()));
}

// re-create all mentions and set them to the op
op.getFeatureStructures().forEach(m -> {
m.addToIndexes();
m.addToIndexes(getJCas());
m.setEntity(op.getEntity());
entityMentionMap.put(op.getEntity(), m);
for (MentionSurface ms : m.getSurface())
Expand All @@ -1038,13 +1038,13 @@ private void undo(RemoveMentionSurface op) {
}

private void undo(RemoveSingletons op) {
op.getFeatureStructures().forEach(e -> e.addToIndexes());
op.getFeatureStructures().forEach(e -> e.addToIndexes(getJCas()));
op.getMentions().forEach(m -> {
entityMentionMap.put(m.getEntity(), m);
for (MentionSurface ms : m.getSurface())
characterPosition2AnnotationMap.add(ms);
m.addToIndexes();
m.getEntity().addToIndexes();
m.addToIndexes(getJCas());
m.getEntity().addToIndexes(getJCas());
fireEvent(Event.get(this, Event.Type.Add, null, m.getEntity()));
fireEvent(Event.get(this, Event.Type.Add, m.getEntity(), m));
});
Expand Down Expand Up @@ -1076,7 +1076,7 @@ protected void undo(RenameAllEntities operation) {
*/
protected void undo(MergeMentions operation) {
operation.getMentions().forEach(m -> {
m.addToIndexes();
m.addToIndexes(getJCas());
entityMentionMap.put(operation.getNewMention().getEntity(), m);
fireEvent(Event.get(this, Type.Add, m.getEntity(), m));
});
Expand Down

0 comments on commit a87d3ce

Please sign in to comment.