@ohtaman/washi 0.6.0 → 0.7.0

package/dist/browser/washi.js

@@ -491,37 +491,107 @@ var S = class e {
 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 y || typeof e == "object" && "sense" in e && "lhs" in e && "rhs" in e) throw Error("Cannot sum a constraint comparison (<=, >=, ==) in sum(): expected a number, Var, or LinExpr.");
-			else if (e instanceof S || typeof e == "object" && "quadTerms" in e && e.quadTerms instanceof Map) {
+			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 C(n, r);
 }
@@ -830,7 +900,13 @@ var M = class {
 	toString() {
 		return this.name;
 	}
-}, de = /^(?:[0-9]+(?:\.[0-9]+)?|\.[0-9]+)(?:[eE][+-]?[0-9]+)?$/;
+};
+//#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;) {
@@ -870,6 +946,10 @@ function fe(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({
@@ -914,12 +994,205 @@ function fe(e, t) {
 	}
 	return n;
 }
-var pe = 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];
@@ -931,54 +1204,240 @@ var pe = 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 S && e.quadTerms.size === 0 ? new C(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 M || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new C(/* @__PURE__ */ new Map([[n, 1]]), 0) : n.clone();
-				} else this.consume("LPAREN"), e = this.parseExpression(), this.consume("RPAREN");
-				return this.applyPower(e).mul(n);
-			}
-			t = new C(/* @__PURE__ */ new Map(), n);
-		} else if (e.type === "IDENT") {
-			this.consume();
-			let n = this.resolve(e.value);
-			t = n instanceof M || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new C(/* @__PURE__ */ new Map([[n, 1]]), 0) : n.clone();
-		} else if (e.type === "LPAREN") this.consume("LPAREN"), t = this.parseExpression(), this.consume("RPAREN");
+				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);
+		});
 	}
