@ohtaman/washi 0.4.0 → 0.6.0

package/dist/browser/washi.js

@@ -1,97 +1,182 @@
-import { a as e, c as t, i as n, l as r, n as i, o as a, r as o, s, t as c } from "./loader-CVt4CloI.js";
+import { a as e, i as t, n, o as r, r as i, s as a, t as o } from "./loader-DewlSho8.js";
 //#region src/modeler/types.ts
-function l(e) {
-	return e && e.toLowerCase() === "maximize" ? "Maximize" : "Minimize";
+function s(e) {
+	if (e === void 0) return "Minimize";
+	if (typeof e == "string") {
+		let t = e.toLowerCase();
+		if (t === "maximize") return "Maximize";
+		if (t === "minimize") return "Minimize";
+	}
+	throw Error(`Invalid optimization sense "${String(e)}": expected "Maximize", "Minimize", "maximize", or "minimize".`);
 }
 //#endregion
 //#region src/modeler/boolean-expr.ts
-var u = 0, d = class {
+var c = 0;
+function l(e, t) {
+	if (e instanceof u || e instanceof y) return e;
+	throw typeof e == "object" && e && ("terms" in e || "quadTerms" in e) ? Error(`Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical operator "${t}". Use a comparison constraint such as expr\`\${x} <= 10\` or a BoolVar/BoolExpr.`) : typeof e == "object" && e && "id" in e && "name" in e && "lb" in e && "ub" in e && !("sense" in e) ? Error(`Invalid operand passed to logical operator "${t}": expected a BoolVar, BoolExpr, or Constraint, but received numeric variable "${e.name}". Use m.bool() for propositional variables, add a comparison such as expr\`\${x} == 1\`, or use m.indicator(binVar, constraint) for 0-1 Big-M indicator constraints.`) : Error(`Invalid operand passed to logical operator "${t}": expected a BoolVar, BoolExpr, or Constraint.`);
+}
+var u = class {
 	and(e) {
-		return new p("and", [this, e]);
+		return new f("and", [this, l(e, "and")]);
 	}
 	or(e) {
-		return new p("or", [this, e]);
+		return new f("or", [this, l(e, "or")]);
 	}
 	implies(e) {
-		return new p("implies", [this, e]);
+		return new f("implies", [this, l(e, "implies")]);
 	}
 	xor(e) {
-		return new p("xor", [this, e]);
+		return new f("xor", [this, l(e, "xor")]);
 	}
 	not() {
-		return new p("not", [this]);
+		return new f("not", [this]);
 	}
-}, f = class extends d {
+}, d = class extends u {
 	id;
 	name;
 	value = null;
 	constructor(e) {
-		super(), this.id = ++u, this.name = e || `p_${this.id}`;
+		super(), this.id = ++c, this.name = e || `p_${this.id}`;
 	}
 	toString() {
 		return this.name;
 	}
-}, p = class extends d {
+}, f = class extends u {
 	op;
 	children;
 	constructor(e, t) {
-		super(), this.op = e, this.children = t;
+		super(), this.op = e, this.children = t.map((t) => l(t, e));
 	}
 	toString() {
 		return this.op === "not" ? `not(${this.children[0].toString()})` : `(${this.children.map((e) => e.toString()).join(` ${this.op} `)})`;
 	}
 };
-function m(...e) {
+function p(...e) {
 	if (e.length === 0) throw Error("and() requires at least one expression");
-	return new p("and", e);
+	return new f("and", e);
 }
-function h(...e) {
+function m(...e) {
 	if (e.length === 0) throw Error("or() requires at least one expression");
-	return new p("or", e);
+	return new f("or", e);
 }
-function g(e) {
-	return new p("not", [e]);
+function h(e) {
+	return new f("not", [e]);
 }
-function _(e, t) {
-	return new p("implies", [e, t]);
+function g(e, t) {
+	return new f("implies", [e, t]);
 }
-function v(...e) {
+function _(...e) {
 	if (e.length === 0) throw Error("xor() requires at least one expression");
-	return new p("xor", e);
+	return new f("xor", e);
 }
 //#endregion
 //#region src/modeler/constraint.ts
-var y = 0, b = class {
+var v = 0, y = class e {
+	kind = "constraint";
 	id;
-	lhs;
-	sense;
-	rhs;
-	name;
+	_lhs;
+	_sense;
+	_rhs;
+	_name;
+	hasExplicitName;
+	ownerModel = null;
 	slack = null;
 	dual = null;
+	addTerm(e, t) {
+		return t === 0 ? this : (this._lhs.addTerm(e, t), this.ownerModel?.notifyMutation?.(), this);
+	}
+	setTerm(e, t) {
+		return this._lhs.setTerm(e, t), this.ownerModel?.notifyMutation?.(), this;
+	}
 	constructor(e, t, n, r) {
-		this.id = ++y, this.lhs = e, this.sense = t, this.rhs = n, this.name = r || `c_${this.id}`;
+		this.id = ++v, this._lhs = e, this._sense = t, this._rhs = n;
+		let i = typeof r == "string" ? r.trim() : void 0;
+		i && i.length > 0 ? (this._name = i, this.hasExplicitName = !0) : (this._name = `c_${this.id}`, this.hasExplicitName = !1);
+	}
+	get lhs() {
+		return this._lhs;
+	}
+	set lhs(e) {
+		this._lhs !== e && (this._lhs = e, this.ownerModel?.notifyMutation?.());
+	}
+	get sense() {
+		return this._sense;
+	}
+	set sense(e) {
+		this._sense !== e && (this._sense = e, this.ownerModel?.notifyMutation?.());
+	}
+	get rhs() {
+		return this._rhs;
+	}
+	set rhs(e) {
+		Object.is(this._rhs, e) || (this._rhs = e, this.ownerModel?.notifyMutation?.());
+	}
+	get name() {
+		return this._name;
+	}
+	set name(e) {
+		this._name !== e && (this._name = e, this.ownerModel?.notifyMutation?.()), this.hasExplicitName = !0;
+	}
+	_assignModelName(e, t) {
+		this._name = e, this.hasExplicitName = t;
 	}
 	and(e) {
-		return new p("and", [this, e]);
+		return new f("and", [this, e]);
 	}
 	or(e) {
-		return new p("or", [this, e]);
+		return new f("or", [this, e]);
 	}
 	implies(e) {
-		return new p("implies", [this, e]);
+		return new f("implies", [this, e]);
 	}
 	xor(e) {
-		return new p("xor", [this, e]);
+		return new f("xor", [this, e]);
 	}
 	not() {
-		return new p("not", [this]);
+		return new f("not", [this]);
+	}
+	add(e) {
+		throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+	}
+	sub(e) {
+		throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+	}
+	mul(e) {
+		throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+	}
+	div(e) {
+		throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+	}
+	neg() {
+		throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+	}
+	le(e, t) {
+		throw Error("Cannot compare a Constraint in (<=): expected a number, Var, or LinExpr.");
+	}
+	ge(e, t) {
+		throw Error("Cannot compare a Constraint in (>=): expected a number, Var, or LinExpr.");
+	}
+	eq(e, t) {
+		throw Error("Cannot compare a Constraint in (==): expected a number, Var, or LinExpr.");
+	}
+	get value() {
+		throw Error("Cannot read numeric value of a Constraint: expected a Var, LinExpr, or QuadExpr.");
+	}
+	get constant() {
+		throw Error("Cannot read numeric constant of a Constraint: expected a LinExpr or QuadExpr.");
+	}
+	clone() {
+		return new e(this._lhs.clone(), this._sense, this._rhs, this.hasExplicitName ? this._name : void 0);
 	}
 	toString() {
 		let e = this.sense === "==" ? "=" : this.sense;
 		return `${this.name}: ${this.lhs.toString()} ${e} ${this.rhs}`;
 	}
 };
+function b(e) {
+	return e instanceof y || typeof e == "object" && !!e && "sense" in e && "lhs" in e && "rhs" in e;
+}
 //#endregion
 //#region src/modeler/quad-expr.ts
 function x(e, t) {
@@ -99,6 +184,7 @@ function x(e, t) {
 	return n <= r ? `${n}:${r}` : `${r}:${n}`;
 }
 var S = class e {
+	kind = "quadratic";
 	linearTerms;
 	quadTerms;
 	constant;
@@ -115,80 +201,72 @@ var S = class e {
 		return r ? r.coeff : 0;
 	}
 	add(t) {
+		if (b(t)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
 		let n = this.clone();
 		if (typeof t == "number") return n.constant += t, n;
 		if (t instanceof e) {
 			for (let [e, r] of t.quadTerms) {
 				let t = n.quadTerms.get(e), i = (t ? t.coeff : 0) + r.coeff;
-				Math.abs(i) < 1e-12 ? n.quadTerms.delete(e) : n.quadTerms.set(e, {
+				i === 0 ? n.quadTerms.delete(e) : n.quadTerms.set(e, {
 					var1: r.var1,
 					var2: r.var2,
 					coeff: i
 				});
 			}
 			for (let [e, r] of t.linearTerms) {
-				let t = (n.linearTerms.get(e) || 0) + r;
-				Math.abs(t) < 1e-12 ? n.linearTerms.delete(e) : n.linearTerms.set(e, t);
+				let t = (n.linearTerms.get(e) ?? 0) + r;
+				t === 0 ? n.linearTerms.delete(e) : n.linearTerms.set(e, t);
 			}
 			return n.constant += t.constant, n;
 		}
 		if ("terms" in t && t.terms instanceof Map) {
 			for (let [e, r] of t.terms) {
-				let t = (n.linearTerms.get(e) || 0) + r;
-				Math.abs(t) < 1e-12 ? n.linearTerms.delete(e) : n.linearTerms.set(e, t);
+				let t = (n.linearTerms.get(e) ?? 0) + r;
+				t === 0 ? n.linearTerms.delete(e) : n.linearTerms.set(e, t);
 			}
 			return n.constant += t.constant, n;
 		}
-		let r = t, i = (n.linearTerms.get(r) || 0) + 1;
-		return Math.abs(i) < 1e-12 ? n.linearTerms.delete(r) : n.linearTerms.set(r, i), n;
+		let r = t, i = (n.linearTerms.get(r) ?? 0) + 1;
+		return i === 0 ? n.linearTerms.delete(r) : n.linearTerms.set(r, i), n;
 	}
-	sub(t) {
-		return typeof t == "number" ? this.add(-t) : t instanceof e ? this.add(t.neg()) : ("terms" in t && t.terms instanceof Map, this.add(t.mul(-1)));
+	sub(e) {
+		if (b(e)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+		return typeof e == "number" ? this.add(-e) : this.add(e.mul(-1));
 	}
 	mul(t) {
+		if (b(t)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
 		if (typeof t == "number") {
-			let n = new e(/* @__PURE__ */ new Map(), /* @__PURE__ */ new Map(), this.constant * t);
-			for (let [e, r] of this.linearTerms) {
-				let i = r * t;
-				Math.abs(i) >= 1e-12 && n.linearTerms.set(e, i);
+			let n = this.linearTerms.size > 0 || this.quadTerms.size > 0, r = this.constant === 0 && n ? 0 : this.constant * t;
+			if (this.constant !== 0 && t !== 0 && r === 0) throw Error("Constant multiplication underflows to zero.");
+			let i = new e(/* @__PURE__ */ new Map(), /* @__PURE__ */ new Map(), r);
+			for (let [e, n] of this.linearTerms) {
+				let r = n * t;
+				if (n !== 0 && t !== 0 && r === 0) throw Error("Coefficient multiplication underflows to zero.");
+				r !== 0 && i.linearTerms.set(e, r);
 			}
-			for (let [e, r] of this.quadTerms) {
-				let i = r.coeff * t;
-				Math.abs(i) >= 1e-12 && n.quadTerms.set(e, {
-					var1: r.var1,
-					var2: r.var2,
-					coeff: i
+			for (let [e, n] of this.quadTerms) {
+				let r = n.coeff * t;
+				if (n.coeff !== 0 && t !== 0 && r === 0) throw Error("Coefficient multiplication underflows to zero.");
+				r !== 0 && i.quadTerms.set(e, {
+					var1: n.var1,
+					var2: n.var2,
+					coeff: r
 				});
 			}
-			return n;
-		}
-		if ("id" in t && "name" in t && !("terms" in t) && !("quadTerms" in t)) {
-			if (this.quadTerms.size > 0) throw Error("Multiplication creates a non-linear term of degree > 2 (not allowed in MILP/LP/QP)");
-			let n = new e();
-			Math.abs(this.constant) >= 1e-12 && n.linearTerms.set(t, this.constant);
-			for (let [r, i] of this.linearTerms) n = n.add(e.fromProduct(r, t, i));
-			return n;
+			return i;
 		}
-		let n = t, r = "quadTerms" in n ? n.quadTerms.size : 0, i = "quadTerms" in n ? n.linearTerms : n.terms;
+		let n = "id" in t && "name" in t && !("terms" in t) && !("quadTerms" in t), r = "quadTerms" in t ? t.quadTerms.size : 0, i = n ? /* @__PURE__ */ new Map([[t, 1]]) : "quadTerms" in t ? t.linearTerms : t.terms, a = n ? 0 : t.constant;
 		if (this.quadTerms.size > 0 && (r > 0 || i.size > 0) || r > 0 && this.linearTerms.size > 0) throw Error("Multiplication creates a non-linear term of degree > 2 (not allowed in MILP/LP/QP)");
-		if (r === 0 && i.size === 0) return this.mul(n.constant);
-		if (this.quadTerms.size === 0 && this.linearTerms.size === 0) {
-			let t = n.mul(this.constant);
-			if (t instanceof e) return t;
-			let r = new e();
-			r.constant = t.constant;
-			for (let [e, n] of t.terms) r.linearTerms.set(e, n);
-			return r;
+		if (r === 0 && i.size === 0) return this.mul(a);
+		if (this.quadTerms.size === 0 && this.linearTerms.size === 0 && !n) {
+			let n = t.mul(this.constant);
+			return "quadTerms" in n ? n : new e(n.terms, /* @__PURE__ */ new Map(), n.constant);
 		}
-		let a = new e();
-		if (a.constant = this.constant * n.constant, Math.abs(n.constant) >= 1e-12) for (let [e, t] of this.linearTerms) a.linearTerms.set(e, (a.linearTerms.get(e) || 0) + t * n.constant);
-		if (Math.abs(this.constant) >= 1e-12) for (let [e, t] of i) a.linearTerms.set(e, (a.linearTerms.get(e) || 0) + t * this.constant);
-		for (let [t, n] of this.linearTerms) for (let [r, o] of i) a = a.add(e.fromProduct(t, r, n * o));
-		return a;
+		return e.multiplyLinearTerms(this.constant, this.linearTerms, a, i);
 	}
-	div(e) {
-		if (Math.abs(e) < 1e-12) throw Error("Division by zero in QuadExpr.div()");
-		return this.mul(1 / e);
+	div(t) {
+		let n = e.extractScalarDivisor(t, "QuadExpr.div()");
+		return this.mul(1 / n);
 	}
 	neg() {
 		return this.mul(-1);
@@ -205,8 +283,34 @@ var S = class e {
 		}
 		return e;
 	}
-	getValue() {
-		return this.value;
+	le(e, t) {
+		return this.toConstraint("<=", e, t);
+	}
+	ge(e, t) {
+		return this.toConstraint(">=", e, t);
+	}
+	eq(e, t) {
+		return this.toConstraint("==", e, t);
+	}
+	toConstraint(e, t, n) {
+		if (this.quadTerms.size > 0) throw Error(`Quadratic expressions are not supported in linear constraints (${e}): quadratic terms are only allowed in objectives.`);
+		let r = new C(this.linearTerms, this.constant);
+		return e === "<=" ? r.le(t, n) : e === ">=" ? r.ge(t, n) : r.eq(t, n);
+	}
+	and(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'and': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	or(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'or': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	implies(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'implies': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	xor(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'xor': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	not() {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'not': expected a BoolVar, Constraint, or BoolOp.");
 	}
 	toString() {
 		let e = [], t = !0;
@@ -225,76 +329,104 @@ var S = class e {
 		return e.join(" ") || "0";
 	}
 	static fromProduct(t, n, r = 1) {
-		let i = new e(), a = x(t, n);
+		let i = new e();
+		if (r === 0) return i;
+		let a = x(t, n);
 		return i.quadTerms.set(a, {
 			var1: t.id <= n.id ? t : n,
 			var2: t.id <= n.id ? n : t,
 			coeff: r
 		}), i;
 	}
+	static multiplyLinearTerms(t, n, r, i) {
+		let a = n.size > 0 || i.size > 0, o = (t === 0 || r === 0) && a ? 0 : t * r;
+		if (t !== 0 && r !== 0 && o === 0) throw Error("Constant multiplication underflows to zero.");
+		let s = new e(/* @__PURE__ */ new Map(), /* @__PURE__ */ new Map(), o === 0 ? 0 : o);
+		if (r !== 0) for (let [e, t] of n) {
+			let n = t * r;
+			if (t !== 0 && n === 0) throw Error("Coefficient multiplication underflows to zero.");
+			n !== 0 && s.linearTerms.set(e, n);
+		}
+		if (t !== 0) for (let [e, n] of i) {
+			let r = s.linearTerms.get(e) ?? 0, i = n * t;
+			if (n !== 0 && i === 0) throw Error("Coefficient multiplication underflows to zero.");
+			let a = r + i;
+			a === 0 ? s.linearTerms.delete(e) : s.linearTerms.set(e, a);
+		}
+		for (let [t, r] of n) for (let [n, a] of i) {
+			let i = r * a;
+			if (r !== 0 && a !== 0 && i === 0) throw Error("Coefficient multiplication underflows to zero.");
+			s = s.add(e.fromProduct(t, n, i));
+		}
+		return s;
+	}
+	static extractScalarDivisor(e, t) {
+		if (b(e)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+		if (typeof e == "number") {
+			if (e === 0) throw Error(`Division by zero in ${t}`);
+			return e;
+		}
+		let n = "quadTerms" in e ? e.linearTerms.size : e.terms.size, r = "quadTerms" in e ? e.quadTerms.size : 0;
+		if (n > 0 || r > 0) throw Error("Cannot divide by variable in expression");
+		if (e.constant === 0) throw Error(`Division by zero in ${t}`);
+		return e.constant;
+	}
 }, C = class e {
+	kind = "linear";
 	terms;
 	constant;
 	constructor(e = /* @__PURE__ */ new Map(), t = 0) {
 		this.terms = new Map(e), this.constant = t;
 	}
+	setTerm(e, t) {
+		return t === 0 ? this.terms.delete(e) : this.terms.set(e, t), this;
+	}
+	addTerm(e, t) {
+		let n = (this.terms.get(e) ?? 0) + t;
+		return n === 0 ? this.terms.delete(e) : this.terms.set(e, n), this;
+	}
 	clone() {
 		return new e(this.terms, this.constant);
 	}
 	add(e) {
+		if (b(e)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
 		if (e instanceof S) return e.add(this);
 		let t = this.clone();
 		if (typeof e == "number") t.constant += e;
 		else if ("terms" in e) {
 			for (let [n, r] of e.terms) {
-				let e = (t.terms.get(n) || 0) + r;
-				Math.abs(e) < 1e-12 ? t.terms.delete(n) : t.terms.set(n, e);
+				let e = (t.terms.get(n) ?? 0) + r;
+				e === 0 ? t.terms.delete(n) : t.terms.set(n, e);
 			}
 			t.constant += e.constant;
 		} else {
-			let n = (t.terms.get(e) || 0) + 1;
-			Math.abs(n) < 1e-12 ? t.terms.delete(e) : t.terms.set(e, n);
+			let n = (t.terms.get(e) ?? 0) + 1;
+			n === 0 ? t.terms.delete(e) : t.terms.set(e, n);
 		}
 		return t;
 	}
 	sub(e) {
-		return e instanceof S ? e.neg().add(this) : typeof e == "number" ? this.add(-e) : ("terms" in e, this.add(e.mul(-1)));
+		if (b(e)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+		return e instanceof S ? e.neg().add(this) : typeof e == "number" ? this.add(-e) : this.add(e.mul(-1));
 	}
 	mul(t) {
+		if (b(t)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
 		if (typeof t == "number") {
-			let n = new e(/* @__PURE__ */ new Map(), this.constant * t);
-			for (let [e, r] of this.terms) {
-				let i = r * t;
-				Math.abs(i) >= 1e-12 && n.terms.set(e, i);
+			let n = this.constant === 0 && this.terms.size > 0 ? 0 : this.constant * t;
+			if (this.constant !== 0 && t !== 0 && n === 0) throw Error("Constant multiplication underflows to zero.");
+			let r = new e(/* @__PURE__ */ new Map(), n);
+			for (let [e, n] of this.terms) {
+				let i = n * t;
+				if (n !== 0 && t !== 0 && i === 0) throw Error("Coefficient multiplication underflows to zero.");
+				i !== 0 && r.terms.set(e, i);
 			}
-			return n;
-		}
-		if (t instanceof D || typeof t == "object" && t && "id" in t && !("terms" in t) && !("quadTerms" in t)) {
-			let e = t, n = new S();
-			Math.abs(this.constant) >= 1e-12 && n.linearTerms.set(e, this.constant);
-			for (let [t, r] of this.terms) n = n.add(S.fromProduct(t, e, r));
-			return n;
-		}
-		if (t instanceof S) {
-			if (t.quadTerms.size > 0 && this.terms.size > 0) throw Error("Multiplication creates a non-linear term of degree > 2 (not allowed in MILP/LP/QP)");
-			if (this.terms.size === 0) return t.mul(this.constant);
-			let e = new S();
-			if (e.constant = this.constant * t.constant, Math.abs(t.constant) >= 1e-12) for (let [n, r] of this.terms) e.linearTerms.set(n, (e.linearTerms.get(n) || 0) + r * t.constant);
-			if (Math.abs(this.constant) >= 1e-12) for (let [n, r] of t.linearTerms) e.linearTerms.set(n, (e.linearTerms.get(n) || 0) + r * this.constant);
-			for (let [n, r] of this.terms) for (let [i, a] of t.linearTerms) e = e.add(S.fromProduct(n, i, r * a));
-			return e;
+			return r;
 		}
-		if (this.terms.size === 0) return t.mul(this.constant);
-		if (t.terms.size === 0) return this.mul(t.constant);
-		let n = new S();
-		if (n.constant = this.constant * t.constant, Math.abs(t.constant) >= 1e-12) for (let [e, r] of this.terms) n.linearTerms.set(e, (n.linearTerms.get(e) || 0) + r * t.constant);
-		if (Math.abs(this.constant) >= 1e-12) for (let [e, r] of t.terms) n.linearTerms.set(e, (n.linearTerms.get(e) || 0) + r * this.constant);
-		for (let [e, r] of this.terms) for (let [i, a] of t.terms) n = n.add(S.fromProduct(e, i, r * a));
-		return n;
+		return t instanceof M || typeof t == "object" && t && "id" in t && !("terms" in t) && !("quadTerms" in t) ? S.multiplyLinearTerms(this.constant, this.terms, 0, /* @__PURE__ */ new Map([[t, 1]])) : t instanceof S ? this.terms.size === 0 ? t.mul(this.constant) : new S(this.terms, /* @__PURE__ */ new Map(), this.constant).mul(t) : this.terms.size === 0 ? t.mul(this.constant) : t.terms.size === 0 ? this.mul(t.constant) : S.multiplyLinearTerms(this.constant, this.terms, t.constant, t.terms);
 	}
 	div(e) {
-		if (Math.abs(e) < 1e-12) throw Error("Division by zero in LinExpr.div()");
-		return this.mul(1 / e);
+		let t = S.extractScalarDivisor(e, "LinExpr.div()");
+		return this.mul(1 / t);
 	}
 	neg() {
 		return this.mul(-1);
@@ -307,32 +439,41 @@ var S = class e {
 		}
 		return e;
 	}
-	getValue() {
-		return this.value;
-	}
 	le(e, t) {
 		return this.toConstraint("<=", e, t);
 	}
-	lessThanOrEqual(e, t) {
-		return this.le(e, t);
-	}
 	ge(e, t) {
 		return this.toConstraint(">=", e, t);
 	}
-	greaterThanOrEqual(e, t) {
-		return this.ge(e, t);
-	}
 	eq(e, t) {
 		return this.toConstraint("==", e, t);
 	}
-	equalTo(e, t) {
-		return this.eq(e, t);
-	}
 	toConstraint(t, n, r) {
 		let i = this.clone(), a = 0;
-		typeof n == "number" ? a = n : "terms" in n ? (i = i.sub(new e(n.terms, 0)), a = n.constant) : i = i.sub(n);
+		if (typeof n == "number") a = n;
+		else if (n instanceof y || typeof n == "object" && n && "sense" in n && "lhs" in n) throw Error(`Cannot compare against a Constraint in (${t}): expected a number, Var, or LinExpr.`);
+		else if (n instanceof S || typeof n == "object" && n && "quadTerms" in n) {
+			let r = n;
+			if (r.quadTerms.size > 0) throw Error(`Quadratic expressions are not supported in linear constraints (${t}): quadratic terms are only allowed in objectives.`);
+			i = i.sub(new e(r.linearTerms, 0)), a = r.constant;
+		} else "terms" in n ? (i = i.sub(new e(n.terms, 0)), a = n.constant) : i = i.sub(n);
 		let o = a - i.constant;
-		return i.constant = 0, new b(i, t, o, r);
+		return i.constant = 0, new y(i, t, o, r);
+	}
+	and(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'and': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	or(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'or': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	implies(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'implies': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	xor(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'xor': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	not() {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'not': expected a BoolVar, Constraint, or BoolOp.");
 	}
 	toString() {
 		let e = [], t = !0;
@@ -352,17 +493,26 @@ function w(e, t) {
 	function i(e) {
 		if (e != null) {
 			if (typeof e == "number") r += e;
-			else if (typeof e == "object" && "terms" in e) {
+			else if (e instanceof y || typeof e == "object" && "sense" in e && "lhs" in e && "rhs" in e) throw Error("Cannot sum a constraint comparison (<=, >=, ==) in sum(): expected a number, Var, or LinExpr.");
+			else if (e instanceof S || typeof e == "object" && "quadTerms" in e && e.quadTerms instanceof Map) {
+				let t = e;
+				if (t.quadTerms.size > 0) throw Error("Quadratic expressions are not supported in sum(): sum() produces a linear expression (LinExpr).");
+				for (let [e, r] of t.linearTerms) {
+					let t = n.get(e) ?? 0;
+					n.set(e, t + r);
+				}
+				r += t.constant;
+			} else if (typeof e == "object" && "terms" in e) {
 				let t = e;
 				for (let [e, r] of t.terms) {
-					let t = n.get(e) || 0;
+					let t = n.get(e) ?? 0;
 					n.set(e, t + r);
 				}
 				r += t.constant;
-			} else {
-				let t = e, r = n.get(t) || 0;
+			} else if (typeof e == "object" && "id" in e && "name" in e && "lb" in e && "ub" in e) {
+				let t = e, r = n.get(t) ?? 0;
 				n.set(t, r + 1);
-			}
+			} else throw Error("Unsupported item in sum(): expected a number, Var, or LinExpr.");
 		}
 	}
 	if (typeof e == "number") {
@@ -372,41 +522,55 @@ function w(e, t) {
 		let n = 0;
 		for (let r of e) i(t ? t(r, n++) : r);
 	}
-	for (let [e, t] of n) Math.abs(t) < 1e-12 && n.delete(e);
+	for (let [e, t] of n) t === 0 && n.delete(e);
 	return new C(n, r);
 }
-function ee(e, t) {
+function T(e, t) {
 	let n = /* @__PURE__ */ new Map(), r = 0;
 	function i(e) {
-		return typeof e == "object" && !!e && typeof e.id == "number" && typeof e.name == "string" && typeof e.mul == "function" && typeof e.le == "function";
+		return typeof e == "object" && !!e && !(e instanceof y) && typeof e.id == "number" && typeof e.name == "string" && typeof e.lb == "number" && typeof e.ub == "number" && typeof e.type == "string" && typeof e.mul == "function" && typeof e.le == "function";
 	}
 	function a(e) {
 		return i(e) || e instanceof C || e instanceof S;
 	}
-	function o(e, t) {
-		if (typeof t == "number") r += e * t;
-		else if (t instanceof C) {
+	function o(e, t, a) {
+		if (!Number.isFinite(e)) throw Error(`Invalid non-finite coefficient "${e}" in dot() at '${a || "root"}'.`);
+		if (t instanceof S) throw Error(`Quadratic expressions are not supported in dot() at '${a || "root"}': dot() produces a linear expression (LinExpr).`);
+		if (t instanceof C) {
+			if (!Number.isFinite(t.constant)) throw Error(`Invalid non-finite constant "${t.constant}" in dot() at '${a || "root"}'.`);
+			let i = e === 0 || t.constant === 0 ? 0 : e * t.constant;
+			if (e !== 0 && t.constant !== 0 && i === 0) throw Error("Constant multiplication underflows to zero.");
+			if (!Number.isFinite(i)) throw Error(`Coefficient multiplication overflows finite floating-point range in dot() at '${a || "root"}'.`);
+			let o = r + i;
+			if (!Number.isFinite(o)) throw Error(`Constant accumulation overflows finite floating-point range in dot() at '${a || "root"}'.`);
+			r = o;
 			for (let [r, i] of t.terms) {
-				let t = n.get(r) || 0;
-				n.set(r, t + e * i);
+				if (!Number.isFinite(i)) throw Error(`Invalid non-finite coefficient "${i}" in dot() at '${a || "root"}'.`);
+				let t = e * i;
+				if (e !== 0 && i !== 0 && t === 0) throw Error("Coefficient multiplication underflows to zero.");
+				if (!Number.isFinite(t)) throw Error(`Coefficient multiplication overflows finite floating-point range in dot() at '${a || "root"}'.`);
+				let o = (n.get(r) ?? 0) + t;
+				if (!Number.isFinite(o)) throw Error(`Coefficient accumulation overflows finite floating-point range in dot() at '${a || "root"}'.`);
+				n.set(r, o);
 			}
-			r += e * t.constant;
 		} else if (i(t)) {
-			let r = t, i = n.get(r) || 0;
-			n.set(r, i + e);
-		} else throw Error("Cannot multiply number by non-variable/expression operand in dot().");
+			let r = t, i = (n.get(r) ?? 0) + e;
+			if (!Number.isFinite(i)) throw Error(`Coefficient accumulation overflows finite floating-point range in dot() at '${a || "root"}'.`);
+			n.set(r, i);
+		} else throw Error(`Cannot multiply number by non-variable/expression operand in dot() at '${a || "root"}'.`);
 	}
 	function s(e) {
-		return typeof e == "object" && !!e && !Array.isArray(e) && !a(e);
+		return typeof e == "object" && !!e && !Array.isArray(e) && !a(e) && !(e instanceof y) && e.kind !== "constraint";
 	}
 	function c(e, t, n = "") {
 		if (e === void 0 || t === void 0 || e === null || t === null) throw Error(`Nullish or undefined operand encountered in dot() at '${n || "root"}'.`);
+		if (typeof e == "number" && typeof t == "number") throw Error(`Cannot multiply two numbers in dot() at '${n || "root"}': expected one numeric coefficient and one Var or LinExpr.`);
 		if (typeof e == "number") {
-			o(e, t);
+			o(e, t, n);
 			return;
 		}
 		if (typeof t == "number") {
-			o(t, e);
+			o(t, e, n);
 			return;
 		}
 		if (Array.isArray(e) || Array.isArray(t)) {
@@ -417,21 +581,22 @@ function ee(e, t) {
 			}
 			let r = Array.isArray(e) ? e : t, i = Array.isArray(e) ? t : e;
 			if (s(i)) {
+				if (Object.getOwnPropertySymbols(i).length > 0) throw Error(`Symbol keys are not supported in dot() at '${n || "root"}'.`);
 				let a = Object.keys(i);
-				if (a.length > 0 && a.every((e) => /^\d+$/.test(e))) {
-					if (a.length !== r.length) throw Error(`Array length mismatch in dot() at '${n || "root"}': array has length ${r.length}, but object has ${a.length} indices.`);
-					let o = [];
-					for (let e = 0; e < r.length; e++) !(e in i) && !(String(e) in i) && o.push(e);
-					if (o.length > 0) throw Error(`Key mismatch in dot() at '${n || "root"}': missing indices [${o.join(", ")}] in numeric record.`);
+				if (a.length === r.length && a.every((e) => /^(?:0|[1-9]\d*)$/.test(e))) {
+					let a = [];
+					for (let e = 0; e < r.length; e++) Object.prototype.hasOwnProperty.call(i, e) || a.push(e);
+					if (a.length > 0) throw Error(`Key mismatch in dot() at '${n || "root"}': missing indices [${a.join(", ")}] in numeric record.`);
 					for (let i = 0; i < r.length; i++) c(e[i], t[i], n ? `${n}[${i}]` : `[${i}]`);
 					return;
 				}
-				throw Error(`Type mismatch in dot() at '${n || "root"}': one operand is an Array while the other is an Object with keys [${a.slice(0, 5).join(", ")}].`);
+				throw a.length > 0 && a.every((e) => /^(?:0|[1-9]\d*)$/.test(e)) ? Error(`Array length mismatch in dot() at '${n || "root"}': array has length ${r.length}, but object has ${a.length} indices.`) : Error(`Type mismatch in dot() at '${n || "root"}': one operand is an Array while the other is an Object with keys [${a.slice(0, 5).join(", ")}].`);
 			}
 			throw Error(`Type mismatch in dot() at '${n || "root"}': one operand is an Array while the other is not.`);
 		}
 		if (s(e) && s(t)) {
-			let r = Object.keys(e), i = Object.keys(t), a = r.filter((e) => !(e in t)), o = i.filter((t) => !(t in e));
+			if (Object.getOwnPropertySymbols(e).length > 0 || Object.getOwnPropertySymbols(t).length > 0) throw Error(`Symbol keys are not supported in dot() at '${n || "root"}'.`);
+			let r = Object.keys(e), i = Object.keys(t), a = r.filter((e) => !Object.prototype.hasOwnProperty.call(t, e)), o = i.filter((t) => !Object.prototype.hasOwnProperty.call(e, t));
 			if (a.length > 0 || o.length > 0) {
 				let e = [];
 				throw a.length > 0 && e.push(`missing in second operand: [${a.join(", ")}]`), o.length > 0 && e.push(`missing in first operand: [${o.join(", ")}]`), Error(`Key mismatch in dot() at '${n || "root"}': ${e.join("; ")}.`);
@@ -442,45 +607,207 @@ function ee(e, t) {
 		throw Error(`Unsupported operand types in dot() at '${n || "root"}'.`);
 	}
 	c(e, t);
-	for (let [e, t] of n) Math.abs(t) < 1e-12 && n.delete(e);
+	for (let [e, t] of n) t === 0 && n.delete(e);
 	return new C(n, r);
 }
 //#endregion
+//#region src/modeler/validation.ts
+var E = /* @__PURE__ */ new WeakMap(), D = /* @__PURE__ */ new WeakMap(), O = /* @__PURE__ */ new WeakMap();
+function k(e, t, n) {
+	if (e instanceof f) for (let r of e.children) k(r, t, n);
+	else if (e instanceof y) {
+		let r = e.ownerModel, i = D.get(e);
+		(r !== t || i !== t) && (n && n.push(() => {
+			e.ownerModel = r, i ? D.set(e, i) : D.delete(e);
+		}), e.ownerModel = t, D.set(e, t));
+	}
+}
+function ee(e, t) {
+	let n = E.get(e);
+	if (n && n !== t) throw Error(`Variable "${e.name}" already belongs to model "${n.name}" and cannot be added to model "${t.name}".`);
+	E.set(e, t);
+}
+function te(e, t) {
+	let n = O.get(e);
+	if (n) throw Error(n === t ? `Constraint "${e.name}" is already registered in model "${t.name}".` : `Constraint "${e.name}" already belongs to model "${n.name}" and cannot be added to model "${t.name}".`);
+	let r = D.get(e);
+	if (r && r !== t) throw Error(`Constraint "${e.name}" already belongs to model "${r.name}" and cannot be added to model "${t.name}".`);
+	return O.set(e, t), D.set(e, t), r;
+}
+function ne(e, t) {
+	E.get(e) === t && E.delete(e);
+}
+function re(e, t, n) {
+	O.get(e) === t && O.delete(e), D.get(e) === t && (n ? D.set(e, n) : D.delete(e));
+}
+var ie = 1e-6;
+function A(e) {
+	if (typeof e.lb != "number" || Number.isNaN(e.lb)) throw Error(`Variable "${e.name}" has invalid lower bound: ${e.lb} (NaN or non-numeric bound is not allowed).`);
+	if (e.lb === Infinity) throw Error(`Variable "${e.name}" has invalid lower bound: +Infinity is not allowed as a lower bound.`);
+	if (typeof e.ub != "number" || Number.isNaN(e.ub)) throw Error(`Variable "${e.name}" has invalid upper bound: ${e.ub} (NaN or non-numeric bound is not allowed).`);
+	if (e.ub === -Infinity) throw Error(`Variable "${e.name}" has invalid upper bound: -Infinity is not allowed as an upper bound.`);
+	if (e.lb > e.ub) throw Error(`Variable "${e.name}" has invalid bounds: lower bound (${e.lb}) is strictly greater than upper bound (${e.ub}).`);
+	if (e.initialValue !== void 0) {
+		if (typeof e.initialValue != "number" || !Number.isFinite(e.initialValue)) throw Error(`Variable "${e.name}" has invalid initialValue: ${String(e.initialValue)} (initialValue must be a finite number).`);
+		let t = e.type === "Binary" ? Math.max(0, e.lb) : e.lb, n = e.type === "Binary" ? Math.min(1, e.ub) : e.ub;
+		if (e.initialValue < t - 1e-6 || e.initialValue > n + 1e-6) throw Error(`Variable "${e.name}" has initialValue (${e.initialValue}) outside its bounds [${t}, ${n}] (tolerance ${ie}).`);
+		if (e.type === "Integer" || e.type === "Binary") {
+			let r = Math.round(e.initialValue);
+			if (Math.abs(e.initialValue - r) > 1e-6 || r < t || r > n) throw Error(`Variable "${e.name}" of type "${e.type}" has non-integral or out-of-domain initialValue: ${e.initialValue} (must be within ${ie} of an integer in [${t}, ${n}]).`);
+		}
+	}
+}
+function ae(e) {
+	if (e.initialValue === void 0) return;
+	if (A(e), e.type === "Integer" || e.type === "Binary") {
+		let t = Math.round(e.initialValue);
+		return Object.is(t, -0) ? 0 : t;
+	}
+	let t = Math.min(e.ub, Math.max(e.lb, e.initialValue));
+	return Object.is(t, -0) ? 0 : t;
+}
+function oe(e, t, n) {
+	if (e instanceof S) {
+		if (!Number.isFinite(e.constant)) throw Error(`Objective function has invalid constant: ${e.constant}. Constant must be a finite number.`);
+		for (let [r, i] of e.linearTerms) {
+			if (!n(r)) throw Error(`Variable "${r.name}" in objective function does not belong to model "${t}". All variables must belong to the model by object identity.`);
+			if (!Number.isFinite(i)) throw Error(`Variable "${r.name}" in objective function has invalid coefficient: ${i}. Coefficients must be finite numbers.`);
+		}
+		for (let [, r] of e.quadTerms) {
+			if (!n(r.var1)) throw Error(`Variable "${r.var1.name}" in quadratic objective function does not belong to model "${t}". All variables must belong to the model by object identity.`);
+			if (!n(r.var2)) throw Error(`Variable "${r.var2.name}" in quadratic objective function does not belong to model "${t}". All variables must belong to the model by object identity.`);
+			if (!Number.isFinite(r.coeff) || !Number.isFinite(r.coeff * 2)) throw Error(`Quadratic term (${r.var1.name} * ${r.var2.name}) in objective function has invalid coefficient: ${r.coeff}.`);
+		}
+	} else if ("terms" in e) {
+		if (!Number.isFinite(e.constant)) throw Error(`Objective function has invalid constant: ${e.constant}. Constant must be a finite number.`);
+		for (let [r, i] of e.terms) {
+			if (!n(r)) throw Error(`Variable "${r.name}" in objective function does not belong to model "${t}". All variables must belong to the model by object identity.`);
+			if (!Number.isFinite(i)) throw Error(`Variable "${r.name}" in objective function has invalid coefficient: ${i}. Coefficients must be finite numbers.`);
+		}
+	}
+}
+function j(e, t, n, r = e.name) {
+	if (!Number.isFinite(e.rhs)) throw Error(`Constraint "${r}" has invalid right-hand side (RHS): ${e.rhs}. RHS must be a finite number.`);
+	if (e.lhs.constant !== void 0 && !Number.isFinite(e.lhs.constant)) throw Error(`Constraint "${r}" has invalid LHS constant: ${e.lhs.constant}. Constant must be a finite number.`);
+	for (let [i, a] of e.lhs.terms) {
+		if (!n(i)) throw Error(`Variable "${i.name}" in constraint "${r}" does not belong to model "${t}". All variables must belong to the model by object identity.`);
+		if (!Number.isFinite(a)) throw Error(`Variable "${i.name}" in constraint "${r}" has invalid coefficient: ${a}. Coefficients must be finite numbers.`);
+	}
+}
+function se(e, t, n, r, i, a) {
+	if (e instanceof d) {
+		if (!i(e)) throw Error(`Boolean variable "${e.name}" in logical constraint "${t}" does not belong to model "${n}".`);
+	} else if (e instanceof f) for (let o of e.children) se(o, t, n, r, i, a);
+	else if (e instanceof y) {
+		if (a) {
+			let r = D.get(e) ?? e.ownerModel ?? void 0;
+			if (r && r !== a) throw Error(`Constraint "${e.name}" embedded in logical constraint "${t}" already belongs to model "${r.name ?? "another model"}" and cannot be added to model "${n}".`);
+		}
+		if (!Number.isFinite(e.rhs)) throw Error(`Constraint "${e.name}" embedded in logical constraint "${t}" has invalid RHS: ${e.rhs}.`);
+		if (e.lhs.constant !== void 0 && !Number.isFinite(e.lhs.constant)) throw Error(`Constraint "${e.name}" embedded in logical constraint "${t}" has invalid LHS constant: ${e.lhs.constant}.`);
+		for (let [i, a] of e.lhs.terms) {
+			if (!r(i)) throw Error(`Variable "${i.name}" embedded in logical constraint "${t}" does not belong to model "${n}".`);
+			if (!Number.isFinite(a)) throw Error(`Variable "${i.name}" embedded in logical constraint "${t}" has invalid coefficient: ${a}.`);
+		}
+	}
+}
+function ce(e) {
+	let t = /* @__PURE__ */ new Set(), n = /* @__PURE__ */ new Set();
+	for (let r of e.variables) {
+		A(r);
+		let i = E.get(r);
+		if (i && i !== e || t.has(r.name) || e.getVarByName(r.name) !== r) throw Error(`Variable "${r.name}" is duplicated or not canonically registered in model "${e.name}".`);
+		t.add(r.name), n.add(r);
+	}
+	let r = /* @__PURE__ */ new Set(), i = /* @__PURE__ */ new Set();
+	for (let t of e.boolVars) {
+		if (r.has(t.name) || e.getBoolVarByName(t.name) !== t) throw Error(`Boolean variable "${t.name}" is duplicated or not canonically registered in model "${e.name}".`);
+		r.add(t.name), i.add(t);
+	}
+	let a = /* @__PURE__ */ new Set();
+	for (let t of e.constraints) {
+		if (r.has(t.name)) throw Error(`Constraint name "${t.name}" conflicts with Boolean variable "${t.name}" in model "${e.name}".`);
+		if (a.has(t.name)) throw Error(`Duplicate constraint name "${t.name}" in model "${e.name}".`);
+		a.add(t.name);
+	}
+	for (let t of e.logicalConstraints) {
+		if (r.has(t.name)) throw Error(`Logical constraint name "${t.name}" conflicts with Boolean variable "${t.name}" in model "${e.name}".`);
+		if (a.has(t.name)) throw Error(`Conflicting constraint name "${t.name}" across arithmetic and logical constraints in model "${e.name}".`);
+		a.add(t.name);
+	}
+	for (let t of e.constraints) {
+		let n = D.get(t);
+		if (n && n !== e || e.getConstraintByName(t.name) !== t) throw Error(`Constraint "${t.name}" is duplicated or not canonically registered in model "${e.name}".`);
+	}
+	for (let t of e.logicalConstraints) if (e.getLogicalConstraintByName(t.name) !== t) throw Error(`Logical constraint "${t.name}" is duplicated or not canonically registered in model "${e.name}".`);
+	e.objectiveExpr && oe(e.objectiveExpr, e.name, (e) => n.has(e));
+	for (let t of e.constraints) j(t, e.name, (e) => n.has(e));
+	for (let t of e.logicalConstraints) se(t.expr, t.name, e.name, (e) => n.has(e), (e) => i.has(e), e);
+}
+//#endregion
 //#region src/modeler/variable.ts
-var T = 0;
-function E(e) {
-	if (!e) return "Continuous";
-	let t = e.toLowerCase();
-	return t === "binary" || t === "bin" ? "Binary" : t === "integer" || t === "int" ? "Integer" : "Continuous";
+var le = 0;
+function ue(e) {
+	if (e === void 0) return "Continuous";
+	if (typeof e == "string") {
+		let t = e.toLowerCase();
+		if (t === "binary" || t === "bin") return "Binary";
+		if (t === "integer" || t === "int") return "Integer";
+		if (t === "continuous" || t === "cont") return "Continuous";
+	}
+	throw Error(`Invalid variable type "${String(e)}": expected "Continuous", "Integer", or "Binary".`);
 }
-var D = class e {
+var M = class {
 	id;
-	name;
-	type;
-	lb;
-	ub;
+	_name;
+	prefix;
+	hasExplicitName;
+	ownerModel = null;
+	_type;
+	_lb;
+	_ub;
+	_initialValue;
 	value = null;
 	reducedCost = null;
 	constructor(e = {}) {
-		this.id = ++T, this.name = e.name || `x_${this.id}`, this.type = E(e.type), this.type === "Binary" ? (this.lb = 0, this.ub = 1) : (this.lb = e.lb === void 0 ? 0 : e.lb, this.ub = e.ub === void 0 ? Infinity : e.ub);
+		this.id = ++le;
+		let t = typeof e.name == "string" ? e.name.trim() : "", n = typeof e.prefix == "string" ? e.prefix.trim() : "";
+		this.prefix = n.length > 0 ? n : "x", this.hasExplicitName = t.length > 0, this._name = this.hasExplicitName ? t : `${this.prefix}_${this.id}`, this._type = ue(e.type), this._type === "Binary" ? (this._lb = 0, this._ub = 1) : (this._lb = e.lb === void 0 ? 0 : e.lb, this._ub = e.ub === void 0 ? Infinity : e.ub), this._initialValue = e.initialValue === void 0 ? void 0 : Object.is(e.initialValue, -0) ? 0 : e.initialValue, this._initialValue !== void 0 && A(this);
 	}
-	mul(t) {
-		if (typeof t == "number") return new C(/* @__PURE__ */ new Map([[this, t]]), 0);
-		if (t instanceof e) return S.fromProduct(this, t, 1);
-		if (t instanceof S) {
-			if (t.quadTerms.size > 0) throw Error("Multiplication creates a non-linear term of degree > 2 (not allowed in MILP/LP/QP)");
-			let e = new S();
-			Math.abs(t.constant) >= 1e-12 && e.linearTerms.set(this, t.constant);
-			for (let [n, r] of t.linearTerms) e = e.add(S.fromProduct(this, n, r));
-			return e;
-		}
-		let n = new S();
-		Math.abs(t.constant) >= 1e-12 && n.linearTerms.set(this, t.constant);
-		for (let [e, r] of t.terms) {
-			let t = S.fromProduct(this, e, r);
-			n = n.add(t);
-		}
-		return n;
+	get name() {
+		return this._name;
+	}
+	get type() {
+		return this._type;
+	}
+	set type(e) {
+		let t = ue(e);
+		this._type !== t && (this._type = t, this.ownerModel?.notifyMutation?.());
+	}
+	get lb() {
+		return this._lb;
+	}
+	set lb(e) {
+		Object.is(this._lb, e) || (this._lb = e, this.ownerModel?.notifyMutation?.());
+	}
+	get ub() {
+		return this._ub;
+	}
+	set ub(e) {
+		Object.is(this._ub, e) || (this._ub = e, this.ownerModel?.notifyMutation?.());
+	}
+	get initialValue() {
+		return this._initialValue;
+	}
+	set initialValue(e) {
+		let t = e !== void 0 && Object.is(e, -0) ? 0 : e;
+		Object.is(this._initialValue, t) || (this._initialValue = t, this.ownerModel?.notifyMutation?.());
+	}
+	_assignModelName(e) {
+		this._name = e;
+	}
+	mul(e) {
+		return typeof e == "number" ? new C(/* @__PURE__ */ new Map([[this, 1]]), 0).mul(e) : new S(/* @__PURE__ */ new Map([[this, 1]]), /* @__PURE__ */ new Map(), 0).mul(e);
 	}
 	add(e) {
 		return e instanceof S ? e.add(this) : new C(/* @__PURE__ */ new Map([[this, 1]]), 0).add(e);
@@ -494,108 +821,100 @@ var D = class e {
 	le(e, t) {
 		return new C(/* @__PURE__ */ new Map([[this, 1]]), 0).le(e, t);
 	}
-	lessThanOrEqual(e, t) {
-		return this.le(e, t);
-	}
 	ge(e, t) {
 		return new C(/* @__PURE__ */ new Map([[this, 1]]), 0).ge(e, t);
 	}
-	greaterThanOrEqual(e, t) {
-		return this.ge(e, t);
-	}
 	eq(e, t) {
 		return new C(/* @__PURE__ */ new Map([[this, 1]]), 0).eq(e, t);
 	}
-	equalTo(e, t) {
-		return this.eq(e, t);
-	}
 	toString() {
 		return this.name;
 	}
-};
-//#endregion
-//#region src/modeler/parser.ts
-function O(e) {
-	let t = [], n = 0, r = e.length;
-	for (; n < r;) {
-		let i = e[n];
-		if (/\s/.test(i)) {
-			n++;
+}, de = /^(?:[0-9]+(?:\.[0-9]+)?|\.[0-9]+)(?:[eE][+-]?[0-9]+)?$/;
+function fe(e, t) {
+	let n = [], r = 0, i = e.length;
+	for (; r < i;) {
+		let a = e[r];
+		if (/\s/.test(a)) {
+			r++;
 			continue;
 		}
-		if (i === "+") t.push({
+		if (a === "+") n.push({
 			type: "PLUS",
 			value: "+"
-		}), n++;
-		else if (i === "-") t.push({
+		}), r++;
+		else if (a === "-") n.push({
 			type: "MINUS",
 			value: "-"
-		}), n++;
-		else if (i === "*") n + 1 < r && e[n + 1] === "*" ? (t.push({
+		}), r++;
+		else if (a === "*") r + 1 < i && e[r + 1] === "*" ? (n.push({
 			type: "CARET",
 			value: "**"
-		}), n += 2) : (t.push({
+		}), r += 2) : (n.push({
 			type: "STAR",
 			value: "*"
-		}), n++);
-		else if (i === "^") t.push({
+		}), r++);
+		else if (a === "^") n.push({
 			type: "CARET",
 			value: "^"
-		}), n++;
-		else if (i === "/") t.push({
+		}), r++;
+		else if (a === "/") n.push({
 			type: "SLASH",
 			value: "/"
-		}), n++;
-		else if (i === "(") t.push({
+		}), r++;
+		else if (a === "(") n.push({
 			type: "LPAREN",
 			value: "("
-		}), n++;
-		else if (i === ")") t.push({
+		}), r++;
+		else if (a === ")") n.push({
 			type: "RPAREN",
 			value: ")"
-		}), n++;
-		else if (i === "<" || i === ">" || i === "=") {
-			let a = i;
-			n + 1 < r && (e[n + 1] === "=" || e[n + 1] === "<" || e[n + 1] === ">") ? (a += e[n + 1], n += 2) : n++, t.push({
+		}), r++;
+		else if (a === "<" || a === ">" || a === "=") {
+			let t = a;
+			r + 1 < i && (e[r + 1] === "=" || e[r + 1] === "<" || e[r + 1] === ">") ? (t += e[r + 1], r += 2) : r++, n.push({
 				type: "COMP",
-				value: a
+				value: t
 			});
-		} else if (/[0-9.]/.test(i)) {
-			let i = "";
-			for (; n < r && /[0-9.]/.test(e[n]);) i += e[n], n++;
-			t.push({
+		} else if (/[0-9.]/.test(a)) {
+			let t = r, a = "";
+			for (; r < i && /[0-9]/.test(e[r]);) a += e[r++];
+			if (r < i && e[r] === ".") for (a += e[r++]; r < i && /[0-9]/.test(e[r]);) a += e[r++];
+			if (r < i && (e[r] === "e" || e[r] === "E")) {
+				let t = r + 1 < i ? e[r + 1] : "";
+				if (!/[a-zA-Z_]/.test(t)) {
+					for (a += e[r++], r < i && (e[r] === "+" || e[r] === "-") && (a += e[r++]); r < i && /[0-9]/.test(e[r]);) a += e[r++];
+					for (; r < i && (e[r] === "." || e[r] === "e" || e[r] === "E" || /[0-9]/.test(e[r]));) a += e[r++];
+				}
+			} else for (; r < i && (e[r] === "." || /[0-9]/.test(e[r]));) a += e[r++];
+			if (!de.test(a)) throw Error(`Invalid numeric literal '${a}' at position ${t} in: "${e}"`);
+			let o = Number(a);
+			if (!Number.isFinite(o)) throw Error(`Numeric literal '${a}' overflows finite floating-point range in: "${e}"`);
+			if (o === 0 && !/^[0.]+(?:[eE][+-]?\d+)?$/.test(a)) throw Error(`Numeric literal '${a}' underflows to zero at position ${t} in: "${e}"`);
+			n.push({
 				type: "NUMBER",
-				value: i
+				value: a,
+				numericValue: o
 			});
-		} else if (/[a-zA-Z_]/.test(i)) {
-			let i = "";
-			for (; n < r && /[a-zA-Z0-9_]/.test(e[n]);) i += e[n], n++;
-			t.push({
+		} else if (/[a-zA-Z_]/.test(a)) {
+			let a = "";
+			for (; r < i && /[a-zA-Z0-9_]/.test(e[r]);) a += e[r], r++;
+			if (t && t.has(a)) {
+				let e = t.get(a);
+				n.push({
+					type: "NUMBER",
+					value: String(e),
+					numericValue: e
+				});
+			} else n.push({
 				type: "IDENT",
-				value: i
+				value: a
 			});
-		} else throw Error(`Unexpected character '${i}' at position ${n} in: "${e}"`);
+		} else throw Error(`Unexpected character '${a}' at position ${r} in: "${e}"`);
 	}
-	return t;
-}
-function k(e, t) {
-	return e instanceof S ? e.add(t) : t instanceof S ? t.add(e) : e.add(t);
-}
-function te(e, t) {
-	return e instanceof S ? e.sub(t) : t instanceof S ? t.neg().add(e) : e.sub(t);
-}
-function A(e, t) {
-	let n = e instanceof S ? e.quadTerms : /* @__PURE__ */ new Map(), r = t instanceof S ? t.quadTerms : /* @__PURE__ */ new Map(), i = e instanceof S ? e.linearTerms : e.terms, a = t instanceof S ? t.linearTerms : t.terms;
-	if (n.size > 0 && (r.size > 0 || a.size > 0) || r.size > 0 && (n.size > 0 || i.size > 0)) throw Error("Multiplication creates a non-linear term of degree > 2 (not allowed in MILP/LP/QP)");
-	if (n.size === 0 && i.size === 0) return t.mul(e.constant);
-	if (r.size === 0 && a.size === 0) return e.mul(t.constant);
-	let o = new S();
-	if (o.constant = e.constant * t.constant, Math.abs(t.constant) >= 1e-12) for (let [e, n] of i) o.linearTerms.set(e, (o.linearTerms.get(e) || 0) + n * t.constant);
-	if (Math.abs(e.constant) >= 1e-12) for (let [t, n] of a) o.linearTerms.set(t, (o.linearTerms.get(t) || 0) + n * e.constant);
-	for (let [e, t] of i) for (let [n, r] of a) o = o.add(S.fromProduct(e, n, t * r));
-	return o;
+	return n;
 }
-var j = class {
+var pe = class {
 	tokens;
 	pos = 0;
 	resolver;
@@ -616,8 +935,8 @@ var j = class {
 		for (; this.pos < this.tokens.length;) {
 			let t = this.peek();
 			if (!t) break;
-			if (t.type === "PLUS") this.consume(), e = k(e, this.parseTerm());
-			else if (t.type === "MINUS") this.consume(), e = te(e, this.parseTerm());
+			if (t.type === "PLUS") this.consume(), e = e.add(this.parseTerm());
+			else if (t.type === "MINUS") this.consume(), e = e.sub(this.parseTerm());
 			else break;
 		}
 		return e instanceof S && e.quadTerms.size === 0 ? new C(e.linearTerms, e.constant) : e;
@@ -627,17 +946,9 @@ var j = class {
 		for (; this.pos < this.tokens.length;) {
 			let t = this.peek();
 			if (!t) break;
-			if (t.type === "STAR") {
-				this.consume();
-				let t = this.parseFactor();
-				e = A(e, t);
-			} else if (t.type === "SLASH") {
-				this.consume();
-				let t = this.parseFactor(), n = t instanceof S ? t.linearTerms : t.terms, r = t instanceof S ? t.quadTerms.size : 0;
-				if (n.size > 0 || r > 0) throw Error("Cannot divide by variable in expression");
-				if (Math.abs(t.constant) < 1e-12) throw Error("Division by zero in expression");
-				e = e.div(t.constant);
-			} else break;
+			if (t.type === "STAR") this.consume(), e = e.mul(this.parseFactor());
+			else if (t.type === "SLASH") this.consume(), e = e.div(this.parseFactor());
+			else break;
 		}
 		return e;
 	}
@@ -649,12 +960,12 @@ var j = class {
 		let t;
 		if (e.type === "NUMBER") {
 			this.consume();
-			let n = parseFloat(e.value);
+			let n = e.numericValue ?? Number(e.value);
 			if (this.peek()?.type === "IDENT" || this.peek()?.type === "LPAREN") {
 				let e;
 				if (this.peek()?.type === "IDENT") {
 					let t = this.consume(), n = this.resolve(t.value);
-					e = n instanceof D || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new C(/* @__PURE__ */ new Map([[n, 1]]), 0) : n.clone();
+					e = n instanceof M || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new C(/* @__PURE__ */ new Map([[n, 1]]), 0) : n.clone();
 				} else this.consume("LPAREN"), e = this.parseExpression(), this.consume("RPAREN");
 				return this.applyPower(e).mul(n);
 			}
@@ -662,7 +973,7 @@ var j = class {
 		} else if (e.type === "IDENT") {
 			this.consume();
 			let n = this.resolve(e.value);
-			t = n instanceof D || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new C(/* @__PURE__ */ new Map([[n, 1]]), 0) : n.clone();
+			t = n instanceof M || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new C(/* @__PURE__ */ new Map([[n, 1]]), 0) : n.clone();
 		} else if (e.type === "LPAREN") this.consume("LPAREN"), t = this.parseExpression(), this.consume("RPAREN");
 		else throw Error(`Unexpected token '${e.value}' in expression`);
 		return this.applyPower(t);
@@ -672,12 +983,14 @@ var j = class {
 		let t = [];
 		for (; this.peek()?.type === "CARET";) {
 			this.consume();
-			let e = this.peek();
-			if (!e || e.type !== "NUMBER") throw Error("Exponent must be a non-negative integer number");
-			this.consume();
-			let n = parseFloat(e.value);
-			if (!Number.isInteger(n) || n < 0) throw Error("Exponent must be a non-negative integer");
-			t.push(n);
+			let e = this.tokens[this.pos]?.type === "LPAREN" && this.tokens[this.pos + 1]?.type === "NUMBER" && this.tokens[this.pos + 2]?.type === "RPAREN";
+			e && this.consume("LPAREN");
+			let n = this.peek();
+			if (!n || n.type !== "NUMBER") throw Error("Exponent must be a non-negative integer number");
+			this.consume(), e && this.consume("RPAREN");
+			let r = n.numericValue ?? Number(n.value);
+			if (!Number.isInteger(r) || r < 0) throw Error("Exponent must be a non-negative integer");
+			t.push(r);
 		}
 		let n = t[t.length - 1];
 		for (let e = t.length - 2; e >= 0; e--) n = t[e] ** +n;
@@ -685,11 +998,12 @@ var j = class {
 		let r = e instanceof S, i = r ? e.quadTerms.size : 0, a = r ? e.linearTerms.size : e.terms.size;
 		if (i === 0 && a === 0) {
 			let t = e.constant ** +n;
+			if (e.constant !== 0 && n > 0 && t === 0) throw Error("Constant exponentiation underflows to zero.");
 			return new C(/* @__PURE__ */ new Map(), t);
 		}
 		if (n === 0) return new C(/* @__PURE__ */ new Map(), 1);
 		if (n === 1) return e;
-		if (n === 2) return A(e, e);
+		if (n === 2) return e.mul(e);
 		throw Error(`Exponent ${n} creates a non-linear term of degree > 2 (not allowed in MILP/LP/QP)`);
 	}
 	getRemainingToken() {
@@ -701,159 +1015,221 @@ var j = class {
 		return t;
 	}
 };
-function M(e, t) {
-	let n = new j(O(e), t), r = n.parseExpression(), i = n.getRemainingToken();
-	if (i) throw Error(`Unexpected token '${i.value}' after expression in "${e}"`);
-	return r;
-}
 function N(e, t, n) {
-	let r = e.match(/(<=|>=|==|=<|=>|=)/);
-	if (!r) throw Error(`Constraint must contain a comparison operator (<=, >=, ==, =): "${e}"`);
-	let i = r[0], a = r.index, o = e.substring(0, a).trim(), s = e.substring(a + i.length).trim(), c;
-	if (i === "<=" || i === "=<") c = "<=";
-	else if (i === ">=" || i === "=>") c = ">=";
-	else if (i === "==" || i === "=") c = "==";
-	else throw Error(`Unsupported operator "${i}"`);
-	let l = M(o, t), u = M(s, t);
-	if (l instanceof S && l.quadTerms.size > 0 || u instanceof S && u.quadTerms.size > 0) throw Error("Quadratic constraints are not supported (only linear constraints are allowed in MILP/LP/QP)");
-	let d = l instanceof S ? new C(l.linearTerms, l.constant) : l, f = u instanceof S ? new C(u.linearTerms, u.constant) : u;
-	return c === "<=" ? d.le(f, n) : c === ">=" ? d.ge(f, n) : d.eq(f, n);
-}
-function P(e, t) {
-	let n = /* @__PURE__ */ new Map(), r = "";
-	for (let i = 0; i < e.length; i++) if (r += e[i], i < t.length) {
+	let r = new pe(fe(e, n), t), i = r.parseExpression(), a = r.getRemainingToken();
+	if (a) throw Error(`Unexpected token '${a.value}' after expression in "${e}"`);
+	return P(i), i;
+}
+function me(e, t) {
+	return N(e, t);
+}
+function he(e, t, n, r) {
+	let i = e.match(/(<=|>=|==|=<|=>|=)/);
+	if (!i) throw Error(`Constraint must contain a comparison operator (<=, >=, ==, =): "${e}"`);
+	let a = i[0], o = i.index, s = e.substring(0, o).trim(), c = e.substring(o + a.length).trim(), l;
+	if (a === "<=" || a === "=<") l = "<=";
+	else if (a === ">=" || a === "=>") l = ">=";
+	else if (a === "==" || a === "=") l = "==";
+	else throw Error(`Unsupported operator "${a}"`);
+	let u = N(s, t, r), d = N(c, t, r);
+	if (u instanceof S && u.quadTerms.size > 0 || d instanceof S && d.quadTerms.size > 0) throw Error("Quadratic constraints are not supported (only linear constraints are allowed in MILP/LP/QP)");
+	let f = u instanceof S ? new C(u.linearTerms, u.constant) : u, p = d instanceof S ? new C(d.linearTerms, d.constant) : d, m;
+	if (m = l === "<=" ? f.le(p, n) : l === ">=" ? f.ge(p, n) : f.eq(p, n), P(m.lhs), !Number.isFinite(m.rhs)) throw Error(`Invalid non-finite right-hand side "${m.rhs}" in constraint.`);
+	return m;
+}
+function ge(e, t, n) {
+	return he(e, t, n);
+}
+function _e(e) {
+	return e instanceof M || e instanceof C || e instanceof S ? !0 : typeof e != "object" || !e ? !1 : "terms" in e && e.terms instanceof Map || "quadTerms" in e && e.quadTerms instanceof Map || "id" in e && "name" in e && "lb" in e && "ub" in e && "type" in e && typeof e.mul == "function";
+}
+function P(e) {
+	if ("constant" in e && !Number.isFinite(e.constant)) throw Error(`Invalid non-finite constant "${e.constant}" in expression.`);
+	if ("terms" in e && e.terms instanceof Map) {
+		for (let [, t] of e.terms) if (!Number.isFinite(t)) throw Error(`Invalid non-finite coefficient "${t}" in expression.`);
+	}
+	if ("linearTerms" in e && e.linearTerms instanceof Map) {
+		for (let [, t] of e.linearTerms) if (!Number.isFinite(t)) throw Error(`Invalid non-finite coefficient "${t}" in expression.`);
+	}
+	if ("quadTerms" in e && e.quadTerms instanceof Map) {
+		for (let [, t] of e.quadTerms) if (!Number.isFinite(t.coeff)) throw Error(`Invalid non-finite quadratic coefficient "${t.coeff}" in expression.`);
+	}
+}
+function ve(e) {
+	return e instanceof y || typeof e == "object" && !!e && "sense" in e && "lhs" in e && "rhs" in e;
+}
+function ye(e, t) {
+	let n = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Map(), i = e.join(""), a = "__washi_";
+	for (; i.includes(a);) a += "_";
+	let o = "";
+	for (let i = 0; i < e.length; i++) if (o += e[i], i < t.length) {
 		let e = t[i];
-		if (typeof e == "number") r += `(${e})`;
-		else if (e instanceof D || e instanceof C || e instanceof S || typeof e == "object" && e && ("id" in e || "terms" in e || "quadTerms" in e)) {
-			let t = `__ph_${i}__`;
-			n.set(t, e), r += t;
-		}
+		if (typeof e == "number") {
+			if (!Number.isFinite(e)) throw Error(`Invalid numeric value "${e}" in template expression: interpolated numbers must be finite.`);
+			let t = `${a}num_${i}__`;
+			r.set(t, e), o += `(${t})`;
+		} else if (ve(e)) throw Error("Cannot interpolate a constraint comparison (<=, >=, ==) inside a template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
+		else if (_e(e)) {
+			P(e);
+			let t = `${a}ph_${i}__`;
+			n.set(t, e), o += ` ${t} `;
+		} else throw Error("Unsupported interpolation value in template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
 	}
 	return {
-		fullText: r,
-		resolver: (e) => n.get(e)
+		fullText: o,
+		resolver: (e) => n.get(e),
+		numberMap: r
 	};
 }
-function F(e, ...t) {
-	let { fullText: n, resolver: r } = P(e, t);
-	return N(n, r);
-}
-function I(e, ...t) {
-	let { fullText: n, resolver: r } = P(e, t);
-	return /(<=|>=|==|=<|=>|=)/.test(n) ? N(n, r) : M(n, r);
+function be(e, ...t) {
+	let { fullText: n, resolver: r, numberMap: i } = ye(e, t);
+	return /(<=|>=|==|=<|=>|=)/.test(n) ? he(n, r, void 0, i) : N(n, r, i);
 }
 //#endregion
 //#region src/modeler/lp-writer.ts
-function L(e, t, n) {
+function F(e) {
+	return typeof e == "object" && !!e && typeof e.lpString == "string" && e.nameToVar instanceof Map && e.nameToConstraint instanceof Map;
+}
+function I(e, t = "x", n = 0) {
 	let r = e.replace(/[^a-zA-Z0-9_]/g, "_");
 	return /^[0-9]/.test(r) && (r = `${t}_${r}`), (!r || r.length === 0) && (r = `${t}_${n}`), r;
 }
-function R(e) {
-	let { sense: t, objective: n, constraints: r, variables: i } = e, a = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Set();
-	for (let e of i) {
-		let t = L(e.name, "x", e.id), n = t, r = 1;
-		for (; c.has(n);) n = `${t}_${r++}`;
-		c.add(n), o.set(e, n), a.set(n, e);
+function xe(e) {
+	let t = e.variables || [], n = e.constraints || [], r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Set();
+	for (let e = 0; e < t.length; e++) {
+		let n = t[e];
+		s.set(n, e);
+		let a = I(n.name, "x", e), o = a, l = 1;
+		for (; c.has(o);) o = `${a}_${l++}`;
+		c.add(o), i.set(n, o), r.set(o, n);
+	}
+	let l = /* @__PURE__ */ new Set();
+	for (let e = 0; e < n.length; e++) {
+		let t = n[e], r = I(t.name, "c", e + 1), i = r, s = 1;
+		for (; l.has(i);) i = `${r}_${s++}`;
+		l.add(i), o.set(t, i), a.set(i, t);
 	}
-	let l = /* @__PURE__ */ new Set(), u = /* @__PURE__ */ new Map();
-	for (let e of r) {
-		let t = L(e.name, "c", e.id), n = t, r = 1;
-		for (; l.has(n);) n = `${t}_${r++}`;
-		l.add(n), u.set(e, n), s.set(n, e);
-	}
-	let d = [];
-	d.push(t && t.toLowerCase() === "maximize" ? "Maximize" : "Minimize");
-	let f = [], p = !0, m = n instanceof S ? n.linearTerms : n.terms;
-	if (m) for (let [e, t] of m) {
-		if (Math.abs(t) < 1e-12) continue;
-		let n = o.get(e), r = t >= 0 ? p ? "" : "+ " : "- ", i = Math.abs(t), a = i === 1 ? "" : `${i} `;
-		f.push(`${r}${a}${n}`), p = !1;
-	}
-	if (n instanceof S && n.quadTerms.size > 0) {
-		let e = [], t = !0;
-		for (let r of n.quadTerms.values()) {
-			if (Math.abs(r.coeff) < 1e-12) continue;
-			let n = 2 * r.coeff, i = n >= 0 ? t ? "" : "+ " : "- ", a = Math.abs(n), s = a === 1 ? "" : `${a} `, c = o.get(r.var1), l = o.get(r.var2);
-			r.var1 === r.var2 ? e.push(`${i}${s}${c} ^ 2`) : e.push(`${i}${s}${c} * ${l}`), t = !1;
+	return {
+		nameToVar: r,
+		varToName: i,
+		nameToConstraint: a,
+		constraintToName: o,
+		constrToName: o,
+		varOrder: s
+	};
+}
+function L(e, t) {
+	let { sense: n, objective: r, constraints: i, variables: a } = e, o = t?.relax === !0, { nameToVar: s, varToName: c, nameToConstraint: l, constrToName: u, varOrder: d } = xe(e), f = [];
+	f.push(n && n.toLowerCase() === "maximize" ? "Maximize" : "Minimize");
+	let p = [], m = !0, h = r instanceof S ? r.linearTerms : r.terms;
+	if (h) for (let [e, t] of h) {
+		if (t === 0) continue;
+		let n = c.get(e), r = t >= 0 ? m ? "" : "+ " : "- ", i = Math.abs(t), a = i === 1 ? "" : `${i} `;
+		p.push(`${r}${a}${n}`), m = !1;
+	}
+	if (r instanceof S && r.quadTerms.size > 0) {
+		let e = [], t = !0, n = Array.from(r.quadTerms.values()).filter((e) => e.coeff !== 0).map((e) => {
+			let t = d.get(e.var1) ?? e.var1.id, n = d.get(e.var2) ?? e.var2.id, [r, i, a, o] = t <= n ? [
+				e.var1,
+				e.var2,
+				t,
+				n
+			] : [
+				e.var2,
+				e.var1,
+				n,
+				t
+			];
+			return {
+				firstVar: r,
+				secondVar: i,
+				firstIdx: a,
+				secondIdx: o,
+				coeff: e.coeff
+			};
+		}).sort((e, t) => e.firstIdx - t.firstIdx || e.secondIdx - t.secondIdx);
+		for (let r of n) {
+			let n = 2 * r.coeff, i = n >= 0 ? t ? "" : "+ " : "- ", a = Math.abs(n), o = a === 1 ? "" : `${a} `, s = c.get(r.firstVar), l = c.get(r.secondVar);
+			r.firstVar === r.secondVar ? e.push(`${i}${o}${s} ^ 2`) : e.push(`${i}${o}${s} * ${l}`), t = !1;
 		}
 		if (e.length > 0) {
 			let t = `[ ${e.join(" ")} ] / 2`;
-			f.length > 0 ? f.push("+", t) : f.push(t);
+			p.length > 0 ? p.push("+", t) : p.push(t);
 		}
 	}
-	let h = f.length > 0 ? f.join(" ") : "0";
-	d.push(` obj: ${h}`), d.push("Subject To");
-	for (let e of r) {
+	let g = p.length > 0 ? p.join(" ") : "0";
+	f.push(` obj: ${g}`), f.push("Subject To");
+	for (let e of i) {
 		let t = u.get(e), n = [], r = !0;
 		for (let [t, i] of e.lhs.terms) {
-			if (Math.abs(i) < 1e-12) continue;
-			let e = o.get(t), a = i >= 0 ? r ? "" : "+ " : "- ", s = Math.abs(i), c = s === 1 ? "" : `${s} `;
-			n.push(`${a}${c}${e}`), r = !1;
+			if (i === 0) continue;
+			let e = c.get(t), a = i >= 0 ? r ? "" : "+ " : "- ", o = Math.abs(i), s = o === 1 ? "" : `${o} `;
+			n.push(`${a}${s}${e}`), r = !1;
 		}
 		let i = n.length > 0 ? n.join(" ") : "0", a = e.sense === "==" ? "=" : e.sense;
-		d.push(` ${t}: ${i} ${a} ${e.rhs}`);
-	}
-	d.push("Bounds");
-	let g = [], _ = [];
-	for (let e of i) {
-		let t = o.get(e);
-		if (e.type === "Binary") {
-			_.push(t);
+		f.push(` ${t}: ${i} ${a} ${e.rhs}`);
+	}
+	f.push("Bounds");
+	let _ = [], v = [];
+	for (let e of a) {
+		let t = c.get(e);
+		if (!o && e.type === "Binary") {
+			v.push(t);
 			continue;
 		}
-		e.type === "Integer" && g.push(t);
+		!o && e.type === "Integer" && _.push(t);
 		let n = e.lb === -Infinity, r = e.ub === Infinity;
-		n && r ? d.push(` ${t} free`) : n && !r ? d.push(` -infinity <= ${t} <= ${e.ub}`) : !n && r ? e.lb !== 0 && d.push(` ${t} >= ${e.lb}`) : d.push(` ${e.lb} <= ${t} <= ${e.ub}`);
-	}
-	if (g.length > 0) {
-		d.push("Generals");
-		for (let e = 0; e < g.length; e += 10) d.push(" " + g.slice(e, e + 10).join(" "));
+		n && r ? f.push(` ${t} free`) : n && !r ? f.push(` -infinity <= ${t} <= ${e.ub}`) : !n && r ? (e.lb !== 0 || e.initialValue !== void 0) && f.push(` ${t} >= ${e.lb}`) : f.push(` ${e.lb} <= ${t} <= ${e.ub}`);
 	}
 	if (_.length > 0) {
-		d.push("Binary");
-		for (let e = 0; e < _.length; e += 10) d.push(" " + _.slice(e, e + 10).join(" "));
+		f.push("Generals");
+		for (let e = 0; e < _.length; e += 10) f.push(" " + _.slice(e, e + 10).join(" "));
+	}
+	if (v.length > 0) {
+		f.push("Binary");
+		for (let e = 0; e < v.length; e += 10) f.push(" " + v.slice(e, e + 10).join(" "));
 	}
-	return d.push("End"), {
-		lpString: d.join("\n") + "\n",
-		nameToVar: a,
-		nameToConstraint: s
+	return f.push("End"), {
+		lpString: f.join("\n") + "\n",
+		nameToVar: s,
+		nameToConstraint: l
 	};
 }
 //#endregion
 //#region src/modeler/solvers/registry.ts
-var z = Symbol.for("washi.solverRegistry"), B = Symbol.for("washi.defaultSolverFactory"), V = globalThis;
-V[z] || (V[z] = /* @__PURE__ */ new Map());
-var H = V[z];
-function U(e, t) {
-	H.set(e.toLowerCase(), t);
+var R = Symbol.for("washi.solverRegistry"), Se = Symbol.for("washi.defaultSolverFactory"), z = globalThis;
+z[R] || (z[R] = /* @__PURE__ */ new Map());
+var B = z[R];
+function Ce(e, t) {
+	B.set(e.toLowerCase(), t);
 }
-function W(e) {
+function we(e) {
 	if (typeof e == "string") {
-		let t = H.get(e.toLowerCase());
+		let t = B.get(e.toLowerCase());
 		if (!t) throw Error(`Solver '${e}' is not registered.`);
-		V[B] = t;
-	} else V[B] = typeof e == "function" ? e : () => e;
+		z[Se] = t;
+	} else z[Se] = typeof e == "function" ? e : () => e;
 }
-function G(e, t) {
+function V(e, t) {
 	if (!e) {
-		let e = V[B] || H.get("highs");
-		if (!e) throw Error(`No default solver available. Available solvers: ${K().join(", ")}`);
+		let e = z[Se] || B.get("highs");
+		if (!e) throw Error(`No default solver available. Available solvers: ${H().join(", ")}`);
 		return e(t);
 	}
 	if (typeof e == "string") {
-		let n = e.toLowerCase(), r = H.get(n);
-		if (!r) throw Error(n === "glpk" ? `Solver 'glpk' not found. Available solvers: ${K().join(", ")}. Please import '@ohtaman/washi/solvers/glpk' before selecting this solver.` : n === "z3" ? `Solver 'z3' not found. Available solvers: ${K().join(", ")}. Please import '@ohtaman/washi/solvers/z3' before selecting this solver.` : `Solver '${e}' not found. Available solvers: ${K().join(", ")}`);
+		let n = e.toLowerCase(), r = B.get(n);
+		if (!r) throw Error(n === "glpk" ? `Solver 'glpk' not found. Available solvers: ${H().join(", ")}. Please import '@ohtaman/washi/solvers/glpk' before selecting this solver.` : n === "z3" ? `Solver 'z3' not found. Available solvers: ${H().join(", ")}. Please import '@ohtaman/washi/solvers/z3' before selecting this solver.` : `Solver '${e}' not found. Available solvers: ${H().join(", ")}`);
 		return r(t);
 	}
 	return e;
 }
-function K() {
-	return Array.from(H.keys());
+function H() {
+	return Array.from(B.keys());
 }
 //#endregion
 //#region \0washi-browser-worker-factory
-function q() {
-	let e = r("highs-worker.js");
+function Te() {
+	let e = a("highs-worker.js");
 	if (new URL(e).origin === window.location.origin) return new Worker(e, { type: "module" });
 	let t = URL.createObjectURL(new Blob(["import " + JSON.stringify(e) + ";"], { type: "text/javascript" }));
 	try {
@@ -865,73 +1241,198 @@ function q() {
 }
 //#endregion
 //#region src/modeler/solvers/highs/worker-client.ts
-var J = null, Y = 0, X = /* @__PURE__ */ new Map();
-function Z() {
+var U = null, Ee = 0, W = /* @__PURE__ */ new Map();
+function De(e, t) {
+	return e ? {
+		Status: "Interrupted",
+		StatusCode: 17,
+		HasPrimalSolution: !0,
+		IsMip: !0,
+		ObjectiveValue: e.objectiveValue,
+		ObjectiveOffsetApplied: !0,
+		...t?.objectiveBound === void 0 ? e.mipDualBound === void 0 ? {} : { MipDualBound: e.mipDualBound } : { MipDualBound: t.objectiveBound },
+		...t?.relGap === void 0 ? e.mipGap === void 0 ? {} : { MipGap: e.mipGap } : { MipGap: t.relGap },
+		Columns: e.columns,
+		Rows: []
+	} : {
+		Status: "Interrupted",
+		StatusCode: 17,
+		HasPrimalSolution: !1,
+		ObjectiveValue: NaN,
+		ObjectiveOffsetApplied: !0,
+		...t?.objectiveBound === void 0 ? {} : { MipDualBound: t.objectiveBound },
+		...t?.relGap === void 0 ? {} : { MipGap: t.relGap },
+		Columns: {},
+		Rows: []
+	};
+}
+function G(e) {
+	let t = W.values().next().value;
+	if (t && !t.dispatched) {
+		t.dispatched = !0;
+		try {
+			e.postMessage({
+				type: "SOLVE",
+				id: t.id,
+				lpString: t.lpString,
+				options: t.workerOptions,
+				...t.reportProgress ? { reportProgress: !0 } : {}
+			});
+		} catch (n) {
+			W.delete(t.id), t.cleanupAbort?.(), t.reject(n), G(e);
+		}
+	}
+}
+function Oe() {
+	let e = U;
+	e && (U = null, e.terminate());
+	for (let e of W.values()) e.dispatched = !1;
+	if (W.size > 0) {
+		let e = ke();
+		if (e) G(e);
+		else {
+			let e = /* @__PURE__ */ Error("[WaSHI] Failed to recreate HiGHS Worker after interruption.");
+			for (let t of Array.from(W.values())) W.delete(t.id), t.cleanupAbort?.(), t.reject(e);
+		}
+	}
+}
+function ke() {
 	if (typeof window > "u" || typeof Worker > "u") return null;
-	if (!J) try {
-		J = q();
-		let e = J;
-		J.onmessage = (e) => {
-			let { type: t, id: n, result: r, runTime: i, error: a } = e.data, o = X.get(n);
-			o && (X.delete(n), t === "SOLVE_SUCCESS" ? o.resolve({
-				result: r,
-				runTime: i
-			}) : o.reject(Error(a || "Worker solve failed")));
+	if (!U) try {
+		U = Te();
+		let e = U;
+		U.onmessage = (t) => {
+			let { type: n, id: r, result: i, runTime: a, error: o, progress: s, incumbent: c } = t.data, l = W.get(r);
+			if (l) {
+				if (n === "SOLVE_PROGRESS") {
+					if (s) {
+						l.lastProgress = s;
+						try {
+							l.onProgress?.(s);
+						} catch (e) {
+							let t = W.get(r);
+							if (t) {
+								let n = W.keys().next().value;
+								W.delete(r), t.cleanupAbort?.(), n === r && Oe(), t.reject(e);
+							}
+						}
+					}
+					return;
+				}
+				if (n === "SOLVE_INCUMBENT") {
+					c && (l.lastIncumbent = c);
+					return;
+				}
+				W.delete(r), l.cleanupAbort?.(), n === "SOLVE_SUCCESS" ? l.resolve({
+					result: i,
+					runTime: a
+				}) : l.reject(Error(o || "Worker solve failed")), U === e && G(e);
+			}
 		};
 		let t = (t) => {
-			if (J === e) {
-				J = null, e.terminate();
-				for (let e of X.values()) e.reject(t);
-				X.clear();
+			if (U === e) {
+				U = null, e.terminate();
+				for (let e of W.values()) e.cleanupAbort?.(), e.reject(t);
+				W.clear();
 			}
 		};
-		J.onerror = (e) => t(/* @__PURE__ */ Error(`[WaSHI] HiGHS Worker failed to load or execute. Check Worker assets, CORS and CSP. ${e?.message || ""}`)), J.onmessageerror = () => t(/* @__PURE__ */ Error("[WaSHI] Could not deserialize the HiGHS Worker response."));
+		U.onerror = (e) => t(/* @__PURE__ */ Error(`[WaSHI] HiGHS Worker failed to load or execute. Check Worker assets, CORS and CSP. ${e?.message || ""}`)), U.onmessageerror = () => t(/* @__PURE__ */ Error("[WaSHI] Could not deserialize the HiGHS Worker response."));
 	} catch {
-		J = null;
-	}
-	return J;
-}
-async function ne(e, n = {}) {
-	let r = await a(n.wasmUrl), i = n.useWorker ?? typeof window < "u" ? Z() : null;
-	if (!i) return t(e, n);
-	let o = {
-		...n,
-		wasmUrl: r
-	}, s = `req_${++Y}`;
-	return new Promise((t, n) => {
-		X.set(s, {
-			resolve: t,
+		U = null;
+	}
+	return U;
+}
+async function Ae(t, n = {}) {
+	if (n.signal?.aborted) return {
+		result: De(),
+		runTime: 0
+	};
+	let r = await i(n.wasmUrl);
+	if (n.signal?.aborted) return {
+		result: De(),
+		runTime: 0
+	};
+	let a = n.useWorker ?? typeof window < "u" ? ke() : null;
+	if (!a) return e(t, n);
+	let { signal: o, onProgress: s, ...c } = n, l = {};
+	for (let [e, t] of Object.entries(c)) typeof t != "function" && (l[e] = t);
+	l.wasmUrl = r;
+	let u = !!(s || o), d = `req_${++Ee}`, f = performance.now();
+	return new Promise((e, n) => {
+		let r = {
+			id: d,
+			lpString: t,
+			workerOptions: l,
+			reportProgress: u,
+			startTime: f,
+			onProgress: s,
+			resolve: e,
 			reject: n
-		});
-		try {
-			i.postMessage({
-				type: "SOLVE",
-				id: s,
-				lpString: e,
-				options: o
-			});
-		} catch (e) {
-			X.delete(s), n(e);
+		};
+		if (o) {
+			let e = () => {
+				let e = W.get(d);
+				if (!e) return;
+				let t = W.keys().next().value;
+				W.delete(d), e.cleanupAbort?.(), t === d && Oe();
+				let n = (performance.now() - e.startTime) / 1e3;
+				e.resolve({
+					result: De(e.lastIncumbent, e.lastProgress),
+					runTime: n
+				});
+			};
+			o.addEventListener("abort", e, { once: !0 }), r.cleanupAbort = () => o.removeEventListener("abort", e);
 		}
+		W.set(d, r), G(a);
 	});
 }
 //#endregion
 //#region src/modeler/solvers/highs/solver.ts
-function re(e) {
+function je(e, t) {
+	if (typeof t == "number") switch (t) {
+		case 0: return "NotSolved";
+		case 1:
+		case 2:
+		case 3:
+		case 4:
+		case 5: return "Error";
+		case 6: return "Unknown";
+		case 7: return "Optimal";
+		case 8: return "Infeasible";
+		case 9: return "InfeasibleOrUnbounded";
+		case 10: return "Unbounded";
+		case 11: return "ObjectiveBound";
+		case 12: return "ObjectiveTarget";
+		case 13: return "TimeLimit";
+		case 14: return "IterationLimit";
+		case 15: return "Unknown";
+		case 16: return "SolutionLimit";
+		case 17: return "Interrupted";
+		case 18: return "MemoryLimit";
+	}
 	if (typeof e != "string") return "Unknown";
-	let t = e.trim();
-	if (!t) return "Unknown";
-	switch (t) {
+	let n = e.trim();
+	if (!n) return "Unknown";
+	switch (n) {
 		case "Optimal": return "Optimal";
 		case "Infeasible": return "Infeasible";
 		case "Unbounded": return "Unbounded";
-		case "Primal infeasible or unbounded": return "Unknown";
+		case "Primal infeasible or unbounded":
+		case "InfeasibleOrUnbounded": return "InfeasibleOrUnbounded";
 		case "Time limit reached":
 		case "TimeLimit": return "TimeLimit";
 		case "Iteration limit reached":
 		case "IterationLimit": return "IterationLimit";
+		case "Solution limit reached":
+		case "SolutionLimit": return "SolutionLimit";
+		case "Memory limit reached":
+		case "MemoryLimit": return "MemoryLimit";
 		case "Bound on objective reached":
+		case "ObjectiveBound": return "ObjectiveBound";
 		case "Target for objective reached":
+		case "ObjectiveTarget": return "ObjectiveTarget";
+		case "Interrupted":
+		case "User interrupt": return "Interrupted";
 		case "Feasible": return "Feasible";
 		case "Not Set": return "NotSolved";
 		case "Load error":
@@ -943,136 +1444,1314 @@ function re(e) {
 		case "Empty":
 		case "Unknown": return "Unknown";
 	}
-	let n = t.toLowerCase();
-	return n.includes("infeasible") && n.includes("unbounded") ? "Unknown" : n.includes("infeasible") ? "Infeasible" : n.includes("unbounded") ? "Unbounded" : n.includes("time limit") || n.includes("timelimit") ? "TimeLimit" : n.includes("iteration limit") || n.includes("iterationlimit") ? "IterationLimit" : n.includes("error") ? "Error" : n === "optimal" ? "Optimal" : "Unknown";
+	let r = n.toLowerCase();
+	return r.includes("infeasible") && r.includes("unbounded") ? "InfeasibleOrUnbounded" : r.includes("infeasible") ? "Infeasible" : r.includes("unbounded") ? "Unbounded" : r.includes("time limit") || r.includes("timelimit") ? "TimeLimit" : r.includes("iteration limit") || r.includes("iterationlimit") ? "IterationLimit" : r.includes("solution limit") || r.includes("solutionlimit") ? "SolutionLimit" : r.includes("memory limit") || r.includes("memorylimit") ? "MemoryLimit" : r.includes("bound on objective") ? "ObjectiveBound" : r.includes("target for objective") ? "ObjectiveTarget" : r.includes("interrupt") ? "Interrupted" : r.includes("error") ? "Error" : r === "optimal" ? "Optimal" : "Unknown";
+}
+function Me(e, t, n) {
+	switch (je(e, t)) {
+		case "Optimal": return "Optimal";
+		case "Infeasible": return "Infeasible";
+		case "Unbounded": return "Unbounded";
+		case "TimeLimit": return "TimeLimit";
+		case "IterationLimit": return "IterationLimit";
+		case "Feasible": return "Feasible";
+		case "ObjectiveBound":
+		case "ObjectiveTarget":
+		case "SolutionLimit": return n === !1 ? "Unknown" : "Feasible";
+		case "MemoryLimit":
+		case "Interrupted": return n ? "Feasible" : "Unknown";
+		case "NotSolved": return "NotSolved";
+		case "Error": return "Error";
+		default: return "Unknown";
+	}
 }
-var Q = class e {
+var K = class e {
 	static capabilities = {
 		supportsMIP: !0,
-		supportsQP: !0
+		supportsQP: !0,
+		supportsWarmStart: !0
 	};
 	name = "HiGHS";
-	version = "1.15.3";
+	version = "1.15.1";
 	capabilities = e.capabilities;
 	options;
 	constructor(e = {}) {
 		this.options = e;
 	}
-	async solve(e, t, n = {}) {
-		let r = {
+	async solve(e, t = {}, n = {}) {
+		let r = F(t), i = r ? n : t, a = {
 			...this.options,
-			...n
-		}, { lpString: i, nameToVar: a, nameToConstraint: o } = t, { result: s, runTime: c } = await ne(i, r), l = re(s?.Status);
-		if (l === "Infeasible" || l === "Unbounded") return {
-			status: l,
+			...i
+		}, o = e.objective.constant || 0;
+		for (let t of e.variables) A(t);
+		let { lpString: s, nameToVar: c, nameToConstraint: l } = r ? t : L(e, { relax: a.relax }), u = Object.create(null), d = !1, f = /* @__PURE__ */ new Set();
+		for (let [e, t] of c.entries()) {
+			f.add(t);
+			let n = ae(t);
+			n !== void 0 && (u[e] = n, d = !0);
+		}
+		for (let t = 0; t < e.variables.length; t++) {
+			let n = e.variables[t];
+			if (!f.has(n)) {
+				let e = ae(n);
+				if (e !== void 0) {
+					let r = I(n.name, "x", t);
+					Object.prototype.hasOwnProperty.call(u, r) || (u[r] = e, d = !0);
+				}
+			}
+		}
+		let p = a;
+		(o !== 0 || d || p.initialValues !== void 0) && (p = {
+			...p,
+			...o === 0 ? {} : { objectiveOffset: o },
+			initialValues: d ? u : void 0
+		});
+		let { result: m, runTime: h } = await Ae(s, p), g = m?.ObjectiveOffsetApplied ? 0 : o, _ = je(m?.Status, m?.StatusCode), v = a.relax ? !1 : typeof m?.IsMip == "boolean" ? m.IsMip : e.variables.some((e) => e.type === "Integer" || e.type === "Binary"), y;
+		if (typeof m?.HasPrimalSolution == "boolean") y = m.HasPrimalSolution;
+		else {
+			let e = m?.Columns ? Object.values(m.Columns) : [], t = e.length > 0 && e.some((e) => typeof e?.Primal == "number" && Number.isFinite(e.Primal)), n = typeof m?.ObjectiveValue == "number" && Number.isFinite(m.ObjectiveValue);
+			y = _ === "Infeasible" || _ === "Unbounded" || _ === "InfeasibleOrUnbounded" || _ === "Error" || _ === "NotSolved" ? !1 : _ === "Optimal" || _ === "Feasible" ? n || t : n && (e.length === 0 || t);
+		}
+		let b = Me(m?.Status, m?.StatusCode, y), x = null;
+		y && typeof m?.ObjectiveValue == "number" && Number.isFinite(m.ObjectiveValue) && (x = m.ObjectiveValue + g);
+		let S, C, w;
+		if (typeof m?.MipDualBound == "number" && Number.isFinite(m.MipDualBound) ? S = m.MipDualBound + g : !v && _ === "Optimal" && x !== null && (S = x), x !== null && S !== void 0 && Number.isFinite(S) && (w = Math.abs(x - S)), g !== 0 && v && x !== null && S !== void 0 && w !== void 0) {
+			if (w === 0) C = 0;
+			else if (Math.abs(x) > 0) {
+				let e = w / Math.abs(x);
+				C = Number.isFinite(e) ? e : void 0;
+			} else C = void 0;
+		} else typeof m?.MipGap == "number" && Number.isFinite(m.MipGap) ? C = m.MipGap : v && _ === "Optimal" && y && (w === void 0 || w === 0) && (C = 0);
+		if (!y) return {
+			status: b,
+			terminationStatus: _,
+			hasPrimalSolution: !1,
 			objectiveValue: null,
+			...S === void 0 ? {} : { objectiveBound: S },
+			...C === void 0 ? {} : {
+				relGap: C,
+				mipGap: C
+			},
+			...w === void 0 ? {} : { absGap: w },
 			values: {},
 			reducedCosts: {},
 			duals: {},
 			slacks: {},
-			runTime: c,
-			raw: s
+			runTime: h,
+			raw: m
 		};
-		let u = s.ObjectiveValue, d = typeof u == "number" ? u + e.objective.constant : null, f = {}, p = {}, m = {}, h = {};
-		if (s.Columns) for (let [e, t] of Object.entries(s.Columns)) {
-			let n = a.get(e);
+		let T = (e, t, n) => {
+			Object.defineProperty(e, t, {
+				value: n,
+				enumerable: !0,
+				writable: !0,
+				configurable: !0
+			});
+		}, E = {}, D = {}, O = {}, k = {};
+		if (m.Columns) for (let [e, t] of Object.entries(m.Columns)) {
+			let n = c.get(e);
 			if (n) {
-				let e = Math.abs(t.Primal) < 1e-9 ? 0 : t.Primal;
-				f[n.name] = e, t.Dual !== void 0 && (m[n.name] = Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual);
+				if (typeof t.Primal == "number" && Number.isFinite(t.Primal)) {
+					let e = Math.abs(t.Primal) < 1e-9 ? 0 : t.Primal;
+					T(E, n.name, e);
+				}
+				typeof t.Dual == "number" && Number.isFinite(t.Dual) && T(O, n.name, Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual);
 			}
 		}
-		if (s.Rows) {
-			let e = Array.isArray(s.Rows) ? s.Rows : Object.values(s.Rows);
+		if (m.Rows) {
+			let e = Array.isArray(m.Rows) ? m.Rows : Object.values(m.Rows);
 			for (let t of e) {
-				let e = t.Name, n = o.get(e);
-				if (n && (t.Dual !== void 0 && (p[n.name] = Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual), t.Primal !== void 0)) {
+				let e = t.Name, n = e ? l.get(e) : void 0;
+				if (n && (typeof t.Dual == "number" && Number.isFinite(t.Dual) && T(D, n.name, Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual), typeof t.Primal == "number" && Number.isFinite(t.Primal))) {
 					let e = n.rhs - t.Primal;
-					h[n.name] = Math.abs(e) < 1e-9 ? 0 : e;
+					T(k, n.name, Math.abs(e) < 1e-9 ? 0 : e);
 				}
 			}
 		}
 		return {
-			status: l,
-			objectiveValue: d,
-			values: f,
-			reducedCosts: m,
-			duals: p,
-			slacks: h,
-			runTime: c,
-			raw: s
+			status: b,
+			terminationStatus: _,
+			hasPrimalSolution: !0,
+			objectiveValue: x,
+			...S === void 0 ? {} : { objectiveBound: S },
+			...C === void 0 ? {} : {
+				relGap: C,
+				mipGap: C
+			},
+			...w === void 0 ? {} : { absGap: w },
+			values: E,
+			reducedCosts: O,
+			duals: D,
+			slacks: k,
+			runTime: h,
+			raw: m
 		};
 	}
-}, ie = Q;
-function ae() {
-	U("highs", (e) => new Q(e)), W((e) => new Q(e));
+}, Ne = K;
+function Pe() {
+	Ce("highs", (e) => new K(e)), we((e) => new K(e));
 }
-ae();
+Pe();
 //#endregion
 //#region src/modeler/solvers/mock.ts
-var $ = class {
+var Fe = class {
 	name;
 	capabilities;
 	options;
 	constructor(e = {}) {
 		this.name = e.name || "MockSolver", this.capabilities = e.capabilities || {
 			supportsMIP: !0,
-			supportsQP: !0
+			supportsQP: !0,
+			supportsWarmStart: !0
 		}, this.options = e;
 	}
-	async solve(e, t, n = {}) {
-		let r = {
+	async solve(e, t = {}, n = {}) {
+		let r = F(t) ? n : t, i = {
 			...this.options,
-			...n
+			...r
+		}, a = !!(i.values && Object.keys(i.values).length > 0 || i.boolValues && Object.keys(i.boolValues).length > 0);
+		if (i.signal?.aborted) return {
+			status: "Unknown",
+			terminationStatus: "Interrupted",
+			hasPrimalSolution: !1,
+			objectiveValue: null,
+			values: {},
+			runTime: 0,
+			raw: { mock: !0 }
 		};
-		return r.delayMs && r.delayMs > 0 && await new Promise((e) => setTimeout(e, r.delayMs)), {
-			status: r.status || "Optimal",
-			objectiveValue: r.objectiveValue ?? 0,
-			values: r.values || {},
-			reducedCosts: r.reducedCosts,
-			duals: r.duals,
-			slacks: r.slacks,
+		if (i.delayMs && i.delayMs > 0 && (await new Promise((e) => {
+			let t = setTimeout(() => {
+				i.signal?.removeEventListener("abort", n), e();
+			}, i.delayMs), n = () => {
+				clearTimeout(t), e();
+			};
+			i.signal?.addEventListener("abort", n, { once: !0 });
+		}), i.signal?.aborted)) {
+			let e = !!(i.hasPrimalSolution ?? a);
+			return {
+				status: e ? "Feasible" : "Unknown",
+				terminationStatus: "Interrupted",
+				hasPrimalSolution: e,
+				objectiveValue: e ? i.objectiveValue ?? 0 : null,
+				...i.objectiveBound === void 0 ? {} : { objectiveBound: i.objectiveBound },
+				...i.relGap === void 0 ? i.mipGap === void 0 ? {} : {
+					relGap: i.mipGap,
+					mipGap: i.mipGap
+				} : {
+					relGap: i.relGap,
+					mipGap: i.relGap
+				},
+				...i.absGap === void 0 ? {} : { absGap: i.absGap },
+				values: e && i.values || {},
+				...e && i.boolValues !== void 0 ? { boolValues: i.boolValues } : {},
+				runTime: .001,
+				raw: { mock: !0 }
+			};
+		}
+		if (i.onProgress && Array.isArray(i.progressEvents)) for (let e of i.progressEvents) {
+			if (i.signal?.aborted) break;
+			i.onProgress(e);
+		}
+		let o = i.status || "Optimal", s = i.terminationStatus ?? o, c = i.hasPrimalSolution === void 0 ? o === "Optimal" || o === "Feasible" || o === "Sat" || (o === "TimeLimit" || o === "IterationLimit" || s === "Interrupted") && a : i.hasPrimalSolution;
+		if (i.onProgress && !Array.isArray(i.progressEvents) && !i.signal?.aborted) {
+			let e = c ? i.objectiveValue ?? 0 : void 0;
+			i.onProgress({
+				elapsedTime: .001,
+				elapsedSeconds: .001,
+				...typeof e == "number" && Number.isFinite(e) ? { objectiveValue: e } : {},
+				...i.objectiveBound === void 0 ? {} : { objectiveBound: i.objectiveBound },
+				...i.relGap === void 0 ? i.mipGap === void 0 ? {} : {
+					relGap: i.mipGap,
+					mipGap: i.mipGap
+				} : {
+					relGap: i.relGap,
+					mipGap: i.relGap
+				},
+				...i.absGap === void 0 ? {} : { absGap: i.absGap }
+			});
+		}
+		return i.signal?.aborted && (s = "Interrupted", c = i.hasPrimalSolution === void 0 ? a : i.hasPrimalSolution, o = c ? "Feasible" : "Unknown"), {
+			status: o,
+			terminationStatus: s,
+			hasPrimalSolution: c,
+			objectiveValue: c ? i.objectiveValue ?? 0 : null,
+			...i.objectiveBound === void 0 ? {} : { objectiveBound: i.objectiveBound },
+			...i.relGap === void 0 ? i.mipGap === void 0 ? {} : {
+				relGap: i.mipGap,
+				mipGap: i.mipGap
+			} : {
+				relGap: i.relGap,
+				mipGap: i.relGap
+			},
+			...i.absGap === void 0 ? {} : { absGap: i.absGap },
+			values: c && i.values || {},
+			...c && i.boolValues !== void 0 ? { boolValues: i.boolValues } : {},
+			reducedCosts: i.reducedCosts,
+			duals: i.duals,
+			slacks: i.slacks,
 			runTime: .001,
 			raw: { mock: !0 }
 		};
 	}
 };
-function oe() {
-	U("mock", (e) => new $(e));
+function Ie() {
+	Ce("mock", (e) => new Fe(e));
 }
-oe();
+Ie();
 //#endregion
-//#region src/modeler/model.ts
-var se = class {
-	name;
-	sense;
-	objective;
-	variables = [];
-	constraints = [];
-	boolVars = [];
+//#region src/modeler/solution-validator.ts
+function Le(e, t) {
+	if (e === void 0) return 1e-6;
+	if (typeof e != "number" || !Number.isFinite(e) || e < 0) throw Error(`Invalid ${t}: expected a finite non-negative number, received ${String(e)}.`);
+	return e;
+}
+function Re(e, t = {}) {
+	let n = Le(t.feasibilityTolerance, "feasibilityTolerance"), r = Le(t.integralityTolerance, "integralityTolerance"), i = t.evaluateLogicalConstraints === void 0 || !!t.evaluateLogicalConstraints, a = t.values !== void 0 && t.values !== null;
+	if (t.values !== void 0 && (typeof t.values != "object" || t.values === null || Array.isArray(t.values))) throw Error("Invalid values option: expected a plain object mapping variable names to values.");
+	let o = t.values, s = [], c = Object.create(null), l = [], u = [], p = 0, m = (e) => {
+		typeof e == "number" && !Number.isNaN(e) && e > p && (p = e);
+	}, h = (e) => {
+		s.push(e), Object.prototype.hasOwnProperty.call(c, e.name) || (c[e.name] = []), c[e.name].push(e), e.type !== "missing_value" && e.type !== "unchecked_constraint" && m(e.violation);
+	}, g = /* @__PURE__ */ new Map(), _ = /* @__PURE__ */ new Map(), v = 0, b = 0, x = 0, S = 0;
+	for (let t of e.variables) {
+		let e = a ? Object.prototype.hasOwnProperty.call(o, t.name) ? o[t.name] : void 0 : t.value;
+		if (e == null) {
+			u.push(t.name), h({
+				type: "missing_value",
+				target: "variable",
+				name: t.name,
+				actual: e ?? null,
+				violation: Infinity,
+				message: `Variable "${t.name}" has no assigned solution value.`
+			});
+			continue;
+		}
+		if (typeof e != "number" || !Number.isFinite(e)) {
+			h({
+				type: "non_finite_value",
+				target: "variable",
+				name: t.name,
+				actual: e,
+				violation: Infinity,
+				message: `Variable "${t.name}" has non-finite or non-numeric value: ${String(e)}.`
+			});
+			continue;
+		}
+		g.set(t, e), v++;
+		let i = t.type === "Binary" || t.type === "BINARY", s = i || t.type === "Integer" || t.type === "INTEGER", c = i ? Math.max(0, t.lb) : t.lb, l = i ? Math.min(1, t.ub) : t.ub, d = typeof t.lb == "number" && !Number.isNaN(t.lb) && t.lb !== Infinity, f = typeof t.ub == "number" && !Number.isNaN(t.ub) && t.ub !== -Infinity;
+		if (!d) h({
+			type: "lower_bound",
+			target: "variable",
+			name: t.name,
+			actual: e,
+			limit: t.lb,
+			violation: Infinity,
+			message: `Variable "${t.name}" has invalid lower bound (${String(t.lb)}).`
+		});
+		else if (c !== -Infinity) {
+			let r = e - c, i = Math.max(0, c - e);
+			m(i), i > n && h({
+				type: "lower_bound",
+				target: "variable",
+				name: t.name,
+				actual: e,
+				limit: c,
+				violation: i,
+				signedViolation: r,
+				message: `Variable "${t.name}" value (${e}) violates lower bound (${c}) by ${i}.`
+			});
+		}
+		if (!f) h({
+			type: "upper_bound",
+			target: "variable",
+			name: t.name,
+			actual: e,
+			limit: t.ub,
+			violation: Infinity,
+			message: `Variable "${t.name}" has invalid upper bound (${String(t.ub)}).`
+		});
+		else if (l !== Infinity) {
+			let r = e - l, i = Math.max(0, e - l);
+			m(i), i > n && h({
+				type: "upper_bound",
+				target: "variable",
+				name: t.name,
+				actual: e,
+				limit: l,
+				violation: i,
+				signedViolation: r,
+				message: `Variable "${t.name}" value (${e}) violates upper bound (${l}) by ${i}.`
+			});
+		}
+		if (d && f && c > l && c - e <= n && e - l <= n) {
+			let n = c - l;
+			h({
+				type: "lower_bound",
+				target: "variable",
+				name: t.name,
+				actual: e,
+				limit: c,
+				violation: n,
+				signedViolation: e - c,
+				message: `Variable "${t.name}" has inverted bounds [${c}, ${l}].`
+			});
+		}
+		if (s) {
+			let n = Math.round(e), a = e - n, o = Math.abs(a);
+			m(o), o > r && h({
+				type: "integrality",
+				target: "variable",
+				name: t.name,
+				varType: i ? "Binary" : "Integer",
+				actual: e,
+				nearestInteger: n,
+				violation: o,
+				signedViolation: a,
+				message: `${i ? "Binary" : "Integer"} variable "${t.name}" value (${e}) violates integrality by ${o} (nearest integer: ${n}).`
+			});
+		}
+	}
+	for (let t of e.boolVars) {
+		let e = a ? Object.prototype.hasOwnProperty.call(o, t.name) ? o[t.name] : void 0 : t.value;
+		if (e == null) {
+			u.push(t.name), h({
+				type: "missing_value",
+				target: "bool_variable",
+				name: t.name,
+				actual: e ?? null,
+				violation: Infinity,
+				message: `Boolean variable "${t.name}" has no assigned solution value.`
+			});
+			continue;
+		}
+		if (typeof e != "boolean") {
+			h({
+				type: "invalid_boolean_value",
+				target: "bool_variable",
+				name: t.name,
+				actual: e,
+				violation: Infinity,
+				message: `Boolean variable "${t.name}" has non-boolean value: ${String(e)}.`
+			});
+			continue;
+		}
+		_.set(t, e), b++;
+	}
+	let C = (e) => {
+		let t = e.constant === void 0 ? 0 : e.constant;
+		if (typeof t != "number" || !Number.isFinite(t)) return {
+			ok: !1,
+			reason: `non-finite constant (${String(t)})`
+		};
+		let n = t;
+		for (let [t, r] of e.terms) {
+			if (typeof r != "number" || !Number.isFinite(r)) return {
+				ok: !1,
+				reason: `non-finite coefficient (${String(r)}) for variable "${t.name}"`
+			};
+			if (r !== 0) {
+				if (!g.has(t)) return {
+					ok: !1,
+					reason: `missing or invalid value for variable "${t.name}"`
+				};
+				if (n += r * g.get(t), !Number.isFinite(n)) return {
+					ok: !1,
+					reason: "linear expression evaluation overflowed finite range"
+				};
+			}
+		}
+		return {
+			ok: !0,
+			value: n
+		};
+	}, w = (e, t = n) => {
+		if (typeof e.rhs != "number" || !Number.isFinite(e.rhs)) return {
+			status: "unchecked",
+			reason: `non-finite right-hand side (${String(e.rhs)})`
+		};
+		let r = C(e.lhs);
+		if (!r.ok) return {
+			status: "unchecked",
+			reason: r.reason
+		};
+		let i = r.value, a = i - e.rhs;
+		if (!Number.isFinite(a)) return {
+			status: "unchecked",
+			reason: "constraint residual overflowed finite range"
+		};
+		let o = e.sense === "<=" ? Math.max(0, a) : e.sense === ">=" ? Math.max(0, -a) : Math.abs(a);
+		return o > t ? {
+			status: "violated",
+			lhsVal: i,
+			signed: a,
+			violation: o,
+			message: `Constraint "${e.name}" (${i} ${e.sense} ${e.rhs}) violated by ${o}.`
+		} : {
+			status: "satisfied",
+			lhsVal: i,
+			signed: a,
+			violation: o
+		};
+	};
+	for (let t of e.constraints) {
+		let e = w(t);
+		e.status === "unchecked" ? (l.push(t.name), h({
+			type: "unchecked_constraint",
+			target: "constraint",
+			name: t.name,
+			sense: t.sense,
+			limit: t.rhs,
+			rhs: t.rhs,
+			violation: Infinity,
+			message: `Constraint "${t.name}" could not be evaluated: ${e.reason}.`
+		})) : e.status === "violated" ? (x++, h({
+			type: "linear_constraint",
+			target: "constraint",
+			name: t.name,
+			sense: t.sense,
+			actual: e.lhsVal,
+			limit: t.rhs,
+			rhs: t.rhs,
+			violation: e.violation,
+			signedViolation: e.signed,
+			message: e.message
+		})) : (x++, m(e.violation));
+	}
+	let T = (e) => {
+		if (e instanceof d) return _.has(e) ? {
+			ok: !0,
+			value: _.get(e),
+			violation: 0
+		} : {
+			ok: !1,
+			reason: `missing or invalid value for Boolean variable "${e.name}"`
+		};
+		if (e instanceof y) {
+			let t = w(e, 0);
+			if (t.status === "unchecked") return {
+				ok: !1,
+				reason: t.reason
+			};
+			if (n > 0) {
+				let r = Math.abs(t.lhsVal - e.rhs);
+				if (r > 0 && r <= n) return {
+					ok: !1,
+					reason: `numeric comparison "${e.name}" lies within feasibilityTolerance (${n}) of boundary (${t.lhsVal} vs ${e.rhs})`
+				};
+			}
+			return {
+				ok: !0,
+				value: t.status === "satisfied",
+				violation: 0
+			};
+		}
+		if (e instanceof f) switch (e.op) {
+			case "not": {
+				let t = T(e.children[0]);
+				return t.ok ? {
+					ok: !0,
+					value: !t.value,
+					violation: 0
+				} : t;
+			}
+			case "and": {
+				let t = 0;
+				for (let n of e.children) {
+					let e = T(n);
+					if (!e.ok) return e;
+					if (!e.value) return {
+						ok: !0,
+						value: !1,
+						violation: 0
+					};
+					e.violation > t && (t = e.violation);
+				}
+				return {
+					ok: !0,
+					value: !0,
+					violation: t
+				};
+			}
+			case "or": {
+				let t = !1, n = Infinity;
+				for (let r of e.children) {
+					let e = T(r);
+					if (!e.ok) return e;
+					e.value && (t = !0, e.violation < n && (n = e.violation));
+				}
+				return {
+					ok: !0,
+					value: t,
+					violation: t ? n : 0
+				};
+			}
+			case "implies": {
+				let t = T(e.children[0]);
+				if (!t.ok) return t;
+				if (!t.value) return {
+					ok: !0,
+					value: !0,
+					violation: 0
+				};
+				let n = T(e.children[1]);
+				return n.ok ? {
+					ok: !0,
+					value: n.value,
+					violation: n.value ? n.violation : 0
+				} : n;
+			}
+			case "xor": {
+				let t = !1, n = 0;
+				for (let r of e.children) {
+					let e = T(r);
+					if (!e.ok) return e;
+					e.value && (t = !t, e.violation > n && (n = e.violation));
+				}
+				return {
+					ok: !0,
+					value: t,
+					violation: t ? n : 0
+				};
+			}
+			default: return {
+				ok: !1,
+				reason: `unsupported logical operator "${String(e.op)}"`
+			};
+		}
+		return {
+			ok: !1,
+			reason: "unsupported logical expression node"
+		};
+	};
+	for (let t = 0; t < e.logicalConstraints.length; t++) {
+		let n = e.logicalConstraints[t], r = n.name || `lc_${t + 1}`;
+		if (!i) {
+			l.push(r), h({
+				type: "unchecked_constraint",
+				target: "logical_constraint",
+				name: r,
+				violation: Infinity,
+				message: `Logical constraint "${r}" was not evaluated because evaluateLogicalConstraints is false.`
+			});
+			continue;
+		}
+		let a = T(n.expr);
+		if (!a.ok) {
+			l.push(r), h({
+				type: "unchecked_constraint",
+				target: "logical_constraint",
+				name: r,
+				violation: Infinity,
+				message: `Logical constraint "${r}" could not be evaluated: ${a.reason}.`
+			});
+			continue;
+		}
+		S++, a.value ? m(a.violation) : h({
+			type: "logical_constraint",
+			target: "logical_constraint",
+			name: r,
+			actual: !1,
+			limit: !0,
+			violation: 1,
+			signedViolation: -1,
+			message: `Logical constraint "${r}" evaluated to false.`
+		});
+	}
+	let E = v === e.variables.length && b === e.boolVars.length && x === e.constraints.length && S === e.logicalConstraints.length && l.length === 0 && u.length === 0;
+	return {
+		valid: E && s.length === 0,
+		complete: E,
+		violations: s,
+		violationsByName: c,
+		uncheckedConstraints: l,
+		missingVariables: u,
+		maxViolation: p,
+		summary: {
+			checkedVariables: v,
+			totalVariables: e.variables.length,
+			checkedBoolVariables: b,
+			totalBoolVariables: e.boolVars.length,
+			checkedLinearConstraints: x,
+			totalLinearConstraints: e.constraints.length,
+			checkedLogicalConstraints: S,
+			totalLogicalConstraints: e.logicalConstraints.length
+		}
+	};
+}
+//#endregion
+//#region src/modeler/big-m.ts
+function ze(e, t) {
+	if (typeof e != "number" || !Number.isFinite(e) || e <= 0) throw Error(`Invalid Big-M value for indicator constraint "${t}": expected a finite positive number, received ${e}.`);
+}
+function Be(e, t, n) {
+	let r = e.constant === void 0 ? 0 : e.constant;
+	if (!Number.isFinite(t) || !Number.isFinite(r)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": constraint contains non-finite constant (${r}) or right-hand side (${t}).`);
+	let i = t - r;
+	if (!Number.isFinite(i)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": effective right-hand side (${t} - ${r}) overflows finite floating-point range. Please rescale coefficients/constants.`);
+	for (let [t, r] of e.terms) {
+		if (!Number.isFinite(r)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" has non-finite coefficient (${r}).`);
+		if (Number.isNaN(t.lb) || Number.isNaN(t.ub) || t.lb === Infinity || t.ub === -Infinity || t.lb > t.ub) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" has invalid bounds [${t.lb}, ${t.ub}].`);
+	}
+	return i;
+}
+function q(e, t, n) {
+	let r = Be(e, t, n), i = 0;
+	for (let [t, r] of e.terms) {
+		if (r === 0) continue;
+		let e;
+		if (r > 0) {
+			if (!Number.isFinite(t.ub)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" lacks a finite upper bound (required because coefficient ${r} is positive in <= constraint). Please set an explicit finite upper bound on the variable or specify { M } explicitly in indicator options.`);
+			e = t.ub;
+		} else {
+			if (!Number.isFinite(t.lb)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" lacks a finite lower bound (required because coefficient ${r} is negative in <= constraint). Please set an explicit finite lower bound on the variable or specify { M } explicitly in indicator options.`);
+			e = t.lb;
+		}
+		let a = r * e;
+		if (i += a, !Number.isFinite(a) || !Number.isFinite(i)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": numeric overflow while bounding contribution of variable "${t.name}". Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	}
+	let a = i - r;
+	if (!Number.isFinite(a)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": numeric overflow while computing Big-M (${i} - ${r}). Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	let o = Math.max(0, a);
+	if (!Number.isFinite(o) || !Number.isFinite(r + o)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": derived Big-M (${o}) or shifted right-hand side overflows finite floating-point range. Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	return o;
+}
+function J(e, t, n) {
+	let r = Be(e, t, n), i = 0;
+	for (let [t, r] of e.terms) {
+		if (r === 0) continue;
+		let e;
+		if (r > 0) {
+			if (!Number.isFinite(t.lb)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" lacks a finite lower bound (required because coefficient ${r} is positive in >= constraint). Please set an explicit finite lower bound on the variable or specify { M } explicitly in indicator options.`);
+			e = t.lb;
+		} else {
+			if (!Number.isFinite(t.ub)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" lacks a finite upper bound (required because coefficient ${r} is negative in >= constraint). Please set an explicit finite upper bound on the variable or specify { M } explicitly in indicator options.`);
+			e = t.ub;
+		}
+		let a = r * e;
+		if (i += a, !Number.isFinite(a) || !Number.isFinite(i)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": numeric overflow while bounding contribution of variable "${t.name}". Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	}
+	let a = r - i;
+	if (!Number.isFinite(a)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": numeric overflow while computing Big-M (${r} - ${i}). Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	let o = Math.max(0, a);
+	if (!Number.isFinite(o) || !Number.isFinite(r - o)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": derived Big-M (${o}) or shifted right-hand side overflows finite floating-point range. Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	return o;
+}
+function Y(e, t, n, r, i, a, o) {
+	if (!(e instanceof M && (e.type === "Binary" || e.type === "Integer" && e.lb === 0 && e.ub === 1))) throw Error(`Indicator variable "${e?.name ?? String(e)}" must be a Binary variable (or Integer variable with bounds [0, 1]), received "${e?.type ?? typeof e}" with bounds [${e?.lb}, ${e?.ub}].`);
+	if (!Number.isFinite(e.lb) || !Number.isFinite(e.ub) || e.lb < 0 || e.ub > 1 || e.lb > e.ub) throw Error(`Binary indicator variable "${e.name}" has invalid bounds [${e.lb}, ${e.ub}]. Binary variables must stay within [0, 1] with lb <= ub.`);
+	let s = Be(t, r, o);
+	if (i !== 0 && i !== 1) throw Error(`Invalid activeValue: ${i}. Indicator activation value must be 0 or 1.`);
+	if (n !== "<=" && n !== ">=") throw Error(`Invalid indicator sense for "${o}": expected "<=" or ">=", received "${String(n)}".`);
+	if (!Number.isFinite(a) || a < 0) throw Error(`Invalid Big-M value for indicator constraint "${o}": expected a finite non-negative number, received ${a}.`);
+	let c = t.terms.get(e);
+	if (c !== void 0 && c !== 0) throw Error(`Indicator constraint "${o}" cannot include its own binary activation variable "${e.name}" in the linear expression.`);
+	let l, u;
+	if (i === 1 ? n === "<=" ? (l = a, u = s + a) : (l = -a, u = s - a) : n === "<=" ? (l = -a, u = s) : (l = a, u = s), !Number.isFinite(u)) throw Error(`Cannot construct finite indicator constraint "${o}": shifted right-hand side overflows finite floating-point range. Please rescale coefficients/bounds or specify a smaller finite { M }.`);
+	let d = /* @__PURE__ */ new Map();
+	for (let [e, n] of t.terms) n !== 0 && d.set(e, n);
+	return l !== 0 && d.set(e, l), {
+		lhs: new C(d, 0),
+		rhs: u
+	};
+}
+//#endregion
+//#region src/modeler/linearizer.ts
+function X(e, t = 0) {
+	return new C(new Map(e), t);
+}
+function Ve(e, t, n, r) {
+	let i = [...e], a = [...n], o = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map();
+	for (let e of n) s.set(e, e.name);
+	let c = new Set(e.map((e) => e.name)), l = 0;
+	function u(e) {
+		let t;
+		do
+			t = `__washi_${e}_${++l}`;
+		while (c.has(t));
+		return c.add(t), t;
+	}
+	for (let e of t) {
+		let t = e.name;
+		c.has(t) ? t = u(`bool_${e.name}`) : c.add(t);
+		let n = new M({
+			name: t,
+			type: "Binary",
+			lb: 0,
+			ub: 1
+		});
+		o.set(e, n), i.push(n);
+	}
+	function p(e, t) {
+		if (e instanceof He) return e.wrappedVar;
+		if (e instanceof d) {
+			let n = o.get(e);
+			if (!n) throw Error(`Unregistered BoolVar "${e.name}" in logical constraint "${t}".`);
+			return n;
+		}
+		let n = new M({
+			name: u("expr"),
+			type: "Binary",
+			lb: 0,
+			ub: 1
+		});
+		return i.push(n), h(n, e, t), n;
+	}
+	function m(e, t, n, r) {
+		let i = new y(X([
+			[e, 1],
+			[t, -1],
+			[n, -1]
+		], 0), "<=", 0, `${r}_xor_1`), o = new y(X([
+			[e, 1],
+			[t, -1],
+			[n, 1]
+		], 0), ">=", 0, `${r}_xor_2`), c = new y(X([
+			[e, 1],
+			[n, -1],
+			[t, 1]
+		], 0), ">=", 0, `${r}_xor_3`), l = new y(X([
+			[e, 1],
+			[t, 1],
+			[n, 1]
+		], 0), "<=", 2, `${r}_xor_4`);
+		a.push(i, o, c, l), s.set(i, r), s.set(o, r), s.set(c, r), s.set(l, r);
+	}
+	function h(e, t, n) {
+		if (t instanceof d) {
+			let r = o.get(t), i = new y(X([[e, 1], [r, -1]], 0), "==", 0, `${n}_equiv`);
+			a.push(i), s.set(i, n);
+			return;
+		}
+		if (t instanceof f) {
+			if (t.op === "not") {
+				let r = p(t.children[0], n), i = new y(X([[e, 1], [r, 1]], 0), "==", 1, `${n}_not`);
+				a.push(i), s.set(i, n);
+				return;
+			}
+			if (t.op === "and") {
+				let r = t.children.map((e) => p(e, n));
+				for (let t = 0; t < r.length; t++) {
+					let i = new y(X([[e, 1], [r[t], -1]], 0), "<=", 0, `${n}_and_ub_${t}`);
+					a.push(i), s.set(i, n);
+				}
+				let i = new y(X([[e, 1], ...r.map((e) => [e, -1])], 0), ">=", 1 - r.length, `${n}_and_lb`);
+				a.push(i), s.set(i, n);
+				return;
+			}
+			if (t.op === "or") {
+				let r = t.children.map((e) => p(e, n));
+				for (let t = 0; t < r.length; t++) {
+					let i = new y(X([[e, 1], [r[t], -1]], 0), ">=", 0, `${n}_or_lb_${t}`);
+					a.push(i), s.set(i, n);
+				}
+				let i = new y(X([[e, 1], ...r.map((e) => [e, -1])], 0), "<=", 0, `${n}_or_ub`);
+				a.push(i), s.set(i, n);
+				return;
+			}
+			if (t.op === "implies") {
+				let r = p(t.children[0], n), i = p(t.children[1], n), o = new y(X([
+					[e, 1],
+					[i, -1],
+					[r, 1]
+				], 0), ">=", 0, `${n}_imp_1`), c = new y(X([
+					[e, 1],
+					[r, 1],
+					[i, -1]
+				], 0), "<=", 1, `${n}_imp_2`);
+				a.push(o, c), s.set(o, n), s.set(c, n);
+				return;
+			}
+			if (t.op === "xor") {
+				if (t.children.length === 0) {
+					let t = new y(X([[e, 1]], 0), "==", 0, `${n}_xor_empty`);
+					a.push(t), s.set(t, n);
+					return;
+				}
+				if (t.children.length === 1) {
+					let r = p(t.children[0], n), i = new y(X([[e, 1], [r, -1]], 0), "==", 0, `${n}_xor_single`);
+					a.push(i), s.set(i, n);
+					return;
+				}
+				let r = t.children.map((e) => p(e, n)), o = r[0];
+				for (let e = 1; e < r.length - 1; e++) {
+					let t = new M({
+						name: u(`xor_fold_${e}`),
+						type: "Binary",
+						lb: 0,
+						ub: 1
+					});
+					i.push(t), m(t, o, r[e], `${n}_xor_fold_${e}`), o = t;
+				}
+				m(e, o, r[r.length - 1], n);
+				return;
+			}
+		}
+		throw Error(`Unsupported logical element in equivalence linearization: ${t}`);
+	}
+	for (let e of r) {
+		let t = e.name, n = e.expr;
+		g(n, t);
+	}
+	function g(e, t) {
+		if (e instanceof d) {
+			let n = new y(X([[o.get(e), 1]], 0), ">=", 1, t);
+			a.push(n), s.set(n, t);
+			return;
+		}
+		if (e instanceof f) {
+			if (e.op === "not") {
+				let n = e.children[0];
+				if (n instanceof d) {
+					let e = new y(X([[o.get(n), 1]], 0), "<=", 0, t);
+					a.push(e), s.set(e, t);
+					return;
+				}
+				let r = new y(X([[p(n, t), 1]], 0), "<=", 0, t);
+				a.push(r), s.set(r, t);
+				return;
+			}
+			if (e.op === "and") {
+				for (let n = 0; n < e.children.length; n++) g(e.children[n], `${t}_and_${n}`);
+				return;
+			}
+			if (e.op === "or") {
+				if (e.children.every((e) => e instanceof d || e instanceof f)) {
+					let n = new y(X(e.children.map((e) => p(e, t)).map((e) => [e, 1]), 0), ">=", 1, t);
+					a.push(n), s.set(n, t);
+					return;
+				}
+				let n = [];
+				for (let r = 0; r < e.children.length; r++) {
+					let o = e.children[r], c = new M({
+						name: u(`or_branch_${r}`),
+						type: "Binary",
+						lb: 0,
+						ub: 1
+					});
+					if (i.push(c), n.push(c), o instanceof y) _(c, o, 1, `${t}_or_branch_${r}`, t);
+					else {
+						let e = p(o, t), n = new y(X([[c, 1], [e, -1]], 0), "<=", 0, `${t}_or_bool_${r}`);
+						a.push(n), s.set(n, t);
+					}
+				}
+				let r = new y(X(n.map((e) => [e, 1]), 0), ">=", 1, t);
+				a.push(r), s.set(r, t);
+				return;
+			}
+			if (e.op === "xor") {
+				if (e.children.length === 0) {
+					let e = new M({
+						name: u("unsat"),
+						type: "Binary",
+						lb: 0,
+						ub: 0
+					});
+					i.push(e);
+					let n = new y(X([[e, 1]], 0), ">=", 1, t);
+					a.push(n), s.set(n, t);
+					return;
+				}
+				if (e.children.length === 1) {
+					g(e.children[0], t);
+					return;
+				}
+				let n = e.children.map((e) => p(e, t));
+				if (n.length === 2) {
+					let e = new y(X([[n[0], 1], [n[1], 1]], 0), "==", 1, t);
+					a.push(e), s.set(e, t);
+					return;
+				}
+				let r = n[0];
+				for (let e = 1; e < n.length - 1; e++) {
+					let a = new M({
+						name: u(`xor_fold_${e}`),
+						type: "Binary",
+						lb: 0,
+						ub: 1
+					});
+					i.push(a), m(a, r, n[e], `${t}_xor_fold_${e}`), r = a;
+				}
+				let o = n[n.length - 1], c = new y(X([[r, 1], [o, 1]], 0), "==", 1, t);
+				a.push(c), s.set(c, t);
+				return;
+			}
+			if (e.op === "implies") {
+				let [n, r] = e.children;
+				if (n instanceof y && n.lhs.terms.size === 1 && n.lhs.constant === 0) {
+					let [[e, i]] = Array.from(n.lhs.terms.entries());
+					if ((e.type === "Binary" || e.type === "Integer" && e.lb === 0 && e.ub === 1) && i === 1) {
+						let i = null;
+						if (n.sense === "==" && n.rhs === 1 ? i = 1 : n.sense === "==" && n.rhs === 0 || n.sense === "<=" && n.rhs === 0 ? i = 0 : n.sense === ">=" && n.rhs === 1 && (i = 1), i !== null && r instanceof y) {
+							_(e, r, i, t, t);
+							return;
+						}
+					}
+				}
+				let c;
+				if (n instanceof y ? (c = new M({
+					name: u("ante"),
+					type: "Binary",
+					lb: 0,
+					ub: 1
+				}), i.push(c), _(c, n, 1, `${t}_ante_active`, t)) : c = p(n, t), r instanceof y) {
+					_(c, r, 1, t, t);
+					return;
+				}
+				if (r instanceof d) {
+					let e = new y(X([[o.get(r), 1], [c, -1]], 0), ">=", 0, t);
+					a.push(e), s.set(e, t);
+					return;
+				}
+				if (r instanceof f) {
+					if (r.op === "and") {
+						for (let e = 0; e < r.children.length; e++) g(new f("implies", [c instanceof M ? new He(c) : n, r.children[e]]), `${t}_and_${e}`);
+						return;
+					}
+					if (r.op === "not") {
+						let e = r.children[0], n = p(e, t), i = new y(X([[c, 1], [n, 1]], 0), "<=", 1, t);
+						a.push(i), s.set(i, t);
+						return;
+					}
+					let e = new y(X([[p(r, t), 1], [c, -1]], 0), ">=", 0, t);
+					a.push(e), s.set(e, t);
+					return;
+				}
+			}
+		}
+		throw Error(`Unsupported top-level logical constraint "${t}": ${e}`);
+	}
+	function _(e, t, n, r, i) {
+		let { lhs: o, sense: c, rhs: l } = t;
+		if (c === "<=" || c === ">=") {
+			let t = Y(e, o, c, l, n, c === "<=" ? q(o, l, r) : J(o, l, r), r), u = new y(t.lhs, c, t.rhs, r);
+			a.push(u), s.set(u, i);
+		} else {
+			let t = q(o, l, `${r}_le`), c = J(o, l, `${r}_ge`), u = Y(e, o, "<=", l, n, t, `${r}_le`), d = Y(e, o, ">=", l, n, c, `${r}_ge`), f = new y(u.lhs, "<=", u.rhs, `${r}_le`), p = new y(d.lhs, ">=", d.rhs, `${r}_ge`);
+			a.push(f, p), s.set(f, i), s.set(p, i);
+		}
+	}
+	return {
+		variables: i,
+		constraints: a,
+		boolVarToBinary: o,
+		constraintToOriginalName: s
+	};
+}
+var He = class extends d {
+	wrappedVar;
+	constructor(e) {
+		super(e.name), this.wrappedVar = e;
+	}
+};
+//#endregion
+//#region src/decomposition/column-generation.ts
+async function Ue(e) {
+	let t = e.master;
+	if (!t) throw Error("A master Model must be provided for solveColumnGeneration.");
+	let { pricing: n, maxIterations: r = 100, reducedCostTolerance: i = 1e-6, finalizeAsMIP: a = !0, solver: o, solverOptions: s, onIteration: c } = e, l = t.sense.toLowerCase() === "maximize", u = n;
+	if (!u) throw Error("The 'pricing' callback must be provided in ColumnGenerationOptions.");
+	let d = [], f = null, p = 0, m = t.status;
+	for (let e = 1; e <= r; e++) {
+		p = e;
+		let n = await t.relax(o, s);
+		if (m = n, n !== "Optimal" && n !== "Feasible" || !t.solution) break;
+		f = t.objectiveValue;
+		let r = t.solution, a = r.duals || {}, h = (e) => typeof e == "string" ? a[e] ?? 0 : e.dual ?? (e.name ? a[e.name] ?? 0 : 0), g = await u({
+			iteration: e,
+			duals: a,
+			getDual: h,
+			masterSolution: r,
+			reducedCostTolerance: i,
+			master: t
+		}), _ = [];
+		g && (Array.isArray(g) ? _.push(...g) : _.push(g));
+		let v = [];
+		for (let e of _) {
+			let t = e.reducedCost;
+			if (typeof t != "number" || !Number.isFinite(t)) {
+				let n = 0, r = e.coefficients;
+				if (Array.isArray(r)) for (let e of r) Array.isArray(e) ? n += e[1] * h(e[0]) : e && typeof e == "object" && (n += e.coeff * h(e.constraint));
+				else if (r instanceof Map) for (let [e, t] of r.entries()) n += t * h(e);
+				else if (r && typeof r == "object") for (let [e, t] of Object.entries(r)) n += t * h(e);
+				t = e.cost - n;
+			}
+			(l ? t > i : t < -i) && v.push(e);
+		}
+		if (c && c({
+			iteration: e,
+			relaxationObjective: f,
+			columnsAdded: d.length + v.length,
+			proposedColumns: v
+		}), v.length === 0) break;
+		for (let e of v) {
+			let n = t.addColumn({
+				name: e.name,
+				type: e.type || "Continuous",
+				lb: e.lb,
+				ub: e.ub,
+				cost: e.cost,
+				coefficients: e.coefficients
+			});
+			d.push({
+				variable: n,
+				proposal: e
+			});
+		}
+	}
+	let h = f;
+	a && (m === "Optimal" || m === "Feasible") && (m = await t.solve(o, s), h = t.objectiveValue);
+	let g = {};
+	for (let e of t.variables) e.value !== null && (g[e.name] = e.value);
+	let _ = {
+		status: m,
+		objectiveValue: h,
+		relaxationObjectiveValue: f,
+		iterations: p,
+		columnsAdded: d.length,
+		generatedColumns: d,
+		master: t,
+		values: g
+	};
+	return t.decomposition = _, _;
+}
+//#endregion
+//#region src/modeler/objective.ts
+function We(e, t) {
+	let n = e;
+	if (n instanceof y || typeof n == "object" && n && "sense" in n && "lhs" in n && "rhs" in n) throw Error(`Cannot use a Constraint as an objective in ${t}(). Use m.constraint(expr\`... <= ...\`) for constraints, or supply an unconstrained arithmetic expression to ${t}(), e.g. m.objective(${t}(expr\`30 * \${x}\`)).`);
+	if (typeof n == "string" && /(<=|>=|==|=<|=>|=)/.test(n)) throw Error(`Cannot use a comparison constraint as an objective in ${t}(). Use m.constraint(expr\`... <= ...\`) for constraints, or supply an unconstrained arithmetic expression to ${t}(), e.g. m.objective(${t}(expr\`30 * \${x}\`)).`);
+	if (typeof n == "number") {
+		if (!Number.isFinite(n)) throw Error(`Invalid non-finite objective constant "${n}" passed to ${t}().`);
+		return n;
+	}
+	if (typeof n == "string" || n instanceof C || n instanceof S || n instanceof M || typeof n == "object" && n && ("terms" in n && n.terms instanceof Map && typeof n.constant == "number" || "quadTerms" in n && n.quadTerms instanceof Map && "linearTerms" in n && n.linearTerms instanceof Map && typeof n.constant == "number" || "id" in n && "name" in n && "lb" in n && "ub" in n)) return n;
+	throw Error(`Invalid expression passed to ${t}(): expected a finite number, Var, LinExpr, QuadExpr, or arithmetic expression string.`);
+}
+function Ge(e) {
+	return {
+		expr: We(e, "maximize"),
+		sense: "Maximize"
+	};
+}
+function Ke(e) {
+	return {
+		expr: We(e, "minimize"),
+		sense: "Minimize"
+	};
+}
+//#endregion
+//#region src/decomposition/benders.ts
+function qe(e) {
+	return !!(e && typeof e == "object" && "constraints" in e && "variables" in e && typeof e.solve == "function");
+}
+async function Je(e, t, n, r, i, a, o, s, c = 1) {
+	let l = [];
+	for (let r = 0; r < t.length; r++) {
+		let a = t[r], o = a.lhs, s = a.sense, u = a.rhs - (o.constant || 0), d = [], f = [], p = 0;
+		for (let [e, t] of o.terms.entries()) if (e.ownerModel === n || n.getVarByName(e.name) !== void 0) {
+			f.push([e, t]);
+			let n = i[e.name] ?? 0;
+			p += t * n;
+		} else d.push([e, t]);
+		let m = u - p, h = new C();
+		for (let [e, t] of d) h.addTerm(e, t);
+		let g = new y(h, s, m, `__benders_link_${c}_${r}`);
+		e.constraint(g), l.push({
+			origConstraint: a,
+			subConstr: g,
+			masterTerms: f,
+			baseRhs: u
+		});
+	}
+	let u = await e.solve(o, {
+		...s,
+		relax: !0
+	});
+	if (u !== "Optimal" && u !== "Feasible") return null;
+	let d = e.objectiveValue ?? 0, f = i[r.name] ?? 0, p = 1e-4;
+	if (!(a ? f < d - p : f > d + p)) return null;
+	let m = 0, h = /* @__PURE__ */ new Map(), g = new Set(l.map((e) => e.subConstr.name));
+	for (let t of e.constraints) {
+		if (g.has(t.name)) continue;
+		let n = e.solution?.duals[t.name] ?? t.dual ?? 0;
+		if (Math.abs(n) > 1e-12) {
+			let e = t.rhs - (t.lhs.constant || 0);
+			m += n * e;
+		}
+	}
+	for (let t of l) {
+		let n = e.solution?.duals[t.subConstr.name] ?? t.subConstr.dual ?? 0;
+		if (Math.abs(n) > 1e-12) {
+			m += n * t.baseRhs;
+			for (let [e, r] of t.masterTerms) {
+				let t = h.get(e) ?? 0;
+				h.set(e, t + n * r);
+			}
+		}
+	}
+	let _ = new C();
+	_.addTerm(r, 1);
+	for (let [e, t] of h.entries()) Math.abs(t) > 1e-12 && _.addTerm(e, t);
+	let v = new y(_, a ? ">=" : "<=", m, `__benders_opt_cut_${c}`), b = (n.objectiveValue ?? 0) - f + d;
+	return {
+		kind: "optimality",
+		constraint: v,
+		name: v.name,
+		subproblemObjective: b
+	};
+}
+async function Ye(e) {
+	let t = e.master;
+	if (!t) throw Error("A master Model must be provided for solveBenders.");
+	let { subproblem: n, maxIterations: r = 100, gapTolerance: i = 1e-4, solver: a, solverOptions: o, onIteration: s } = e, c;
+	e.theta && (c = typeof e.theta == "string" ? t.getVarByName(e.theta) : e.theta), c ||= t.variables.find((e) => e.name === "theta" || e.name === "__benders_theta");
+	let l = 0, u = 0, d = t.status, f, p, m, h = {}, g = null;
+	for (let e = 1; e <= r; e++) {
+		u = e;
+		let r = await t.solve(a, o);
+		if (d = r, r !== "Optimal" && r !== "Feasible") break;
+		let _ = t.objectiveValue, v = t.sense.toLowerCase() === "minimize";
+		v ? f = _ === null ? f : _ : p = _ === null ? p : _;
+		let y = {};
+		for (let e of t.variables) e.value !== null && (y[e.name] = e.value);
+		let b = await n({
+			iteration: e,
+			masterValues: y,
+			getMasterValue: (e) => typeof e == "string" ? y[e] ?? 0 : e.value ?? (e.name ? y[e.name] ?? 0 : 0),
+			masterObjective: _,
+			lowerBound: f,
+			upperBound: p,
+			master: t
+		}), x = [];
+		if (b) {
+			if (qe(b)) {
+				let n = b, r = n.linkingConstraints;
+				c || (c = t.continuous("__benders_theta", { lb: 0 }), v ? t.objective(Ke(t.objectiveExpr.add(c))) : t.objective(Ge(t.objectiveExpr.sub(c))));
+				let i = await Je(n, r, t, c, y, v, a, o, e);
+				i && x.push(i);
+			} else Array.isArray(b) ? x.push(...b) : x.push(b);
+		}
+		for (let e of x) if (typeof e.subproblemObjective == "number" && Number.isFinite(e.subproblemObjective)) {
+			if (v) {
+				let t = e.subproblemObjective;
+				(p === void 0 || t < p) && (p = t, g = t, h = { ...y });
+			} else {
+				let t = e.subproblemObjective;
+				(f === void 0 || t > f) && (f = t, g = t, h = { ...y });
+			}
+		}
+		if (f !== void 0 && p !== void 0) {
+			let e = Math.abs(p) + 1e-10;
+			m = Math.abs(p - f) / e;
+		}
+		if (s && s({
+			iteration: e,
+			masterObjective: _,
+			lowerBound: f,
+			upperBound: p,
+			cutsAdded: l + x.length,
+			proposedCuts: x
+		}), x.length === 0) {
+			g = _, h = { ...y };
+			break;
+		}
+		if (m !== void 0 && m <= i) break;
+		for (let e of x) t.constraint(e.constraint, e.name), l++;
+	}
+	let _ = Object.keys(h).length > 0 ? h : (() => {
+		let e = {};
+		for (let n of t.variables) n.value !== null && (e[n.name] = n.value);
+		return e;
+	})(), v = g === null ? t.objectiveValue : g, y = {
+		status: d,
+		objectiveValue: v,
+		lowerBound: f,
+		upperBound: p,
+		gap: m,
+		iterations: u,
+		cutsAdded: l,
+		master: t,
+		values: _
+	};
+	return t.decomposition = y, y;
+}
+//#endregion
+//#region src/modeler/model.ts
+function Z(e) {
+	return Array.isArray(e) || typeof e == "object" && !!e && !(e instanceof String) && typeof e[Symbol.iterator] == "function";
+}
+function Q(e) {
+	return typeof e == "object" && !!e && !Array.isArray(e) && !(e instanceof String) && typeof e[Symbol.iterator] != "function";
+}
+function Xe(e) {
+	return e instanceof M || typeof e == "object" && !!e && !(e instanceof u) && !(e instanceof y) && "id" in e && "name" in e && "lb" in e && "ub" in e && !("terms" in e) && !("quadTerms" in e) && !("sense" in e);
+}
+function $(e, t) {
+	if (!Number.isInteger(e) || e < 0) throw Error(`Invalid count (${e}) for ${t} variable creation: count must be a non-negative integer.`);
+}
+var Ze = class {
+	name;
+	_sense;
+	_objectiveExpr;
+	variables = [];
+	constraints = [];
+	boolVars = [];
 	logicalConstraints = [];
-	unsatCore = [];
+	unsatCore = void 0;
+	_conflicts = void 0;
 	values = /* @__PURE__ */ new Map();
 	varMapByName = /* @__PURE__ */ new Map();
+	varPrefixCounters = /* @__PURE__ */ new Map();
 	boolVarMapByName = /* @__PURE__ */ new Map();
 	boolVarPrefixCounters = /* @__PURE__ */ new Map();
 	constrMapByName = /* @__PURE__ */ new Map();
+	constrPrefixCounters = /* @__PURE__ */ new Map();
+	logicalConstrMapByName = /* @__PURE__ */ new Map();
+	logicalConstrCounter = 0;
 	status = "NotSolved";
+	terminationStatus = "NotSolved";
+	hasPrimalSolution = !1;
 	objectiveValue = null;
+	objectiveBound = void 0;
+	relGap = void 0;
+	mipGap = void 0;
+	absGap = void 0;
 	runTime = 0;
 	solution = null;
 	solver = null;
+	decomposition;
+	_linkingConstraints;
+	hasSolutionState = !1;
+	modelRevision = 0;
+	activeOperationId = 0;
+	batchDepth = 0;
+	batchMutated = !1;
+	batchUndoActions = [];
 	constructor(e = {}, t) {
 		let n;
 		n = typeof e == "string" ? {
 			...t,
 			name: e
-		} : e, this.name = n.name || "OptimizationModel", this.sense = l(n.sense), this.objective = new C(), n.solver && (this.solver = G(n.solver));
+		} : e, this.name = n.name || "OptimizationModel", this._sense = s(n.sense), this._objectiveExpr = new C(), n.solver && (this.solver = V(n.solver));
+	}
+	get sense() {
+		return this._sense;
+	}
+	set sense(e) {
+		let t = s(e);
+		this._sense !== t && (this._sense = t, this.recordModelMutation());
+	}
+	get objectiveExpr() {
+		return this._objectiveExpr.clone();
+	}
+	set objectiveExpr(e) {
+		this.applyObjective(e);
 	}
-	get vars() {
-		return this.variables;
+	get conflicts() {
+		return this._conflicts ?? this.unsatCore;
 	}
-	get constrs() {
-		return this.constraints;
+	set conflicts(e) {
+		this._conflicts = e;
 	}
 	get numVars() {
 		return this.variables.length;
@@ -1080,50 +2759,123 @@ var se = class {
 	get numConstrs() {
 		return this.constraints.length;
 	}
-	createDomainVars(e, t, n, r) {
-		if (typeof n == "number" || Array.isArray(n)) {
-			let i = typeof t == "number" ? Array.from({ length: t }, (e, t) => t) : t, a = typeof n == "number" ? Array.from({ length: n }, (e, t) => t) : n, o = r || {}, s = o.prefix || o.name || "x", c = {};
-			for (let t of i) {
-				c[t] = {};
-				for (let n of a) c[t][n] = this.addVar({
-					...o,
-					type: e,
-					name: `${s}_${t}_${n}`
-				});
+	clearSolutionFields() {
+		if (this.hasSolutionState || this.status !== "NotSolved" || this.terminationStatus !== "NotSolved" || this.hasPrimalSolution || this.solution !== null || this.unsatCore !== void 0) {
+			this.hasSolutionState = !1, this.status = "NotSolved", this.terminationStatus = "NotSolved", this.hasPrimalSolution = !1, this.objectiveValue = null, this.objectiveBound = void 0, this.relGap = void 0, this.mipGap = void 0, this.absGap = void 0, this.solution = null, this.runTime = 0, this.unsatCore = void 0, this._conflicts = void 0, this.values.clear();
+			for (let e of this.variables) e.value = null, e.reducedCost = null;
+			for (let e of this.boolVars) e.value = null;
+			for (let e of this.constraints) e.dual = null, e.slack = null;
+		}
+	}
+	recordModelMutation() {
+		if (this.batchDepth > 0) {
+			this.batchMutated = !0;
+			return;
+		}
+		this.modelRevision++, this.clearSolutionFields();
+	}
+	notifyMutation() {
+		this.recordModelMutation();
+	}
+	resetSolutionState() {
+		this.recordModelMutation();
+	}
+	runTransactionalBatch(e) {
+		if (this.batchDepth > 0) return e();
+		let t = this.variables.length, n = this.boolVars.length, r = this.constraints.length, i = this.logicalConstraints.length, a = new Map(this.varPrefixCounters), o = new Map(this.boolVarPrefixCounters), s = new Map(this.constrPrefixCounters), c = this.logicalConstrCounter;
+		this.batchDepth = 1, this.batchMutated = !1, this.batchUndoActions = [];
+		try {
+			let t = e();
+			this.batchDepth = 0;
+			let n = this.batchMutated;
+			return this.batchMutated = !1, this.batchUndoActions = [], n && this.recordModelMutation(), t;
+		} catch (e) {
+			this.batchDepth = 0, this.batchMutated = !1;
+			for (let e = t; e < this.variables.length; e++) {
+				let t = this.variables[e];
+				this.varMapByName.delete(t.name), t.ownerModel = null, ne(t, this);
+			}
+			this.variables.length = t;
+			for (let e = n; e < this.boolVars.length; e++) {
+				let t = this.boolVars[e];
+				this.boolVarMapByName.delete(t.name);
 			}
-			return c;
+			this.boolVars.length = n;
+			for (let e = r; e < this.constraints.length; e++) {
+				let t = this.constraints[e];
+				this.constrMapByName.delete(t.name);
+			}
+			this.constraints.length = r;
+			for (let e = i; e < this.logicalConstraints.length; e++) {
+				let t = this.logicalConstraints[e];
+				this.logicalConstrMapByName.delete(t.name);
+			}
+			this.logicalConstraints.length = i;
+			for (let e = this.batchUndoActions.length - 1; e >= 0; e--) this.batchUndoActions[e]();
+			throw this.batchUndoActions = [], this.varPrefixCounters = a, this.boolVarPrefixCounters = o, this.constrPrefixCounters = s, this.logicalConstrCounter = c, e;
 		}
-		if (typeof t == "string") {
-			let r = n || {};
+	}
+	createDomainVars(e, t, n, r) {
+		let i = e.toLowerCase(), a = typeof t == "number", o = typeof n == "number", s = Z(t), c = Z(n);
+		if (o || c) {
+			if (a && $(t, i), o && $(n, i), !a && !s || r !== void 0 && !Q(r)) throw Error(`Invalid arguments provided for ${i} variable creation`);
+			let c = a ? Array.from({ length: t }, (e, t) => t) : Array.from(t), l = o ? Array.from({ length: n }, (e, t) => t) : n === t ? c : Array.from(n), u = r || {}, d = u.prefix || u.name || "x";
+			return this.runTransactionalBatch(() => {
+				let t = a ? [] : {};
+				for (let n of c) {
+					let r = o ? [] : {};
+					for (let t of l) r[t] = this.addVar({
+						...u,
+						type: e,
+						name: `${d}_${n}_${t}`
+					});
+					t[n] = r;
+				}
+				return t;
+			});
+		}
+		if (typeof t == "string" || t === void 0) {
+			if (n !== void 0 && !Q(n)) throw Error(`Invalid arguments provided for ${i} variable creation`);
+			let r = n || {}, a = typeof t == "string" ? t : r.name;
 			return this.addVar({
 				...r,
 				type: e,
-				name: t
+				name: a
 			});
 		}
-		let i = n || {}, a = i.prefix || i.name;
-		if (typeof t == "number") {
-			let n = [], r = a || "x";
-			for (let a = 0; a < t; a++) n.push(this.addVar({
-				...i,
+		if (Q(t)) {
+			if (n !== void 0) throw Error(`Invalid arguments provided for ${i} variable creation`);
+			let r = t;
+			return this.addVar({
+				...r,
+				type: e
+			});
+		}
+		if (n !== void 0 && !Q(n)) throw Error(`Invalid arguments provided for ${i} variable creation`);
+		let l = n || {}, u = l.prefix || l.name;
+		if (typeof t == "number") return $(t, i), this.runTransactionalBatch(() => {
+			let n = [], r = u || "x";
+			for (let i = 0; i < t; i++) n.push(this.addVar({
+				...l,
 				type: e,
-				name: `${r}_${a}`
+				name: void 0,
+				prefix: r
 			}));
 			return n;
-		}
-		if (Array.isArray(t) || t && typeof t[Symbol.iterator] == "function") {
+		});
+		if (Z(t)) return this.runTransactionalBatch(() => {
 			let n = {};
 			for (let r of t) {
-				let t = a ? `${a}_${r}` : `${r}`;
+				let t = u ? `${u}_${r}` : `${r}`;
 				n[r] = this.addVar({
-					...i,
+					...l,
 					type: e,
 					name: t
 				});
 			}
 			return n;
-		}
-		throw Error(`Invalid arguments provided for ${e.toLowerCase()} variable creation`);
+		});
+		throw Error(`Invalid arguments provided for ${i} variable creation`);
 	}
 	binary(e, t, n) {
 		return this.createDomainVars("Binary", e, t, n);
@@ -1134,53 +2886,128 @@ var se = class {
 	continuous(e, t, n) {
 		return this.createDomainVars("Continuous", e, t, n);
 	}
-	bool(e, t, n) {
-		if (typeof t == "number" || Array.isArray(t)) {
-			let r = typeof e == "number" ? Array.from({ length: e }, (e, t) => t) : e, i = typeof t == "number" ? Array.from({ length: t }, (e, t) => t) : t, a = n || {}, o = a.prefix || a.name || "p", s = {};
-			for (let e of r) {
-				s[e] = {};
-				for (let t of i) s[e][t] = this.createBoolVar(`${o}_${e}_${t}`);
+	addColumn(e) {
+		let t = e.type || "Continuous", n = this.addVar({
+			name: e.name,
+			type: t,
+			lb: e.lb,
+			ub: e.ub
+		});
+		if (typeof e.cost == "number" && e.cost !== 0 && (this._objectiveExpr = this._objectiveExpr.add(n.mul(e.cost)), this.recordModelMutation()), e.coefficients) {
+			if (Array.isArray(e.coefficients)) {
+				for (let t of e.coefficients) if (Array.isArray(t)) {
+					let [e, r] = t, i = typeof e == "string" ? this.getConstraintByName(e) : e;
+					if (!i) throw Error(`Constraint '${String(e)}' not found in model when adding column`);
+					i.addTerm(n, r);
+				} else if (typeof t == "object" && t) {
+					let e = typeof t.constraint == "string" ? this.getConstraintByName(t.constraint) : t.constraint;
+					if (!e) throw Error(`Constraint '${String(t.constraint)}' not found in model when adding column`);
+					e.addTerm(n, t.coeff);
+				}
+			} else if (e.coefficients instanceof Map) for (let [t, r] of e.coefficients.entries()) {
+				let e = typeof t == "string" ? this.getConstraintByName(t) : t;
+				if (!e) throw Error(`Constraint '${String(t)}' not found in model when adding column`);
+				e.addTerm(n, r);
+			}
+			else if (typeof e.coefficients == "object") for (let [t, r] of Object.entries(e.coefficients)) {
+				let e = this.getConstraintByName(t);
+				if (!e) throw Error(`Constraint '${t}' not found in model when adding column`);
+				e.addTerm(n, r);
 			}
-			return s;
 		}
-		if (typeof e == "string" || e === void 0) return this.createBoolVar(e);
-		let r = t || {}, i = r.prefix || r.name;
-		if (typeof e == "number") {
-			let t = [], n = i || "p";
-			for (let r = 0; r < e; r++) t.push(this.createBoolVar(this.getNextBoolVarName(n)));
-			return t;
+		return n;
+	}
+	bool(e, t, n) {
+		let r = typeof e == "number", i = typeof t == "number", a = Z(e), o = Z(t);
+		if (i || o) {
+			if (r && $(e, "boolean"), i && $(t, "boolean"), !r && !a || n !== void 0 && !Q(n)) throw Error("Invalid arguments provided for boolean variable creation");
+			let o = r ? Array.from({ length: e }, (e, t) => t) : Array.from(e), s = i ? Array.from({ length: t }, (e, t) => t) : t === e ? o : Array.from(t), c = n || {}, l = c.prefix || c.name || "p";
+			return this.runTransactionalBatch(() => {
+				let e = r ? [] : {};
+				for (let t of o) {
+					let n = i ? [] : {};
+					for (let e of s) n[e] = this.createBoolVar(`${l}_${t}_${e}`);
+					e[t] = n;
+				}
+				return e;
+			});
+		}
+		if (typeof e == "string" || e === void 0) {
+			if (t !== void 0 && !Q(t)) throw Error("Invalid arguments provided for boolean variable creation");
+			let n = t || {}, r = typeof e == "string" ? e : n.name;
+			return this.createBoolVar(r, n.prefix);
 		}
-		if (Array.isArray(e) || e && typeof e[Symbol.iterator] == "function") {
+		if (Q(e)) {
+			if (t !== void 0) throw Error("Invalid arguments provided for boolean variable creation");
+			let n = e;
+			return this.createBoolVar(n.name, n.prefix);
+		}
+		if (t !== void 0 && !Q(t)) throw Error("Invalid arguments provided for boolean variable creation");
+		let s = t || {}, c = s.prefix || s.name;
+		if (typeof e == "number") return $(e, "boolean"), this.runTransactionalBatch(() => {
+			let t = [], n = c || "p";
+			for (let r = 0; r < e; r++) t.push(this.createBoolVar(void 0, n));
+			return t;
+		});
+		if (Z(e)) return this.runTransactionalBatch(() => {
 			let t = {};
 			for (let n of e) {
-				let e = i ? `${i}_${n}` : `${n}`;
+				let e = c ? `${c}_${n}` : `${n}`;
 				t[n] = this.createBoolVar(e);
 			}
 			return t;
-		}
+		});
 		throw Error("Invalid arguments provided for boolean variable creation");
 	}
 	hasVarName(e) {
 		return this.varMapByName.has(e) || this.boolVarMapByName.has(e);
 	}
+	getNextVarName(e) {
+		let t = this.varPrefixCounters.get(e) ?? 0, n = `${e}_${t}`;
+		for (; this.hasVarName(n);) t++, n = `${e}_${t}`;
+		return this.varPrefixCounters.set(e, t + 1), n;
+	}
 	getNextBoolVarName(e) {
 		let t = this.boolVarPrefixCounters.get(e) ?? 0, n = `${e}_${t}`;
-		for (; this.hasVarName(n);) t++, n = `${e}_${t}`;
+		for (; this.hasVarName(n) || this.hasConstraintName(n);) t++, n = `${e}_${t}`;
 		return this.boolVarPrefixCounters.set(e, t + 1), n;
 	}
-	createBoolVar(e) {
-		let t = typeof e == "string" ? e.trim() : void 0, n = t && t.length > 0 ? t : this.getNextBoolVarName("p");
-		if (this.hasVarName(n)) throw Error(`Variable with name '${n}' already exists in model`);
-		let r = new f(n);
-		return this.boolVars.push(r), this.boolVarMapByName.set(r.name, r), r;
+	hasConstraintName(e) {
+		return this.constrMapByName.has(e) || this.logicalConstrMapByName.has(e);
+	}
+	hasBoolVarName(e) {
+		return this.boolVarMapByName.has(e);
+	}
+	getNextConstrName(e = "c") {
+		let t = this.constrPrefixCounters.get(e) ?? 1, n = `${e}_${t}`;
+		for (; this.hasConstraintName(n) || this.hasBoolVarName(n);) t++, n = `${e}_${t}`;
+		return this.constrPrefixCounters.set(e, t + 1), n;
+	}
+	getNextLogicalConstrName() {
+		let e = this.logicalConstrCounter + 1, t = `lc_${e}`;
+		for (; this.hasConstraintName(t) || this.hasBoolVarName(t);) e++, t = `lc_${e}`;
+		return this.logicalConstrCounter = e, t;
+	}
+	createBoolVar(e, t) {
+		let n = typeof e == "string" ? e.trim() : void 0, r = typeof t == "string" ? t.trim() : "", i = r.length > 0 ? r : "p", a = n && n.length > 0 ? n : this.getNextBoolVarName(i);
+		if (this.hasVarName(a)) throw Error(`Variable with name '${a}' already exists in model`);
+		if (this.hasConstraintName(a)) throw Error(`Boolean variable name '${a}' conflicts with an existing constraint in model`);
+		let o = new d(a);
+		return this.boolVars.push(o), this.boolVarMapByName.set(o.name, o), this.recordModelMutation(), o;
 	}
 	addVar(e) {
-		let t = e || {}, n = typeof t.name == "string" ? t.name.trim() : void 0, r = n && n.length > 0 ? n : void 0, i = new D({
-			...t,
-			name: r
-		});
-		if (this.hasVarName(i.name)) throw Error(`Variable with name '${i.name}' already exists in model`);
-		return this.variables.push(i), this.varMapByName.set(i.name, i), i;
+		let t = e || {}, n = typeof t.name == "string" ? t.name.trim() : void 0, r = n && n.length > 0 ? n : void 0, i = typeof t.prefix == "string" ? t.prefix.trim() : "", a = i.length > 0 ? i : "x", o = this.varPrefixCounters.get(a), s = r ?? this.getNextVarName(a);
+		try {
+			if (this.hasVarName(s)) throw Error(`Variable with name '${s}' already exists in model`);
+			let e = new M({
+				...t,
+				name: s,
+				prefix: a
+			});
+			return e.hasExplicitName = r !== void 0, A(e), ee(e, this), e.ownerModel = this, this.variables.push(e), this.varMapByName.set(e.name, e), this.recordModelMutation(), e;
+		} catch (e) {
+			throw r === void 0 && (o === void 0 ? this.varPrefixCounters.delete(a) : this.varPrefixCounters.set(a, o)), e;
+		}
 	}
 	getVarByName(e) {
 		return this.varMapByName.get(e);
@@ -1191,28 +3018,46 @@ var se = class {
 	getConstraintByName(e) {
 		return this.constrMapByName.get(e);
 	}
-	setObjective(e, t) {
-		if (e instanceof b) throw Error("Cannot set objective to a constraint comparison (<=, >=, ==). Did you mean to use m.constrain(expr`... <= ...`)? For objectives, supply an unconstrained expression like expr`45 * ${x} + 80 * ${y}`.");
-		t && (this.sense = l(t)), this.objective = typeof e == "string" ? M(e, (e) => this.getVarByName(e)) : typeof e == "number" ? new C(/* @__PURE__ */ new Map(), e) : e instanceof S || "terms" in e ? e.clone() : new C(/* @__PURE__ */ new Map([[e, 1]]), 0);
-	}
-	maximize(e) {
-		this.setObjective(e, "Maximize");
-	}
-	minimize(e) {
-		this.setObjective(e, "Minimize");
-	}
-	constrain(e, t) {
-		if (Array.isArray(e)) {
-			for (let t of e) this.constrain(t);
+	getLogicalConstraintByName(e) {
+		return this.logicalConstrMapByName.get(e);
+	}
+	objective(e) {
+		if (arguments.length === 0) return this.objectiveExpr;
+		let t = e;
+		if (t instanceof y || typeof t == "object" && t && "sense" in t && "lhs" in t && "rhs" in t || typeof t == "string" && /(<=|>=|==|=<|=>|=)/.test(t)) throw Error("Cannot use a Constraint as an objective. Did you mean to use m.constraint(expr`... <= ...`)? To set an objective, wrap an unconstrained expression with maximize(...) or minimize(...), e.g. m.objective(maximize(expr`30 * ${x}`)).");
+		if (typeof t != "object" || !t || !("expr" in t) || !("sense" in t)) throw Error("m.objective(...) expects an ObjectiveSpec created with maximize(...) or minimize(...), e.g. m.objective(maximize(expr`30 * ${x}`)).");
+		return this.applyObjective(t.expr, t.sense), this;
+	}
+	applyObjective(e, t) {
+		if (e instanceof y || typeof e == "object" && e && "sense" in e && "lhs" in e && "rhs" in e || typeof e == "string" && /(<=|>=|==|=<|=>|=)/.test(e)) throw Error(typeof e == "string" ? "Cannot use a comparison constraint as an objective. Did you mean to use m.constraint(expr`... <= ...`)? To set an objective, wrap an unconstrained expression with maximize(...) or minimize(...), e.g. m.objective(maximize(expr`30 * ${x}`))." : "Cannot use a Constraint as an objective. Did you mean to use m.constraint(expr`... <= ...`)? To set an objective, wrap an unconstrained expression with maximize(...) or minimize(...), e.g. m.objective(maximize(expr`30 * ${x}`)).");
+		let n = t === void 0 ? this.sense : s(t), r;
+		if (typeof e == "string") r = me(e, (e) => this.getVarByName(e));
+		else if (typeof e == "number") r = new C(/* @__PURE__ */ new Map(), e);
+		else if (e instanceof S) r = e.clone();
+		else if (e instanceof C) r = e.clone();
+		else if (typeof e == "object" && e && "quadTerms" in e && e.quadTerms instanceof Map && "linearTerms" in e && e.linearTerms instanceof Map && typeof e.constant == "number") {
+			let t = e;
+			r = new S(t.linearTerms, t.quadTerms, t.constant);
+		} else if (typeof e == "object" && e && "terms" in e && e.terms instanceof Map && typeof e.constant == "number") {
+			let t = e;
+			r = new C(t.terms, t.constant);
+		} else if (e instanceof M || typeof e == "object" && e && "id" in e && "name" in e && "lb" in e && "ub" in e) r = new C(/* @__PURE__ */ new Map([[e, 1]]), 0);
+		else throw Error("Invalid objective expression: expected a finite number, Var, LinExpr, QuadExpr, or arithmetic expression string.");
+		oe(r, this.name, (e) => this.varMapByName.get(e.name) === e), this._sense = n, this._objectiveExpr = r, this.recordModelMutation();
+	}
+	constraint(e, t) {
+		if (Array.isArray(e)) return this.runTransactionalBatch(() => {
+			for (let t of e) this.constraint(t);
 			return this;
-		}
-		if (e instanceof S) throw Error("Cannot add a quadratic expression without a comparison operator (<=, >=, ==) as a constraint. Quadratic constraints are not supported (only linear constraints are allowed in MILP/LP/QP).");
-		if (e instanceof C) throw Error("Cannot add a linear expression without a comparison operator (<=, >=, ==) as a constraint. Use expr`... <= ...` or .le(), .ge(), .eq().");
+		});
+		if (e instanceof S || typeof e == "object" && e && "quadTerms" in e) throw Error("Constraint must contain a comparison operator (<=, >=, ==): cannot add a quadratic expression as a constraint.");
+		if (e instanceof C || typeof e == "object" && e && "terms" in e) throw Error("Constraint must contain a comparison operator (<=, >=, ==): cannot add a linear expression without a comparison operator. Use expr`... <= ...` or .le(), .ge(), .eq().");
+		if (Xe(e)) throw Error(`Cannot add numeric variable "${e.name}" directly as a constraint without a comparison operator (<=, >=, ==). Numeric variables require a comparison such as expr\`\${x} <= 10\` or x.le(10), whereas propositional BoolVar variables must be created with m.bool().`);
 		return this.addConstraint(e, t), this;
 	}
 	getValues(e) {
 		if (e == null) return null;
-		if (e instanceof D || e instanceof f) return e.value;
+		if (e instanceof M || e instanceof d) return e.value;
 		if (Array.isArray(e)) return e.map((e) => this.getValues(e));
 		if (typeof e == "object") {
 			let t = {};
@@ -1222,157 +3067,417 @@ var se = class {
 		return null;
 	}
 	addConstraint(e, t) {
-		if (e instanceof S) throw Error("Cannot add a quadratic expression without a comparison operator (<=, >=, ==) as a constraint. Quadratic constraints are not supported (only linear constraints are allowed in MILP/LP/QP).");
-		if (e instanceof C) throw Error("Cannot add a linear expression without a comparison operator (<=, >=, ==) as a constraint. Use expr`... <= ...` or .le(), .ge(), .eq().");
-		if (e instanceof d) {
-			let n = t || `lc_${this.logicalConstraints.length + 1}`;
-			return this.logicalConstraints.push({
-				name: n,
+		if (e instanceof S || typeof e == "object" && e && "quadTerms" in e) throw Error("Constraint must contain a comparison operator (<=, >=, ==): cannot add a quadratic expression as a constraint.");
+		if (e instanceof C || typeof e == "object" && e && "terms" in e) throw Error("Constraint must contain a comparison operator (<=, >=, ==): cannot add a linear expression without a comparison operator. Use expr`... <= ...` or .le(), .ge(), .eq().");
+		if (Xe(e)) throw Error(`Cannot add numeric variable "${e.name}" directly as a constraint without a comparison operator (<=, >=, ==). Numeric variables require a comparison such as expr\`\${x} <= 10\` or x.le(10), whereas propositional BoolVar variables must be created with m.bool().`);
+		if (e instanceof u) {
+			let n = typeof t == "string" && t.trim().length > 0 ? t.trim() : void 0;
+			if (n !== void 0) {
+				if (this.hasConstraintName(n)) throw Error(`Constraint with name '${n}' already exists in model`);
+				if (this.hasBoolVarName(n)) throw Error(`Constraint name '${n}' conflicts with an existing Boolean variable in model`);
+			}
+			let r = this.logicalConstrCounter, i = n ?? this.getNextLogicalConstrName();
+			try {
+				se(e, i, this.name, (e) => this.varMapByName.get(e.name) === e, (e) => this.boolVarMapByName.get(e.name) === e, this);
+			} catch (e) {
+				throw n === void 0 && (this.logicalConstrCounter = r), e;
+			}
+			k(e, this, this.batchDepth > 0 ? this.batchUndoActions : void 0);
+			let a = {
+				name: i,
 				expr: e
-			}), e;
+			};
+			return this.logicalConstraints.push(a), this.logicalConstrMapByName.set(i, a), this.recordModelMutation(), e;
 		}
-		let n;
-		if (typeof e == "string" ? n = N(e, (e) => this.getVarByName(e), t) : (n = e, t && (n.name = t)), this.constrMapByName.has(n.name)) throw Error(`Constraint with name '${n.name}' already exists in model`);
-		return this.constraints.push(n), this.constrMapByName.set(n.name, n), n;
-	}
-	add(e, t) {
-		if (Array.isArray(e)) {
-			for (let t of e) this.add(t);
-			return this;
+		let n = typeof e == "string" ? ge(e, (e) => this.getVarByName(e), t) : e;
+		if (typeof n != "object" || !n || !("sense" in n) || !("lhs" in n) || !("rhs" in n)) throw Error("Invalid constraint passed to m.constraint(...): expected a linear Constraint (e.g. expr`${x} <= 10` or x.le(10)), a propositional BoolVar/BoolExpr (created with m.bool()), or an array of constraints.");
+		n.ownerModel && n.ownerModel !== this && (j(n, this.name, (e) => this.varMapByName.get(e.name) === e, n.name), te(n, this));
+		let r = typeof t == "string" && t.trim().length > 0 ? t.trim() : n.hasExplicitName ? n.name.trim() : void 0;
+		if (r !== void 0) {
+			if (this.hasConstraintName(r)) throw Error(`Constraint with name '${r}' already exists in model`);
+			if (this.hasBoolVarName(r)) throw Error(`Constraint name '${r}' conflicts with an existing Boolean variable in model`);
 		}
-		return e instanceof D ? (this.varMapByName.has(e.name) || (this.variables.push(e), this.varMapByName.set(e.name, e)), this) : (this.addConstraint(e, t), this);
+		let i = this.constrPrefixCounters.get("c"), a = r ?? this.getNextConstrName("c"), o;
+		try {
+			j(n, this.name, (e) => this.varMapByName.get(e.name) === e, a), o = te(n, this);
+		} catch (e) {
+			throw r === void 0 && (i === void 0 ? this.constrPrefixCounters.delete("c") : this.constrPrefixCounters.set("c", i)), e;
+		}
+		let s = n.name, c = n.hasExplicitName, l = n.ownerModel, d = o;
+		return this.batchUndoActions.push(() => {
+			n.ownerModel = l, n._assignModelName(s, c), re(n, this, d);
+		}), this.batchDepth === 0 && (this.batchUndoActions = []), n._assignModelName(a, !0), n.ownerModel = this, this.constraints.push(n), this.constrMapByName.set(n.name, n), this.recordModelMutation(), n;
 	}
 	indicator(e, t, n = {}) {
-		if (t instanceof S) throw Error("Quadratic expressions or constraints are not supported in indicator constraints (only linear constraints are allowed).");
-		if (!("sense" in t) || !("lhs" in t)) throw Error("Invalid constraint expression passed to indicator(). Expression must include a comparison operator (<=, >=, ==).");
-		let r = t, i = n.activeValue === void 0 ? 1 : n.activeValue, a = n.M === void 0 ? 1e5 : n.M, o = n.name || `ind_${e.name}_${r.name}`, s = [], { lhs: c, sense: l, rhs: u } = r;
-		if (i === 1) {
-			if (l === "<=" || l === "==") {
-				let t = this.addConstraint(c.add(e.mul(a)).le(u + a), l === "==" ? `${o}_le` : o);
-				s.push(t);
-			}
-			if (l === ">=" || l === "==") {
-				let t = this.addConstraint(c.sub(e.mul(a)).ge(u - a), l === "==" ? `${o}_ge` : o);
-				s.push(t);
-			}
-		} else {
-			if (l === "<=" || l === "==") {
-				let t = this.addConstraint(c.sub(e.mul(a)).le(u), l === "==" ? `${o}_le` : o);
-				s.push(t);
+		if (e instanceof u) throw Error("Invalid binary variable passed to indicator(): received a propositional BoolVar/BoolExpr, but m.indicator() requires a 0-1 numeric binary Var created with m.binary(). For general boolean logic with m.bool(), use m.constraint(implies(flag, expr`${x} <= 10`)) with the Z3 solver.");
+		if (!(e instanceof M)) throw Error("Invalid binary variable passed to indicator(). Expected a 0-1 binary Var instance created with m.binary() (or use implies(flag, ...) with m.bool() and the Z3 solver for general boolean logic).");
+		if (!(e.type === "Binary" || e.type === "Integer" && e.lb === 0 && e.ub === 1)) throw Error(`Invalid variable "${e.name}" passed to indicator(): variable has type "${e.type}" with bounds [${e.lb}, ${e.ub}]. Indicator activation variable must be a Binary variable created with m.binary() (or Integer variable with bounds [0, 1]).`);
+		if (t instanceof S || typeof t == "object" && t && "quadTerms" in t) throw Error("Quadratic expressions or constraints are not supported in indicator constraints (only linear Constraints with <=, >=, or == such as expr`${x} <= 10` are allowed).");
+		if (typeof t != "object" || !t || !("sense" in t) || !("lhs" in t) || !("rhs" in t)) throw Error("Invalid constraint expression passed to indicator(). Expression must include a comparison operator (<=, >=, ==), e.g. m.indicator(b, expr`${x} <= 10`). For general boolean logic (such as BoolVar or implies/and/or/not), use m.constraint(implies(flag, ...)) with the Z3 solver.");
+		let r = t, i = n.activeValue === void 0 ? 1 : n.activeValue;
+		if (i !== 0 && i !== 1) throw Error(`Invalid activeValue: ${i}. Indicator activeValue must be 0 or 1.`);
+		if (this.varMapByName.get(e.name) !== e) throw Error(`Variable "${e.name}" passed to indicator() does not belong to model "${this.name}". All variables must belong to the model by object identity.`);
+		let a = typeof n.name == "string" && n.name.trim().length > 0 ? n.name.trim() : void 0, o = this.constrPrefixCounters.get("c"), { lhs: s, sense: c, rhs: l } = r, d, f, p;
+		if (a !== void 0) d = a, f = c === "==" ? `${d}_le` : d, p = c === "==" ? `${d}_ge` : d;
+		else if (r.hasExplicitName) d = `ind_${e.name}_${r.name.trim()}`, f = c === "==" ? `${d}_le` : d, p = c === "==" ? `${d}_ge` : d;
+		else do {
+			let t = this.getNextConstrName("c");
+			d = `ind_${e.name}_${t}`, f = c === "==" ? `${d}_le` : d, p = c === "==" ? `${d}_ge` : d;
+		} while ((c === "<=" || c === "==") && (this.hasConstraintName(f) || this.hasBoolVarName(f)) || (c === ">=" || c === "==") && (this.hasConstraintName(p) || this.hasBoolVarName(p)));
+		let m = [];
+		try {
+			if ((c === "<=" || c === "==") && (this.hasConstraintName(f) || this.hasBoolVarName(f))) throw Error(this.hasBoolVarName(f) ? `Constraint name '${f}' conflicts with an existing Boolean variable in model` : `Constraint with name '${f}' already exists in model`);
+			if ((c === ">=" || c === "==") && (this.hasConstraintName(p) || this.hasBoolVarName(p))) throw Error(this.hasBoolVarName(p) ? `Constraint name '${p}' conflicts with an existing Boolean variable in model` : `Constraint with name '${p}' already exists in model`);
+			n.M !== void 0 && ze(n.M, d);
+			let t = (e) => this.varMapByName.get(e.name) === e;
+			for (let [e] of s.terms) if (!t(e)) throw Error(`Variable "${e.name}" in constraint "${d}" does not belong to model "${this.name}". All variables must belong to the model by object identity.`);
+			if (c === "<=" || c === "==") {
+				let t = Y(e, s, "<=", l, i, n.M === void 0 ? q(s, l, f) : n.M, f);
+				m.push([new y(t.lhs, "<=", t.rhs, f), f]);
 			}
-			if (l === ">=" || l === "==") {
-				let t = this.addConstraint(c.add(e.mul(a)).ge(u), l === "==" ? `${o}_ge` : o);
-				s.push(t);
+			if (c === ">=" || c === "==") {
+				let t = Y(e, s, ">=", l, i, n.M === void 0 ? J(s, l, p) : n.M, p);
+				m.push([new y(t.lhs, ">=", t.rhs, p), p]);
 			}
+			for (let [e, n] of m) j(e, this.name, t, n);
+		} catch (e) {
+			throw o === void 0 ? this.constrPrefixCounters.delete("c") : this.constrPrefixCounters.set("c", o), e;
 		}
-		return s;
+		return this.runTransactionalBatch(() => m.map(([e, t]) => this.addConstraint(e, t)));
 	}
 	toLpString() {
-		let { lpString: e } = R({
+		this.validateIntegrity();
+		let { lpString: e } = L({
 			name: this.name,
 			sense: this.sense,
-			objective: this.objective,
+			objective: this.objectiveExpr,
 			constraints: this.constraints,
 			variables: this.variables
 		});
 		return e;
 	}
-	async optimize(e, t) {
-		let n, r;
-		if (e && typeof e == "object" && "solve" in e && typeof e.solve == "function" ? (n = e, r = t || {}) : typeof e == "function" ? (n = new e(t), r = t || {}) : typeof e == "string" ? (n = G(e, t), r = t || {}) : (r = { ...e }, r.solver ? (n = G(r.solver, r), delete r.solver) : n = this.solver || G()), this.objective instanceof S && this.objective.quadTerms.size > 0 && n.capabilities?.supportsQP === !1) throw Error(`Solver "${n.name}" does not support quadratic objectives (QP). Please use a QP-capable solver such as HiGHS or Clarabel.`);
-		if (this.logicalConstraints.length > 0 && n.capabilities?.supportsSMT !== !0) throw Error(`Solver "${n.name}" does not support SMT / logical constraints (or, implies, not, xor). Please use an SMT-capable solver such as Z3.`);
-		let i = {
+	validateIntegrity() {
+		ce(this);
+	}
+	ensureExecutionValid(e, t, n) {
+		if (this.modelRevision !== e) throw this.activeOperationId === t && this.clearSolutionFields(), Error(`Model "${this.name}" was modified while ${n}() was in progress; stale solver result was discarded.`);
+		if (this.activeOperationId !== t) throw Error(`Stale ${n}() result discarded because a newer solve or check operation was started on model "${this.name}".`);
+	}
+	wrapSolveOptions(e, t, n) {
+		let r = e.onProgress;
+		return r ? {
+			...e,
+			onProgress: (e) => {
+				this.activeOperationId === n && this.modelRevision === t && r(e);
+			}
+		} : e;
+	}
+	hasPrimalFromResult(e) {
+		if (typeof e.hasPrimalSolution == "boolean") return e.hasPrimalSolution;
+		let t = e.status, n = e.terminationStatus ?? t, r = e.values || {}, i = e.boolValues || {};
+		return t !== "Infeasible" && t !== "Unsat" && t !== "Unbounded" && t !== "Error" && t !== "NotSolved" && n !== "Infeasible" && n !== "Unsat" && n !== "Unbounded" && n !== "InfeasibleOrUnbounded" && n !== "Error" && n !== "NotSolved" && (t === "Optimal" || t === "Feasible" || t === "Sat" || n === "Optimal" || n === "Feasible" || n === "Sat" || typeof e.objectiveValue == "number" && Number.isFinite(e.objectiveValue) || Object.values(r).some((e) => typeof e == "number" && Number.isFinite(e) || typeof e == "boolean") || Object.values(i).some((e) => typeof e == "boolean"));
+	}
+	resolveSolverAndOptions(e, t) {
+		if (e && typeof e == "object" && "solve" in e && typeof e.solve == "function") {
+			let { solver: n, ...r } = t || {};
+			return {
+				activeSolver: e,
+				activeOptions: r
+			};
+		}
+		if (typeof e == "function") {
+			let { solver: n, ...r } = t || {};
+			return {
+				activeSolver: new e(r),
+				activeOptions: r
+			};
+		}
+		if (typeof e == "string") {
+			let { solver: n, ...r } = t || {};
+			return {
+				activeSolver: V(e, r),
+				activeOptions: r
+			};
+		}
+		let { solver: n, ...r } = e || {};
+		return n ? {
+			activeSolver: V(n, r),
+			activeOptions: r
+		} : {
+			activeSolver: this.solver || V(),
+			activeOptions: r
+		};
+	}
+	async relax(e, t) {
+		let n = typeof e == "object" && !!e && !("solve" in e), r = n ? {
+			...e,
+			relax: !0
+		} : {
+			...t || {},
+			relax: !0
+		}, i = n ? void 0 : e;
+		return i ? this.solve(i, r) : this.solve(r);
+	}
+	async solve(e, t) {
+		let n = ++this.activeOperationId, r = this.modelRevision;
+		this.clearSolutionFields(), this.validateIntegrity();
+		let { activeSolver: i, activeOptions: a } = this.resolveSolverAndOptions(e, t);
+		if (this._objectiveExpr instanceof S && this._objectiveExpr.quadTerms.size > 0 && i.capabilities?.supportsQP === !1) throw Error(`Solver "${i.name}" does not support quadratic objectives (QP). Please use a QP-capable solver such as HiGHS or Clarabel.`);
+		let o, s = null;
+		if (this.logicalConstraints.length > 0 && i.capabilities?.supportsSMT !== !0 ? (s = Ve(this.variables, this.boolVars, this.constraints, this.logicalConstraints), o = {
 			name: this.name,
 			sense: this.sense,
-			objective: this.objective,
+			objective: this._objectiveExpr,
+			constraints: s.constraints,
+			variables: s.variables,
+			logicalConstraints: [],
+			boolVars: []
+		}) : o = {
+			name: this.name,
+			sense: this.sense,
+			objective: this._objectiveExpr,
 			constraints: this.constraints,
 			variables: this.variables,
 			logicalConstraints: this.logicalConstraints,
 			boolVars: this.boolVars
-		}, a = R(i), o = await n.solve(i, a, r);
-		this.runTime = o.runTime ?? 0, this.status = o.status, this.objectiveValue = o.objectiveValue ?? null;
-		let s = {}, c = {}, l = {}, u = {};
-		this.values.clear();
-		for (let e of this.variables) e.value = null, e.reducedCost = null;
-		for (let e of this.boolVars) e.value = null;
-		for (let e of this.constraints) e.dual = null, e.slack = null;
-		if (a?.nameToVar) for (let e of a.nameToVar.values()) e.value = null, e.reducedCost = null;
-		if (a?.nameToConstraint) for (let e of a.nameToConstraint.values()) e.dual = null, e.slack = null;
-		if (o.values && o.status !== "Infeasible" && o.status !== "Unbounded") {
-			for (let [e, t] of Object.entries(o.values)) if (typeof t == "number" && !Number.isNaN(t)) {
-				this.values.set(e, t);
-				let n = this.getVarByName(e) || a.nameToVar.get(e);
-				n && (n.value = t, s[n.name] = t);
-				let r = this.boolVars.find((t) => t.name === e);
-				r && (r.value = !!t);
+		}, this.variables.some((e) => e.initialValue !== void 0) && i.capabilities?.supportsWarmStart !== !0) throw Error(`Solver "${i.name}" does not support primal initial values (initialValue). Please use a solver with warm-start support such as HiGHS.`);
+		let c = this.wrapSolveOptions(a, r, n), l;
+		try {
+			l = await i.solve(o, c);
+		} catch (e) {
+			throw this.activeOperationId === n && this.clearSolutionFields(), e;
+		}
+		this.ensureExecutionValid(r, n, "solve"), this.runTime = l.runTime ?? 0, this.status = l.status, this.terminationStatus = l.terminationStatus ?? l.status;
+		let u = this.hasPrimalFromResult(l);
+		this.hasPrimalSolution = u, this.objectiveValue = u && typeof l.objectiveValue == "number" && Number.isFinite(l.objectiveValue) ? l.objectiveValue : null, this.objectiveBound = typeof l.objectiveBound == "number" && Number.isFinite(l.objectiveBound) ? l.objectiveBound : void 0;
+		let d = typeof l.relGap == "number" && Number.isFinite(l.relGap) ? l.relGap : typeof l.mipGap == "number" && Number.isFinite(l.mipGap) ? l.mipGap : void 0;
+		this.relGap = d, this.mipGap = d, this.absGap = typeof l.absGap == "number" && Number.isFinite(l.absGap) ? l.absGap : this.objectiveValue !== null && this.objectiveBound !== void 0 ? Math.abs(this.objectiveValue - this.objectiveBound) : void 0;
+		let f = (e, t, n) => {
+			Object.defineProperty(e, t, {
+				value: n,
+				enumerable: !0,
+				writable: !0,
+				configurable: !0
+			});
+		}, p = {}, m = {}, h = {}, g = {};
+		if (this.values.clear(), u && l.values) {
+			for (let [e, t] of Object.entries(l.values)) if (typeof t == "number" && Number.isFinite(t)) {
+				let n = this.getVarByName(e), r = this.getBoolVarByName(e);
+				n && (n.value = t, f(p, n.name, t), this.values.set(n.name, t)), r && (r.value = !!t, this.values.set(r.name, t)), !n && !r && this.values.set(e, t);
+			} else if (typeof t == "boolean") {
+				let n = t, r = this.getBoolVarByName(e);
+				r ? (r.value = n, f(p, r.name, +!!n), this.values.set(r.name, n)) : this.values.set(e, n);
 			}
+			if (s) for (let e of this.boolVars) {
+				let t = s.boolVarToBinary.get(e);
+				if (t && l.values) {
+					let n = l.values[t.name];
+					if (typeof n == "number" && Number.isFinite(n)) {
+						let t = Math.round(n) === 1;
+						e.value = t, f(p, e.name, +!!t), this.values.set(e.name, t);
+					}
+				}
+			}
+		}
+		if (u && l.boolValues) for (let [e, t] of Object.entries(l.boolValues)) {
+			if (typeof t != "boolean") continue;
+			let n = this.getBoolVarByName(e);
+			n ? (n.value = t, this.values.has(n.name) || this.values.set(n.name, t)) : this.values.has(e) || this.values.set(e, t);
 		}
-		if (o.reducedCosts) for (let [e, t] of Object.entries(o.reducedCosts)) {
-			let n = this.getVarByName(e) || a.nameToVar.get(e);
-			n && (n.reducedCost = t, l[n.name] = t);
+		if (u && l.reducedCosts) for (let [e, t] of Object.entries(l.reducedCosts)) {
+			if (typeof t != "number" || !Number.isFinite(t)) continue;
+			let n = this.getVarByName(e);
+			n && (n.reducedCost = t, f(h, n.name, t));
 		}
-		if (o.duals) for (let [e, t] of Object.entries(o.duals)) {
-			let n = this.getConstraintByName(e) || a.nameToConstraint.get(e);
-			n && (n.dual = t, c[n.name] = t);
+		if (l.duals) for (let [e, t] of Object.entries(l.duals)) {
+			if (typeof t != "number" || !Number.isFinite(t)) continue;
+			let n = this.getConstraintByName(e);
+			n && (n.dual = t, f(m, n.name, t));
 		}
-		if (o.slacks) for (let [e, t] of Object.entries(o.slacks)) {
-			let n = this.getConstraintByName(e) || a.nameToConstraint.get(e);
-			n && (n.slack = t, u[n.name] = t);
+		if (l.slacks) for (let [e, t] of Object.entries(l.slacks)) {
+			if (typeof t != "number" || !Number.isFinite(t)) continue;
+			let n = this.getConstraintByName(e);
+			n && (n.slack = t, f(g, n.name, t));
 		}
 		return this.solution = {
 			status: this.status,
+			terminationStatus: this.terminationStatus,
+			hasPrimalSolution: this.hasPrimalSolution,
 			objectiveValue: this.objectiveValue,
-			values: s,
-			duals: c,
-			reducedCosts: l,
-			slacks: u,
+			...this.objectiveBound === void 0 ? {} : { objectiveBound: this.objectiveBound },
+			...this.relGap === void 0 ? {} : {
+				relGap: this.relGap,
+				mipGap: this.mipGap
+			},
+			...this.absGap === void 0 ? {} : { absGap: this.absGap },
+			values: p,
+			duals: m,
+			reducedCosts: h,
+			slacks: g,
 			runTime: this.runTime,
-			raw: o.raw
-		}, this.status;
-	}
-	async solve(e, t) {
-		return this.optimize(e, t);
+			raw: l.raw
+		}, this.hasSolutionState = !0, this.status;
 	}
 	async check(e, t) {
-		let n, r;
-		if (e && typeof e == "object" && "solve" in e && typeof e.solve == "function" ? (n = e, r = t || {}) : typeof e == "function" ? (n = new e(t), r = t || {}) : typeof e == "string" ? (n = G(e, t), r = t || {}) : (r = { ...e }, r.solver ? (n = G(r.solver, r), delete r.solver) : n = this.solver || G()), this.logicalConstraints.length > 0 && n.capabilities?.supportsSMT !== !0) throw Error(`Solver "${n.name}" does not support SMT / logical constraints (or, implies, not, xor). Please use an SMT-capable solver such as Z3.`);
-		if (typeof n.check == "function") {
-			let e = await n.check({
-				name: this.name,
-				variables: this.variables,
-				boolVars: this.boolVars,
-				constraints: this.constraints,
-				logicalConstraints: this.logicalConstraints
-			}, r);
-			this.status = e.status, this.runTime = e.runTime ?? 0, this.unsatCore = e.unsatCore || [], this.values.clear();
-			for (let e of this.variables) e.value = null;
-			for (let e of this.boolVars) e.value = null;
-			if (e.values && e.status === "Sat") for (let [t, n] of Object.entries(e.values)) {
-				this.values.set(t, n);
-				let e = this.getVarByName(t);
-				e && typeof n == "number" && (e.value = n);
-				let r = this.boolVars.find((e) => e.name === t);
-				r && (r.value = !!n);
+		let n = ++this.activeOperationId, r = this.modelRevision;
+		this.clearSolutionFields(), this.validateIntegrity();
+		let { activeSolver: i, activeOptions: a } = this.resolveSolverAndOptions(e, t);
+		if (this.variables.some((e) => e.initialValue !== void 0) && i.capabilities?.supportsWarmStart !== !0) throw Error(`Solver "${i.name}" does not support primal initial values (initialValue). Please use a solver with warm-start support such as HiGHS.`);
+		let o = this.wrapSolveOptions(a, r, n), s = (e, t, n) => {
+			Object.defineProperty(e, t, {
+				value: n,
+				enumerable: !0,
+				writable: !0,
+				configurable: !0
+			});
+		}, c = {
+			name: this.name,
+			variables: this.variables,
+			boolVars: this.boolVars,
+			constraints: this.constraints,
+			logicalConstraints: this.logicalConstraints
+		};
+		if (typeof i.check == "function") {
+			let e;
+			try {
+				e = await i.check(c, o);
+			} catch (e) {
+				throw this.activeOperationId === n && this.clearSolutionFields(), e;
 			}
-			return e;
-		}
-		let i = this.objective, a = this.sense;
-		try {
-			this.objective = new C(), this.sense = "Minimize";
-			let e = await this.optimize(n, r), t = e === "Optimal" || e === "Feasible", i = e === "Infeasible", a = {};
-			if (t) {
-				for (let e of this.variables) e.value !== null && (a[e.name] = e.value);
-				for (let e of this.boolVars) e.value !== null && (a[e.name] = e.value);
+			this.ensureExecutionValid(r, n, "check"), this.status = e.status, this.terminationStatus = a.signal?.aborted ? "Interrupted" : e.status, this.hasPrimalSolution = e.status === "Sat", this.runTime = e.runTime ?? 0, this.unsatCore = e.unsatCore === void 0 ? void 0 : Object.freeze([...e.unsatCore]), this.conflicts = e.conflicts === void 0 ? this.unsatCore : Object.freeze([...e.conflicts]);
+			let t = {};
+			if (e.values && e.status === "Sat") {
+				for (let [n, r] of Object.entries(e.values)) if (typeof r == "number") {
+					if (!Number.isFinite(r)) continue;
+					let e = this.getVarByName(n), i = this.getBoolVarByName(n);
+					e && (e.value = r, this.values.set(e.name, r), s(t, e.name, r)), i && (i.value = !!r, this.values.set(i.name, i.value), s(t, i.name, i.value)), !e && !i && (this.values.set(n, r), s(t, n, r));
+				} else if (typeof r == "boolean") {
+					let e = this.getBoolVarByName(n);
+					e ? (e.value = r, this.values.set(e.name, r), s(t, e.name, r)) : (this.values.set(n, r), s(t, n, r));
+				}
 			}
-			return {
-				status: t ? "Sat" : i ? "Unsat" : "Unknown",
-				values: a,
+			return this.hasSolutionState = !0, {
+				status: e.status,
+				values: t,
+				unsatCore: this.unsatCore,
+				conflicts: this.conflicts,
 				runTime: this.runTime
 			};
-		} finally {
-			this.objective = i, this.sense = a;
 		}
+		let l = this.logicalConstraints.length > 0 || this.boolVars.length > 0 ? Ve(this.variables, this.boolVars, this.constraints, this.logicalConstraints) : {
+			variables: [...this.variables],
+			constraints: [...this.constraints],
+			boolVarToBinary: /* @__PURE__ */ new Map(),
+			constraintToOriginalName: new Map(this.constraints.map((e) => [e, e.name]))
+		}, u = [], d = [], f = [], p = /* @__PURE__ */ new Map(), m = 0;
+		for (let e of l.constraints) {
+			let t = l.constraintToOriginalName.get(e) ?? e.name, { lhs: n, sense: r, rhs: i } = e;
+			if (r === "<=") {
+				let r = new M({
+					name: `__slack_${++m}`,
+					type: "Continuous",
+					lb: 0,
+					ub: Infinity
+				});
+				d.push(r), f.push([r, 1]), p.set(r, t);
+				let a = n.clone().add(new C(/* @__PURE__ */ new Map([[r, -1]]), 0));
+				u.push(new y(a, "<=", i, `${e.name}_slack`));
+			} else if (r === ">=") {
+				let r = new M({
+					name: `__slack_${++m}`,
+					type: "Continuous",
+					lb: 0,
+					ub: Infinity
+				});
+				d.push(r), f.push([r, 1]), p.set(r, t);
+				let a = n.clone().add(new C(/* @__PURE__ */ new Map([[r, 1]]), 0));
+				u.push(new y(a, ">=", i, `${e.name}_slack`));
+			} else {
+				let r = new M({
+					name: `__slack_${++m}_p`,
+					type: "Continuous",
+					lb: 0,
+					ub: Infinity
+				}), a = new M({
+					name: `__slack_${++m}_n`,
+					type: "Continuous",
+					lb: 0,
+					ub: Infinity
+				});
+				d.push(r, a), f.push([r, 1], [a, 1]), p.set(r, t), p.set(a, t);
+				let o = n.clone().add(new C(/* @__PURE__ */ new Map([[r, -1], [a, 1]]), 0));
+				u.push(new y(o, "==", i, `${e.name}_slack`));
+			}
+		}
+		let h = {
+			name: `${this.name}_elastic_check`,
+			sense: "Minimize",
+			objective: new C(new Map(f), 0),
+			constraints: u,
+			variables: [...l.variables, ...d]
+		}, g;
+		try {
+			g = await i.solve(h, o);
+		} catch (e) {
+			throw this.activeOperationId === n && this.clearSolutionFields(), e;
+		}
+		this.ensureExecutionValid(r, n, "check"), this.runTime = g.runTime ?? 0;
+		let _ = g.status, v = g.terminationStatus ?? _, b = this.hasPrimalFromResult(g), x = typeof g.objectiveValue == "number" && Number.isFinite(g.objectiveValue) ? g.objectiveValue : Infinity, S = (_ === "Optimal" || _ === "Feasible" || b) && x <= 1e-5, w = typeof g.objectiveBound == "number" && Number.isFinite(g.objectiveBound) && g.objectiveBound > 1e-5, T = !S && (_ === "Infeasible" || _ === "Optimal" && x > 1e-5 || w), E = S ? "Sat" : T ? "Unsat" : "Unknown";
+		this.status = E, this.terminationStatus = a.signal?.aborted || v === "Interrupted" ? "Interrupted" : v === "Optimal" || v === "Feasible" || v === "Infeasible" ? E : v, this.hasPrimalSolution = S, this.objectiveValue = null, this.objectiveBound = void 0, this.relGap = void 0, this.mipGap = void 0, this.absGap = void 0, this.solution = null, this.values.clear();
+		let D = {};
+		if (S && g.values) {
+			for (let e of this.variables) {
+				let t = g.values[e.name];
+				typeof t == "number" && Number.isFinite(t) && (e.value = t, this.values.set(e.name, t), s(D, e.name, t));
+			}
+			for (let e of this.boolVars) {
+				let t = l.boolVarToBinary.get(e), n = t ? g.values[t.name] : g.values[e.name];
+				if (typeof n == "number" && Number.isFinite(n)) {
+					let t = Math.round(n) === 1;
+					e.value = t, this.values.set(e.name, t), s(D, e.name, t);
+				}
+			}
+		}
+		let O = /* @__PURE__ */ new Set();
+		if (T && g.values) for (let [e, t] of p.entries()) {
+			let n = g.values[e.name];
+			typeof n == "number" && n > 1e-5 && O.add(t);
+		}
+		return this.conflicts = T ? Object.freeze(Array.from(O)) : void 0, this.unsatCore = void 0, this.hasSolutionState = !0, {
+			status: E,
+			values: D,
+			conflicts: this.conflicts,
+			unsatCore: this.unsatCore,
+			runTime: this.runTime
+		};
+	}
+	validateSolution(e = {}) {
+		return Re(this, e);
+	}
+	link(e) {
+		if (e instanceof S || typeof e == "object" && e && "quadTerms" in e) throw Error("Linking constraint cannot be a quadratic expression.");
+		if (!(e instanceof y) && (typeof e != "object" || !e || !("sense" in e) || !("lhs" in e) || !("rhs" in e))) throw Error("Linking constraint must contain a comparison operator (<=, >=, ==). Use expr`... <= ...` or .le(), .ge(), .eq().");
+		this._linkingConstraints ||= [];
+		let t = e;
+		return this._linkingConstraints.push(t), t;
+	}
+	get linkingConstraints() {
+		return this._linkingConstraints ?? [];
+	}
+	async solveBenders(e) {
+		let t = await Ye({
+			master: this,
+			...e
+		});
+		return this.decomposition = t, t;
+	}
+	async solveColumnGeneration(e) {
+		let t = await Ue({
+			master: this,
+			...e
+		});
+		return this.decomposition = t, t;
 	}
 };
 //#endregion
-export { d as BoolExpr, p as BoolOp, f as BoolVar, b as Constraint, ie as HiGHS, Q as HighsSolver, C as LinExpr, $ as MockSolver, se as Model, c as OFFICIAL_HIGHS_CDN_WASM_URL, S as QuadExpr, D as Var, m as and, F as c, ee as dot, I as expr, R as generateLpString, i as getHighs, o as getHighsWasmUrl, G as getSolver, _ as implies, n as isValidWasmHeader, K as listAvailableSolvers, l as normalizeSense, g as not, h as or, N as parseConstraint, M as parseExpr, e as probeWasmUrl, U as registerSolver, a as resolveBrowserWasmUrl, W as setDefaultSolver, s as setHighsWasmUrl, t as solveLpWithHighs, w as sum, v as xor };
+export { u as BoolExpr, f as BoolOp, d as BoolVar, y as Constraint, Ne as HiGHS, r as Highs, K as HighsSolver, C as LinExpr, Fe as MockSolver, Ze as Model, S as QuadExpr, M as Var, p as and, Y as buildIndicatorLinearization, xe as buildLpSymbolMaps, J as deriveBigMForGe, q as deriveBigMForLe, T as dot, be as expr, L as generateLpString, o as getHighs, n as getHighsWasmUrl, V as getSolver, g as implies, F as isLpExportResult, Ve as linearizeModelForMip, H as listAvailableSolvers, Ge as maximize, Ke as minimize, s as normalizeSense, h as not, m as or, ge as parseConstraint, me as parseExpr, Ce as registerSolver, I as sanitizeIdentifier, we as setDefaultSolver, t as setHighsWasmUrl, Ye as solveBenders, Ue as solveColumnGeneration, e as solveLpWithHighs, w as sum, ce as validateModelIntegrity, Re as validateModelSolution, ze as validateUserBigM, _ as xor };