Enhance execution sequence determination: add complete dependency graph and build trigger chains for independent root points.
This commit is contained in:
@@ -11,7 +11,7 @@ function Simulator() {
|
|||||||
executionOrder.forEach(point => {
|
executionOrder.forEach(point => {
|
||||||
if ('actions' in point) {
|
if ('actions' in point) {
|
||||||
handleAction(point.actions[0]);
|
handleAction(point.actions[0]);
|
||||||
}else{
|
} else {
|
||||||
handleAction(point.action);
|
handleAction(point.action);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -130,6 +130,106 @@ function Simulator() {
|
|||||||
return triggeredPoints;
|
return triggeredPoints;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function determineExecutionSequences(products: productsSchema): PointsScheme[][] {
|
||||||
|
// Create maps for all points
|
||||||
|
const pointMap = new Map<string, PointsScheme>();
|
||||||
|
const allPoints: PointsScheme[] = [];
|
||||||
|
|
||||||
|
// First pass: collect all points
|
||||||
|
products.forEach(product => {
|
||||||
|
product.eventDatas.forEach(event => {
|
||||||
|
if (event.type === 'transfer') {
|
||||||
|
event.points.forEach(point => {
|
||||||
|
pointMap.set(point.uuid, point);
|
||||||
|
allPoints.push(point);
|
||||||
|
});
|
||||||
|
} else if (event.type === 'vehicle' ||
|
||||||
|
event.type === 'machine' ||
|
||||||
|
event.type === 'storageUnit' ||
|
||||||
|
event.type === 'roboticArm') {
|
||||||
|
pointMap.set(event.point.uuid, event.point);
|
||||||
|
allPoints.push(event.point);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Build complete dependency graph
|
||||||
|
const dependencyGraph = new Map<string, string[]>();
|
||||||
|
const reverseDependencyGraph = new Map<string, string[]>();
|
||||||
|
const triggeredPoints = new Set<string>();
|
||||||
|
|
||||||
|
allPoints.forEach(point => {
|
||||||
|
const triggers = extractTriggersFromPoint(point);
|
||||||
|
const dependencies: string[] = [];
|
||||||
|
|
||||||
|
triggers.forEach(trigger => {
|
||||||
|
const targetUuid = trigger.triggeredAsset?.triggeredPoint?.pointUuid;
|
||||||
|
if (targetUuid && pointMap.has(targetUuid)) {
|
||||||
|
dependencies.push(targetUuid);
|
||||||
|
triggeredPoints.add(targetUuid);
|
||||||
|
|
||||||
|
if (!reverseDependencyGraph.has(targetUuid)) {
|
||||||
|
reverseDependencyGraph.set(targetUuid, []);
|
||||||
|
}
|
||||||
|
reverseDependencyGraph.get(targetUuid)!.push(point.uuid);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
dependencyGraph.set(point.uuid, dependencies);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Identify independent root points (points that trigger others but aren't triggered themselves)
|
||||||
|
const rootPoints = allPoints.filter(point => {
|
||||||
|
const hasOutgoingTriggers = extractTriggersFromPoint(point).some(
|
||||||
|
t => t.triggeredAsset?.triggeredPoint?.pointUuid
|
||||||
|
);
|
||||||
|
return hasOutgoingTriggers && !triggeredPoints.has(point.uuid);
|
||||||
|
});
|
||||||
|
|
||||||
|
// For each root point, build its complete trigger chain
|
||||||
|
const executionSequences: PointsScheme[][] = [];
|
||||||
|
|
||||||
|
function buildSequence(startUuid: string): PointsScheme[] {
|
||||||
|
const sequence: PointsScheme[] = [];
|
||||||
|
const visited = new Set<string>();
|
||||||
|
|
||||||
|
function traverse(uuid: string) {
|
||||||
|
if (visited.has(uuid)) return;
|
||||||
|
visited.add(uuid);
|
||||||
|
|
||||||
|
const point = pointMap.get(uuid);
|
||||||
|
if (point) {
|
||||||
|
sequence.push(point);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Follow forward dependencies
|
||||||
|
const nextPoints = dependencyGraph.get(uuid) || [];
|
||||||
|
nextPoints.forEach(nextUuid => traverse(nextUuid));
|
||||||
|
}
|
||||||
|
|
||||||
|
traverse(startUuid);
|
||||||
|
return sequence;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build sequences for all root points
|
||||||
|
rootPoints.forEach(root => {
|
||||||
|
executionSequences.push(buildSequence(root.uuid));
|
||||||
|
});
|
||||||
|
|
||||||
|
// Handle any triggered points not reachable from roots (isolated chains)
|
||||||
|
const processedPoints = new Set(
|
||||||
|
executionSequences.flat().map(p => p.uuid)
|
||||||
|
);
|
||||||
|
|
||||||
|
allPoints.forEach(point => {
|
||||||
|
if (triggeredPoints.has(point.uuid) && !processedPoints.has(point.uuid)) {
|
||||||
|
executionSequences.push(buildSequence(point.uuid));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return executionSequences;
|
||||||
|
}
|
||||||
|
|
||||||
function extractTriggersFromPoint(point: PointsScheme): TriggerSchema[] {
|
function extractTriggersFromPoint(point: PointsScheme): TriggerSchema[] {
|
||||||
if ('actions' in point) {
|
if ('actions' in point) {
|
||||||
return point.actions.flatMap(action => action.triggers);
|
return point.actions.flatMap(action => action.triggers);
|
||||||
|
|||||||
Reference in New Issue
Block a user