-	applyPower(e) {
+	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;
+	}
+	applyPowerNode(e) {
 		if (this.peek()?.type !== "CARET") return e;
 		let t = [];
 		for (; this.peek()?.type === "CARET";) {
@@ -995,55 +1454,87 @@ var pe = 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 S, i = r ? e.quadTerms.size : 0, a = r ? e.linearTerms.size : e.terms.size;
-		if (i === 0 && a === 0) {
-			let t = e.constant ** +n;
-			if (e.constant !== 0 && n > 0 && t === 0) throw Error("Constant exponentiation underflows to zero.");
-			return new C(/* @__PURE__ */ new Map(), t);
+		if (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 C(/* @__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 N(e, t, n) {
-	let r = new pe(fe(e, n), t), i = r.parseExpression(), a = r.getRemainingToken();
-	if (a) throw Error(`Unexpected token '${a.value}' after expression in "${e}"`);
-	return P(i), i;
-}
-function me(e, t) {
-	return N(e, t);
-}
-function he(e, t, n, r) {
-	let i = e.match(/(<=|>=|==|=<|=>|=)/);
-	if (!i) throw Error(`Constraint must contain a comparison operator (<=, >=, ==, =): "${e}"`);
-	let a = i[0], o = i.index, s = e.substring(0, o).trim(), c = e.substring(o + a.length).trim(), l;
-	if (a === "<=" || a === "=<") l = "<=";
-	else if (a === ">=" || a === "=>") l = ">=";
-	else if (a === "==" || a === "=") l = "==";
-	else throw Error(`Unsupported operator "${a}"`);
-	let u = N(s, t, r), d = N(c, t, r);
-	if (u instanceof S && u.quadTerms.size > 0 || d instanceof S && d.quadTerms.size > 0) throw Error("Quadratic constraints are not supported (only linear constraints are allowed in MILP/LP/QP)");
-	let f = u instanceof S ? new C(u.linearTerms, u.constant) : u, p = d instanceof S ? new C(d.linearTerms, d.constant) : d, m;
-	if (m = l === "<=" ? f.le(p, n) : l === ">=" ? f.ge(p, n) : f.eq(p, n), P(m.lhs), !Number.isFinite(m.rhs)) throw Error(`Invalid non-finite right-hand side "${m.rhs}" in constraint.`);
-	return m;
+function 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 ge(e, t, n) {
-	return he(e, t, n);
+function Ce(e, t) {
+	return Se(e, t);
 }
-function _e(e) {
-	return e instanceof M || e instanceof C || e instanceof S ? !0 : typeof e != "object" || !e ? !1 : "terms" in e && e.terms instanceof Map || "quadTerms" in e && e.quadTerms instanceof Map || "id" in e && "name" in e && "lb" in e && "ub" in e && "type" in e && typeof e.mul == "function";
+function 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 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 Ee(e, t, n) {
+	return Te(e, t, n);
 }
-function P(e) {
+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 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.`);
@@ -1055,57 +1546,67 @@ function P(e) {
 		for (let [, t] of e.quadTerms) if (!Number.isFinite(t.coeff)) throw Error(`Invalid non-finite quadratic coefficient "${t.coeff}" in expression.`);
 	}
 }
-function ve(e) {
-	return e instanceof y || typeof e == "object" && !!e && "sense" in e && "lhs" in e && "rhs" in e;
+function 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 ye(e, t) {
-	let n = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Map(), i = e.join(""), a = "__washi_";
-	for (; i.includes(a);) a += "_";
-	let o = "";
-	for (let i = 0; i < e.length; i++) if (o += e[i], i < t.length) {
-		let e = t[i];
+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 (ve(e)) throw Error("Cannot interpolate a constraint comparison (<=, >=, ==) inside a template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
-		else if (_e(e)) {
-			P(e);
-			let t = `${a}ph_${i}__`;
-			n.set(t, e), o += ` ${t} `;
+			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 be(e, ...t) {
-	let { fullText: n, resolver: r, numberMap: i } = ye(e, t);
-	return /(<=|>=|==|=<|=>|=)/.test(n) ? he(n, r, void 0, i) : N(n, r, i);
+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 F(e) {
+function ke(e) {
 	return typeof e == "object" && !!e && typeof e.lpString == "string" && e.nameToVar instanceof Map && e.nameToConstraint instanceof Map;
 }
-function I(e, t = "x", n = 0) {
+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 xe(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 = I(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 = I(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);
 	}
@@ -1118,8 +1619,8 @@ function xe(e) {
 		varOrder: s
 	};
 }
-function L(e, t) {
-	let { sense: n, objective: r, constraints: i, variables: a } = e, o = t?.relax === !0, { nameToVar: s, varToName: c, nameToConstraint: l, constrToName: u, varOrder: d } = xe(e), f = [];
+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) {
@@ -1197,52 +1698,52 @@ function L(e, t) {
 }
 //#endregion
 //#region src/modeler/solvers/registry.ts
-var R = Symbol.for("washi.solverRegistry"), Se = Symbol.for("washi.defaultSolverFactory"), z = globalThis;
-z[R] || (z[R] = /* @__PURE__ */ new Map());
-var B = z[R];
-function Ce(e, t) {
-	B.set(e.toLowerCase(), t);
+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 we(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[Se] = t;
-	} else z[Se] = typeof e == "function" ? e : () => e;
+		U[Ne] = t;
+	} else U[Ne] = typeof e == "function" ? e : () => e;
 }
-function V(e, t) {
+function G(e, t) {
 	if (!e) {
-		let e = z[Se] || B.get("highs");
-		if (!e) throw Error(`No default solver available. Available solvers: ${H().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: ${H().join(", ")}. Please import '@ohtaman/washi/solvers/glpk' before selecting this solver.` : n === "z3" ? `Solver 'z3' not found. Available solvers: ${H().join(", ")}. Please import '@ohtaman/washi/solvers/z3' before selecting this solver.` : `Solver '${e}' not found. Available solvers: ${H().join(", ")}`);
+		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 H() {
-	return Array.from(B.keys());
+function K() {
+	return Array.from(W.keys());
 }
 //#endregion
 //#region \0washi-browser-worker-factory
-function Te() {
-	let e = a("highs-worker.js");
-	if (new URL(e).origin === window.location.origin) return new Worker(e, { type: "module" });
-	let t = URL.createObjectURL(new Blob(["import " + JSON.stringify(e) + ";"], { type: "text/javascript" }));
+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 U = null, Ee = 0, W = /* @__PURE__ */ new Map();
-function De(e, t) {
+var q = null, Le = 0, J = /* @__PURE__ */ new Map();
+function Re(e, t) {
 	return e ? {
 		Status: "Interrupted",
 		StatusCode: 17,
@@ -1266,8 +1767,8 @@ function De(e, t) {
 		Rows: []
 	};
 }
-function G(e) {
-	let t = W.values().next().value;
+function ze(e) {
+	let t = J.values().next().value;
 	if (t && !t.dispatched) {
 		t.dispatched = !0;
 		try {
@@ -1279,30 +1780,30 @@ function G(e) {
 				...t.reportProgress ? { reportProgress: !0 } : {}
 			});
 		} catch (n) {
-			W.delete(t.id), t.cleanupAbort?.(), t.reject(n), G(e);
+			J.delete(t.id), t.cleanupAbort?.(), t.reject(n), ze(e);
 		}
 	}
 }
-function Oe() {
-	let e = U;
-	e && (U = null, e.terminate());
-	for (let e of W.values()) e.dispatched = !1;
-	if (W.size > 0) {
-		let e = ke();
-		if (e) G(e);
+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(W.values())) W.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 ke() {
+function Ve() {
 	if (typeof window > "u" || typeof Worker > "u") return null;
-	if (!U) try {
-		U = Te();
-		let e = U;
-		U.onmessage = (t) => {
-			let { type: n, id: r, result: i, runTime: a, error: o, progress: s, incumbent: c } = t.data, l = W.get(r);
+	if (!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) {
@@ -1310,10 +1811,10 @@ function ke() {
 						try {
 							l.onProgress?.(s);
 						} catch (e) {
-							let t = W.get(r);
+							let t = J.get(r);
 							if (t) {
-								let n = W.keys().next().value;
-								W.delete(r), t.cleanupAbort?.(), n === r && Oe(), t.reject(e);
+								let n = J.keys().next().value;
+								J.delete(r), t.cleanupAbort?.(), n === r && Be(), t.reject(e);
 							}
 						}
 					}
@@ -1323,72 +1824,72 @@ function ke() {
 					c && (l.lastIncumbent = c);
 					return;
 				}
-				W.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")), U === e && G(e);
+				}) : l.reject(Error(o || "Worker solve failed")), q === e && ze(e);
 			}
 		};
 		let t = (t) => {
-			if (U === e) {
-				U = null, e.terminate();
-				for (let e of W.values()) e.cleanupAbort?.(), e.reject(t);
-				W.clear();
+			if (q === e) {
+				q = null, e.terminate();
+				for (let e of J.values()) e.cleanupAbort?.(), e.reject(t);
+				J.clear();
 			}
 		};
-		U.onerror = (e) => t(/* @__PURE__ */ Error(`[WaSHI] HiGHS Worker failed to load or execute. Check Worker assets, CORS and CSP. ${e?.message || ""}`)), U.onmessageerror = () => t(/* @__PURE__ */ Error("[WaSHI] Could not deserialize the HiGHS Worker response."));
+		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 {
-		U = null;
+		q = null;
 	}
-	return U;
+	return q;
 }
-async function Ae(t, n = {}) {
+async function He(t, n = {}) {
 	if (n.signal?.aborted) return {
-		result: De(),
+		result: Re(),
 		runTime: 0
 	};
 	let r = await i(n.wasmUrl);
 	if (n.signal?.aborted) return {
-		result: De(),
+		result: Re(),
 		runTime: 0
 	};
-	let a = n.useWorker ?? typeof window < "u" ? ke() : null;
-	if (!a) return e(t, n);
-	let { signal: o, onProgress: s, ...c } = n, l = {};
-	for (let [e, t] of Object.entries(c)) typeof t != "function" && (l[e] = t);
-	l.wasmUrl = r;
-	let u = !!(s || o), d = `req_${++Ee}`, f = performance.now();
+	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 = W.get(d);
+				let e = J.get(f);
 				if (!e) return;
-				let t = W.keys().next().value;
-				W.delete(d), e.cleanupAbort?.(), t === d && Oe();
+				let t = J.keys().next().value;
+				J.delete(f), e.cleanupAbort?.(), t === f && Be();
 				let n = (performance.now() - e.startTime) / 1e3;
 				e.resolve({
-					result: De(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);
 		}
-		W.set(d, r), G(a);
+		J.set(f, r), ze(o);
 	});
 }
 //#endregion
 //#region src/modeler/solvers/highs/solver.ts
-function je(e, t) {
+function Ue(e, t) {
 	if (typeof t == "number") switch (t) {
 		case 0: return "NotSolved";
 		case 1:
@@ -1447,8 +1948,8 @@ function je(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 Me(e, t, n) {
-	switch (je(e, t)) {
+function We(e, t, n) {
+	switch (Ue(e, t)) {
 		case "Optimal": return "Optimal";
 		case "Infeasible": return "Infeasible";
 		case "Unbounded": return "Unbounded";
@@ -1465,7 +1966,7 @@ function Me(e, t, n) {
 		default: return "Unknown";
 	}
 }
-var K = class e {
+var Ge = class e {
 	static capabilities = {
 		supportsMIP: !0,
 		supportsQP: !0,
@@ -1479,12 +1980,12 @@ var K = class e {
 		this.options = e;
 	}
 	async solve(e, t = {}, n = {}) {
-		let r = F(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 : L(e, { relax: a.relax }), 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 = ae(t);
@@ -1495,7 +1996,7 @@ var K = class e {
 			if (!f.has(n)) {
 				let e = ae(n);
 				if (e !== void 0) {
-					let r = I(n.name, "x", t);
+					let r = H(n.name, "x", t);
 					Object.prototype.hasOwnProperty.call(u, r) || (u[r] = e, d = !0);
 				}
 			}
@@ -1506,13 +2007,13 @@ var K = class e {
 			...o === 0 ? {} : { objectiveOffset: o },
 			initialValues: d ? u : void 0
 		});
-		let { result: m, runTime: h } = await Ae(s, p), g = m?.ObjectiveOffsetApplied ? 0 : o, _ = je(m?.Status, m?.StatusCode), v = a.relax ? !1 : typeof m?.IsMip == "boolean" ? m.IsMip : e.variables.some((e) => e.type === "Integer" || e.type === "Binary"), y;
+		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 = Me(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) {
@@ -1553,7 +2054,7 @@ var K = 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);
 			}
@@ -1587,14 +2088,14 @@ var K = class e {
 			raw: m
 		};
 	}
-}, Ne = K;
-function Pe() {
-	Ce("highs", (e) => new K(e)), we((e) => new K(e));
+}, Ke = Ge;
+function qe() {
+	Pe("highs", (e) => new Ge(e)), Fe((e) => new Ge(e));
 }
-Pe();
+qe();
 //#endregion
 //#region src/modeler/solvers/mock.ts
-var Fe = class {
+var Je = class {
 	name;
 	capabilities;
 	options;
@@ -1606,7 +2107,7 @@ var Fe = class {
 		}, this.options = e;
 	}
 	async solve(e, t = {}, n = {}) {
-		let r = F(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);
@@ -1694,19 +2195,19 @@ var Fe = class {
 		};
 	}
 };
-function Ie() {
-	Ce("mock", (e) => new Fe(e));
+function Ye() {
+	Pe("mock", (e) => new Je(e));
 }
-Ie();
+Ye();
 //#endregion
 //#region src/modeler/solution-validator.ts
-function Le(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 Re(e, t = {}) {
-	let n = Le(t.feasibilityTolerance, "feasibilityTolerance"), r = Le(t.integralityTolerance, "integralityTolerance"), i = t.evaluateLogicalConstraints === void 0 || !!t.evaluateLogicalConstraints, a = t.values !== void 0 && t.values !== null;
+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 = [], u = [], p = 0, m = (e) => {
 		typeof e == "number" && !Number.isNaN(e) && e > p && (p = e);
@@ -2080,10 +2581,10 @@ function Re(e, t = {}) {
 }
 //#endregion
 //#region src/modeler/big-m.ts
-function ze(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 Be(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;
@@ -2094,8 +2595,8 @@ function Be(e, t, n) {
 	}
 	return i;
 }
-function q(e, t, n) {
-	let r = Be(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;
@@ -2115,8 +2616,8 @@ function q(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 J(e, t, n) {
-	let r = Be(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;
@@ -2139,7 +2640,7 @@ function J(e, t, n) {
 function Y(e, t, n, r, i, a, o) {
 	if (!(e instanceof M && (e.type === "Binary" || e.type === "Integer" && e.lb === 0 && e.ub === 1))) throw Error(`Indicator variable "${e?.name ?? String(e)}" must be a Binary variable (or Integer variable with bounds [0, 1]), received "${e?.type ?? typeof e}" with bounds [${e?.lb}, ${e?.ub}].`);
 	if (!Number.isFinite(e.lb) || !Number.isFinite(e.ub) || e.lb < 0 || e.ub > 1 || e.lb > e.ub) throw Error(`Binary indicator variable "${e.name}" has invalid bounds [${e.lb}, ${e.ub}]. Binary variables must stay within [0, 1] with lb <= ub.`);
-	let s = Be(t, r, o);
+	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}.`);
@@ -2159,7 +2660,7 @@ function Y(e, t, n, r, i, a, o) {
 function X(e, t = 0) {
 	return new C(new Map(e), t);
 }
-function Ve(e, t, n, r) {
+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;
@@ -2182,7 +2683,7 @@ function Ve(e, t, n, r) {
 		o.set(e, n), i.push(n);
 	}
 	function p(e, t) {
-		if (e instanceof He) return e.wrappedVar;
+		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}".`);
@@ -2404,7 +2905,7 @@ function Ve(e, t, n, r) {
 				}
 				if (r instanceof f) {
 					if (r.op === "and") {
-						for (let e = 0; e < r.children.length; e++) g(new f("implies", [c instanceof M ? new He(c) : n, r.children[e]]), `${t}_and_${e}`);
+						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") {
@@ -2423,10 +2924,10 @@ function Ve(e, t, n, r) {
 	function _(e, t, n, r, i) {
 		let { lhs: o, sense: c, rhs: l } = t;
 		if (c === "<=" || c === ">=") {
-			let t = Y(e, o, c, l, n, c === "<=" ? q(o, l, r) : J(o, l, r), r), u = new y(t.lhs, c, t.rhs, r);
+			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 = q(o, l, `${r}_le`), c = J(o, l, `${r}_ge`), u = Y(e, o, "<=", l, n, t, `${r}_le`), d = Y(e, o, ">=", l, n, c, `${r}_ge`), f = new y(u.lhs, "<=", u.rhs, `${r}_le`), p = new y(d.lhs, ">=", d.rhs, `${r}_ge`);
+			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);
 		}
 	}
@@ -2437,7 +2938,7 @@ function Ve(e, t, n, r) {
 		constraintToOriginalName: s
 	};
 }
-var He = class extends d {
+var rt = class extends d {
 	wrappedVar;
 	constructor(e) {
 		super(e.name), this.wrappedVar = e;
@@ -2445,7 +2946,7 @@ var He = class extends d {
 };
 //#endregion
 //#region src/decomposition/column-generation.ts
-async function Ue(e) {
+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;
@@ -2516,7 +3017,7 @@ async function Ue(e) {
 }
 //#endregion
 //#region src/modeler/objective.ts
-function We(e, t) {
+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}\`)).`);
@@ -2527,24 +3028,24 @@ function We(e, t) {
 	if (typeof n == "string" || n instanceof C || n instanceof S || n instanceof M || typeof n == "object" && n && ("terms" in n && n.terms instanceof Map && typeof n.constant == "number" || "quadTerms" in n && n.quadTerms instanceof Map && "linearTerms" in n && n.linearTerms instanceof Map && typeof n.constant == "number" || "id" in n && "name" in n && "lb" in n && "ub" in n)) return n;
 	throw Error(`Invalid expression passed to ${t}(): expected a finite number, Var, LinExpr, QuadExpr, or arithmetic expression string.`);
 }
-function Ge(e) {
+function ot(e) {
 	return {
-		expr: We(e, "maximize"),
+		expr: at(e, "maximize"),
 		sense: "Maximize"
 	};
 }
-function Ke(e) {
+function st(e) {
 	return {
-		expr: We(e, "minimize"),
+		expr: at(e, "minimize"),
 		sense: "Minimize"
 	};
 }
 //#endregion
 //#region src/decomposition/benders.ts
-function qe(e) {
+function ct(e) {
 	return !!(e && typeof e == "object" && "constraints" in e && "variables" in e && typeof e.solve == "function");
 }
-async function Je(e, t, n, r, i, a, o, s, c = 1) {
+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;
@@ -2600,7 +3101,7 @@ async function Je(e, t, n, r, i, a, o, s, c = 1) {
 		subproblemObjective: b
 	};
 }
-async function Ye(e) {
+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;
@@ -2624,10 +3125,10 @@ async function Ye(e) {
 			master: t
 		}), x = [];
 		if (b) {
-			if (qe(b)) {
+			if (ct(b)) {
 				let n = b, r = n.linkingConstraints;
-				c || (c = t.continuous("__benders_theta", { lb: 0 }), v ? t.objective(Ke(t.objectiveExpr.add(c))) : t.objective(Ge(t.objectiveExpr.sub(c))));
-				let i = await Je(n, r, t, c, y, v, a, o, e);
+				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);
 		}
@@ -2683,13 +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 Xe(e) {
+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;
@@ -2732,7 +3233,7 @@ var Ze = class {
 		n = typeof e == "string" ? {
 			...t,
 			name: e
-		} : e, this.name = n.name || "OptimizationModel", this._sense = s(n.sense), this._objectiveExpr = new C(), n.solver && (this.solver = V(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;
@@ -3031,7 +3532,7 @@ var Ze = class {
 	applyObjective(e, t) {
 		if (e instanceof y || typeof e == "object" && e && "sense" in e && "lhs" in e && "rhs" in e || typeof e == "string" && /(<=|>=|==|=<|=>|=)/.test(e)) throw Error(typeof e == "string" ? "Cannot use a comparison constraint as an objective. Did you mean to use m.constraint(expr`... <= ...`)? To set an objective, wrap an unconstrained expression with maximize(...) or minimize(...), e.g. m.objective(maximize(expr`30 * ${x}`))." : "Cannot use a Constraint as an objective. Did you mean to use m.constraint(expr`... <= ...`)? To set an objective, wrap an unconstrained expression with maximize(...) or minimize(...), e.g. m.objective(maximize(expr`30 * ${x}`)).");
 		let n = t === void 0 ? this.sense : s(t), r;
-		if (typeof e == "string") r = me(e, (e) => this.getVarByName(e));
+		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();
@@ -3047,13 +3548,14 @@ var Ze = class {
 	}
 	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 S || typeof e == "object" && e && "quadTerms" in e) throw Error("Constraint must contain a comparison operator (<=, >=, ==): cannot add a quadratic expression as a constraint.");
 		if (e instanceof C || typeof e == "object" && e && "terms" in e) throw Error("Constraint must contain a comparison operator (<=, >=, ==): cannot add a linear expression without a comparison operator. Use expr`... <= ...` or .le(), .ge(), .eq().");
-		if (Xe(e)) throw Error(`Cannot add numeric variable "${e.name}" directly as a constraint without a comparison operator (<=, >=, ==). Numeric variables require a comparison such as expr\`\${x} <= 10\` or x.le(10), whereas propositional BoolVar variables must be created with m.bool().`);
-		return this.addConstraint(e, t), this;
+		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;
@@ -3069,7 +3571,7 @@ var Ze = class {
 	addConstraint(e, t) {
 		if (e instanceof S || typeof e == "object" && e && "quadTerms" in e) throw Error("Constraint must contain a comparison operator (<=, >=, ==): cannot add a quadratic expression as a constraint.");
 		if (e instanceof C || typeof e == "object" && e && "terms" in e) throw Error("Constraint must contain a comparison operator (<=, >=, ==): cannot add a linear expression without a comparison operator. Use expr`... <= ...` or .le(), .ge(), .eq().");
-		if (Xe(e)) throw Error(`Cannot add numeric variable "${e.name}" directly as a constraint without a comparison operator (<=, >=, ==). Numeric variables require a comparison such as expr\`\${x} <= 10\` or x.le(10), whereas propositional BoolVar variables must be created with m.bool().`);
+		if (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) {
@@ -3089,7 +3591,7 @@ var Ze = class {
 			};
 			return this.logicalConstraints.push(a), this.logicalConstrMapByName.set(i, a), this.recordModelMutation(), e;
 		}
-		let n = typeof e == "string" ? ge(e, (e) => this.getVarByName(e), t) : e;
+		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;
@@ -3128,15 +3630,15 @@ var Ze = class {
 		try {
 			if ((c === "<=" || c === "==") && (this.hasConstraintName(f) || this.hasBoolVarName(f))) throw Error(this.hasBoolVarName(f) ? `Constraint name '${f}' conflicts with an existing Boolean variable in model` : `Constraint with name '${f}' already exists in model`);
 			if ((c === ">=" || c === "==") && (this.hasConstraintName(p) || this.hasBoolVarName(p))) throw Error(this.hasBoolVarName(p) ? `Constraint name '${p}' conflicts with an existing Boolean variable in model` : `Constraint with name '${p}' already exists in model`);
-			n.M !== void 0 && ze(n.M, d);
+			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 "${d}" does not belong to model "${this.name}". All variables must belong to the model by object identity.`);
 			if (c === "<=" || c === "==") {
-				let t = Y(e, s, "<=", l, i, n.M === void 0 ? q(s, l, f) : n.M, f);
+				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 = Y(e, s, ">=", l, i, n.M === void 0 ? J(s, l, p) : n.M, p);
+				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 m) j(e, this.name, t, n);
@@ -3147,7 +3649,7 @@ var Ze = class {
 	}
 	toLpString() {
 		this.validateIntegrity();
-		let { lpString: e } = L({
+		let { lpString: e } = je({
 			name: this.name,
 			sense: this.sense,
 			objective: this.objectiveExpr,
@@ -3177,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 || {};
@@ -3195,16 +3700,16 @@ var Ze = class {
 		if (typeof e == "string") {
 			let { solver: n, ...r } = t || {};
 			return {
-				activeSolver: V(e, r),
+				activeSolver: G(e, r),
 				activeOptions: r
 			};
 		}
 		let { solver: n, ...r } = e || {};
 		return n ? {
-			activeSolver: V(n, r),
+			activeSolver: G(n, r),
 			activeOptions: r
 		} : {
-			activeSolver: this.solver || V(),
+			activeSolver: this.solver || G(),
 			activeOptions: r
 		};
 	}
@@ -3224,7 +3729,7 @@ var Ze = class {
 		let { activeSolver: i, activeOptions: a } = this.resolveSolverAndOptions(e, t);
 		if (this._objectiveExpr instanceof S && this._objectiveExpr.quadTerms.size > 0 && i.capabilities?.supportsQP === !1) throw Error(`Solver "${i.name}" does not support quadratic objectives (QP). Please use a QP-capable solver such as HiGHS or Clarabel.`);
 		let o, s = null;
-		if (this.logicalConstraints.length > 0 && i.capabilities?.supportsSMT !== !0 ? (s = Ve(this.variables, this.boolVars, this.constraints, this.logicalConstraints), o = {
+		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,
@@ -3263,7 +3768,11 @@ var Ze = class {
 		if (this.values.clear(), u && l.values) {
 			for (let [e, t] of Object.entries(l.values)) if (typeof t == "number" && Number.isFinite(t)) {
 				let n = this.getVarByName(e), r = this.getBoolVarByName(e);
-				n && (n.value = t, f(p, n.name, t), this.values.set(n.name, t)), r && (r.value = !!t, this.values.set(r.name, t)), !n && !r && this.values.set(e, t);
+				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, f(p, r.name, +!!n), this.values.set(r.name, n)) : this.values.set(e, n);
@@ -3349,8 +3858,12 @@ var Ze = class {
 			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));
@@ -3364,7 +3877,7 @@ var Ze = class {
 				runTime: this.runTime
 			};
 		}
-		let l = this.logicalConstraints.length > 0 || this.boolVars.length > 0 ? Ve(this.variables, this.boolVars, this.constraints, this.logicalConstraints) : {
+		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(),
@@ -3428,7 +3941,10 @@ var Ze = class {
 		if (S && g.values) {
 			for (let e of this.variables) {
 				let t = g.values[e.name];
-				typeof t == "number" && Number.isFinite(t) && (e.value = t, this.values.set(e.name, t), s(D, e.name, t));
+				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];
@@ -3452,7 +3968,7 @@ var Ze = class {
 		};
 	}
 	validateSolution(e = {}) {
-		return Re(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.");
@@ -3465,14 +3981,14 @@ var Ze = class {
 		return this._linkingConstraints ?? [];
 	}
 	async solveBenders(e) {
-		let t = await Ye({
+		let t = await ut({
 			master: this,
 			...e
 		});
 		return this.decomposition = t, t;
 	}
 	async solveColumnGeneration(e) {
-		let t = await Ue({
+		let t = await it({
 			master: this,
 			...e
 		});
@@ -3480,4 +3996,4 @@ var Ze = class {
 	}
 };
 //#endregion
-export { u as BoolExpr, f as BoolOp, d as BoolVar, y as Constraint, Ne as HiGHS, r as Highs, K as HighsSolver, C as LinExpr, Fe as MockSolver, Ze as Model, S as QuadExpr, M as Var, p as and, Y as buildIndicatorLinearization, xe as buildLpSymbolMaps, J as deriveBigMForGe, q as deriveBigMForLe, T as dot, be as expr, L as generateLpString, o as getHighs, n as getHighsWasmUrl, V as getSolver, g as implies, F as isLpExportResult, Ve as linearizeModelForMip, H as listAvailableSolvers, Ge as maximize, Ke as minimize, s as normalizeSense, h as not, m as or, ge as parseConstraint, me as parseExpr, Ce as registerSolver, I as sanitizeIdentifier, we as setDefaultSolver, t as setHighsWasmUrl, Ye as solveBenders, Ue as solveColumnGeneration, e as solveLpWithHighs, w as sum, ce as validateModelIntegrity, Re as validateModelSolution, ze as validateUserBigM, _ as xor };
+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 };