@ohtaman/washi 0.5.0 → 0.7.0

package/dist/browser/washi.js

@@ -1,6 +1,6 @@
-import { a as e, i as t, n, o as r, r as i, t as a } from "./loader-CtaDHef_.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 o(e) {
+function s(e) {
 	if (e === void 0) return "Minimize";
 	if (typeof e == "string") {
 		let t = e.toLowerCase();
@@ -11,68 +11,68 @@ function o(e) {
 }
 //#endregion
 //#region src/modeler/boolean-expr.ts
-var s = 0;
-function c(e, t) {
-	if (e instanceof l || e instanceof v) 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.`) : Error(`Invalid operand passed to logical operator "${t}": expected a BoolVar, BoolExpr, or Constraint.`);
+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 l = class {
+var u = class {
 	and(e) {
-		return new d("and", [this, c(e, "and")]);
+		return new f("and", [this, l(e, "and")]);
 	}
 	or(e) {
-		return new d("or", [this, c(e, "or")]);
+		return new f("or", [this, l(e, "or")]);
 	}
 	implies(e) {
-		return new d("implies", [this, c(e, "implies")]);
+		return new f("implies", [this, l(e, "implies")]);
 	}
 	xor(e) {
-		return new d("xor", [this, c(e, "xor")]);
+		return new f("xor", [this, l(e, "xor")]);
 	}
 	not() {
-		return new d("not", [this]);
+		return new f("not", [this]);
 	}
-}, u = class extends l {
+}, d = class extends u {
 	id;
 	name;
 	value = null;
 	constructor(e) {
-		super(), this.id = ++s, this.name = e || `p_${this.id}`;
+		super(), this.id = ++c, this.name = e || `p_${this.id}`;
 	}
 	toString() {
 		return this.name;
 	}
-}, d = class extends l {
+}, f = class extends u {
 	op;
 	children;
 	constructor(e, t) {
-		super(), this.op = e, this.children = t.map((t) => c(t, e));
+		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 f(...e) {
+function p(...e) {
 	if (e.length === 0) throw Error("and() requires at least one expression");
-	return new d("and", e);
+	return new f("and", e);
 }
-function p(...e) {
+function m(...e) {
 	if (e.length === 0) throw Error("or() requires at least one expression");
-	return new d("or", e);
+	return new f("or", e);
 }
-function m(e) {
-	return new d("not", [e]);
+function h(e) {
+	return new f("not", [e]);
 }
-function h(e, t) {
-	return new d("implies", [e, t]);
+function g(e, t) {
+	return new f("implies", [e, t]);
 }
-function g(...e) {
+function _(...e) {
 	if (e.length === 0) throw Error("xor() requires at least one expression");
-	return new d("xor", e);
+	return new f("xor", e);
 }
 //#endregion
 //#region src/modeler/constraint.ts
-var _ = 0, v = class e {
+var v = 0, y = class e {
 	kind = "constraint";
 	id;
 	_lhs;
@@ -83,8 +83,14 @@ var _ = 0, v = class e {
 	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 = ++_, this._lhs = e, this._sense = t, this._rhs = n;
+		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);
 	}
@@ -116,19 +122,19 @@ var _ = 0, v = class e {
 		this._name = e, this.hasExplicitName = t;
 	}
 	and(e) {
-		return new d("and", [this, e]);
+		return new f("and", [this, e]);
 	}
 	or(e) {
-		return new d("or", [this, e]);
+		return new f("or", [this, e]);
 	}
 	implies(e) {
-		return new d("implies", [this, e]);
+		return new f("implies", [this, e]);
 	}
 	xor(e) {
-		return new d("xor", [this, e]);
+		return new f("xor", [this, e]);
 	}
 	not() {
-		return new d("not", [this]);
+		return new f("not", [this]);
 	}
 	add(e) {
 		throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
@@ -168,16 +174,16 @@ var _ = 0, v = class e {
 		return `${this.name}: ${this.lhs.toString()} ${e} ${this.rhs}`;
 	}
 };
-function y(e) {
-	return e instanceof v || typeof e == "object" && !!e && "sense" in e && "lhs" in e && "rhs" in e;
+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 b(e, t) {
+function x(e, t) {
 	let n = e.id, r = t.id;
 	return n <= r ? `${n}:${r}` : `${r}:${n}`;
 }
-var x = class e {
+var S = class e {
 	kind = "quadratic";
 	linearTerms;
 	quadTerms;
@@ -191,11 +197,11 @@ var x = class e {
 		return new e(this.linearTerms, this.quadTerms, this.constant);
 	}
 	getQuadCoeff(e, t) {
-		let n = b(e, t), r = this.quadTerms.get(n);
+		let n = x(e, t), r = this.quadTerms.get(n);
 		return r ? r.coeff : 0;
 	}
 	add(t) {
-		if (y(t)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+		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) {
@@ -224,11 +230,11 @@ var x = class e {
 		return i === 0 ? n.linearTerms.delete(r) : n.linearTerms.set(r, i), n;
 	}
 	sub(e) {
-		if (y(e)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+		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 (y(t)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+		if (b(t)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
 		if (typeof t == "number") {
 			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.");
@@ -288,7 +294,7 @@ var x = class e {
 	}
 	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 S(this.linearTerms, this.constant);
+		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) {
@@ -325,7 +331,7 @@ var x = class e {
 	static fromProduct(t, n, r = 1) {
 		let i = new e();
 		if (r === 0) return i;
-		let a = b(t, n);
+		let a = x(t, n);
 		return i.quadTerms.set(a, {
 			var1: t.id <= n.id ? t : n,
 			var2: t.id <= n.id ? n : t,
@@ -355,7 +361,7 @@ var x = class e {
 		return s;
 	}
 	static extractScalarDivisor(e, t) {
-		if (y(e)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+		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;
@@ -365,19 +371,26 @@ var x = class e {
 		if (e.constant === 0) throw Error(`Division by zero in ${t}`);
 		return e.constant;
 	}
-}, S = class e {
+}, 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 (y(e)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
-		if (e instanceof x) return e.add(this);
+		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) {
@@ -393,11 +406,11 @@ var x = class e {
 		return t;
 	}
 	sub(e) {
-		if (y(e)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
-		return e instanceof x ? e.neg().add(this) : typeof e == "number" ? this.add(-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 (y(t)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+		if (b(t)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
 		if (typeof t == "number") {
 			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.");
@@ -409,10 +422,10 @@ var x = class e {
 			}
 			return r;
 		}
-		return t instanceof N || typeof t == "object" && t && "id" in t && !("terms" in t) && !("quadTerms" in t) ? x.multiplyLinearTerms(this.constant, this.terms, 0, /* @__PURE__ */ new Map([[t, 1]])) : t instanceof x ? this.terms.size === 0 ? t.mul(this.constant) : new x(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) : x.multiplyLinearTerms(this.constant, this.terms, t.constant, t.terms);
+		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) {
-		let t = x.extractScalarDivisor(e, "LinExpr.div()");
+		let t = S.extractScalarDivisor(e, "LinExpr.div()");
 		return this.mul(1 / t);
 	}
 	neg() {
@@ -438,14 +451,14 @@ var x = class e {
 	toConstraint(t, n, r) {
 		let i = this.clone(), a = 0;
 		if (typeof n == "number") a = n;
-		else if (n instanceof v || 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 x || typeof n == "object" && n && "quadTerms" in 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 v(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.");
@@ -475,55 +488,125 @@ var x = class e {
 		return e.join(" ") || "0";
 	}
 };
-function C(e, t) {
+function w(e, t) {
 	let n = /* @__PURE__ */ new Map(), r = 0;
 	function i(e) {
+		return e instanceof y || e.kind === "constraint" || "sense" in e && (e.sense === "<=" || e.sense === ">=" || e.sense === "==") && "lhs" in e && "rhs" in e && typeof e.rhs == "number" && typeof e.lhs == "object" && e.lhs !== null && "terms" in e.lhs && e.lhs.terms instanceof Map;
+	}
+	function a(e) {
+		return e instanceof S || "quadTerms" in e && e.quadTerms instanceof Map && "linearTerms" in e && e.linearTerms instanceof Map && typeof e.constant == "number";
+	}
+	function o(e) {
+		return e instanceof C || "terms" in e && e.terms instanceof Map && typeof e.constant == "number";
+	}
+	function s(e) {
+		return e instanceof M || !i(e) && typeof e.id == "number" && typeof e.name == "string" && typeof e.lb == "number" && typeof e.ub == "number" && typeof e.type == "string" && typeof e.mul == "function";
+	}
+	function c(e) {
+		return i(e) || a(e) || o(e) || s(e);
+	}
+	function l(e) {
+		if (typeof e != "object" || !e || Array.isArray(e) || c(e)) return !1;
+		let t = Object.getPrototypeOf(e);
+		return t === Object.prototype || t === null;
+	}
+	function u(e) {
 		if (e != null) {
-			if (typeof e == "number") r += e;
-			else if (e instanceof v || 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 x || typeof e == "object" && "quadTerms" in e && e.quadTerms instanceof Map) {
+			if (typeof e == "number") {
+				if (!Number.isFinite(e)) throw Error(`Invalid non-finite number "${e}" in sum().`);
+				let t = r + e;
+				if (!Number.isFinite(t)) throw Error("Constant accumulation overflows finite floating-point range in sum().");
+				r = t;
+			} else if (typeof e == "object" && i(e)) throw Error("Cannot sum a constraint comparison (<=, >=, ==) in sum(): expected a number, Var, or LinExpr.");
+			else if (typeof e == "object" && a(e)) {
 				let t = e;
 				if (t.quadTerms.size > 0) throw Error("Quadratic expressions are not supported in sum(): sum() produces a linear expression (LinExpr).");
+				if (!Number.isFinite(t.constant)) throw Error(`Invalid non-finite constant "${t.constant}" in sum().`);
 				for (let [e, r] of t.linearTerms) {
-					let t = n.get(e) ?? 0;
-					n.set(e, t + r);
+					if (!Number.isFinite(r)) throw Error(`Invalid non-finite coefficient "${r}" in sum().`);
+					let t = (n.get(e) ?? 0) + r;
+					if (!Number.isFinite(t)) throw Error("Coefficient accumulation overflows finite floating-point range in sum().");
+					n.set(e, t);
 				}
-				r += t.constant;
-			} else if (typeof e == "object" && "terms" in e) {
+				let i = r + t.constant;
+				if (!Number.isFinite(i)) throw Error("Constant accumulation overflows finite floating-point range in sum().");
+				r = i;
+			} else if (typeof e == "object" && o(e)) {
 				let t = e;
+				if (!Number.isFinite(t.constant)) throw Error(`Invalid non-finite constant "${t.constant}" in sum().`);
 				for (let [e, r] of t.terms) {
-					let t = n.get(e) ?? 0;
-					n.set(e, t + r);
+					if (!Number.isFinite(r)) throw Error(`Invalid non-finite coefficient "${r}" in sum().`);
+					let t = (n.get(e) ?? 0) + r;
+					if (!Number.isFinite(t)) throw Error("Coefficient accumulation overflows finite floating-point range in sum().");
+					n.set(e, t);
 				}
-				r += t.constant;
-			} 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);
+				let i = r + t.constant;
+				if (!Number.isFinite(i)) throw Error("Constant accumulation overflows finite floating-point range in sum().");
+				r = i;
+			} else if (typeof e == "object" && s(e)) {
+				let t = e, r = (n.get(t) ?? 0) + 1;
+				if (!Number.isFinite(r)) throw Error("Coefficient accumulation overflows finite floating-point range in sum().");
+				n.set(t, r);
 			} else throw Error("Unsupported item in sum(): expected a number, Var, or LinExpr.");
 		}
 	}
+	function d(e, t = 0) {
+		if (e != null) {
+			if (typeof e == "number") {
+				u(e);
+				return;
+			}
+			if (typeof e == "object") {
+				if (c(e)) {
+					u(e);
+					return;
+				}
+				if (!(e instanceof String) && !(e instanceof Map) && Symbol.iterator in e && typeof e[Symbol.iterator] == "function") {
+					if (t >= 2) throw Error("Nested containers deeper than 2D are not supported in sum().");
+					for (let n of e) d(n, t + 1);
+					return;
+				}
+				if (l(e)) {
+					if (t >= 2) throw Error("Nested containers deeper than 2D are not supported in sum().");
+					if (Object.getOwnPropertySymbols(e).length > 0) throw Error("Symbol keys are not supported in sum().");
+					for (let n of Object.keys(e)) d(e[n], t + 1);
+					return;
+				}
+			}
+			u(e);
+		}
+	}
 	if (typeof e == "number") {
-		let n = e, r = t;
-		for (let e = 0; e < n; e++) i(r(e, e));
-	} else {
+		if (typeof t != "function") throw Error("sum(count, mapFn) requires a mapping function as the second argument.");
+		if (!Number.isInteger(e) || e < 0) throw Error("sum(count, mapFn) requires a non-negative integer count.");
+		let n = e;
+		for (let e = 0; e < n; e++) d(t(e, e), 0);
+	} else if (typeof e == "object" && e && !(e instanceof String) && (!(e instanceof Map) || typeof t == "function") && Symbol.iterator in e && typeof e[Symbol.iterator] == "function") {
 		let n = 0;
-		for (let r of e) i(t ? t(r, n++) : r);
-	}
+		for (let r of e) t ? d(t(r, n++), 0) : d(r, 1);
+	} else if (l(e)) {
+		if (Object.getOwnPropertySymbols(e).length > 0) throw Error("Symbol keys are not supported in sum().");
+		let n = 0;
+		for (let r of Object.keys(e)) {
+			let i = e[r];
+			t ? d(t(i, n++), 0) : d(i, 1);
+		}
+	} else throw Error("Unsupported item in sum(): expected an Iterable, Record, or (count, mapFn).");
 	for (let [e, t] of n) t === 0 && n.delete(e);
-	return new S(n, r);
+	return new C(n, r);
 }
-function w(e, t) {
+function T(e, t) {
 	let n = /* @__PURE__ */ new Map(), r = 0;
 	function i(e) {
-		return typeof e == "object" && !!e && !(e instanceof v) && 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";
+		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 S || e instanceof x;
+		return i(e) || e instanceof C || e instanceof S;
 	}
 	function o(e, t, a) {
 		if (!Number.isFinite(e)) throw Error(`Invalid non-finite coefficient "${e}" in dot() at '${a || "root"}'.`);
-		if (t instanceof x) throw Error(`Quadratic expressions are not supported in dot() at '${a || "root"}': dot() produces a linear expression (LinExpr).`);
-		if (t instanceof S) {
+		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.");
@@ -547,7 +630,7 @@ function w(e, t) {
 		} 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) && !(e instanceof v) && e.kind !== "constraint";
+		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"}'.`);
@@ -595,39 +678,39 @@ function w(e, t) {
 	}
 	c(e, t);
 	for (let [e, t] of n) t === 0 && n.delete(e);
-	return new S(n, r);
+	return new C(n, r);
 }
 //#endregion
 //#region src/modeler/validation.ts
-var T = /* @__PURE__ */ new WeakMap(), E = /* @__PURE__ */ new WeakMap(), D = /* @__PURE__ */ new WeakMap();
-function O(e, t, n) {
-	if (e instanceof d) for (let r of e.children) O(r, t, n);
-	else if (e instanceof v) {
-		let r = e.ownerModel, i = E.get(e);
+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 ? E.set(e, i) : E.delete(e);
-		}), e.ownerModel = t, E.set(e, t));
+			e.ownerModel = r, i ? D.set(e, i) : D.delete(e);
+		}), e.ownerModel = t, D.set(e, t));
 	}
 }
