Skip to content

Commit

Permalink
PLANNER-471 BZ-1273783 Refactor out Map in VariableListenerSupport
Browse files Browse the repository at this point in the history
  • Loading branch information
@ge0ffrey
ge0ffrey committed Oct 27, 2015
1 parent 359f577 commit 8d20377
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 15 deletions.
10 changes: 10 additions & 0 deletions ...rg/optaplanner/core/impl/domain/variable/listener/support/VariableListenerNotifiable.java
View file
Expand Up @@ -16,16 +16,22 @@

package org.optaplanner.core.impl.domain.variable.listener.support;

import java.util.LinkedHashSet;
import java.util.Set;

import org.optaplanner.core.impl.domain.variable.listener.VariableListener;

public class VariableListenerNotifiable implements Comparable<VariableListenerNotifiable> {

protected final VariableListener variableListener;
protected final int globalOrder;

protected final Set<VariableListenerNotification> notificationQueue;

public VariableListenerNotifiable(VariableListener variableListener, int globalOrder) {
this.variableListener = variableListener;
this.globalOrder = globalOrder;
notificationQueue = new LinkedHashSet<VariableListenerNotification>();
}

public VariableListener getVariableListener() {
Expand All @@ -36,6 +42,10 @@ public int getGlobalOrder() {
return globalOrder;
}

public Set<VariableListenerNotification> getNotificationQueue() {
return notificationQueue;
}

@Override
public int compareTo(VariableListenerNotifiable other) {
if (globalOrder < other.globalOrder) {
Expand Down
29 changes: 14 additions & 15 deletions ...a/org/optaplanner/core/impl/domain/variable/listener/support/VariableListenerSupport.java
View file
Expand Up @@ -17,13 +17,13 @@
package org.optaplanner.core.impl.domain.variable.listener.support;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;

import org.optaplanner.core.impl.domain.entity.descriptor.EntityDescriptor;
Expand All @@ -43,23 +43,23 @@ public class VariableListenerSupport implements SupplyManager {

protected final InnerScoreDirector scoreDirector;

protected final List<VariableListenerNotifiable> notifiableList;
protected final Map<VariableDescriptor, List<VariableListenerNotifiable>> sourceVariableToNotifiableMap;
protected final Map<EntityDescriptor, List<VariableListenerNotifiable>> sourceEntityToNotifiableMap;
protected final Map<Demand, Supply> supplyMap;
protected int nextGlobalOrder = 0;

protected SortedMap<VariableListenerNotifiable, Set<VariableListenerNotification>> notificationQueueMap;
protected boolean notificationQueuesAreEmpty;

public VariableListenerSupport(InnerScoreDirector scoreDirector) {
this.scoreDirector = scoreDirector;
notifiableList = new ArrayList<VariableListenerNotifiable>();
sourceVariableToNotifiableMap = new LinkedHashMap<VariableDescriptor, List<VariableListenerNotifiable>>();
sourceEntityToNotifiableMap = new LinkedHashMap<EntityDescriptor, List<VariableListenerNotifiable>>();
supplyMap = new LinkedHashMap<Demand, Supply>();
}

public void linkVariableListeners() {
notificationQueueMap = new TreeMap<VariableListenerNotifiable, Set<VariableListenerNotification>>();
notificationQueuesAreEmpty = true;
for (EntityDescriptor entityDescriptor : scoreDirector.getSolutionDescriptor().getEntityDescriptors()) {
for (VariableDescriptor variableDescriptor : entityDescriptor.getDeclaredVariableDescriptors()) {
Expand Down Expand Up @@ -87,11 +87,11 @@ public void linkVariableListeners() {
entityNotifiableList.add(notifiable);
}
}
Set<VariableListenerNotification> notificationQueue = new LinkedHashSet<VariableListenerNotification>();
notificationQueueMap.put(notifiable, notificationQueue);
notifiableList.add(notifiable);
}
}
}
Collections.sort(notifiableList);
}

public <S extends Supply> S demand(Demand<S> demand) {
Expand All @@ -110,8 +110,8 @@ public <S extends Supply> S demand(Demand<S> demand) {
if (!entityNotifiableList.contains(notifiable)) {
entityNotifiableList.add(notifiable);
}
Set<VariableListenerNotification> notificationQueue = new LinkedHashSet<VariableListenerNotification>();
notificationQueueMap.put(notifiable, notificationQueue);
notifiableList.add(notifiable);
// No need to sort notifiableList again because notifiable's globalOrder is highest
}
supplyMap.put(demand, supply);
}
Expand All @@ -123,7 +123,7 @@ public <S extends Supply> S demand(Demand<S> demand) {
// ************************************************************************

public void resetWorkingSolution() {
for (VariableListenerNotifiable notifiable : notificationQueueMap.keySet()) {
for (VariableListenerNotifiable notifiable : notifiableList) {
VariableListener variableListener = notifiable.getVariableListener();
if (variableListener instanceof StatefulVariableListener) {
((StatefulVariableListener) variableListener).resetWorkingSolution(scoreDirector);
Expand All @@ -132,7 +132,7 @@ public void resetWorkingSolution() {
}

public void clearWorkingSolution() {
for (VariableListenerNotifiable notifiable : notificationQueueMap.keySet()) {
for (VariableListenerNotifiable notifiable : notifiableList) {
VariableListener variableListener = notifiable.getVariableListener();
if (variableListener instanceof StatefulVariableListener) {
((StatefulVariableListener) variableListener).clearWorkingSolution(scoreDirector);
Expand All @@ -143,7 +143,7 @@ public void clearWorkingSolution() {
public void beforeEntityAdded(EntityDescriptor entityDescriptor, Object entity) {
List<VariableListenerNotifiable> notifiableList = sourceEntityToNotifiableMap.get(entityDescriptor);
for (VariableListenerNotifiable notifiable : notifiableList) {
Set<VariableListenerNotification> notificationQueue = notificationQueueMap.get(notifiable);
Set<VariableListenerNotification> notificationQueue = notifiable.getNotificationQueue();
boolean added = notificationQueue.add(
new VariableListenerNotification(entity, VariableListenerNotificationType.ENTITY_ADDED));
if (added) {
Expand All @@ -160,7 +160,7 @@ public void afterEntityAdded(EntityDescriptor entityDescriptor, Object entity) {
public void beforeVariableChanged(VariableDescriptor variableDescriptor, Object entity) {
List<VariableListenerNotifiable> notifiableList = sourceVariableToNotifiableMap.get(variableDescriptor);
for (VariableListenerNotifiable notifiable : notifiableList) {
Set<VariableListenerNotification> notificationQueue = notificationQueueMap.get(notifiable);
Set<VariableListenerNotification> notificationQueue = notifiable.getNotificationQueue();
boolean added = notificationQueue.add(
new VariableListenerNotification(entity, VariableListenerNotificationType.VARIABLE_CHANGED));
if (added) {
Expand All @@ -177,7 +177,7 @@ public void afterVariableChanged(VariableDescriptor variableDescriptor, Object e
public void beforeEntityRemoved(EntityDescriptor entityDescriptor, Object entity) {
List<VariableListenerNotifiable> notifiableList = sourceEntityToNotifiableMap.get(entityDescriptor);
for (VariableListenerNotifiable notifiable : notifiableList) {
Set<VariableListenerNotification> notificationQueue = notificationQueueMap.get(notifiable);
Set<VariableListenerNotification> notificationQueue = notifiable.getNotificationQueue();
boolean added = notificationQueue.add(
new VariableListenerNotification(entity, VariableListenerNotificationType.ENTITY_REMOVED));
if (added) {
Expand All @@ -192,9 +192,8 @@ public void afterEntityRemoved(EntityDescriptor entityDescriptor, Object entity)
}

public void triggerVariableListenersInNotificationQueues() {
for (Map.Entry<VariableListenerNotifiable, Set<VariableListenerNotification>> entry : notificationQueueMap.entrySet()) {
VariableListenerNotifiable notifiable = entry.getKey();
Set<VariableListenerNotification> notificationQueue = entry.getValue();
for (VariableListenerNotifiable notifiable : notifiableList) {
Set<VariableListenerNotification> notificationQueue = notifiable.getNotificationQueue();
VariableListener variableListener = notifiable.getVariableListener();
for (Iterator<VariableListenerNotification> it = notificationQueue.iterator(); it.hasNext(); ) {
VariableListenerNotification notification = it.next();
Expand Down

0 comments on commit 8d20377

Please sign in to comment.