feat: extend ordered pair evidence through common
This commit is contained in:
@@ -54,12 +54,55 @@ const operationSpecs = {
|
||||
pocket: { builder: 'BRepPrimAPI_MakePrism+BRepAlgoAPI_Cut', nominal: { length: 5 }, edited: { length: 4 }, parameter: 'length', beforeValue: 5, editedValue: 4 },
|
||||
loft: { builder: 'BRepOffsetAPI_ThruSections', nominal: { ruled: false }, edited: { ruled: true }, parameter: 'ruled', beforeValue: false, editedValue: true, decision: 'rejected', rejectionAuthority: 'freecad-document', kernelOutcome: 'accepted' },
|
||||
pipe: { builder: 'BRepOffsetAPI_MakePipe', nominal: { spineLength: 15 }, edited: { spineLength: 12 }, parameter: 'spineLength', beforeValue: 15, editedValue: 12, decision: 'rejected', rejectionAuthority: 'freecad-document', kernelOutcome: 'invalid-result' },
|
||||
revolution: { builder: 'BRepPrimAPI_MakeRevol', nominal: { angle: 360 }, edited: { angle: 270 }, parameter: 'angle', beforeValue: 360, editedValue: 270, decision: 'rejected' },
|
||||
groove: { builder: 'BRepPrimAPI_MakeRevol+BRepAlgoAPI_Cut', nominal: { angle: 360 }, edited: { angle: 180 }, parameter: 'angle', beforeValue: 360, editedValue: 180 },
|
||||
fillet: { builder: 'BRepFilletAPI_MakeFillet', nominal: { radius: 0.4 }, edited: { radius: 0.6 }, parameter: 'radius', beforeValue: 0.4, editedValue: 0.6 },
|
||||
chamfer: { builder: 'BRepFilletAPI_MakeChamfer', nominal: { distance: 0.4 }, edited: { distance: 0.6 }, parameter: 'distance', beforeValue: 0.4, editedValue: 0.6 },
|
||||
hole: { builder: 'BRepPrimAPI_MakeCylinder+BRepAlgoAPI_Cut', nominal: { radius: 1, depth: 14, position: [5, 5, -2], direction: [0, 0, 1] }, edited: { radius: 1.5 }, parameter: 'radius', beforeValue: 1, editedValue: 1.5 },
|
||||
draft: { builder: 'BRepOffsetAPI_DraftAngle', nominal: { faceIndex: 0, angle: 5, direction: [0, 0, 1], axisOrigin: [0, 0, 0], neutralPlaneDirection: [0, 0, 1], reversed: false }, edited: { angle: 8 }, parameter: 'angle', beforeValue: 5, editedValue: 8 },
|
||||
thickness: { builder: 'BRepOffsetAPI_MakeThickSolid', nominal: { faceIndex: 1, offset: -0.4, intersectionJoin: false }, edited: { offset: -0.6 }, parameter: 'offset', beforeValue: -0.4, editedValue: -0.6 },
|
||||
'linear-pattern': { builder: 'BRepBuilderAPI_Transform+BRepAlgoAPI_Fuse', nominal: { translationX: 8 }, edited: { translationX: 9 }, parameter: 'translationX', beforeValue: 8, editedValue: 9 },
|
||||
'polar-pattern': { builder: 'BRepBuilderAPI_Transform+BRepAlgoAPI_Fuse', nominal: { angle: 30, axisOrigin: [0, 0, 0], direction: [0, 0, 1] }, edited: { angle: 45 }, parameter: 'angle', beforeValue: 30, editedValue: 45 },
|
||||
mirrored: { builder: 'BRepBuilderAPI_Transform+BRepAlgoAPI_Fuse', nominal: { planeOriginX: 5 }, edited: { planeOriginX: 6 }, parameter: 'planeOriginX', beforeValue: 5, editedValue: 6 },
|
||||
'multi-transform': { builder: 'BRepBuilderAPI_Transform+BRepAlgoAPI_Fuse(ordered)', nominal: { multiTranslationX: 8 }, edited: { multiTranslationX: 9 }, parameter: 'multiTranslationX', beforeValue: 8, editedValue: 9 },
|
||||
}
|
||||
const pairSpecOverrides = {
|
||||
'cut->fuse': { ...operationSpecs.fuse, nominal: { toolSize: 5, toolOffset: 8 }, edited: { toolSize: 5, toolOffset: 9 }, beforeValue: 8, editedValue: 9 },
|
||||
'cut->cut': { ...operationSpecs.cut, nominal: { toolSize: 3, toolOffset: 6 }, edited: { toolSize: 4, toolOffset: 6 }, beforeValue: 3, editedValue: 4 },
|
||||
'cut->common': { ...operationSpecs.common, nominal: { toolSize: 5, toolOffset: 4 }, edited: { toolSize: 5, toolOffset: 5 }, beforeValue: 4, editedValue: 5 },
|
||||
'common->fuse': { ...operationSpecs.fuse, nominal: { toolSize: 5, toolOffset: 8 }, edited: { toolSize: 5, toolOffset: 7 }, beforeValue: 8, editedValue: 7 },
|
||||
'common->common': { ...operationSpecs.common, nominal: { toolSize: 4, toolOffset: 7 }, edited: { toolSize: 4, toolOffset: 6 }, beforeValue: 7, editedValue: 6 },
|
||||
'common->linear-pattern': { ...operationSpecs['linear-pattern'], nominal: { translationX: 4 }, edited: { translationX: 3 }, beforeValue: 4, editedValue: 3 },
|
||||
'common->multi-transform': { ...operationSpecs['multi-transform'], nominal: { multiTranslationX: 4 }, edited: { multiTranslationX: 3 }, beforeValue: 4, editedValue: 3 },
|
||||
}
|
||||
|
||||
const createOperation = (module, { operation, objectStep, toolSize, toolOffset, angle, length, ruled, spineLength, stage }) => {
|
||||
const createOperation = (module, { operation, objectStep, toolSize, toolOffset, angle, length, ruled, spineLength, radius, distance, depth, position, direction, faceIndex, axisOrigin, neutralPlaneDirection, reversed, offset, intersectionJoin, translationX, planeOriginX, multiTranslationX, stage }) => {
|
||||
const baseStep = objectStep ?? shapeStep(module, 'makeBox', 10, 10, 10)
|
||||
const objectInput = input('object', 'object', stage.objectId, stage.objectTag, baseStep, stage.namingEvidence)
|
||||
if (operation === 'rotate') return { response: module.rotateHistoryFromStep(baseStep, 0, 0, 0, 0, 0, 1, angle), inputs: [objectInput] }
|
||||
if (operation === 'revolution') return { response: module.revolutionHistoryFromStep(baseStep, -1, 0, 0, 0, 1, 0, angle), inputs: [objectInput] }
|
||||
if (operation === 'fillet') return { response: module.filletHistoryFromStep(baseStep, radius), inputs: [objectInput] }
|
||||
if (operation === 'chamfer') return { response: module.chamferHistoryFromStep(baseStep, distance), inputs: [objectInput] }
|
||||
if (operation === 'hole') return { response: module.holeHistoryFromStep(baseStep, radius, depth, ...position, ...direction), inputs: [objectInput] }
|
||||
if (operation === 'draft') return { response: module.draftHistoryFromStep(baseStep, faceIndex, angle, ...direction, ...axisOrigin, ...neutralPlaneDirection, reversed), inputs: [objectInput] }
|
||||
if (operation === 'thickness') return { response: module.thicknessHistoryFromStep(baseStep, faceIndex, offset, intersectionJoin), inputs: [objectInput] }
|
||||
if (operation === 'linear-pattern') return { response: module.linearPatternHistoryFromStep(baseStep, translationX, 0, 0), inputs: [objectInput] }
|
||||
if (operation === 'polar-pattern') return { response: module.polarPatternHistoryFromStep(baseStep, ...axisOrigin, ...direction, angle), inputs: [objectInput] }
|
||||
if (operation === 'mirrored') return { response: module.mirroredHistoryFromStep(baseStep, planeOriginX, 0, 0, 1, 0, 0), inputs: [objectInput] }
|
||||
if (operation === 'multi-transform') return {
|
||||
response: module.multiTransformHistoryFromStep(baseStep, [
|
||||
{ type: 'linear', direction: [multiTranslationX, 0, 0] },
|
||||
{ type: 'mirrored', axisOrigin: [5, 0, 0], direction: [1, 0, 0] },
|
||||
]),
|
||||
inputs: [objectInput],
|
||||
}
|
||||
if (operation === 'groove') {
|
||||
const profileStep = shapeStep(module, 'makeRectangleFacePlaced', 1, 3, 0.5, 2, 0)
|
||||
return {
|
||||
response: module.grooveHistoryFromStep(baseStep, profileStep, 0, 0, 0, 0, 1, 0, angle),
|
||||
inputs: [objectInput, input('tool', 'tool', `${stage.resultObjectId}:profile`, stage.objectTag + 1, profileStep)],
|
||||
}
|
||||
}
|
||||
if (operation === 'pad') return { response: module.prismHistoryFromStep(baseStep, 0, 0, length), inputs: [objectInput] }
|
||||
if (operation === 'pocket') {
|
||||
const profileStep = shapeStep(module, 'makeRectangleFace', 2, 3)
|
||||
@@ -91,16 +134,17 @@ const createOperation = (module, { operation, objectStep, toolSize, toolOffset,
|
||||
}
|
||||
|
||||
const captureRejectedStage = (module, definition) => {
|
||||
const spec = operationSpecs[definition.operation]
|
||||
let capture
|
||||
try {
|
||||
capture = createOperation(module, definition)
|
||||
} catch (error) {
|
||||
return {
|
||||
operation: definition.operation,
|
||||
builder: operationSpecs[definition.operation].builder,
|
||||
builder: spec.builder,
|
||||
inputCount: 1,
|
||||
parameter: operationSpecs[definition.operation].parameter,
|
||||
parameterValue: definition.length,
|
||||
parameter: spec.parameter,
|
||||
parameterValue: definition[spec.parameter],
|
||||
runtime: 'occt-native',
|
||||
outcome: 'rejected',
|
||||
resultProduced: false,
|
||||
@@ -232,14 +276,27 @@ const persistPair = async (pair, step, namingEvidence, decision) => {
|
||||
}
|
||||
}
|
||||
|
||||
const classifyFusePair = async (toOperation, pairIndex) => {
|
||||
const pair = `fuse->${toOperation}`
|
||||
const classifyPair = async (fromOperation, toOperation, pairIndex) => {
|
||||
const pair = `${fromOperation}->${toOperation}`
|
||||
const pairId = pair.replace('->', '-')
|
||||
const firstParameters = pair === 'cut->thickness'
|
||||
? { toolSize: 10, toolOffset: 5 }
|
||||
: ['common->pocket', 'common->groove'].includes(pair)
|
||||
? { toolSize: 5, toolOffset: 0 }
|
||||
: fromOperation === 'fuse'
|
||||
? toOperation === 'thickness'
|
||||
? { toolSize: 10, toolOffset: 0 }
|
||||
: ['fillet', 'chamfer'].includes(toOperation)
|
||||
? { toolSize: 10, toolOffset: 5 }
|
||||
: { toolSize: 5, toolOffset: 8 }
|
||||
: fromOperation === 'common'
|
||||
? { toolSize: 5, toolOffset: 4 }
|
||||
: operationSpecs[fromOperation].nominal
|
||||
const first = captureStage(module, {
|
||||
operation: 'fuse', toolSize: 5, toolOffset: 8,
|
||||
operation: fromOperation, ...firstParameters,
|
||||
stage: { stageId: `pair:${pairId}:first`, ordinal: 0, objectId: `pair:${pairId}:base`, objectTag: 1001 + pairIndex * 100, resultObjectId: `pair:${pairId}:first`, resultObjectTag: 1101 + pairIndex * 100 },
|
||||
})
|
||||
const spec = operationSpecs[toOperation]
|
||||
const spec = pairSpecOverrides[pair] ?? operationSpecs[toOperation]
|
||||
const secondDefinition = {
|
||||
operation: toOperation,
|
||||
objectStep: first.response.resultStep,
|
||||
@@ -255,7 +312,7 @@ const classifyFusePair = async (toOperation, pairIndex) => {
|
||||
if (!kernelRestoredExactly) fail(`${pair} OCCT diagnostic probe did not restore exactly.`)
|
||||
const persistence = await persistPair(pair, first.response.resultStep, first.namingEvidence, 'rejected')
|
||||
return {
|
||||
taskId: `TSN-PAIR-fuse-${toOperation}`,
|
||||
taskId: `TSN-PAIR-${pairId}`,
|
||||
pair,
|
||||
classification: 'rejected',
|
||||
reasonCode: 'freecad-input-precondition-reject-with-kernel-diagnostic-and-clean-resave',
|
||||
@@ -264,12 +321,12 @@ const classifyFusePair = async (toOperation, pairIndex) => {
|
||||
rejection: { scope: 'second-operation-only', authority: 'freecad-document', parameter: spec.parameter, trajectory, kernelAttempts, kernelRestoredExactly, persistence },
|
||||
}
|
||||
}
|
||||
const attempts = trajectory.map((length) => captureRejectedStage(module, { ...secondDefinition, length }))
|
||||
const attempts = trajectory.map((value) => captureRejectedStage(module, { ...secondDefinition, [spec.parameter]: value }))
|
||||
const stableRejection = attempts.every((attempt) => rejectionSignature(attempt) === rejectionSignature(attempts[0]))
|
||||
if (!stableRejection) fail(`${pair} rejection changed across its parameter trajectory.`)
|
||||
const persistence = await persistPair(pair, first.response.resultStep, first.namingEvidence, 'rejected')
|
||||
return {
|
||||
taskId: `TSN-PAIR-fuse-${toOperation}`,
|
||||
taskId: `TSN-PAIR-${pairId}`,
|
||||
pair,
|
||||
classification: 'rejected',
|
||||
reasonCode: 'native-builder-and-freecad-profile-reject-with-clean-resave',
|
||||
@@ -290,7 +347,7 @@ const classifyFusePair = async (toOperation, pairIndex) => {
|
||||
if (!mutationChanged || !restoredExactly) fail(`${pair} mutation did not change and restore native geometry/history.`)
|
||||
const persistence = await persistPair(pair, second.response.resultStep, second.namingEvidence, 'accepted')
|
||||
return {
|
||||
taskId: `TSN-PAIR-fuse-${toOperation}`,
|
||||
taskId: `TSN-PAIR-${pairId}`,
|
||||
pair,
|
||||
classification: 'accepted',
|
||||
reasonCode: 'native-builders-mutation-naming-and-fcstd-resave-pass',
|
||||
@@ -306,8 +363,10 @@ const classifyFusePair = async (toOperation, pairIndex) => {
|
||||
}
|
||||
}
|
||||
|
||||
const operations = ['fuse', 'cut', 'common', 'rotate', 'pad', 'pocket', 'loft', 'pipe', 'revolution', 'groove', 'fillet', 'chamfer', 'hole', 'draft', 'thickness', 'linear-pattern', 'polar-pattern', 'mirrored', 'multi-transform']
|
||||
const orderedPairPrefix = [...operations.map((toOperation) => ['fuse', toOperation]), ['cut', 'fuse'], ['cut', 'cut'], ['cut', 'common'], ['cut', 'pad'], ['cut', 'pocket'], ['cut', 'loft'], ['cut', 'pipe'], ['cut', 'revolution'], ['cut', 'groove'], ['cut', 'fillet'], ['cut', 'chamfer'], ['cut', 'hole'], ['cut', 'draft'], ['cut', 'thickness'], ['cut', 'linear-pattern'], ['cut', 'polar-pattern'], ['cut', 'mirrored'], ['cut', 'multi-transform'], ['common', 'fuse'], ['common', 'cut'], ['common', 'common'], ['common', 'rotate'], ['common', 'pad'], ['common', 'pocket'], ['common', 'loft'], ['common', 'pipe'], ['common', 'revolution'], ['common', 'groove'], ['common', 'fillet'], ['common', 'chamfer'], ['common', 'hole'], ['common', 'draft'], ['common', 'thickness'], ['common', 'linear-pattern'], ['common', 'polar-pattern'], ['common', 'mirrored'], ['common', 'multi-transform']]
|
||||
const classifications = []
|
||||
for (const [index, operation] of ['fuse', 'cut', 'common', 'rotate', 'pad', 'pocket', 'loft', 'pipe'].entries()) classifications.push(await classifyFusePair(operation, index))
|
||||
for (const [index, [fromOperation, toOperation]] of orderedPairPrefix.entries()) classifications.push(await classifyPair(fromOperation, toOperation, index))
|
||||
|
||||
const [artifacts, executorHarness, matrixHarness, resaveHarness] = await Promise.all([
|
||||
Promise.all(artifactNames.map(async (name) => {
|
||||
|
||||
Reference in New Issue
Block a user