-function k(e, t) {
-	let n = T.get(e);
+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}".`);
-	T.set(e, t);
+	E.set(e, t);
 }
-function ee(e, t) {
-	let n = D.get(e);
+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 = E.get(e);
+	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 D.set(e, t), E.set(e, t), r;
+	return O.set(e, t), D.set(e, t), r;
 }
-function te(e, t) {
-	T.get(e) === t && T.delete(e);
+function ne(e, t) {
+	E.get(e) === t && E.delete(e);
 }
-function ne(e, t, n) {
-	D.get(e) === t && D.delete(e), E.get(e) === t && (n ? E.set(e, n) : 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 re = 1e-6;
+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.`);
@@ -637,14 +720,14 @@ function A(e) {
 	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 ${re}).`);
+		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 ${re} of an integer in [${t}, ${n}]).`);
+			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 ie(e) {
+function ae(e) {
 	if (e.initialValue === void 0) return;
 	if (A(e), e.type === "Integer" || e.type === "Binary") {
 		let t = Math.round(e.initialValue);
@@ -653,8 +736,8 @@ function ie(e) {
 	let t = Math.min(e.ub, Math.max(e.lb, e.initialValue));
 	return Object.is(t, -0) ? 0 : t;
 }
-function ae(e, t, n) {
-	if (e instanceof x) {
+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.`);
@@ -681,13 +764,13 @@ function j(e, t, n, r = e.name) {
 		if (!Number.isFinite(a)) throw Error(`Variable "${i.name}" in constraint "${r}" has invalid coefficient: ${a}. Coefficients must be finite numbers.`);
 	}
 }
-function M(e, t, n, r, i, a) {
-	if (e instanceof u) {
+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 d) for (let o of e.children) M(o, t, n, r, i, a);
-	else if (e instanceof v) {
+	} 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 = E.get(e) ?? e.ownerModel ?? void 0;
+			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}.`);
@@ -698,11 +781,11 @@ function M(e, t, n, r, i, a) {
 		}
 	}
 }
-function oe(e) {
+function ce(e) {
 	let t = /* @__PURE__ */ new Set(), n = /* @__PURE__ */ new Set();
 	for (let r of e.variables) {
 		A(r);
-		let i = T.get(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);
 	}
@@ -723,18 +806,18 @@ function oe(e) {
 		a.add(t.name);
 	}
 	for (let t of e.constraints) {
-		let n = E.get(t);
+		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 && ae(e.objectiveExpr, e.name, (e) => n.has(e));
+	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) M(t.expr, t.name, e.name, (e) => n.has(e), (e) => i.has(e), 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 se = 0;
-function ce(e) {
+var le = 0;
+function ue(e) {
 	if (e === void 0) return "Continuous";
 	if (typeof e == "string") {
 		let t = e.toLowerCase();
@@ -744,7 +827,7 @@ function ce(e) {
 	}
 	throw Error(`Invalid variable type "${String(e)}": expected "Continuous", "Integer", or "Binary".`);
 }
-var N = class {
+var M = class {
 	id;
 	_name;
 	prefix;
@@ -757,9 +840,9 @@ var N = class {
 	value = null;
 	reducedCost = null;
 	constructor(e = {}) {
-		this.id = ++se;
+		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 = ce(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);
+		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);
 	}
 	get name() {
 		return this._name;
@@ -768,7 +851,7 @@ var N = class {
 		return this._type;
 	}
 	set type(e) {
-		let t = ce(e);
+		let t = ue(e);
 		this._type !== t && (this._type = t, this.ownerModel?.notifyMutation?.());
 	}
 	get lb() {
@@ -794,31 +877,37 @@ var N = class {
 		this._name = e;
 	}
 	mul(e) {
-		return typeof e == "number" ? new S(/* @__PURE__ */ new Map([[this, 1]]), 0).mul(e) : new x(/* @__PURE__ */ new Map([[this, 1]]), /* @__PURE__ */ new Map(), 0).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 x ? e.add(this) : new S(/* @__PURE__ */ new Map([[this, 1]]), 0).add(e);
+		return e instanceof S ? e.add(this) : new C(/* @__PURE__ */ new Map([[this, 1]]), 0).add(e);
 	}
 	sub(e) {
-		return e instanceof x ? e.neg().add(this) : new S(/* @__PURE__ */ new Map([[this, 1]]), 0).sub(e);
+		return e instanceof S ? e.neg().add(this) : new C(/* @__PURE__ */ new Map([[this, 1]]), 0).sub(e);
 	}
 	neg() {
 		return this.mul(-1);
 	}
 	le(e, t) {
-		return new S(/* @__PURE__ */ new Map([[this, 1]]), 0).le(e, t);
+		return new C(/* @__PURE__ */ new Map([[this, 1]]), 0).le(e, t);
 	}
 	ge(e, t) {
-		return new S(/* @__PURE__ */ new Map([[this, 1]]), 0).ge(e, t);
+		return new C(/* @__PURE__ */ new Map([[this, 1]]), 0).ge(e, t);
 	}
 	eq(e, t) {
-		return new S(/* @__PURE__ */ new Map([[this, 1]]), 0).eq(e, t);
+		return new C(/* @__PURE__ */ new Map([[this, 1]]), 0).eq(e, t);
 	}
 	toString() {
 		return this.name;
 	}
-}, le = /^(?:[0-9]+(?:\.[0-9]+)?|\.[0-9]+)(?:[eE][+-]?[0-9]+)?$/;
-function ue(e, t) {
+};
+//#endregion
+//#region src/modeler/parser.ts
+function N(e) {
+	return typeof e == "object" && !!e && e.kind === "container";
+}
+var 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];
@@ -857,6 +946,10 @@ function ue(e, t) {
 			type: "RPAREN",
 			value: ")"
 		}), r++;
+		else if (a === ",") n.push({
+			type: "COMMA",
+			value: ","
+		}), 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({
@@ -874,7 +967,7 @@ function ue(e, t) {
 					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 (!le.test(a)) throw Error(`Invalid numeric literal '${a}' at position ${t} in: "${e}"`);
+			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}"`);
@@ -901,12 +994,205 @@ function ue(e, t) {
 	}
 	return n;
 }
