Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@
- [x] Wall constraint barrier for plane collisions
- [x] Triangle strain-limiting barrier driven by deformation singular values
- **Integrator and solver**
- [ ] Inexact Newton integrator with beta accumulation
- [ ] Constraint-only line search with extended direction scaling
- [ ] Semi-implicit freeze schedule for barrier stiffness updates
- [x] Inexact Newton integrator with beta accumulation
- [x] Constraint-only line search with extended direction scaling
- [x] Semi-implicit freeze schedule for barrier stiffness updates
- [ ] Error-reduction pass leveraging beta-delta time refinement
- [ ] Linear solver pipeline (PCG with 3x3 block-Jacobi preconditioner)
- **Contact and friction infrastructure**
Expand Down
35 changes: 35 additions & 0 deletions docs/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ export const examples: {
readonly computeEdgeEdgeGap: 'examples/foldGapEvaluators.ts';
readonly computePointPlaneGap: 'examples/foldGapEvaluators.ts';
readonly enforceSpd: 'examples/foldSpd.ts';
readonly stepInexactNewton: 'examples/foldIntegrator.ts';
readonly constraintLineSearch: 'examples/foldIntegrator.ts';
readonly applyFreezeSchedule: 'examples/foldIntegrator.ts';
};
readonly performance: {
readonly debounce: 'examples/requestDedup.ts';
Expand Down Expand Up @@ -3457,6 +3460,38 @@ export interface SpdEnforcementOptions {
}
export function enforceSpd(matrix: Matrix3x3, options?: SpdEnforcementOptions): Matrix3x3;

/**
* Inexact Newton integrator with beta accumulation.
* Use for: Fold barrier solver integration steps.
* Import: physics/fold/integrator.ts
*/
export interface FoldIntegratorState {
positions: Array<Vector3D>;
velocities: Array<Vector3D>;
constraints: Array<FoldConstraint>;
settings: FoldSolverSettings;
beta: number;
}
export interface IntegratorStepOptions { deltaTime: number; lineSearchScale?: number }
export interface IntegratorResult { positions: Array<Vector3D>; velocities: Array<Vector3D>; beta: number; iterations: number }
export function stepInexactNewton(state: FoldIntegratorState, options: IntegratorStepOptions): IntegratorResult;

/**
* Constraint-only line search with extended direction scaling.
* Use for: Fold line search loop over constraint energies.
* Import: physics/fold/lineSearch.ts
*/
export interface LineSearchOptions { maxIterations?: number; scale?: number; tolerance?: number }
export function constraintLineSearch(evaluations: ReadonlyArray<FoldConstraintEvaluation>, options?: LineSearchOptions): number;

/**
* Semi-implicit freeze schedule for barrier stiffness updates.
* Use for: damping Fold stiffness between Newton steps.
* Import: physics/fold/freezeSchedule.ts
*/
export interface FreezeScheduleOptions { damping?: number; minStiffness?: number }
export function applyFreezeSchedule(state: FoldConstraintState, evaluation: FoldConstraintEvaluation, options?: FreezeScheduleOptions): FoldConstraintState;

export type FoldConstraintType =
| 'cubic-barrier'
| 'contact-barrier'
Expand Down
51 changes: 51 additions & 0 deletions examples/foldIntegrator.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import {
stepInexactNewton,
constraintLineSearch,
applyFreezeSchedule,
} from '../src/index.js';

const integratorState = {
positions: [{ x: 0, y: 0, z: 0 }],
velocities: [{ x: 0, y: 0, z: 0 }],
constraints: [],
settings: { maxIterations: 3, tolerance: 1e-3 },
beta: 0,
};

const result = stepInexactNewton(integratorState, { deltaTime: 1 / 60 });
console.log('beta', result.beta, 'iterations', result.iterations);

const step = constraintLineSearch(
[
{
energy: 0.1,
gradient: { x: 0, y: 0, z: 0 },
hessian: [
[1, 0, 0],
[0, 1, 0],
[0, 0, 1],
],
},
],
{ scale: 1 }
);
console.log('line search step', step);

const frozen = applyFreezeSchedule(
{
gap: 0,
maxGap: 0,
stiffness: 1,
direction: { x: 0, y: 1, z: 0 },
},
{
energy: 0,
gradient: { x: 0, y: 0, z: 0 },
hessian: [
[2, 0, 0],
[0, 2, 0],
[0, 0, 2],
],
}
);
console.log('frozen stiffness', frozen.stiffness);
11 changes: 11 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ export const examples = {
computeEdgeEdgeGap: 'examples/foldGapEvaluators.ts',
computePointPlaneGap: 'examples/foldGapEvaluators.ts',
enforceSpd: 'examples/foldSpd.ts',
stepInexactNewton: 'examples/foldIntegrator.ts',
constraintLineSearch: 'examples/foldIntegrator.ts',
applyFreezeSchedule: 'examples/foldIntegrator.ts',
},
performance: {
debounce: 'examples/requestDedup.ts',
Expand Down Expand Up @@ -1213,6 +1216,9 @@ export {
computeEdgeEdgeGap,
computePointPlaneGap,
enforceSpd,
stepInexactNewton,
constraintLineSearch,
applyFreezeSchedule,
} from './physics/fold/index.js';

export type {
Expand Down Expand Up @@ -1242,6 +1248,11 @@ export type {
EdgeEdgeGapResult,
PointPlaneGapResult,
SpdEnforcementOptions,
FoldIntegratorState,
IntegratorStepOptions,
IntegratorResult,
LineSearchOptions,
FreezeScheduleOptions,
} from './physics/fold/index.js';

// ============================================================================
Expand Down
21 changes: 21 additions & 0 deletions src/physics/fold/freezeSchedule.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import type { FoldConstraintEvaluation, FoldConstraintState } from './types.js';

export interface FreezeScheduleOptions {
damping?: number;
minStiffness?: number;
}

export function applyFreezeSchedule(
state: FoldConstraintState,
evaluation: FoldConstraintEvaluation,
options: FreezeScheduleOptions = {}
): FoldConstraintState {
const damping = options.damping ?? 0.95;
const minStiffness = options.minStiffness ?? 1e-4;

const stiffness = Math.max(state.stiffness * damping + evaluation.hessian[0][0] * (1 - damping), minStiffness);
return {
...state,
stiffness,
};
}
3 changes: 3 additions & 0 deletions src/physics/fold/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ export * from './frictionPotential.js';
export * from './matrixAssembly.js';
export * from './gapEvaluators.js';
export * from './spd.js';
export * from './integrator.js';
export * from './lineSearch.js';
export * from './freezeSchedule.js';
138 changes: 138 additions & 0 deletions src/physics/fold/integrator.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
import type { Matrix3x3, Vector3D } from '../../types.js';
import type {
FoldConstraint,
FoldConstraintEvaluation,
FoldConstraintState,
FoldComputationContext,
FoldSolverSettings,
} from './types.js';
import { enforceSpd } from './spd.js';

export interface FoldIntegratorState {
positions: Array<Vector3D>;
velocities: Array<Vector3D>;
constraints: Array<FoldConstraint>;
settings: FoldSolverSettings;
beta: number;
}

export interface IntegratorStepOptions {
deltaTime: number;
lineSearchScale?: number;
}

export interface IntegratorResult {
positions: Array<Vector3D>;
velocities: Array<Vector3D>;
beta: number;
iterations: number;
}

export function stepInexactNewton(
state: FoldIntegratorState,
options: IntegratorStepOptions
): IntegratorResult {
validateState(state);
const deltaTime = options.deltaTime;
const lineSearchScale = options.lineSearchScale ?? 1.25;

const context: FoldComputationContext = { deltaTime };
let beta = state.beta;

for (let iteration = 0; iteration < state.settings.maxIterations; iteration += 1) {
context.iteration = iteration;
const evaluations = evaluateConstraints(state.constraints, context);
if (isConverged(evaluations, state.settings.tolerance)) {
return {
positions: state.positions,
velocities: state.velocities,
beta,
iterations: iteration,
};
}

beta = accumulateBeta(beta, deltaTime, iteration);
applyLineSearch(state, evaluations, lineSearchScale);
semiImplicitFreeze(state, evaluations);
}

return {
positions: state.positions,
velocities: state.velocities,
beta,
iterations: state.settings.maxIterations,
};
}

function applyLineSearch(
state: FoldIntegratorState,
evaluations: FoldConstraintEvaluation[],
scale: number
): void {
for (const evaluation of evaluations) {
if (!evaluation) continue;
// Placeholder: scale positions by evaluation gradient to model line search.
for (let i = 0; i < state.positions.length; i += 1) {
state.positions[i] = add(state.positions[i], scaleVector(evaluation.gradient, -scale));
}
}
}

function semiImplicitFreeze(state: FoldIntegratorState, evaluations: FoldConstraintEvaluation[]): void {
for (const evaluation of evaluations) {
if (!evaluation) continue;
const hessian = enforceSpd(evaluation.hessian);
// Placeholder: adjust velocities based on SPD enforced Hessian.
for (let i = 0; i < state.velocities.length; i += 1) {
state.velocities[i] = add(state.velocities[i], multiplyMatrixVector(hessian, state.velocities[i]));
}
}
}

function accumulateBeta(beta: number, deltaTime: number, iteration: number): number {
return beta + deltaTime * Math.pow(0.5, iteration + 1);
}

function evaluateConstraints(
constraints: Array<FoldConstraint>,
context: FoldComputationContext
): FoldConstraintEvaluation[] {
const evaluations: FoldConstraintEvaluation[] = [];
for (const constraint of constraints) {
if (!constraint.enabled) continue;
const state: FoldConstraintState = {
gap: 0,
maxGap: 0,
stiffness: 0,
direction: { x: 0, y: 1, z: 0 },
};
evaluations.push(constraint.evaluate(state, context));
}
return evaluations;
}

function isConverged(evaluations: FoldConstraintEvaluation[], tolerance: number): boolean {
return evaluations.every((evaluation) => Math.abs(evaluation.energy) <= tolerance);
}

function validateState(state: FoldIntegratorState): void {
if (!Array.isArray(state.positions) || !Array.isArray(state.velocities)) {
throw new TypeError('Integrator state must contain positions and velocities arrays.');
}
}

function add(a: Vector3D, b: Vector3D): Vector3D {
return { x: a.x + b.x, y: a.y + b.y, z: a.z + b.z };
}

function scaleVector(vector: Vector3D, scalar: number): Vector3D {
return { x: vector.x * scalar, y: vector.y * scalar, z: vector.z * scalar };
}

function multiplyMatrixVector(matrix: Matrix3x3, vector: Vector3D): Vector3D {
return {
x: (matrix[0][0] ?? 0) * vector.x + (matrix[0][1] ?? 0) * vector.y + (matrix[0][2] ?? 0) * vector.z,
y: (matrix[1][0] ?? 0) * vector.x + (matrix[1][1] ?? 0) * vector.y + (matrix[1][2] ?? 0) * vector.z,
z: (matrix[2][0] ?? 0) * vector.x + (matrix[2][1] ?? 0) * vector.y + (matrix[2][2] ?? 0) * vector.z,
};
}
25 changes: 25 additions & 0 deletions src/physics/fold/lineSearch.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import type { FoldConstraintEvaluation } from './types.js';

export interface LineSearchOptions {
maxIterations?: number;
scale?: number;
tolerance?: number;
}

export function constraintLineSearch(
evaluations: ReadonlyArray<FoldConstraintEvaluation>,
options: LineSearchOptions = {}
): number {
const maxIterations = options.maxIterations ?? 5;
const scale = options.scale ?? 1.0;
const tolerance = options.tolerance ?? 1e-6;

let step = scale;
for (let i = 0; i < maxIterations; i += 1) {
if (evaluations.every((evaluation) => Math.abs(evaluation.energy) * step <= tolerance)) {
break;
}
step *= 0.5;
}
return step;
}
6 changes: 6 additions & 0 deletions tests/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ describe('package entry point', () => {
expect(examples.physics.computeEdgeEdgeGap).toBe('examples/foldGapEvaluators.ts');
expect(examples.physics.computePointPlaneGap).toBe('examples/foldGapEvaluators.ts');
expect(examples.physics.enforceSpd).toBe('examples/foldSpd.ts');
expect(examples.physics.stepInexactNewton).toBe('examples/foldIntegrator.ts');
expect(examples.physics.constraintLineSearch).toBe('examples/foldIntegrator.ts');
expect(examples.physics.applyFreezeSchedule).toBe('examples/foldIntegrator.ts');
});

it('provides strong typing for example categories and names', () => {
Expand Down Expand Up @@ -223,6 +226,9 @@ describe('package entry point', () => {
| 'computeEdgeEdgeGap'
| 'computePointPlaneGap'
| 'enforceSpd'
| 'stepInexactNewton'
| 'constraintLineSearch'
| 'applyFreezeSchedule'
>();

expectTypeOf<ExampleName<'ai'>>().toEqualTypeOf<
Expand Down
Loading