-var de = class {
+function pe(e) {
+	return e instanceof S && e.quadTerms.size === 0 ? new C(e.linearTerms, e.constant) : e;
+}
+function me(e) {
+	return typeof e == "number" || e instanceof M || e instanceof C || e instanceof S || z(e);
+}
+function he(e) {
+	return typeof e == "number" ? new C(/* @__PURE__ */ new Map(), e) : e instanceof M || "id" in e && !("terms" in e) && !("quadTerms" in e) ? new C(/* @__PURE__ */ new Map([[e, 1]]), 0) : e.clone();
+}
+function ge(e, t, n) {
+	if (typeof e == "number" && typeof t == "number") {
+		if (n === "+") {
+			let n = e + t;
+			if (!Number.isFinite(n)) throw Error(`Invalid non-finite constant "${n}" in expression.`);
+			return n;
+		}
+		if (n === "-") {
+			let n = e - t;
+			if (!Number.isFinite(n)) throw Error(`Invalid non-finite constant "${n}" in expression.`);
+			return n;
+		}
+		if (n === "*") {
+			let n = e * t;
+			if (e !== 0 && t !== 0 && n === 0) throw Error("Constant multiplication underflows to zero.");
+			if (!Number.isFinite(n)) throw Error(`Invalid non-finite constant "${n}" in expression.`);
+			return n;
+		}
+		if (t === 0) throw Error("Division by zero");
+		let r = 1 / t * e;
+		if (e !== 0 && r === 0) throw Error("Constant multiplication underflows to zero.");
+		if (!Number.isFinite(r)) throw Error(`Invalid non-finite constant "${r}" in expression.`);
+		return r;
+	}
+	let r = he(e), i = he(t), a;
+	a = n === "+" ? r.add(i) : n === "-" ? r.sub(i) : n === "*" ? r.mul(i) : r.div(i);
+	let o = pe(a);
+	return B(o), o;
+}
+function P(e, t) {
+	if (Array.isArray(e)) {
+		let n = Array(e.length);
+		for (let r = 0; r < e.length; r++) {
+			let i = e[r];
+			n[r] = me(i) ? t(i) : P(i, t);
+		}
+		return n;
+	}
+	let n = Object.create(null);
+	for (let r of Object.keys(e)) {
+		let i = e[r];
+		n[r] = me(i) ? t(i) : P(i, t);
+	}
+	return n;
+}
+function F(e, t, n, r = "") {
+	let i = me(e), a = me(t);
+	if (i && a) return ge(e, t, n);
+	if (i || a) throw Error(`Dimension mismatch in template expression at '${r || "root"}': cannot combine scalar element with sub-container.`);
+	if (Array.isArray(e) || Array.isArray(t)) {
+		if (Array.isArray(e) && Array.isArray(t)) {
+			if (e.length !== t.length) throw Error(`Array length mismatch in template expression at '${r || "root"}': received lengths ${e.length} and ${t.length}.`);
+			let i = Array(e.length);
+			for (let a = 0; a < e.length; a++) i[a] = F(e[a], t[a], n, r ? `${r}[${a}]` : `[${a}]`);
+			return i;
+		}
+		let i = Array.isArray(e) ? e : t, a = Array.isArray(e) ? t : e, o = Object.keys(a);
+		if (o.length === i.length && o.every((e) => /^(?:0|[1-9]\d*)$/.test(e))) {
+			let o = [];
+			for (let e = 0; e < i.length; e++) Object.prototype.hasOwnProperty.call(a, e) || o.push(e);
+			if (o.length > 0) throw Error(`Key mismatch in template expression at '${r || "root"}': missing indices [${o.join(", ")}] in numeric record.`);
+			let s = Array(i.length);
+			for (let a = 0; a < i.length; a++) {
+				let i = e[a], o = t[a];
+				s[a] = F(i, o, n, r ? `${r}[${a}]` : `[${a}]`);
+			}
+			return s;
+		}
+		throw o.length > 0 && o.every((e) => /^(?:0|[1-9]\d*)$/.test(e)) ? Error(`Array length mismatch in template expression at '${r || "root"}': array has length ${i.length}, but object has ${o.length} indices.`) : Error(`Type mismatch in template expression at '${r || "root"}': one operand is an Array while the other is an Object with keys [${o.slice(0, 5).join(", ")}].`);
+	}
+	let o = e, s = t, c = Object.keys(o), l = Object.keys(s), u = c.filter((e) => !Object.prototype.hasOwnProperty.call(s, e)), d = l.filter((e) => !Object.prototype.hasOwnProperty.call(o, e));
+	if (u.length > 0 || d.length > 0) {
+		let e = [];
+		throw u.length > 0 && e.push(`missing in second operand: [${u.join(", ")}]`), d.length > 0 && e.push(`missing in first operand: [${d.join(", ")}]`), Error(`Key mismatch in template expression at '${r || "root"}': ${e.join("; ")}.`);
+	}
+	let f = Object.create(null);
+	for (let e of c) f[e] = F(o[e], s[e], n, r ? `${r}.${e}` : e);
+	return f;
+}
+function I(e, t, n) {
+	let r = N(e), i = N(t);
+	if (!r && !i) return ge(e, t, n);
+	if (r && !i) return {
+		kind: "container",
+		data: P(e.data, (e) => ge(e, t, n)),
+		fromNonArrayIterable: e.fromNonArrayIterable
+	};
+	if (!r && i) return {
+		kind: "container",
+		data: P(t.data, (t) => ge(e, t, n)),
+		fromNonArrayIterable: t.fromNonArrayIterable
+	};
+	let a = e, o = t;
+	return {
+		kind: "container",
+		data: F(a.data, o.data, n),
+		fromNonArrayIterable: a.fromNonArrayIterable || o.fromNonArrayIterable
+	};
+}
+function _e(e) {
+	return typeof e == "number" ? -e : N(e) ? {
+		kind: "container",
+		data: P(e.data, (e) => typeof e == "number" ? -e : he(e).neg()),
+		fromNonArrayIterable: e.fromNonArrayIterable
+	} : e.neg();
+}
+function ve(e, t) {
+	let n = e instanceof S, r = n ? e.quadTerms.size : 0, i = n ? e.linearTerms.size : e.terms.size;
+	if (r === 0 && i === 0) {
+		let n = e.constant ** +t;
+		if (e.constant !== 0 && t > 0 && n === 0) throw Error("Constant exponentiation underflows to zero.");
+		return new C(/* @__PURE__ */ new Map(), n);
+	}
+	if (t === 0) return new C(/* @__PURE__ */ new Map(), 1);
+	if (t === 1) return e;
+	if (t === 2) return e.mul(e);
+	throw Error(`Exponent ${t} creates a non-linear term of degree > 2 (not allowed in MILP/LP/QP)`);
+}
+function L(e) {
+	if (typeof e != "object" || !e || Array.isArray(e) || z(e) || V(e)) return !1;
+	let t = Object.getPrototypeOf(e);
+	return t === Object.prototype || t === null;
+}
+function ye(e) {
+	if (typeof e == "number") {
+		if (!Number.isFinite(e)) throw Error(`Invalid numeric value "${e}" in template expression: interpolated numbers must be finite.`);
+		return e;
+	}
+	if (V(e)) throw Error("Cannot interpolate a constraint comparison (<=, >=, ==) inside a template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
+	if (z(e)) return B(e), e instanceof M || "id" in e && !("terms" in e) && !("quadTerms" in e) ? e : e.clone();
+	throw Error("Unsupported interpolation value in template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
+}
+function R(e) {
+	return typeof e == "object" && !!e && !(e instanceof String) && !(e instanceof Map) && !z(e) && !V(e) && Symbol.iterator in e && typeof e[Symbol.iterator] == "function";
+}
+function be(e, t = 0) {
+	if (Array.isArray(e)) {
+		let n = !1, r = Array(e.length);
+		for (let i = 0; i < e.length; i++) {
+			if (!(i in e)) throw Error(`Unsupported interpolation value in template expression: sparse array hole at index ${i}.`);
+			let a = e[i];
+			if (Array.isArray(a) || L(a) || R(a)) {
+				if (t >= 1) throw Error("Nested containers deeper than 2D are not supported in template expressions.");
+				let e = be(a, t + 1);
+				e.fromNonArrayIterable && (n = !0), r[i] = e.data;
+			} else r[i] = ye(a);
+		}
+		return {
+			kind: "container",
+			data: r,
+			fromNonArrayIterable: n
+		};
+	}
+	if (R(e)) return {
+		kind: "container",
+		data: Array.from(e).map((e) => {
+			if (Array.isArray(e) || L(e) || R(e)) {
+				if (t >= 1) throw Error("Nested containers deeper than 2D are not supported in template expressions.");
+				return be(e, t + 1).data;
+			}
+			return ye(e);
+		}),
+		fromNonArrayIterable: !0
+	};
+	if (L(e)) {
+		if (Object.getOwnPropertySymbols(e).length > 0) throw Error("Symbol keys are not supported in template expression at 'root'.");
+		let n = !1, r = Object.create(null);
+		for (let i of Object.keys(e)) {
+			let a = e[i];
+			if (Array.isArray(a) || L(a) || R(a)) {
+				if (t >= 1) throw Error("Nested containers deeper than 2D are not supported in template expressions.");
+				let e = be(a, t + 1);
+				e.fromNonArrayIterable && (n = !0), r[i] = e.data;
+			} else r[i] = ye(a);
+		}
+		return {
+			kind: "container",
+			data: r,
+			fromNonArrayIterable: n
+		};
+	}
+	throw Error("Unsupported interpolation value in template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
+}
+var xe = class {
 	tokens;
 	pos = 0;
 	resolver;
-	constructor(e, t) {
-		this.tokens = e, this.resolver = t;
+	templateCtx;
+	constructor(e, t, n) {
+		this.tokens = e, this.resolver = t, this.templateCtx = n;
 	}
 	peek() {
 		return this.tokens[this.pos];
@@ -918,54 +1204,240 @@ var de = class {
 		return t;
 	}
 	parseExpression() {
-		let e = this.parseTerm();
+		let e = this.parseExpressionNode();
+		if (N(e)) throw Error("Container expression (Array or Record) cannot be used directly as a scalar expression or constraint; wrap it in sum(...) or use dot(a, b).");
+		return typeof e == "number" ? new C(/* @__PURE__ */ new Map(), e) : pe(e);
+	}
+	parseExpressionNode() {
+		let e = this.parseTermNode();
 		for (; this.pos < this.tokens.length;) {
 			let t = this.peek();
 			if (!t) break;
-			if (t.type === "PLUS") this.consume(), e = e.add(this.parseTerm());
-			else if (t.type === "MINUS") this.consume(), e = e.sub(this.parseTerm());
+			if (t.type === "PLUS") this.consume(), e = I(e, this.parseTermNode(), "+");
+			else if (t.type === "MINUS") this.consume(), e = I(e, this.parseTermNode(), "-");
 			else break;
 		}
-		return e instanceof x && e.quadTerms.size === 0 ? new S(e.linearTerms, e.constant) : e;
+		return N(e) || typeof e == "number" ? e : pe(e);
 	}
-	parseTerm() {
-		let e = this.parseFactor();
+	parseTermNode() {
+		let e = this.parseFactorNode();
 		for (; this.pos < this.tokens.length;) {
 			let t = this.peek();
 			if (!t) break;
-			if (t.type === "STAR") this.consume(), e = e.mul(this.parseFactor());
-			else if (t.type === "SLASH") this.consume(), e = e.div(this.parseFactor());
+			if (t.type === "STAR") this.consume(), e = I(e, this.parseFactorNode(), "*");
+			else if (t.type === "SLASH") this.consume(), e = I(e, this.parseFactorNode(), "/");
 			else break;
 		}
 		return e;
 	}
-	parseFactor() {
+	parseFactorNode() {
 		let e = this.peek();
 		if (!e) throw Error("Unexpected end of expression");
-		if (e.type === "PLUS") return this.consume(), this.parseFactor();
-		if (e.type === "MINUS") return this.consume(), this.parseFactor().neg();
+		if (e.type === "PLUS") return this.consume(), this.parseFactorNode();
+		if (e.type === "MINUS") return this.consume(), _e(this.parseFactorNode());
 		let t;
 		if (e.type === "NUMBER") {
 			this.consume();
 			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 N || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new S(/* @__PURE__ */ new Map([[n, 1]]), 0) : n.clone();
-				} else this.consume("LPAREN"), e = this.parseExpression(), this.consume("RPAREN");
-				return this.applyPower(e).mul(n);
-			}
-			t = new S(/* @__PURE__ */ new Map(), n);
-		} else if (e.type === "IDENT") {
-			this.consume();
-			let n = this.resolve(e.value);
-			t = n instanceof N || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new S(/* @__PURE__ */ new Map([[n, 1]]), 0) : n.clone();
-		} else if (e.type === "LPAREN") this.consume("LPAREN"), t = this.parseExpression(), this.consume("RPAREN");
+				let e = this.parsePrimaryNode();
+				return I(this.applyPowerNode(e), n, "*");
+			}
+			t = n;
+		} else if (e.type === "IDENT" || e.type === "LPAREN") t = this.parsePrimaryNode();
 		else throw Error(`Unexpected token '${e.value}' in expression`);
-		return this.applyPower(t);
+		return this.applyPowerNode(t);
+	}
+	parsePrimaryNode() {
+		if (this.peek()?.type === "IDENT") {
+			let e = this.consume();
+			return (e.value === "sum" || e.value === "dot") && this.peek()?.type === "LPAREN" ? this.parseFunctionCall(e.value) : this.resolveNode(e.value);
+		}
+		this.consume("LPAREN");
+		let e = this.parseExpressionNode();
+		return this.consume("RPAREN"), e;
+	}
+	parseFunctionCall(e) {
+		this.consume("LPAREN");
+		let t = 1;
+		for (let n = this.pos; n < this.tokens.length && t > 0; n++) {
+			let r = this.tokens[n];
+			if (r.type === "LPAREN") t++;
+			else if (r.type === "RPAREN") t--;
+			else if (r.type === "COMP") throw Error(e === "sum" ? "Cannot sum a constraint comparison (<=, >=, ==) in sum(): expected a number, Var, LinExpr, or QuadExpr." : "Cannot use a constraint comparison (<=, >=, ==) in dot(): expected 1D or 2D Array or Record containers.");
+		}
+		if (this.peek()?.type === "RPAREN") throw this.consume("RPAREN"), Error(e === "sum" ? "sum() in template expression requires at least 1 argument." : "dot() in template expression requires exactly 2 arguments: dot(a, b).");
+		if (e === "sum") {
+			if (this.tokens[this.pos]?.type === "IDENT" && this.templateCtx?.rawContainerMap.has(this.tokens[this.pos].value) && this.tokens[this.pos + 1]?.type === "RPAREN") {
+				let e = this.consume();
+				this.consume("RPAREN");
+				let t = this.templateCtx.rawContainerMap.get(e.value);
+				return this.accumulateSumItems((e) => {
+					e(t, 0);
+				});
+			}
+			let e = this.pos, t = 0;
+			for (; this.tokens[e]?.type === "LPAREN";) t++, e++;
+			if (this.tokens[e]?.type === "IDENT" && this.templateCtx?.rawContainerMap.has(this.tokens[e].value)) {
+				let n = this.tokens[e].value, r = e + 1, i = 0;
+				for (; i < t && this.tokens[r]?.type === "RPAREN";) i++, r++;
+				if (i === t && this.tokens[r]?.type === "COMMA") {
+					this.pos = r + 1;
+					let e = this.peek();
+					if (!e || e.type !== "IDENT" || !this.templateCtx.functionMap.has(e.value)) throw Error("Second argument to sum() must be a mapping function: sum(itemsOrCount, mapFn).");
+					if (this.consume(), this.peek()?.type === "COMMA") throw Error("sum() in template expression accepts at most 2 arguments: sum(container) or sum(itemsOrCount, mapFn).");
+					return this.consume("RPAREN"), this.evalSumWithMapper(this.templateCtx.rawContainerMap.get(n), this.templateCtx.functionMap.get(e.value));
+				}
+			}
+			let n = this.parseExpressionNode();
+			if (this.peek()?.type === "COMMA") {
+				this.consume("COMMA");
+				let e = this.peek();
+				if (!e || e.type !== "IDENT" || !this.templateCtx?.functionMap.has(e.value)) throw Error("Second argument to sum() must be a mapping function: sum(itemsOrCount, mapFn).");
+				if (this.consume(), this.peek()?.type === "COMMA") throw Error("sum() in template expression accepts at most 2 arguments: sum(container) or sum(itemsOrCount, mapFn).");
+				this.consume("RPAREN");
+				let t = this.templateCtx.functionMap.get(e.value);
+				if (typeof n == "number") return this.evalSumWithMapper(n, t);
+				if (!N(n) && n instanceof C && n.terms.size === 0) return this.evalSumWithMapper(n.constant, t);
+				if (N(n)) return this.evalSumWithMapper(n.data, t);
+				throw Error("Invalid first argument in sum(itemsOrCount, mapFn): expected an Iterable, Record, or non-negative integer count.");
+			}
+			return this.consume("RPAREN"), this.evalSumSingle(n);
+		}
+		let n = this.parseExpressionNode();
+		if (this.peek()?.type !== "COMMA") throw Error("dot() in template expression requires exactly 2 arguments: dot(a, b).");
+		this.consume("COMMA");
+		let r = this.parseExpressionNode();
+		if (this.peek()?.type === "COMMA") throw Error("dot() in template expression requires exactly 2 arguments: dot(a, b).");
+		return this.consume("RPAREN"), this.evalDot(n, r);
+	}
+	accumulateSumItems(e) {
+		let t = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map(), r = 0, i = (e, a = 0) => {
+			if (e != null) {
+				if (typeof e == "number") {
+					if (!Number.isFinite(e)) throw Error(`Invalid non-finite number "${e}" in sum().`);
+					let t = r + e;
+					if (!Number.isFinite(t)) throw Error("Constant accumulation overflows finite floating-point range in sum().");
+					r = t;
+					return;
+				}
+				if (V(e)) throw Error("Cannot sum a constraint comparison (<=, >=, ==) in sum(): expected a number, Var, LinExpr, or QuadExpr.");
+				if (e instanceof S || typeof e == "object" && e && "quadTerms" in e && e.quadTerms instanceof Map && "linearTerms" in e && e.linearTerms instanceof Map) {
+					let i = e;
+					B(i);
+					let a = r + i.constant;
+					if (!Number.isFinite(a)) throw Error("Constant accumulation overflows finite floating-point range in sum().");
+					r = a;
+					for (let [e, n] of i.linearTerms) {
+						let r = (t.get(e) ?? 0) + n;
+						if (!Number.isFinite(r)) throw Error("Coefficient accumulation overflows finite floating-point range in sum().");
+						t.set(e, r);
+					}
+					for (let [e, t] of i.quadTerms) {
+						let r = n.get(e);
+						if (r) {
+							let i = r.coeff + t.coeff;
+							if (!Number.isFinite(i)) throw Error("Quadratic coefficient accumulation overflows finite floating-point range in sum().");
+							n.set(e, {
+								var1: t.var1,
+								var2: t.var2,
+								coeff: i
+							});
+						} else n.set(e, {
+							var1: t.var1,
+							var2: t.var2,
+							coeff: t.coeff
+						});
+					}
+					return;
+				}
+				if (e instanceof C || typeof e == "object" && e && "terms" in e && e.terms instanceof Map && typeof e.constant == "number") {
+					let n = e;
+					B(n);
+					let i = r + n.constant;
+					if (!Number.isFinite(i)) throw Error("Constant accumulation overflows finite floating-point range in sum().");
+					r = i;
+					for (let [e, r] of n.terms) {
+						let n = (t.get(e) ?? 0) + r;
+						if (!Number.isFinite(n)) throw Error("Coefficient accumulation overflows finite floating-point range in sum().");
+						t.set(e, n);
+					}
+					return;
+				}
+				if (z(e)) {
+					let n = e, r = (t.get(n) ?? 0) + 1;
+					if (!Number.isFinite(r)) throw Error("Coefficient accumulation overflows finite floating-point range in sum().");
+					t.set(n, r);
+					return;
+				}
+				if (Array.isArray(e)) {
+					if (a >= 2) throw Error("Nested containers deeper than 2D are not supported in sum().");
+					for (let t = 0; t < e.length; t++) {
+						if (!(t in e)) throw Error(`Unsupported item in sum(): sparse array hole at index ${t}.`);
+						i(e[t], a + 1);
+					}
+					return;
+				}
+				if (R(e)) {
+					if (a >= 2) throw Error("Nested containers deeper than 2D are not supported in sum().");
+					for (let t of e) i(t, a + 1);
+					return;
+				}
+				if (L(e)) {
+					if (a >= 2) throw Error("Nested containers deeper than 2D are not supported in sum().");
+					if (Object.getOwnPropertySymbols(e).length > 0) throw Error("Symbol keys are not supported in sum().");
+					for (let t of Object.keys(e)) i(e[t], a + 1);
+					return;
+				}
+				throw Error("Unsupported item in sum(): expected a number, Var, LinExpr, or QuadExpr.");
+			}
+		};
+		e(i);
+		for (let [e, n] of t) n === 0 && t.delete(e);
+		for (let [e, t] of n) t.coeff === 0 && n.delete(e);
+		return n.size > 0 ? new S(t, n, r) : new C(t, r);
+	}
+	evalSumSingle(e) {
+		if (!N(e)) throw Error("sum() requires a container (Array, Iterable, or Record) or (itemsOrCount, mapFn).");
+		return this.accumulateSumItems((t) => {
+			t(e.data, 0);
+		});
+	}
+	evalSumWithMapper(e, t) {
+		return this.accumulateSumItems((n) => {
+			if (typeof e == "number") {
+				if (!Number.isInteger(e) || e < 0) throw Error("sum(count, mapFn) requires a non-negative integer count.");
+				for (let r = 0; r < e; r++) n(t(r, r));
+				return;
+			}
+			if (Array.isArray(e)) {
+				for (let r = 0; r < e.length; r++) {
+					if (!(r in e)) throw Error(`Unsupported item in sum(): sparse array hole at index ${r}.`);
+					n(t(e[r], r));
+				}
+				return;
+			}
+			if (typeof e == "object" && e && !(e instanceof String) && Symbol.iterator in e && typeof e[Symbol.iterator] == "function") {
+				let r = 0;
+				for (let i of e) n(t(i, r++));
+				return;
+			}
+			if (L(e)) {
+				if (Object.getOwnPropertySymbols(e).length > 0) throw Error("Symbol keys are not supported in sum().");
+				let r = 0;
+				for (let i of Object.keys(e)) n(t(e[i], r++));
+				return;
+			}
+			throw Error("Invalid first argument in sum(itemsOrCount, mapFn): expected an Iterable, Record, or non-negative integer count.");
+		});
+	}
+	evalDot(e, t) {
+		if (!N(e) || !N(t)) throw Error("dot() in template expression requires 1D or 2D Array or Record containers as arguments.");
+		if (e.fromNonArrayIterable || t.fromNonArrayIterable) throw Error("Unsupported operand types in dot() at 'root': dot() requires Array or Record containers (use sum() for general Iterables).");
+		let n = T(e.data, t.data);
+		return B(n), n;
 	}
-	applyPower(e) {
+	applyPowerNode(e) {
 		if (this.peek()?.type !== "CARET") return e;
 		let t = [];
 		for (; this.peek()?.type === "CARET";) {
@@ -982,55 +1454,87 @@ var de = class {
 		let n = t[t.length - 1];
 		for (let e = t.length - 2; e >= 0; e--) n = t[e] ** +n;
 		if (!Number.isFinite(n) || n < 0) throw Error("Exponent creates an invalid or out-of-range power");
-		let r = e instanceof x, 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 S(/* @__PURE__ */ new Map(), t);
+		if (typeof e == "number") {
+			let t = e ** +n;
+			if (e !== 0 && n > 0 && t === 0) throw Error("Constant exponentiation underflows to zero.");
+			if (!Number.isFinite(t)) throw Error(`Invalid non-finite constant "${t}" in expression.`);
+			return t;
 		}
-		if (n === 0) return new S(/* @__PURE__ */ new Map(), 1);
-		if (n === 1) return 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)`);
+		return N(e) ? {
+			kind: "container",
+			data: P(e.data, (e) => {
+				if (typeof e == "number") {
+					let t = e ** +n;
+					if (e !== 0 && n > 0 && t === 0) throw Error("Constant exponentiation underflows to zero.");
+					if (!Number.isFinite(t)) throw Error("Constant exponentiation overflows finite floating-point range.");
+					return t;
+				}
+				let t = pe(ve(he(e), n));
+				return B(t), t;
+			}),
+			fromNonArrayIterable: e.fromNonArrayIterable
+		} : ve(e, n);
 	}
 	getRemainingToken() {
 		return this.peek();
 	}
-	resolve(e) {
+	resolveNode(e) {
+		if (this.templateCtx?.functionMap.has(e)) throw Error("Function interpolation is only supported as the second argument of sum(itemsOrCount, mapFn) in template expressions.");
+		if (this.templateCtx?.rawContainerMap.has(e)) return be(this.templateCtx.rawContainerMap.get(e));
 		let t = this.resolver(e);
 		if (!t) throw Error(`Unknown variable '${e}' in expression`);
-		return t;
+		return t instanceof M || "id" in t && !("terms" in t) && !("quadTerms" in t) ? new C(/* @__PURE__ */ new Map([[t, 1]]), 0) : t.clone();
 	}
 };
-function P(e, t, n) {
-	let r = new de(ue(e, n), t), i = r.parseExpression(), a = r.getRemainingToken();
-	if (a) throw Error(`Unexpected token '${a.value}' after expression in "${e}"`);
-	return F(i), i;
+function Se(e, t, n, r) {
+	let i = new xe(fe(e, n), t, r), a = i.parseExpression(), o = i.getRemainingToken();
+	if (o) throw Error(`Unexpected token '${o.value}' after expression in "${e}"`);
+	return B(a), a;
+}
+function Ce(e, t) {
+	return Se(e, t);
+}
+function we(e) {
+	let t = 0;
+	for (let n = 0; n < e.length; n++) {
+		let r = e[n];
+		if (r === "(") t++;
+		else if (r === ")") t > 0 && t--;
+		else if (t === 0) {
+			let t = e.slice(n, n + 2);
+			if (t === "<=" || t === ">=" || t === "==" || t === "=<" || t === "=>") return {
+				rawOp: t,
+				index: n
+			};
+			if (r === "=") return {
+				rawOp: "=",
+				index: n
+			};
+		}
+	}
+	return null;
 }
-function fe(e, t) {
-	return P(e, t);
-}
-function pe(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 = P(s, t, r), d = P(c, t, r);
-	if (u instanceof x && u.quadTerms.size > 0 || d instanceof x && d.quadTerms.size > 0) throw Error("Quadratic constraints are not supported (only linear constraints are allowed in MILP/LP/QP)");
-	let f = u instanceof x ? new S(u.linearTerms, u.constant) : u, p = d instanceof x ? new S(d.linearTerms, d.constant) : d, m;
-	if (m = l === "<=" ? f.le(p, n) : l === ">=" ? f.ge(p, n) : f.eq(p, n), F(m.lhs), !Number.isFinite(m.rhs)) throw Error(`Invalid non-finite right-hand side "${m.rhs}" in constraint.`);
-	return m;
-}
-function me(e, t, n) {
-	return pe(e, t, n);
+function Te(e, t, n, r, i) {
+	let a = we(e);
+	if (!a) throw Error(`Constraint must contain a comparison operator (<=, >=, ==, =): "${e}"`);
+	let o = a.rawOp, s = a.index, c = e.substring(0, s).trim(), l = e.substring(s + o.length).trim(), u;
+	if (o === "<=" || o === "=<") u = "<=";
+	else if (o === ">=" || o === "=>") u = ">=";
+	else if (o === "==" || o === "=") u = "==";
+	else throw Error(`Unsupported operator "${o}"`);
+	let d = Se(c, t, r, i), f = Se(l, t, r, i);
+	if (d instanceof S && d.quadTerms.size > 0 || f instanceof S && f.quadTerms.size > 0) throw Error("Quadratic constraints are not supported (only linear constraints are allowed in MILP/LP/QP)");
+	let p = d instanceof S ? new C(d.linearTerms, d.constant) : d, m = f instanceof S ? new C(f.linearTerms, f.constant) : f, h;
+	if (h = u === "<=" ? p.le(m, n) : u === ">=" ? p.ge(m, n) : p.eq(m, n), B(h.lhs), !Number.isFinite(h.rhs)) throw Error(`Invalid non-finite right-hand side "${h.rhs}" in constraint.`);
+	return h;
 }
-function he(e) {
-	return e instanceof N || e instanceof S || e instanceof x ? !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 Ee(e, t, n) {
+	return Te(e, t, n);
+}
+function z(e) {
+	return e instanceof M || e instanceof C || e instanceof S ? !0 : typeof e != "object" || !e || V(e) ? !1 : "terms" in e && e.terms instanceof Map && typeof e.constant == "number" || "quadTerms" in e && e.quadTerms instanceof Map && "linearTerms" in e && e.linearTerms instanceof Map && typeof e.constant == "number" || typeof e.id == "number" && typeof e.name == "string" && typeof e.lb == "number" && typeof e.ub == "number" && typeof e.type == "string" && typeof e.mul == "function";
 }
-function F(e) {
+function B(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.`);
@@ -1042,57 +1546,67 @@ function F(e) {
 		for (let [, t] of e.quadTerms) if (!Number.isFinite(t.coeff)) throw Error(`Invalid non-finite quadratic coefficient "${t.coeff}" in expression.`);
 	}
 }
-function ge(e) {
-	return e instanceof v || typeof e == "object" && !!e && "sense" in e && "lhs" in e && "rhs" in e;
+function V(e) {
+	return e instanceof y ? !0 : typeof e != "object" || !e ? !1 : e.kind === "constraint" || "sense" in e && (e.sense === "<=" || e.sense === ">=" || e.sense === "==") && "lhs" in e && "rhs" in e && typeof e.rhs == "number" && typeof e.lhs == "object" && e.lhs !== null && "terms" in e.lhs && e.lhs.terms instanceof Map;
 }
-function _e(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];
+function De(e, t) {
+	let n = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), o = e.join(""), s = "__washi_";
+	for (; o.includes(s);) s += "_";
+	let c = "";
+	for (let o = 0; o < e.length; o++) if (c += e[o], o < t.length) {
+		let e = t[o];
 		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 (ge(e)) throw Error("Cannot interpolate a constraint comparison (<=, >=, ==) inside a template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
-		else if (he(e)) {
-			F(e);
-			let t = `${a}ph_${i}__`;
-			n.set(t, e), o += ` ${t} `;
+			let t = `${s}num_${o}__`;
+			r.set(t, e), c += `(${t})`;
+		} else if (V(e)) throw Error("Cannot interpolate a constraint comparison (<=, >=, ==) inside a template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
+		else if (z(e)) {
+			B(e);
+			let t = `${s}ph_${o}__`;
+			n.set(t, e), c += ` ${t} `;
+		} else if (typeof e == "function") {
+			let t = `${s}fn_${o}__`;
+			a.set(t, e), c += ` ${t} `;
+		} else if (Array.isArray(e) || R(e) || e instanceof Map || L(e)) {
+			let t = `${s}ph_${o}__`;
+			i.set(t, e), c += ` ${t} `;
 		} else throw Error("Unsupported interpolation value in template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
 	}
 	return {
-		fullText: o,
+		fullText: c,
 		resolver: (e) => n.get(e),
-		numberMap: r
+		numberMap: r,
+		templateCtx: {
+			rawContainerMap: i,
+			functionMap: a
+		}
 	};
 }
-function ve(e, ...t) {
-	let { fullText: n, resolver: r, numberMap: i } = _e(e, t);
-	return /(<=|>=|==|=<|=>|=)/.test(n) ? pe(n, r, void 0, i) : P(n, r, i);
+function Oe(e, ...t) {
+	let { fullText: n, resolver: r, numberMap: i, templateCtx: a } = De(e, t);
+	return we(n) ? Te(n, r, void 0, i, a) : Se(n, r, i, a);
 }
 //#endregion
 //#region src/modeler/lp-writer.ts
-function I(e) {
+function ke(e) {
 	return typeof e == "object" && !!e && typeof e.lpString == "string" && e.nameToVar instanceof Map && e.nameToConstraint instanceof Map;
 }
-function L(e, t = "x", n = 0) {
+function H(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 ye(e) {
+function Ae(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 = L(n.name, "x", e), o = a, l = 1;
+		let a = H(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 = L(t.name, "c", e + 1), i = r, s = 1;
+		let t = n[e], r = H(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);
 	}
@@ -1105,18 +1619,18 @@ function ye(e) {
 		varOrder: s
 	};
 }
-function R(e) {
-	let { sense: t, objective: n, constraints: r, variables: i } = e, { nameToVar: a, varToName: o, nameToConstraint: s, constrToName: c, varOrder: l } = ye(e), u = [];
-	u.push(t && t.toLowerCase() === "maximize" ? "Maximize" : "Minimize");
-	let d = [], f = !0, p = n instanceof x ? n.linearTerms : n.terms;
-	if (p) for (let [e, t] of p) {
+function je(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 } = Ae(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 = o.get(e), r = t >= 0 ? f ? "" : "+ " : "- ", i = Math.abs(t), a = i === 1 ? "" : `${i} `;
-		d.push(`${r}${a}${n}`), f = !1;
+		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 (n instanceof x && n.quadTerms.size > 0) {
-		let e = [], t = !0, r = Array.from(n.quadTerms.values()).filter((e) => e.coeff !== 0).map((e) => {
-			let t = l.get(e.var1) ?? e.var1.id, n = l.get(e.var2) ?? e.var2.id, [r, i, a, o] = t <= n ? [
+	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,
@@ -1135,101 +1649,101 @@ function R(e) {
 				coeff: e.coeff
 			};
 		}).sort((e, t) => e.firstIdx - t.firstIdx || e.secondIdx - t.secondIdx);
-		for (let n of r) {
-			let r = 2 * n.coeff, i = r >= 0 ? t ? "" : "+ " : "- ", a = Math.abs(r), s = a === 1 ? "" : `${a} `, c = o.get(n.firstVar), l = o.get(n.secondVar);
-			n.firstVar === n.secondVar ? e.push(`${i}${s}${c} ^ 2`) : e.push(`${i}${s}${c} * ${l}`), t = !1;
+		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`;
-			d.length > 0 ? d.push("+", t) : d.push(t);
+			p.length > 0 ? p.push("+", t) : p.push(t);
 		}
 	}
-	let m = d.length > 0 ? d.join(" ") : "0";
-	u.push(` obj: ${m}`), u.push("Subject To");
-	for (let e of r) {
-		let t = c.get(e), n = [], r = !0;
+	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 (i === 0) 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;
+			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;
-		u.push(` ${t}: ${i} ${a} ${e.rhs}`);
-	}
-	u.push("Bounds");
-	let h = [], g = [];
-	for (let e of i) {
-		let t = o.get(e);
-		if (e.type === "Binary") {
-			g.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" && h.push(t);
+		!o && e.type === "Integer" && _.push(t);
 		let n = e.lb === -Infinity, r = e.ub === Infinity;
-		n && r ? u.push(` ${t} free`) : n && !r ? u.push(` -infinity <= ${t} <= ${e.ub}`) : !n && r ? (e.lb !== 0 || e.initialValue !== void 0) && u.push(` ${t} >= ${e.lb}`) : u.push(` ${e.lb} <= ${t} <= ${e.ub}`);
+		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 (h.length > 0) {
-		u.push("Generals");
-		for (let e = 0; e < h.length; e += 10) u.push(" " + h.slice(e, e + 10).join(" "));
+	if (_.length > 0) {
+		f.push("Generals");
+		for (let e = 0; e < _.length; e += 10) f.push(" " + _.slice(e, e + 10).join(" "));
 	}
-	if (g.length > 0) {
-		u.push("Binary");
-		for (let e = 0; e < g.length; e += 10) u.push(" " + g.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 u.push("End"), {
-		lpString: u.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 be = Symbol.for("washi.solverRegistry"), xe = Symbol.for("washi.defaultSolverFactory"), z = globalThis;
-z[be] || (z[be] = /* @__PURE__ */ new Map());
-var B = z[be];
-function V(e, t) {
-	B.set(e.toLowerCase(), t);
+var Me = Symbol.for("washi.solverRegistry"), Ne = Symbol.for("washi.defaultSolverFactory"), U = globalThis;
+U[Me] || (U[Me] = /* @__PURE__ */ new Map());
+var W = U[Me];
+function Pe(e, t) {
+	W.set(e.toLowerCase(), t);
 }
-function Se(e) {
+function Fe(e) {
 	if (typeof e == "string") {
-		let t = B.get(e.toLowerCase());
+		let t = W.get(e.toLowerCase());
 		if (!t) throw Error(`Solver '${e}' is not registered.`);
-		z[xe] = t;
-	} else z[xe] = typeof e == "function" ? e : () => e;
+		U[Ne] = t;
+	} else U[Ne] = typeof e == "function" ? e : () => e;
 }
-function H(e, t) {
+function G(e, t) {
 	if (!e) {
-		let e = z[xe] || B.get("highs");
-		if (!e) throw Error(`No default solver available. Available solvers: ${U().join(", ")}`);
+		let e = U[Ne] || W.get("highs");
+		if (!e) throw Error(`No default solver available. Available solvers: ${K().join(", ")}`);
 		return e(t);
 	}
 	if (typeof e == "string") {
-		let n = e.toLowerCase(), r = B.get(n);
-		if (!r) throw Error(n === "glpk" ? `Solver 'glpk' not found. Available solvers: ${U().join(", ")}. Please import '@ohtaman/washi/solvers/glpk' before selecting this solver.` : n === "z3" ? `Solver 'z3' not found. Available solvers: ${U().join(", ")}. Please import '@ohtaman/washi/solvers/z3' before selecting this solver.` : `Solver '${e}' not found. Available solvers: ${U().join(", ")}`);
+		let n = e.toLowerCase(), r = W.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(", ")}`);
 		return r(t);
 	}
 	return e;
 }
-function U() {
-	return Array.from(B.keys());
+function K() {
+	return Array.from(W.keys());
 }
 //#endregion
 //#region \0washi-browser-worker-factory
-function Ce() {
-	let e = r("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" }));
+function Ie() {
+	let e = a("highs-worker.js"), t = typeof window.origin == "string" ? window.origin : window.location?.origin;
+	if (new URL(e).origin === t) return new Worker(e, { type: "module" });
+	let n = URL.createObjectURL(new Blob(["import " + JSON.stringify(e) + ";"], { type: "text/javascript" }));
 	try {
-		let e = new Worker(t, { type: "module" }), n = () => URL.revokeObjectURL(t);
-		return e.addEventListener("message", n, { once: !0 }), e.addEventListener("error", n, { once: !0 }), e;
+		let e = new Worker(n, { type: "module" }), t = () => URL.revokeObjectURL(n);
+		return e.addEventListener("message", t, { once: !0 }), e.addEventListener("error", t, { once: !0 }), e;
 	} catch (e) {
-		throw URL.revokeObjectURL(t), e;
+		throw URL.revokeObjectURL(n), e;
 	}
 }
 //#endregion
 //#region src/modeler/solvers/highs/worker-client.ts
-var W = null, we = 0, G = /* @__PURE__ */ new Map();
-function K(e, t) {
+var q = null, Le = 0, J = /* @__PURE__ */ new Map();
+function Re(e, t) {
 	return e ? {
 		Status: "Interrupted",
 		StatusCode: 17,
@@ -1253,8 +1767,8 @@ function K(e, t) {
 		Rows: []
 	};
 }
-function q(e) {
-	let t = G.values().next().value;
+function ze(e) {
+	let t = J.values().next().value;
 	if (t && !t.dispatched) {
 		t.dispatched = !0;
 		try {
@@ -1266,30 +1780,30 @@ function q(e) {
 				...t.reportProgress ? { reportProgress: !0 } : {}
 			});
 		} catch (n) {
-			G.delete(t.id), t.cleanupAbort?.(), t.reject(n), q(e);
+			J.delete(t.id), t.cleanupAbort?.(), t.reject(n), ze(e);
 		}
 	}
 }
-function Te() {
-	let e = W;
-	e && (W = null, e.terminate());
-	for (let e of G.values()) e.dispatched = !1;
-	if (G.size > 0) {
-		let e = Ee();
-		if (e) q(e);
+function Be() {
+	let e = q;
+	e && (q = null, e.terminate());
+	for (let e of J.values()) e.dispatched = !1;
+	if (J.size > 0) {
+		let e = Ve();
+		if (e) ze(e);
 		else {
 			let e = /* @__PURE__ */ Error("[WaSHI] Failed to recreate HiGHS Worker after interruption.");
-			for (let t of Array.from(G.values())) G.delete(t.id), t.cleanupAbort?.(), t.reject(e);
+			for (let t of Array.from(J.values())) J.delete(t.id), t.cleanupAbort?.(), t.reject(e);
 		}
 	}
 }
-function Ee() {
+function Ve() {
 	if (typeof window > "u" || typeof Worker > "u") return null;
-	if (!W) try {
-		W = Ce();
-		let e = W;
-		W.onmessage = (t) => {
-			let { type: n, id: r, result: i, runTime: a, error: o, progress: s, incumbent: c } = t.data, l = G.get(r);
+	if (!q) try {
+		q = Ie();
+		let e = q;
+		q.onmessage = (t) => {
+			let { type: n, id: r, result: i, runTime: a, error: o, progress: s, incumbent: c } = t.data, l = J.get(r);
 			if (l) {
 				if (n === "SOLVE_PROGRESS") {
 					if (s) {
@@ -1297,10 +1811,10 @@ function Ee() {
 						try {
 							l.onProgress?.(s);
 						} catch (e) {
-							let t = G.get(r);
+							let t = J.get(r);
 							if (t) {
-								let n = G.keys().next().value;
-								G.delete(r), t.cleanupAbort?.(), n === r && Te(), t.reject(e);
+								let n = J.keys().next().value;
+								J.delete(r), t.cleanupAbort?.(), n === r && Be(), t.reject(e);
 							}
 						}
 					}
@@ -1310,72 +1824,72 @@ function Ee() {
 					c && (l.lastIncumbent = c);
 					return;
 				}
-				G.delete(r), l.cleanupAbort?.(), n === "SOLVE_SUCCESS" ? l.resolve({
+				J.delete(r), l.cleanupAbort?.(), n === "SOLVE_SUCCESS" ? l.resolve({
 					result: i,
 					runTime: a
-				}) : l.reject(Error(o || "Worker solve failed")), W === e && q(e);
+				}) : l.reject(Error(o || "Worker solve failed")), q === e && ze(e);
 			}
 		};
 		let t = (t) => {
-			if (W === e) {
-				W = null, e.terminate();
-				for (let e of G.values()) e.cleanupAbort?.(), e.reject(t);
-				G.clear();
+			if (q === e) {
+				q = null, e.terminate();
+				for (let e of J.values()) e.cleanupAbort?.(), e.reject(t);
+				J.clear();
 			}
 		};
-		W.onerror = (e) => t(/* @__PURE__ */ Error(`[WaSHI] HiGHS Worker failed to load or execute. Check Worker assets, CORS and CSP. ${e?.message || ""}`)), W.onmessageerror = () => t(/* @__PURE__ */ Error("[WaSHI] Could not deserialize the HiGHS Worker response."));
+		q.onerror = (e) => t(/* @__PURE__ */ Error(`[WaSHI] HiGHS Worker failed to load or execute. Check Worker assets, CORS and CSP. ${e?.message || ""}`)), q.onmessageerror = () => t(/* @__PURE__ */ Error("[WaSHI] Could not deserialize the HiGHS Worker response."));
 	} catch {
-		W = null;
+		q = null;
 	}
-	return W;
+	return q;
 }
-async function De(t, n = {}) {
+async function He(t, n = {}) {
 	if (n.signal?.aborted) return {
-		result: K(),
+		result: Re(),
 		runTime: 0
 	};
 	let r = await i(n.wasmUrl);
 	if (n.signal?.aborted) return {
-		result: K(),
+		result: Re(),
 		runTime: 0
 	};
-	let a = n.useWorker ?? typeof window < "u" ? Ee() : 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_${++we}`, f = performance.now();
+	let a = typeof window < "u" ? typeof window.origin == "string" ? window.origin : window.location?.origin : void 0, o = n.useWorker ?? (typeof window < "u" && a !== "null" && !a?.startsWith("file:")) ? Ve() : null;
+	if (!o) return e(t, n);
+	let { signal: s, onProgress: c, ...l } = n, u = {};
+	for (let [e, t] of Object.entries(l)) typeof t != "function" && (u[e] = t);
+	u.wasmUrl = r;
+	let d = !!(c || s), f = `req_${++Le}`, p = performance.now();
 	return new Promise((e, n) => {
 		let r = {
-			id: d,
+			id: f,
 			lpString: t,
-			workerOptions: l,
-			reportProgress: u,
-			startTime: f,
-			onProgress: s,
+			workerOptions: u,
+			reportProgress: d,
+			startTime: p,
+			onProgress: c,
 			resolve: e,
 			reject: n
 		};
-		if (o) {
+		if (s) {
 			let e = () => {
-				let e = G.get(d);
+				let e = J.get(f);
 				if (!e) return;
-				let t = G.keys().next().value;
-				G.delete(d), e.cleanupAbort?.(), t === d && Te();
+				let t = J.keys().next().value;
+				J.delete(f), e.cleanupAbort?.(), t === f && Be();
 				let n = (performance.now() - e.startTime) / 1e3;
 				e.resolve({
-					result: K(e.lastIncumbent, e.lastProgress),
+					result: Re(e.lastIncumbent, e.lastProgress),
 					runTime: n
 				});
 			};
-			o.addEventListener("abort", e, { once: !0 }), r.cleanupAbort = () => o.removeEventListener("abort", e);
+			s.addEventListener("abort", e, { once: !0 }), r.cleanupAbort = () => s.removeEventListener("abort", e);
 		}
-		G.set(d, r), q(a);
+		J.set(f, r), ze(o);
 	});
 }
 //#endregion
 //#region src/modeler/solvers/highs/solver.ts
-function Oe(e, t) {
+function Ue(e, t) {
 	if (typeof t == "number") switch (t) {
 		case 0: return "NotSolved";
 		case 1:
@@ -1434,8 +1948,8 @@ function Oe(e, t) {
 	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 ke(e, t, n) {
-	switch (Oe(e, t)) {
+function We(e, t, n) {
+	switch (Ue(e, t)) {
 		case "Optimal": return "Optimal";
 		case "Infeasible": return "Infeasible";
 		case "Unbounded": return "Unbounded";
@@ -1452,37 +1966,37 @@ function ke(e, t, n) {
 		default: return "Unknown";
 	}
 }
-var J = class e {
+var Ge = class e {
 	static capabilities = {
 		supportsMIP: !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 = I(t), i = r ? n : t, a = {
+		let r = ke(t), i = r ? n : t, a = {
 			...this.options,
 			...i
 		}, o = e.objective.constant || 0;
 		for (let t of e.variables) A(t);
-		let { lpString: s, nameToVar: c, nameToConstraint: l } = r ? t : R(e), u = Object.create(null), d = !1, f = /* @__PURE__ */ new Set();
+		let { lpString: s, nameToVar: c, nameToConstraint: l } = r ? t : je(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 = ie(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 = ie(n);
+				let e = ae(n);
 				if (e !== void 0) {
-					let r = L(n.name, "x", t);
+					let r = H(n.name, "x", t);
 					Object.prototype.hasOwnProperty.call(u, r) || (u[r] = e, d = !0);
 				}
 			}
@@ -1493,13 +2007,13 @@ var J = class e {
 			...o === 0 ? {} : { objectiveOffset: o },
 			initialValues: d ? u : void 0
 		});
-		let { result: m, runTime: h } = await De(s, p), g = m?.ObjectiveOffsetApplied ? 0 : o, _ = Oe(m?.Status, m?.StatusCode), v = typeof m?.IsMip == "boolean" ? m.IsMip : e.variables.some((e) => e.type === "Integer" || e.type === "Binary"), y;
+		let { result: m, runTime: h } = await He(s, p), g = m?.ObjectiveOffsetApplied ? 0 : o, _ = Ue(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 = ke(m?.Status, m?.StatusCode, y), x = null;
+		let b = We(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) {
@@ -1540,7 +2054,7 @@ var J = class e {
 			if (n) {
 				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);
+					!a.relax && (n.type === "Integer" || n.type === "Binary") && Math.abs(e - Math.round(e)) <= 1e-5 && (e = Math.round(e) + 0), 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);
 			}
@@ -1574,14 +2088,14 @@ var J = class e {
 			raw: m
 		};
 	}
-}, Ae = J;
-function je() {
-	V("highs", (e) => new J(e)), Se((e) => new J(e));
+}, Ke = Ge;
+function qe() {
+	Pe("highs", (e) => new Ge(e)), Fe((e) => new Ge(e));
 }
-je();
+qe();
 //#endregion
 //#region src/modeler/solvers/mock.ts
-var Me = class {
+var Je = class {
 	name;
 	capabilities;
 	options;
@@ -1593,7 +2107,7 @@ var Me = class {
 		}, this.options = e;
 	}
 	async solve(e, t = {}, n = {}) {
-		let r = I(t) ? n : t, i = {
+		let r = ke(t) ? n : t, i = {
 			...this.options,
 			...r
 		}, a = !!(i.values && Object.keys(i.values).length > 0 || i.boolValues && Object.keys(i.boolValues).length > 0);
@@ -1681,29 +2195,29 @@ var Me = class {
 		};
 	}
 };
-function Ne() {
-	V("mock", (e) => new Me(e));
+function Ye() {
+	Pe("mock", (e) => new Je(e));
 }
-Ne();
+Ye();
 //#endregion
 //#region src/modeler/solution-validator.ts
-function Pe(e, t) {
+function Xe(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 Fe(e, t = {}) {
-	let n = Pe(t.feasibilityTolerance, "feasibilityTolerance"), r = Pe(t.integralityTolerance, "integralityTolerance"), i = t.evaluateLogicalConstraints === void 0 || !!t.evaluateLogicalConstraints, a = t.values !== void 0 && t.values !== null;
+function Ze(e, t = {}) {
+	let n = Xe(t.feasibilityTolerance, "feasibilityTolerance"), r = Xe(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 = [], f = [], p = 0, m = (e) => {
+	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(), y = 0, b = 0, x = 0, S = 0;
+	}, 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) {
-			f.push(t.name), h({
+			u.push(t.name), h({
 				type: "missing_value",
 				target: "variable",
 				name: t.name,
@@ -1724,9 +2238,9 @@ function Fe(e, t = {}) {
 			});
 			continue;
 		}
-		g.set(t, e), y++;
-		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, u = typeof t.lb == "number" && !Number.isNaN(t.lb) && t.lb !== Infinity, d = typeof t.ub == "number" && !Number.isNaN(t.ub) && t.ub !== -Infinity;
-		if (!u) h({
+		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,
@@ -1748,7 +2262,7 @@ function Fe(e, t = {}) {
 				message: `Variable "${t.name}" value (${e}) violates lower bound (${c}) by ${i}.`
 			});
 		}
-		if (!d) h({
+		if (!f) h({
 			type: "upper_bound",
 			target: "variable",
 			name: t.name,
@@ -1770,7 +2284,7 @@ function Fe(e, t = {}) {
 				message: `Variable "${t.name}" value (${e}) violates upper bound (${l}) by ${i}.`
 			});
 		}
-		if (u && d && c > l && c - e <= n && e - l <= n) {
+		if (d && f && c > l && c - e <= n && e - l <= n) {
 			let n = c - l;
 			h({
 				type: "lower_bound",
@@ -1801,7 +2315,7 @@ function Fe(e, t = {}) {
 	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) {
-			f.push(t.name), h({
+			u.push(t.name), h({
 				type: "missing_value",
 				target: "bool_variable",
 				name: t.name,
@@ -1905,7 +2419,7 @@ function Fe(e, t = {}) {
 		})) : (x++, m(e.violation));
 	}
 	let T = (e) => {
-		if (e instanceof u) return _.has(e) ? {
+		if (e instanceof d) return _.has(e) ? {
 			ok: !0,
 			value: _.get(e),
 			violation: 0
@@ -1913,7 +2427,7 @@ function Fe(e, t = {}) {
 			ok: !1,
 			reason: `missing or invalid value for Boolean variable "${e.name}"`
 		};
-		if (e instanceof v) {
+		if (e instanceof y) {
 			let t = w(e, 0);
 			if (t.status === "unchecked") return {
 				ok: !1,
@@ -1932,7 +2446,7 @@ function Fe(e, t = {}) {
 				violation: 0
 			};
 		}
-		if (e instanceof d) switch (e.op) {
+		if (e instanceof f) switch (e.op) {
 			case "not": {
 				let t = T(e.children[0]);
 				return t.ok ? {
@@ -2044,17 +2558,17 @@ function Fe(e, t = {}) {
 			message: `Logical constraint "${r}" evaluated to false.`
 		});
 	}
-	let E = y === e.variables.length && b === e.boolVars.length && x === e.constraints.length && S === e.logicalConstraints.length && l.length === 0 && f.length === 0;
+	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: f,
+		missingVariables: u,
 		maxViolation: p,
 		summary: {
-			checkedVariables: y,
+			checkedVariables: v,
 			totalVariables: e.variables.length,
 			checkedBoolVariables: b,
 			totalBoolVariables: e.boolVars.length,
@@ -2067,10 +2581,10 @@ function Fe(e, t = {}) {
 }
 //#endregion
 //#region src/modeler/big-m.ts
-function Ie(e, t) {
+function Qe(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 Y(e, t, n) {
+function $e(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;
@@ -2081,8 +2595,8 @@ function Y(e, t, n) {
 	}
 	return i;
 }
-function Le(e, t, n) {
-	let r = Y(e, t, n), i = 0;
+function et(e, t, n) {
+	let r = $e(e, t, n), i = 0;
 	for (let [t, r] of e.terms) {
 		if (r === 0) continue;
 		let e;
@@ -2102,8 +2616,8 @@ function Le(e, t, n) {
 	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 Re(e, t, n) {
-	let r = Y(e, t, n), i = 0;
+function tt(e, t, n) {
+	let r = $e(e, t, n), i = 0;
 	for (let [t, r] of e.terms) {
 		if (r === 0) continue;
 		let e;
@@ -2123,10 +2637,10 @@ function Re(e, t, n) {
 	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 X(e, t, n, r, i, a, o) {
-	if (!(e instanceof N && (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}].`);
+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 = Y(t, r, o);
+	let s = $e(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}.`);
@@ -2137,11 +2651,532 @@ function X(e, t, n, r, i, a, o) {
 	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 S(d, 0),
+		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 nt(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 rt) 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 rt(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 === "<=" ? et(o, l, r) : tt(o, l, r), r), u = new y(t.lhs, c, t.rhs, r);
+			a.push(u), s.set(u, i);
+		} else {
+			let t = et(o, l, `${r}_le`), c = tt(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 rt = class extends d {
+	wrappedVar;
+	constructor(e) {
+		super(e.name), this.wrappedVar = e;
+	}
+};
+//#endregion
+//#region src/decomposition/column-generation.ts
+async function it(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 at(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 ot(e) {
+	return {
+		expr: at(e, "maximize"),
+		sense: "Maximize"
+	};
+}
+function st(e) {
+	return {
+		expr: at(e, "minimize"),
+		sense: "Minimize"
+	};
+}
+//#endregion
+//#region src/decomposition/benders.ts
+function ct(e) {
+	return !!(e && typeof e == "object" && "constraints" in e && "variables" in e && typeof e.solve == "function");
+}
+async function lt(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 ut(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 (ct(b)) {
+				let n = b, r = n.linkingConstraints;
+				c || (c = t.continuous("__benders_theta", { lb: 0 }), v ? t.objective(st(t.objectiveExpr.add(c))) : t.objective(ot(t.objectiveExpr.sub(c))));
+				let i = await lt(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";
@@ -2149,10 +3184,13 @@ function Z(e) {
 function Q(e) {
 	return typeof e == "object" && !!e && !Array.isArray(e) && !(e instanceof String) && typeof e[Symbol.iterator] != "function";
 }
+function dt(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 {
+var ft = class {
 	name;
 	_sense;
 	_objectiveExpr;
@@ -2161,6 +3199,7 @@ var ze = class {
 	boolVars = [];
 	logicalConstraints = [];
 	unsatCore = void 0;
+	_conflicts = void 0;
 	values = /* @__PURE__ */ new Map();
 	varMapByName = /* @__PURE__ */ new Map();
 	varPrefixCounters = /* @__PURE__ */ new Map();
@@ -2181,6 +3220,8 @@ var ze = class {
 	runTime = 0;
 	solution = null;
 	solver = null;
+	decomposition;
+	_linkingConstraints;
 	hasSolutionState = !1;
 	modelRevision = 0;
 	activeOperationId = 0;
@@ -2192,13 +3233,13 @@ var ze = class {
 		n = typeof e == "string" ? {
 			...t,
 			name: e
-		} : e, this.name = n.name || "OptimizationModel", this._sense = o(n.sense), this._objectiveExpr = new S(), n.solver && (this.solver = H(n.solver));
+		} : e, this.name = n.name || "OptimizationModel", this._sense = s(n.sense), this._objectiveExpr = new C(), n.solver && (this.solver = G(n.solver));
 	}
 	get sense() {
 		return this._sense;
 	}
 	set sense(e) {
-		let t = o(e);
+		let t = s(e);
 		this._sense !== t && (this._sense = t, this.recordModelMutation());
 	}
 	get objectiveExpr() {
@@ -2208,7 +3249,10 @@ var ze = class {
 		this.applyObjective(e);
 	}
 	get conflicts() {
-		return this.unsatCore;
+		return this._conflicts ?? this.unsatCore;
+	}
+	set conflicts(e) {
+		this._conflicts = e;
 	}
 	get numVars() {
 		return this.variables.length;
@@ -2218,7 +3262,7 @@ var ze = class {
 	}
 	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.values.clear();
+			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;
@@ -2250,7 +3294,7 @@ var ze = class {
 			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, te(t, this);
+				this.varMapByName.delete(t.name), t.ownerModel = null, ne(t, this);
 			}
 			this.variables.length = t;
 			for (let e = n; e < this.boolVars.length; e++) {
@@ -2343,6 +3387,37 @@ var ze = class {
 	continuous(e, t, n) {
 		return this.createDomainVars("Continuous", e, t, n);
 	}
+	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 n;
+	}
 	bool(e, t, n) {
 		let r = typeof e == "number", i = typeof t == "number", a = Z(e), o = Z(t);
 		if (i || o) {
@@ -2418,19 +3493,19 @@ var ze = class {
 		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 u(a);
+		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 = 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 N({
+			let e = new M({
 				...t,
 				name: s,
 				prefix: a
 			});
-			return e.hasExplicitName = r !== void 0, A(e), k(e, this), e.ownerModel = this, this.variables.push(e), this.varMapByName.set(e.name, e), this.recordModelMutation(), e;
+			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;
 		}
@@ -2448,37 +3523,43 @@ var ze = class {
 		return this.logicalConstrMapByName.get(e);
 	}
 	objective(e) {
-		return e ? (this.applyObjective(e.expr, e.sense), this) : this.objectiveExpr;
+		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 v || 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`... <= ...`)?" : "Cannot use a Constraint as an objective. Did you mean to use m.constraint(expr`... <= ...`)? For objectives, supply an unconstrained expression like expr`45 * ${x} + 80 * ${y}`.");
-		let n = t === void 0 ? this.sense : o(t), r;
-		if (typeof e == "string") r = fe(e, (e) => this.getVarByName(e));
-		else if (typeof e == "number") r = new S(/* @__PURE__ */ new Map(), e);
-		else if (e instanceof x) r = e.clone();
+		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 = Ce(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 x(t.linearTerms, t.quadTerms, t.constant);
+			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 S(t.terms, t.constant);
-		} else if (e instanceof N || typeof e == "object" && e && "id" in e && "name" in e && "lb" in e && "ub" in e) r = new S(/* @__PURE__ */ new Map([[e, 1]]), 0);
+			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.");
-		ae(r, this.name, (e) => this.varMapByName.get(e.name) === e), this._sense = n, this._objectiveExpr = r, this.recordModelMutation();
+		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;
+			let t = [];
+			for (let n of e) t.push(this.constraint(n));
+			return t;
 		});
-		if (e instanceof x || 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 S || 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().");
-		return this.addConstraint(e, t), this;
+		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 (dt(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);
 	}
 	getValues(e) {
 		if (e == null) return null;
-		if (e instanceof N || e instanceof u) 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 = {};
@@ -2488,9 +3569,10 @@ var ze = class {
 		return null;
 	}
 	addConstraint(e, t) {
-		if (e instanceof x || 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 S || 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 (e instanceof l) {
+		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 (dt(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`);
@@ -2498,19 +3580,20 @@ var ze = class {
 			}
 			let r = this.logicalConstrCounter, i = n ?? this.getNextLogicalConstrName();
 			try {
-				M(e, i, this.name, (e) => this.varMapByName.get(e.name) === e, (e) => this.boolVarMapByName.get(e.name) === e, this);
+				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;
 			}
-			O(e, this, this.batchDepth > 0 ? this.batchUndoActions : void 0);
+			k(e, this, this.batchDepth > 0 ? this.batchUndoActions : void 0);
 			let a = {
 				name: i,
 				expr: e
 			};
 			return this.logicalConstraints.push(a), this.logicalConstrMapByName.set(i, a), this.recordModelMutation(), e;
 		}
-		let n = typeof e == "string" ? me(e, (e) => this.getVarByName(e), t) : e;
-		n.ownerModel && n.ownerModel !== this && (j(n, this.name, (e) => this.varMapByName.get(e.name) === e, n.name), ee(n, this));
+		let n = typeof e == "string" ? Ee(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`);
@@ -2518,54 +3601,55 @@ var ze = class {
 		}
 		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 = ee(n, this);
+			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, u = n.ownerModel, d = o;
+		let s = n.name, c = n.hasExplicitName, l = n.ownerModel, d = o;
 		return this.batchUndoActions.push(() => {
-			n.ownerModel = u, n._assignModelName(s, c), ne(n, this, d);
+			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 (!(e instanceof N)) throw Error("Invalid binary variable passed to indicator(). Expected a binary Var instance.");
-		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 (or Integer variable with bounds [0, 1]).`);
-		if (t instanceof x) 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 (<=, >=, ==).");
+		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, u, d, f;
-		if (a !== void 0) u = a, d = c === "==" ? `${u}_le` : u, f = c === "==" ? `${u}_ge` : u;
-		else if (r.hasExplicitName) u = `ind_${e.name}_${r.name.trim()}`, d = c === "==" ? `${u}_le` : u, f = c === "==" ? `${u}_ge` : u;
+		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");
-			u = `ind_${e.name}_${t}`, d = c === "==" ? `${u}_le` : u, f = c === "==" ? `${u}_ge` : u;
-		} while ((c === "<=" || c === "==") && (this.hasConstraintName(d) || this.hasBoolVarName(d)) || (c === ">=" || c === "==") && (this.hasConstraintName(f) || this.hasBoolVarName(f)));
-		let p = [];
+			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(d) || this.hasBoolVarName(d))) throw Error(this.hasBoolVarName(d) ? `Constraint name '${d}' conflicts with an existing Boolean variable in model` : `Constraint with name '${d}' already exists in model`);
-			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`);
-			n.M !== void 0 && Ie(n.M, u);
+			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 && Qe(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 "${u}" does not belong to model "${this.name}". All variables must belong to the model by object identity.`);
+			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 = X(e, s, "<=", l, i, n.M === void 0 ? Le(s, l, d) : n.M, d);
-				p.push([new v(t.lhs, "<=", t.rhs, d), d]);
+				let t = Y(e, s, "<=", l, i, n.M === void 0 ? et(s, l, f) : n.M, f);
+				m.push([new y(t.lhs, "<=", t.rhs, f), f]);
 			}
 			if (c === ">=" || c === "==") {
-				let t = X(e, s, ">=", l, i, n.M === void 0 ? Re(s, l, f) : n.M, f);
-				p.push([new v(t.lhs, ">=", t.rhs, f), f]);
+				let t = Y(e, s, ">=", l, i, n.M === void 0 ? tt(s, l, p) : n.M, p);
+				m.push([new y(t.lhs, ">=", t.rhs, p), p]);
 			}
-			for (let [e, n] of p) j(e, this.name, t, n);
+			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 this.runTransactionalBatch(() => p.map(([e, t]) => this.addConstraint(e, t)));
+		return this.runTransactionalBatch(() => m.map(([e, t]) => this.addConstraint(e, t)));
 	}
 	toLpString() {
 		this.validateIntegrity();
-		let { lpString: e } = R({
+		let { lpString: e } = je({
 			name: this.name,
 			sense: this.sense,
 			objective: this.objectiveExpr,
@@ -2575,7 +3659,7 @@ var ze = class {
 		return e;
 	}
 	validateIntegrity() {
-		oe(this);
+		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.`);
@@ -2595,6 +3679,9 @@ var ze = class {
 		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"));
 	}
+	normalizePrimalValue(e, t, n, r) {
+		return (r.relax ?? n.options?.relax) !== !0 && (e.type === "Integer" || e.type === "Binary") && Math.abs(t - Math.round(t)) <= 1e-5 ? Math.round(t) + 0 : t;
+	}
 	resolveSolverAndOptions(e, t) {
 		if (e && typeof e == "object" && "solve" in e && typeof e.solve == "function") {
 			let { solver: n, ...r } = t || {};
@@ -2613,27 +3700,44 @@ var ze = class {
 		if (typeof e == "string") {
 			let { solver: n, ...r } = t || {};
 			return {
-				activeSolver: H(e, r),
+				activeSolver: G(e, r),
 				activeOptions: r
 			};
 		}
 		let { solver: n, ...r } = e || {};
 		return n ? {
-			activeSolver: H(n, r),
+			activeSolver: G(n, r),
 			activeOptions: r
 		} : {
-			activeSolver: this.solver || H(),
+			activeSolver: this.solver || G(),
 			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 x && 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.`);
-		if (this.logicalConstraints.length > 0 && i.capabilities?.supportsSMT !== !0) throw Error(`Solver "${i.name}" does not support SMT / logical constraints (or, implies, not, xor). Please use an SMT-capable solver such as Z3.`);
-		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 = {
+		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 = nt(this.variables, this.boolVars, this.constraints, this.logicalConstraints), o = {
+			name: this.name,
+			sense: this.sense,
+			objective: this._objectiveExpr,
+			constraints: s.constraints,
+			variables: s.variables,
+			logicalConstraints: [],
+			boolVars: []
+		}) : o = {
 			name: this.name,
 			sense: this.sense,
 			objective: this._objectiveExpr,
@@ -2641,53 +3745,68 @@ var ze = class {
 			variables: this.variables,
 			logicalConstraints: this.logicalConstraints,
 			boolVars: this.boolVars
-		}, s = this.wrapSolveOptions(a, r, n), c;
+		}, 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 {
-			c = await i.solve(o, s);
+			l = await i.solve(o, c);
 		} catch (e) {
 			throw this.activeOperationId === n && this.clearSolutionFields(), e;
 		}
-		this.ensureExecutionValid(r, n, "solve"), this.runTime = c.runTime ?? 0, this.status = c.status, this.terminationStatus = c.terminationStatus ?? c.status;
-		let l = this.hasPrimalFromResult(c);
-		this.hasPrimalSolution = l, this.objectiveValue = l && typeof c.objectiveValue == "number" && Number.isFinite(c.objectiveValue) ? c.objectiveValue : null, this.objectiveBound = typeof c.objectiveBound == "number" && Number.isFinite(c.objectiveBound) ? c.objectiveBound : void 0;
-		let u = typeof c.relGap == "number" && Number.isFinite(c.relGap) ? c.relGap : typeof c.mipGap == "number" && Number.isFinite(c.mipGap) ? c.mipGap : void 0;
-		this.relGap = u, this.mipGap = u, this.absGap = typeof c.absGap == "number" && Number.isFinite(c.absGap) ? c.absGap : this.objectiveValue !== null && this.objectiveBound !== void 0 ? Math.abs(this.objectiveValue - this.objectiveBound) : void 0;
-		let d = (e, t, n) => {
+		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
 			});
-		}, f = {}, p = {}, m = {}, h = {};
-		if (this.values.clear(), l && c.values) {
-			for (let [e, t] of Object.entries(c.values)) if (typeof t == "number" && Number.isFinite(t)) {
+		}, 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, d(f, 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);
+				if (n) {
+					let e = this.normalizePrimalValue(n, t, i, a);
+					n.value = e, f(p, n.name, e), this.values.set(n.name, e);
+				}
+				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, d(f, r.name, +!!n), this.values.set(r.name, n)) : this.values.set(e, n);
+				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 (l && c.boolValues) for (let [e, t] of Object.entries(c.boolValues)) {
+		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 (l && c.reducedCosts) for (let [e, t] of Object.entries(c.reducedCosts)) {
+		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, d(m, n.name, t));
+			n && (n.reducedCost = t, f(h, n.name, t));
 		}
-		if (c.duals) for (let [e, t] of Object.entries(c.duals)) {
+		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, d(p, n.name, t));
+			n && (n.dual = t, f(m, n.name, t));
 		}
-		if (c.slacks) for (let [e, t] of Object.entries(c.slacks)) {
+		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, d(h, n.name, t));
+			n && (n.slack = t, f(g, n.name, t));
 		}
 		return this.solution = {
 			status: this.status,
@@ -2700,19 +3819,18 @@ var ze = class {
 				mipGap: this.mipGap
 			},
 			...this.absGap === void 0 ? {} : { absGap: this.absGap },
-			values: f,
-			duals: p,
-			reducedCosts: m,
-			slacks: h,
+			values: p,
+			duals: m,
+			reducedCosts: h,
+			slacks: g,
 			runTime: this.runTime,
-			raw: c.raw
+			raw: l.raw
 		}, this.hasSolutionState = !0, this.status;
 	}
 	async check(e, t) {
 		let n = ++this.activeOperationId, r = this.modelRevision;
 		this.clearSolutionFields(), this.validateIntegrity();
 		let { activeSolver: i, activeOptions: a } = this.resolveSolverAndOptions(e, t);
-		if (this.logicalConstraints.length > 0 && i.capabilities?.supportsSMT !== !0) throw Error(`Solver "${i.name}" does not support SMT / logical constraints (or, implies, not, xor). Please use an SMT-capable solver such as Z3.`);
 		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, {
@@ -2735,13 +3853,17 @@ var ze = class {
 			} catch (e) {
 				throw this.activeOperationId === n && this.clearSolutionFields(), e;
 			}
-			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.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));
+					let e = this.getVarByName(n), o = this.getBoolVarByName(n);
+					if (e) {
+						let n = this.normalizePrimalValue(e, r, i, a);
+						e.value = n, this.values.set(e.name, n), s(t, e.name, n);
+					}
+					o && (o.value = !!r, this.values.set(o.name, o.value), s(t, o.name, o.value)), !e && !o && (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));
@@ -2751,81 +3873,127 @@ var ze = class {
 				status: e.status,
 				values: t,
 				unsatCore: this.unsatCore,
-				conflicts: this.unsatCore,
+				conflicts: this.conflicts,
 				runTime: this.runTime
 			};
 		}
-		let l = {
-			name: this.name,
+		let l = this.logicalConstraints.length > 0 || this.boolVars.length > 0 ? nt(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 S(),
-			constraints: this.constraints,
-			variables: this.variables,
-			logicalConstraints: this.logicalConstraints,
-			boolVars: this.boolVars
-		}, u;
+			objective: new C(new Map(f), 0),
+			constraints: u,
+			variables: [...l.variables, ...d]
+		}, g;
 		try {
-			u = await i.solve(l, o);
+			g = await i.solve(h, o);
 		} catch (e) {
 			throw this.activeOperationId === n && this.clearSolutionFields(), e;
 		}
-		this.ensureExecutionValid(r, n, "check"), this.runTime = u.runTime ?? 0;
-		let d = u.status, f = u.terminationStatus ?? d, p = this.hasPrimalFromResult(u) || d === "Optimal" || d === "Feasible", m = p ? "Sat" : d === "Infeasible" ? "Unsat" : "Unknown";
-		this.status = m, this.terminationStatus = a.signal?.aborted || f === "Interrupted" ? "Interrupted" : f === "Optimal" || f === "Feasible" || f === "Infeasible" ? m : f, this.hasPrimalSolution = p, 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 h = {};
-		if (p && u.values) {
-			for (let [e, t] of Object.entries(u.values)) if (typeof t == "number" && Number.isFinite(t)) {
-				let n = this.getVarByName(e), r = this.getBoolVarByName(e);
-				n && (n.value = t, this.values.set(n.name, t), s(h, n.name, t)), r && (r.value = !!t, this.values.set(r.name, r.value), s(h, r.name, r.value)), !n && !r && (this.values.set(e, t), s(h, e, t));
-			} else if (typeof t == "boolean") {
-				let n = t, r = this.getBoolVarByName(e);
-				r ? (r.value = n, this.values.set(r.name, n), s(h, r.name, n)) : (this.values.set(e, n), s(h, e, n));
+		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];
+				if (typeof t == "number" && Number.isFinite(t)) {
+					let n = this.normalizePrimalValue(e, t, i, a);
+					e.value = n, this.values.set(e.name, n), s(D, e.name, n);
+				}
+			}
+			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);
+				}
 			}
 		}
-		if (p && u.boolValues) for (let [e, t] of Object.entries(u.boolValues)) {
-			if (typeof t != "boolean") continue;
-			let n = this.getBoolVarByName(e);
-			n ? (n.value = t, this.values.set(n.name, t), s(h, n.name, t)) : (this.values.set(e, t), s(h, e, t));
-		}
-		if (u.slacks) for (let [e, t] of Object.entries(u.slacks)) {
-			if (typeof t != "number" || !Number.isFinite(t)) continue;
-			let n = this.getConstraintByName(e);
-			n && (n.slack = 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.hasSolutionState = !0, {
-			status: m,
-			values: h,
+		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 Fe(this, e);
+		return Ze(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 ut({
+			master: this,
+			...e
+		});
+		return this.decomposition = t, t;
 	}
-};
-//#endregion
-//#region src/modeler/objective.ts
-function Be(e, t) {
-	let n = e;
-	if (n instanceof v || 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 model.constraint(expr\`... <= ...\`) for constraints, or supply an unconstrained arithmetic expression to ${t}().`);
-	if (typeof n == "string" && /(<=|>=|==|=<|=>|=)/.test(n)) throw Error(`Cannot use a comparison constraint as an objective in ${t}(). Use model.constraint(expr\`... <= ...\`) for constraints, or supply an unconstrained arithmetic expression to ${t}().`);
-	if (typeof n == "number") {
-		if (!Number.isFinite(n)) throw Error(`Invalid non-finite objective constant "${n}" passed to ${t}().`);
-		return n;
+	async solveColumnGeneration(e) {
+		let t = await it({
+			master: this,
+			...e
+		});
+		return this.decomposition = t, t;
 	}
-	if (typeof n == "string" || n instanceof S || n instanceof x || n instanceof N || 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 Ve(e) {
-	return {
-		expr: Be(e, "maximize"),
-		sense: "Maximize"
-	};
-}
-function He(e) {
-	return {
-		expr: Be(e, "minimize"),
-		sense: "Minimize"
-	};
-}
+};
 //#endregion
-export { l as BoolExpr, d as BoolOp, u as BoolVar, v as Constraint, Ae as HiGHS, J as HighsSolver, S as LinExpr, Me as MockSolver, ze as Model, x as QuadExpr, N as Var, f as and, X as buildIndicatorLinearization, ye as buildLpSymbolMaps, Re as deriveBigMForGe, Le as deriveBigMForLe, w as dot, ve as expr, R as generateLpString, a as getHighs, n as getHighsWasmUrl, H as getSolver, h as implies, I as isLpExportResult, U as listAvailableSolvers, Ve as maximize, He as minimize, o as normalizeSense, m as not, p as or, me as parseConstraint, fe as parseExpr, V as registerSolver, L as sanitizeIdentifier, Se as setDefaultSolver, t as setHighsWasmUrl, e as solveLpWithHighs, C as sum, oe as validateModelIntegrity, Fe as validateModelSolution, Ie as validateUserBigM, g as xor };
+export { u as BoolExpr, f as BoolOp, d as BoolVar, y as Constraint, Ke as HiGHS, r as Highs, Ge as HighsSolver, C as LinExpr, Je as MockSolver, ft as Model, S as QuadExpr, M as Var, p as and, Y as buildIndicatorLinearization, Ae as buildLpSymbolMaps, tt as deriveBigMForGe, et as deriveBigMForLe, T as dot, Oe as expr, je as generateLpString, o as getHighs, n as getHighsWasmUrl, G as getSolver, g as implies, ke as isLpExportResult, nt as linearizeModelForMip, K as listAvailableSolvers, ot as maximize, st as minimize, s as normalizeSense, h as not, m as or, Ee as parseConstraint, Ce as parseExpr, Pe as registerSolver, H as sanitizeIdentifier, Fe as setDefaultSolver, t as setHighsWasmUrl, ut as solveBenders, it as solveColumnGeneration, e as solveLpWithHighs, w as sum, ce as validateModelIntegrity, Ze as validateModelSolution, Qe as validateUserBigM, _ as xor };