@ohtaman/washi 0.6.0 → 0.7.0

package/dist/lib/washi.js

@@ -1,24 +1,24 @@
-import { A as e, C as t, D as n, E as r, M as i, N as a, O as o, S as s, T as c, _ as l, a as u, b as d, c as f, d as p, f as m, g as h, h as g, i as _, j as v, k as y, l as b, m as x, n as S, o as C, p as w, r as T, s as E, t as D, u as O, v as k, w as A, x as j, y as ee } from "./registry-C20sxTwm.js";
-import { a as M, c as N, d as P, f as te, h as ne, i as re, l as ie, m as ae, n as oe, o as F, p as se, r as I, s as L, t as ce, u as le } from "./loader-BZUQNvh4.js";
-import { createHighsWorker as ue } from "./highs-worker-factory.js";
+import { A as e, C as t, D as n, E as r, M as i, N as a, O as o, S as s, T as c, _ as l, a as u, b as d, c as f, d as p, f as m, g as h, h as g, i as _, j as v, k as y, l as b, m as x, n as S, o as C, p as ee, r as w, s as T, t as E, u as D, v as O, w as k, x as A, y as te } from "./registry-D7TZ3Wh_.js";
+import { a as j, c as M, d as ne, f as re, h as ie, i as ae, l as oe, m as se, n as ce, o as N, p as le, r as P, s as F, t as ue, u as de } from "./loader-BZUQNvh4.js";
+import { createHighsWorker as fe } from "./highs-worker-factory.js";
 //#region \0rolldown/runtime.js
-var de = Object.defineProperty, fe = Object.getOwnPropertyDescriptor, pe = Object.getOwnPropertyNames, me = Object.prototype.hasOwnProperty, he = (e, t) => {
+var pe = Object.defineProperty, me = Object.getOwnPropertyDescriptor, he = Object.getOwnPropertyNames, ge = Object.prototype.hasOwnProperty, _e = (e, t) => {
 	let n = {};
-	for (var r in e) de(n, r, {
+	for (var r in e) pe(n, r, {
 		get: e[r],
 		enumerable: !0
 	});
-	return t || de(n, Symbol.toStringTag, { value: "Module" }), n;
-}, ge = (e, t, n, r) => {
-	if (t && typeof t == "object" || typeof t == "function") for (var i = pe(t), a = 0, o = i.length, s; a < o; a++) s = i[a], !me.call(e, s) && s !== n && de(e, s, {
+	return t || pe(n, Symbol.toStringTag, { value: "Module" }), n;
+}, ve = (e, t, n, r) => {
+	if (t && typeof t == "object" || typeof t == "function") for (var i = he(t), a = 0, o = i.length, s; a < o; a++) s = i[a], !ge.call(e, s) && s !== n && pe(e, s, {
 		get: ((e) => t[e]).bind(null, s),
-		enumerable: !(r = fe(t, s)) || r.enumerable
+		enumerable: !(r = me(t, s)) || r.enumerable
 	});
 	return e;
-}, R = (e, t, n) => (ge(e, t, "default"), n && ge(n, t, "default"));
+}, I = (e, t, n) => (ve(e, t, "default"), n && ve(n, t, "default"));
 //#endregion
 //#region src/modeler/types.ts
-function _e(e) {
+function ye(e) {
 	if (e === void 0) return "Minimize";
 	if (typeof e == "string") {
 		let t = e.toLowerCase();
@@ -29,8 +29,11 @@ function _e(e) {
 }
 //#endregion
 //#region src/modeler/parser.ts
-var ve = /^(?:[0-9]+(?:\.[0-9]+)?|\.[0-9]+)(?:[eE][+-]?[0-9]+)?$/;
-function ye(e, t) {
+function L(e) {
+	return typeof e == "object" && !!e && e.kind === "container";
+}
+var be = /^(?:[0-9]+(?:\.[0-9]+)?|\.[0-9]+)(?:[eE][+-]?[0-9]+)?$/;
+function xe(e, t) {
 	let n = [], r = 0, i = e.length;
 	for (; r < i;) {
 		let a = e[r];
@@ -69,6 +72,10 @@ function ye(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({
@@ -86,7 +93,7 @@ function ye(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 (!ve.test(a)) throw Error(`Invalid numeric literal '${a}' at position ${t} in: "${e}"`);
+			if (!be.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}"`);
@@ -113,12 +120,205 @@ function ye(e, t) {
 	}
 	return n;
 }
-var be = class {
+function Se(e) {
+	return e instanceof k && e.quadTerms.size === 0 ? new A(e.linearTerms, e.constant) : e;
+}
+function Ce(e) {
+	return typeof e == "number" || e instanceof b || e instanceof A || e instanceof k || H(e);
+}
+function we(e) {
+	return typeof e == "number" ? new A(/* @__PURE__ */ new Map(), e) : e instanceof b || "id" in e && !("terms" in e) && !("quadTerms" in e) ? new A(/* @__PURE__ */ new Map([[e, 1]]), 0) : e.clone();
+}
+function Te(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 = we(e), i = we(t), a;
+	a = n === "+" ? r.add(i) : n === "-" ? r.sub(i) : n === "*" ? r.mul(i) : r.div(i);
+	let o = Se(a);
+	return U(o), o;
+}
+function R(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] = Ce(i) ? t(i) : R(i, t);
+		}
+		return n;
+	}
+	let n = Object.create(null);
+	for (let r of Object.keys(e)) {
+		let i = e[r];
+		n[r] = Ce(i) ? t(i) : R(i, t);
+	}
+	return n;
+}
+function Ee(e, t, n, r = "") {
+	let i = Ce(e), a = Ce(t);
+	if (i && a) return Te(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] = Ee(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] = Ee(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] = Ee(o[e], s[e], n, r ? `${r}.${e}` : e);
+	return f;
+}
+function z(e, t, n) {
+	let r = L(e), i = L(t);
+	if (!r && !i) return Te(e, t, n);
+	if (r && !i) return {
+		kind: "container",
+		data: R(e.data, (e) => Te(e, t, n)),
+		fromNonArrayIterable: e.fromNonArrayIterable
+	};
+	if (!r && i) return {
+		kind: "container",
+		data: R(t.data, (t) => Te(e, t, n)),
+		fromNonArrayIterable: t.fromNonArrayIterable
+	};
+	let a = e, o = t;
+	return {
+		kind: "container",
+		data: Ee(a.data, o.data, n),
+		fromNonArrayIterable: a.fromNonArrayIterable || o.fromNonArrayIterable
+	};
+}
+function De(e) {
+	return typeof e == "number" ? -e : L(e) ? {
+		kind: "container",
+		data: R(e.data, (e) => typeof e == "number" ? -e : we(e).neg()),
+		fromNonArrayIterable: e.fromNonArrayIterable
+	} : e.neg();
+}
+function Oe(e, t) {
+	let n = e instanceof k, 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 A(/* @__PURE__ */ new Map(), n);
+	}
+	if (t === 0) return new A(/* @__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 B(e) {
+	if (typeof e != "object" || !e || Array.isArray(e) || H(e) || W(e)) return !1;
+	let t = Object.getPrototypeOf(e);
+	return t === Object.prototype || t === null;
+}
+function ke(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 (W(e)) throw Error("Cannot interpolate a constraint comparison (<=, >=, ==) inside a template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
+	if (H(e)) return U(e), e instanceof b || "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 V(e) {
+	return typeof e == "object" && !!e && !(e instanceof String) && !(e instanceof Map) && !H(e) && !W(e) && Symbol.iterator in e && typeof e[Symbol.iterator] == "function";
+}
+function Ae(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) || B(a) || V(a)) {
+				if (t >= 1) throw Error("Nested containers deeper than 2D are not supported in template expressions.");
+				let e = Ae(a, t + 1);
+				e.fromNonArrayIterable && (n = !0), r[i] = e.data;
+			} else r[i] = ke(a);
+		}
+		return {
+			kind: "container",
+			data: r,
+			fromNonArrayIterable: n
+		};
+	}
+	if (V(e)) return {
+		kind: "container",
+		data: Array.from(e).map((e) => {
+			if (Array.isArray(e) || B(e) || V(e)) {
+				if (t >= 1) throw Error("Nested containers deeper than 2D are not supported in template expressions.");
+				return Ae(e, t + 1).data;
+			}
+			return ke(e);
+		}),
+		fromNonArrayIterable: !0
+	};
+	if (B(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) || B(a) || V(a)) {
+				if (t >= 1) throw Error("Nested containers deeper than 2D are not supported in template expressions.");
+				let e = Ae(a, t + 1);
+				e.fromNonArrayIterable && (n = !0), r[i] = e.data;
+			} else r[i] = ke(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 je = 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];
@@ -130,54 +330,240 @@ var be = class {
 		return t;
 	}
 	parseExpression() {
-		let e = this.parseTerm();
+		let e = this.parseExpressionNode();
+		if (L(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 A(/* @__PURE__ */ new Map(), e) : Se(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 = z(e, this.parseTermNode(), "+");
+			else if (t.type === "MINUS") this.consume(), e = z(e, this.parseTermNode(), "-");
 			else break;
 		}
-		return e instanceof A && e.quadTerms.size === 0 ? new j(e.linearTerms, e.constant) : e;
+		return L(e) || typeof e == "number" ? e : Se(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 = z(e, this.parseFactorNode(), "*");
+			else if (t.type === "SLASH") this.consume(), e = z(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(), De(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 b || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new j(/* @__PURE__ */ new Map([[n, 1]]), 0) : n.clone();
-				} else this.consume("LPAREN"), e = this.parseExpression(), this.consume("RPAREN");
-				return this.applyPower(e).mul(n);
+				let e = this.parsePrimaryNode();
+				return z(this.applyPowerNode(e), n, "*");
 			}
-			t = new j(/* @__PURE__ */ new Map(), n);
-		} else if (e.type === "IDENT") {
-			this.consume();
-			let n = this.resolve(e.value);
-			t = n instanceof b || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new j(/* @__PURE__ */ new Map([[n, 1]]), 0) : n.clone();
-		} else if (e.type === "LPAREN") this.consume("LPAREN"), t = this.parseExpression(), this.consume("RPAREN");
+			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 (!L(n) && n instanceof A && n.terms.size === 0) return this.evalSumWithMapper(n.constant, t);
+				if (L(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 (W(e)) throw Error("Cannot sum a constraint comparison (<=, >=, ==) in sum(): expected a number, Var, LinExpr, or QuadExpr.");
+				if (e instanceof k || typeof e == "object" && e && "quadTerms" in e && e.quadTerms instanceof Map && "linearTerms" in e && e.linearTerms instanceof Map) {
+					let i = e;
+					U(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 A || typeof e == "object" && e && "terms" in e && e.terms instanceof Map && typeof e.constant == "number") {
+					let n = e;
+					U(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 (H(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 (V(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 (B(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 k(t, n, r) : new A(t, r);
+	}
+	evalSumSingle(e) {
+		if (!L(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 (B(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 (!L(e) || !L(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 = s(e.data, t.data);
+		return U(n), n;
 	}
-	applyPower(e) {
+	applyPowerNode(e) {
 		if (this.peek()?.type !== "CARET") return e;
 		let t = [];
 		for (; this.peek()?.type === "CARET";) {
@@ -194,55 +580,87 @@ var be = 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 A, 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 j(/* @__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 j(/* @__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 L(e) ? {
+			kind: "container",
+			data: R(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 = Se(Oe(we(e), n));
+				return U(t), t;
+			}),
+			fromNonArrayIterable: e.fromNonArrayIterable
+		} : Oe(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 Ae(this.templateCtx.rawContainerMap.get(e));
 		let t = this.resolver(e);
 		if (!t) throw Error(`Unknown variable '${e}' in expression`);
-		return t;
+		return t instanceof b || "id" in t && !("terms" in t) && !("quadTerms" in t) ? new A(/* @__PURE__ */ new Map([[t, 1]]), 0) : t.clone();
 	}
 };
-function xe(e, t, n) {
-	let r = new be(ye(e, n), t), i = r.parseExpression(), a = r.getRemainingToken();
-	if (a) throw Error(`Unexpected token '${a.value}' after expression in "${e}"`);
-	return Ee(i), i;
+function Me(e, t, n, r) {
+	let i = new je(xe(e, n), t, r), a = i.parseExpression(), o = i.getRemainingToken();
+	if (o) throw Error(`Unexpected token '${o.value}' after expression in "${e}"`);
+	return U(a), a;
 }
-function Se(e, t) {
-	return xe(e, t);
+function Ne(e, t) {
+	return Me(e, t);
 }
-function Ce(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 = xe(s, t, r), d = xe(c, t, r);
-	if (u instanceof A && u.quadTerms.size > 0 || d instanceof A && d.quadTerms.size > 0) throw Error("Quadratic constraints are not supported (only linear constraints are allowed in MILP/LP/QP)");
-	let f = u instanceof A ? new j(u.linearTerms, u.constant) : u, p = d instanceof A ? new j(d.linearTerms, d.constant) : d, m;
-	if (m = l === "<=" ? f.le(p, n) : l === ">=" ? f.ge(p, n) : f.eq(p, n), Ee(m.lhs), !Number.isFinite(m.rhs)) throw Error(`Invalid non-finite right-hand side "${m.rhs}" in constraint.`);
-	return m;
+function Pe(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, n, r, i) {
+	let a = Pe(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 = Me(c, t, r, i), f = Me(l, t, r, i);
+	if (d instanceof k && d.quadTerms.size > 0 || f instanceof k && f.quadTerms.size > 0) throw Error("Quadratic constraints are not supported (only linear constraints are allowed in MILP/LP/QP)");
+	let p = d instanceof k ? new A(d.linearTerms, d.constant) : d, m = f instanceof k ? new A(f.linearTerms, f.constant) : f, h;
+	if (h = u === "<=" ? p.le(m, n) : u === ">=" ? p.ge(m, n) : p.eq(m, n), U(h.lhs), !Number.isFinite(h.rhs)) throw Error(`Invalid non-finite right-hand side "${h.rhs}" in constraint.`);
+	return h;
 }
-function we(e, t, n) {
-	return Ce(e, t, n);
+function Ie(e, t, n) {
+	return Fe(e, t, n);
 }
-function Te(e) {
-	return e instanceof b || e instanceof j || e instanceof A ? !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 H(e) {
+	return e instanceof b || e instanceof A || e instanceof k ? !0 : typeof e != "object" || !e || W(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 Ee(e) {
+function U(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.`);
@@ -254,40 +672,50 @@ function Ee(e) {
 		for (let [, t] of e.quadTerms) if (!Number.isFinite(t.coeff)) throw Error(`Invalid non-finite quadratic coefficient "${t.coeff}" in expression.`);
 	}
 }
-function De(e) {
-	return e instanceof c || typeof e == "object" && !!e && "sense" in e && "lhs" in e && "rhs" in e;
+function W(e) {
+	return e instanceof c ? !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 Oe(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 Le(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 (De(e)) throw Error("Cannot interpolate a constraint comparison (<=, >=, ==) inside a template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
-		else if (Te(e)) {
-			Ee(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 (W(e)) throw Error("Cannot interpolate a constraint comparison (<=, >=, ==) inside a template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
+		else if (H(e)) {
+			U(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) || V(e) || e instanceof Map || B(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 ke(e, ...t) {
-	let { fullText: n, resolver: r, numberMap: i } = Oe(e, t);
-	return /(<=|>=|==|=<|=>|=)/.test(n) ? Ce(n, r, void 0, i) : xe(n, r, i);
+function Re(e, ...t) {
+	let { fullText: n, resolver: r, numberMap: i, templateCtx: a } = Le(e, t);
+	return Pe(n) ? Fe(n, r, void 0, i, a) : Me(n, r, i, a);
 }
 //#endregion
 //#region src/modeler/solvers/highs/worker-client.ts
-var z = null, Ae = 0, B = /* @__PURE__ */ new Map();
-function je(e, t) {
+var G = null, ze = 0, K = /* @__PURE__ */ new Map();
+function Be(e, t) {
 	return e ? {
 		Status: "Interrupted",
 		StatusCode: 17,
@@ -311,8 +739,8 @@ function je(e, t) {
 		Rows: []
 	};
 }
-function Me(e) {
-	let t = B.values().next().value;
+function Ve(e) {
+	let t = K.values().next().value;
 	if (t && !t.dispatched) {
 		t.dispatched = !0;
 		try {
@@ -324,30 +752,30 @@ function Me(e) {
 				...t.reportProgress ? { reportProgress: !0 } : {}
 			});
 		} catch (n) {
-			B.delete(t.id), t.cleanupAbort?.(), t.reject(n), Me(e);
+			K.delete(t.id), t.cleanupAbort?.(), t.reject(n), Ve(e);
 		}
 	}
 }
-function Ne() {
-	let e = z;
-	e && (z = null, e.terminate());
-	for (let e of B.values()) e.dispatched = !1;
-	if (B.size > 0) {
-		let e = Pe();
-		if (e) Me(e);
+function He() {
+	let e = G;
+	e && (G = null, e.terminate());
+	for (let e of K.values()) e.dispatched = !1;
+	if (K.size > 0) {
+		let e = Ue();
+		if (e) Ve(e);
 		else {
 			let e = /* @__PURE__ */ Error("[WaSHI] Failed to recreate HiGHS Worker after interruption.");
-			for (let t of Array.from(B.values())) B.delete(t.id), t.cleanupAbort?.(), t.reject(e);
+			for (let t of Array.from(K.values())) K.delete(t.id), t.cleanupAbort?.(), t.reject(e);
 		}
 	}
 }
-function Pe() {
+function Ue() {
 	if (typeof window > "u" || typeof Worker > "u") return null;
-	if (!z) try {
-		z = ue();
-		let e = z;
-		z.onmessage = (t) => {
-			let { type: n, id: r, result: i, runTime: a, error: o, progress: s, incumbent: c } = t.data, l = B.get(r);
+	if (!G) try {
+		G = fe();
+		let e = G;
+		G.onmessage = (t) => {
+			let { type: n, id: r, result: i, runTime: a, error: o, progress: s, incumbent: c } = t.data, l = K.get(r);
 			if (l) {
 				if (n === "SOLVE_PROGRESS") {
 					if (s) {
@@ -355,10 +783,10 @@ function Pe() {
 						try {
 							l.onProgress?.(s);
 						} catch (e) {
-							let t = B.get(r);
+							let t = K.get(r);
 							if (t) {
-								let n = B.keys().next().value;
-								B.delete(r), t.cleanupAbort?.(), n === r && Ne(), t.reject(e);
+								let n = K.keys().next().value;
+								K.delete(r), t.cleanupAbort?.(), n === r && He(), t.reject(e);
 							}
 						}
 					}
@@ -368,72 +796,72 @@ function Pe() {
 					c && (l.lastIncumbent = c);
 					return;
 				}
-				B.delete(r), l.cleanupAbort?.(), n === "SOLVE_SUCCESS" ? l.resolve({
+				K.delete(r), l.cleanupAbort?.(), n === "SOLVE_SUCCESS" ? l.resolve({
 					result: i,
 					runTime: a
-				}) : l.reject(Error(o || "Worker solve failed")), z === e && Me(e);
+				}) : l.reject(Error(o || "Worker solve failed")), G === e && Ve(e);
 			}
 		};
 		let t = (t) => {
-			if (z === e) {
-				z = null, e.terminate();
-				for (let e of B.values()) e.cleanupAbort?.(), e.reject(t);
-				B.clear();
+			if (G === e) {
+				G = null, e.terminate();
+				for (let e of K.values()) e.cleanupAbort?.(), e.reject(t);
+				K.clear();
 			}
 		};
-		z.onerror = (e) => t(/* @__PURE__ */ Error(`[WaSHI] HiGHS Worker failed to load or execute. Check Worker assets, CORS and CSP. ${e?.message || ""}`)), z.onmessageerror = () => t(/* @__PURE__ */ Error("[WaSHI] Could not deserialize the HiGHS Worker response."));
+		G.onerror = (e) => t(/* @__PURE__ */ Error(`[WaSHI] HiGHS Worker failed to load or execute. Check Worker assets, CORS and CSP. ${e?.message || ""}`)), G.onmessageerror = () => t(/* @__PURE__ */ Error("[WaSHI] Could not deserialize the HiGHS Worker response."));
 	} catch {
-		z = null;
+		G = null;
 	}
-	return z;
+	return G;
 }
-async function V(e, t = {}) {
+async function We(e, t = {}) {
 	if (t.signal?.aborted) return {
-		result: je(),
+		result: Be(),
 		runTime: 0
 	};
-	let n = await F(t.wasmUrl);
+	let n = await N(t.wasmUrl);
 	if (t.signal?.aborted) return {
-		result: je(),
+		result: Be(),
 		runTime: 0
 	};
-	let r = t.useWorker ?? typeof window < "u" ? Pe() : null;
-	if (!r) return N(e, t);
-	let { signal: i, onProgress: a, ...o } = t, s = {};
-	for (let [e, t] of Object.entries(o)) typeof t != "function" && (s[e] = t);
-	s.wasmUrl = n;
-	let c = !!(a || i), l = `req_${++Ae}`, u = performance.now();
+	let r = typeof window < "u" ? typeof window.origin == "string" ? window.origin : window.location?.origin : void 0, i = t.useWorker ?? (typeof window < "u" && r !== "null" && !r?.startsWith("file:")) ? Ue() : null;
+	if (!i) return M(e, t);
+	let { signal: a, onProgress: o, ...s } = t, c = {};
+	for (let [e, t] of Object.entries(s)) typeof t != "function" && (c[e] = t);
+	c.wasmUrl = n;
+	let l = !!(o || a), u = `req_${++ze}`, d = performance.now();
 	return new Promise((t, n) => {
-		let o = {
-			id: l,
+		let r = {
+			id: u,
 			lpString: e,
-			workerOptions: s,
-			reportProgress: c,
-			startTime: u,
-			onProgress: a,
+			workerOptions: c,
+			reportProgress: l,
+			startTime: d,
+			onProgress: o,
 			resolve: t,
 			reject: n
 		};
-		if (i) {
+		if (a) {
 			let e = () => {
-				let e = B.get(l);
+				let e = K.get(u);
 				if (!e) return;
-				let t = B.keys().next().value;
-				B.delete(l), e.cleanupAbort?.(), t === l && Ne();
+				let t = K.keys().next().value;
+				K.delete(u), e.cleanupAbort?.(), t === u && He();
 				let n = (performance.now() - e.startTime) / 1e3;
 				e.resolve({
-					result: je(e.lastIncumbent, e.lastProgress),
+					result: Be(e.lastIncumbent, e.lastProgress),
 					runTime: n
 				});
 			};
-			i.addEventListener("abort", e, { once: !0 }), o.cleanupAbort = () => i.removeEventListener("abort", e);
+			a.addEventListener("abort", e, { once: !0 }), r.cleanupAbort = () => a.removeEventListener("abort", e);
 		}
-		B.set(l, o), Me(r);
+		K.set(u, r), Ve(i);
 	});
 }
 //#endregion
 //#region src/modeler/solvers/highs/solver.ts
-function H(e, t) {
+function q(e, t) {
 	if (typeof t == "number") switch (t) {
 		case 0: return "NotSolved";
 		case 1:
@@ -492,8 +920,8 @@ function H(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 U(e, t, n) {
-	switch (H(e, t)) {
+function Ge(e, t, n) {
+	switch (q(e, t)) {
 		case "Optimal": return "Optimal";
 		case "Infeasible": return "Infeasible";
 		case "Unbounded": return "Unbounded";
@@ -510,7 +938,7 @@ function U(e, t, n) {
 		default: return "Unknown";
 	}
 }
-var W = class e {
+var J = class e {
 	static capabilities = {
 		supportsMIP: !0,
 		supportsQP: !0,
@@ -524,7 +952,7 @@ var W = class e {
 		this.options = e;
 	}
 	async solve(e, t = {}, n = {}) {
-		let r = E(t), i = r ? n : t, a = {
+		let r = T(t), i = r ? n : t, a = {
 			...this.options,
 			...i
 		}, o = e.objective.constant || 0;
@@ -532,13 +960,13 @@ var W = class e {
 		let { lpString: s, nameToVar: c, nameToConstraint: l } = r ? t : C(e, { relax: a.relax }), u = Object.create(null), p = !1, m = /* @__PURE__ */ new Set();
 		for (let [e, t] of c.entries()) {
 			m.add(t);
-			let n = w(t);
+			let n = ee(t);
 			n !== void 0 && (u[e] = n, p = !0);
 		}
 		for (let t = 0; t < e.variables.length; t++) {
 			let n = e.variables[t];
 			if (!m.has(n)) {
-				let e = w(n);
+				let e = ee(n);
 				if (e !== void 0) {
 					let r = f(n.name, "x", t);
 					Object.prototype.hasOwnProperty.call(u, r) || (u[r] = e, p = !0);
@@ -551,33 +979,33 @@ var W = class e {
 			...o === 0 ? {} : { objectiveOffset: o },
 			initialValues: p ? u : void 0
 		});
-		let { result: g, runTime: _ } = await V(s, h), v = g?.ObjectiveOffsetApplied ? 0 : o, y = H(g?.Status, g?.StatusCode), b = a.relax ? !1 : typeof g?.IsMip == "boolean" ? g.IsMip : e.variables.some((e) => e.type === "Integer" || e.type === "Binary"), x;
+		let { result: g, runTime: _ } = await We(s, h), v = g?.ObjectiveOffsetApplied ? 0 : o, y = q(g?.Status, g?.StatusCode), b = a.relax ? !1 : typeof g?.IsMip == "boolean" ? g.IsMip : e.variables.some((e) => e.type === "Integer" || e.type === "Binary"), x;
 		if (typeof g?.HasPrimalSolution == "boolean") x = g.HasPrimalSolution;
 		else {
 			let e = g?.Columns ? Object.values(g.Columns) : [], t = e.length > 0 && e.some((e) => typeof e?.Primal == "number" && Number.isFinite(e.Primal)), n = typeof g?.ObjectiveValue == "number" && Number.isFinite(g.ObjectiveValue);
 			x = y === "Infeasible" || y === "Unbounded" || y === "InfeasibleOrUnbounded" || y === "Error" || y === "NotSolved" ? !1 : y === "Optimal" || y === "Feasible" ? n || t : n && (e.length === 0 || t);
 		}
-		let S = U(g?.Status, g?.StatusCode, x), T = null;
-		x && typeof g?.ObjectiveValue == "number" && Number.isFinite(g.ObjectiveValue) && (T = g.ObjectiveValue + v);
-		let D, O, k;
-		if (typeof g?.MipDualBound == "number" && Number.isFinite(g.MipDualBound) ? D = g.MipDualBound + v : !b && y === "Optimal" && T !== null && (D = T), T !== null && D !== void 0 && Number.isFinite(D) && (k = Math.abs(T - D)), v !== 0 && b && T !== null && D !== void 0 && k !== void 0) {
-			if (k === 0) O = 0;
-			else if (Math.abs(T) > 0) {
-				let e = k / Math.abs(T);
-				O = Number.isFinite(e) ? e : void 0;
-			} else O = void 0;
-		} else typeof g?.MipGap == "number" && Number.isFinite(g.MipGap) ? O = g.MipGap : b && y === "Optimal" && x && (k === void 0 || k === 0) && (O = 0);
+		let S = Ge(g?.Status, g?.StatusCode, x), w = null;
+		x && typeof g?.ObjectiveValue == "number" && Number.isFinite(g.ObjectiveValue) && (w = g.ObjectiveValue + v);
+		let E, D, O;
+		if (typeof g?.MipDualBound == "number" && Number.isFinite(g.MipDualBound) ? E = g.MipDualBound + v : !b && y === "Optimal" && w !== null && (E = w), w !== null && E !== void 0 && Number.isFinite(E) && (O = Math.abs(w - E)), v !== 0 && b && w !== null && E !== void 0 && O !== void 0) {
+			if (O === 0) D = 0;
+			else if (Math.abs(w) > 0) {
+				let e = O / Math.abs(w);
+				D = Number.isFinite(e) ? e : void 0;
+			} else D = void 0;
+		} else typeof g?.MipGap == "number" && Number.isFinite(g.MipGap) ? D = g.MipGap : b && y === "Optimal" && x && (O === void 0 || O === 0) && (D = 0);
 		if (!x) return {
 			status: S,
 			terminationStatus: y,
 			hasPrimalSolution: !1,
 			objectiveValue: null,
-			...D === void 0 ? {} : { objectiveBound: D },
-			...O === void 0 ? {} : {
-				relGap: O,
-				mipGap: O
+			...E === void 0 ? {} : { objectiveBound: E },
+			...D === void 0 ? {} : {
+				relGap: D,
+				mipGap: D
 			},
-			...k === void 0 ? {} : { absGap: k },
+			...O === void 0 ? {} : { absGap: O },
 			values: {},
 			reducedCosts: {},
 			duals: {},
@@ -585,31 +1013,31 @@ var W = class e {
 			runTime: _,
 			raw: g
 		};
-		let A = (e, t, n) => {
+		let k = (e, t, n) => {
 			Object.defineProperty(e, t, {
 				value: n,
 				enumerable: !0,
 				writable: !0,
 				configurable: !0
 			});
-		}, j = {}, ee = {}, M = {}, N = {};
+		}, A = {}, te = {}, j = {}, M = {};
 		if (g.Columns) for (let [e, t] of Object.entries(g.Columns)) {
 			let n = c.get(e);
 			if (n) {
 				if (typeof t.Primal == "number" && Number.isFinite(t.Primal)) {
 					let e = Math.abs(t.Primal) < 1e-9 ? 0 : t.Primal;
-					A(j, n.name, e);
+					!a.relax && (n.type === "Integer" || n.type === "Binary") && Math.abs(e - Math.round(e)) <= 1e-5 && (e = Math.round(e) + 0), k(A, n.name, e);
 				}
-				typeof t.Dual == "number" && Number.isFinite(t.Dual) && A(M, n.name, Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual);
+				typeof t.Dual == "number" && Number.isFinite(t.Dual) && k(j, n.name, Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual);
 			}
 		}
 		if (g.Rows) {
 			let e = Array.isArray(g.Rows) ? g.Rows : Object.values(g.Rows);
 			for (let t of e) {
 				let e = t.Name, n = e ? l.get(e) : void 0;
-				if (n && (typeof t.Dual == "number" && Number.isFinite(t.Dual) && A(ee, n.name, Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual), typeof t.Primal == "number" && Number.isFinite(t.Primal))) {
+				if (n && (typeof t.Dual == "number" && Number.isFinite(t.Dual) && k(te, n.name, Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual), typeof t.Primal == "number" && Number.isFinite(t.Primal))) {
 					let e = n.rhs - t.Primal;
-					A(N, n.name, Math.abs(e) < 1e-9 ? 0 : e);
+					k(M, n.name, Math.abs(e) < 1e-9 ? 0 : e);
 				}
 			}
 		}
@@ -617,84 +1045,84 @@ var W = class e {
 			status: S,
 			terminationStatus: y,
 			hasPrimalSolution: !0,
-			objectiveValue: T,
-			...D === void 0 ? {} : { objectiveBound: D },
-			...O === void 0 ? {} : {
-				relGap: O,
-				mipGap: O
+			objectiveValue: w,
+			...E === void 0 ? {} : { objectiveBound: E },
+			...D === void 0 ? {} : {
+				relGap: D,
+				mipGap: D
 			},
-			...k === void 0 ? {} : { absGap: k },
-			values: j,
-			reducedCosts: M,
-			duals: ee,
-			slacks: N,
+			...O === void 0 ? {} : { absGap: O },
+			values: A,
+			reducedCosts: j,
+			duals: te,
+			slacks: M,
 			runTime: _,
 			raw: g
 		};
 	}
-}, G = W;
-function K() {
-	T("highs", (e) => new W(e)), _((e) => new W(e));
+}, Ke = J;
+function qe() {
+	w("highs", (e) => new J(e)), _((e) => new J(e));
 }
-K();
+qe();
 //#endregion
 //#region src/modeler/solvers/highs/index.ts
-var Fe = /* @__PURE__ */ he({
-	HIGHS_CONSTANTS: () => ie,
-	HIGHS_STATUS_NAMES: () => le,
-	HiGHS: () => G,
-	Highs: () => P,
-	HighsError: () => te,
-	HighsModel: () => se,
-	HighsSolver: () => W,
-	HighsUnsupportedOptionError: () => ae,
-	OFFICIAL_HIGHS_CDN_WASM_URL: () => ce,
-	bindHighsFunctions: () => ne,
-	getHighs: () => oe,
-	getHighsWasmUrl: () => I,
-	isValidWasmHeader: () => re,
-	mapHighsStatus: () => U,
-	mapHighsTerminationStatus: () => H,
-	probeWasmUrl: () => M,
-	registerHighsSolver: () => K,
-	resolveBrowserWasmUrl: () => F,
-	setHighsWasmUrl: () => L,
-	solveLp: () => V,
-	solveLpWithHighs: () => N
+var Je = /* @__PURE__ */ _e({
+	HIGHS_CONSTANTS: () => oe,
+	HIGHS_STATUS_NAMES: () => de,
+	HiGHS: () => Ke,
+	Highs: () => ne,
+	HighsError: () => re,
+	HighsModel: () => le,
+	HighsSolver: () => J,
+	HighsUnsupportedOptionError: () => se,
+	OFFICIAL_HIGHS_CDN_WASM_URL: () => ue,
+	bindHighsFunctions: () => ie,
+	getHighs: () => ce,
+	getHighsWasmUrl: () => P,
+	isValidWasmHeader: () => ae,
+	mapHighsStatus: () => Ge,
+	mapHighsTerminationStatus: () => q,
+	probeWasmUrl: () => j,
+	registerHighsSolver: () => qe,
+	resolveBrowserWasmUrl: () => N,
+	setHighsWasmUrl: () => F,
+	solveLp: () => We,
+	solveLpWithHighs: () => M
 });
-import * as Ie from "./highs-worker-factory.js";
-R(Fe, Ie);
-import * as Le from "./highs-assets.js";
-R(Fe, Le);
+import * as Ye from "./highs-worker-factory.js";
+I(Je, Ye);
+import * as Xe from "./highs-assets.js";
+I(Je, Xe);
 //#endregion
 //#region src/modeler/solvers/highs.ts
-var Re = /* @__PURE__ */ he({
-	HIGHS_CONSTANTS: () => ie,
-	HIGHS_STATUS_NAMES: () => le,
-	HiGHS: () => G,
-	Highs: () => P,
-	HighsError: () => te,
-	HighsModel: () => se,
-	HighsSolver: () => W,
-	HighsUnsupportedOptionError: () => ae,
-	OFFICIAL_HIGHS_CDN_WASM_URL: () => ce,
-	bindHighsFunctions: () => ne,
-	getHighs: () => oe,
-	getHighsWasmUrl: () => I,
-	isValidWasmHeader: () => re,
-	mapHighsStatus: () => U,
-	mapHighsTerminationStatus: () => H,
-	probeWasmUrl: () => M,
-	registerHighsSolver: () => K,
-	resolveBrowserWasmUrl: () => F,
-	setHighsWasmUrl: () => L,
-	solveLp: () => V,
-	solveLpWithHighs: () => N
+var Ze = /* @__PURE__ */ _e({
+	HIGHS_CONSTANTS: () => oe,
+	HIGHS_STATUS_NAMES: () => de,
+	HiGHS: () => Ke,
+	Highs: () => ne,
+	HighsError: () => re,
+	HighsModel: () => le,
+	HighsSolver: () => J,
+	HighsUnsupportedOptionError: () => se,
+	OFFICIAL_HIGHS_CDN_WASM_URL: () => ue,
+	bindHighsFunctions: () => ie,
+	getHighs: () => ce,
+	getHighsWasmUrl: () => P,
+	isValidWasmHeader: () => ae,
+	mapHighsStatus: () => Ge,
+	mapHighsTerminationStatus: () => q,
+	probeWasmUrl: () => j,
+	registerHighsSolver: () => qe,
+	resolveBrowserWasmUrl: () => N,
+	setHighsWasmUrl: () => F,
+	solveLp: () => We,
+	solveLpWithHighs: () => M
 });
-R(Re, Fe);
+I(Ze, Je);
 //#endregion
 //#region src/modeler/solvers/mock.ts
-var ze = class {
+var Qe = class {
 	name;
 	capabilities;
 	options;
@@ -706,7 +1134,7 @@ var ze = class {
 		}, this.options = e;
 	}
 	async solve(e, t = {}, n = {}) {
-		let r = E(t) ? n : t, i = {
+		let r = T(t) ? n : t, i = {
 			...this.options,
 			...r
 		}, a = !!(i.values && Object.keys(i.values).length > 0 || i.boolValues && Object.keys(i.boolValues).length > 0);
@@ -794,51 +1222,51 @@ var ze = class {
 		};
 	}
 };
-function Be() {
-	T("mock", (e) => new ze(e));
+function $e() {
+	w("mock", (e) => new Qe(e));
 }
-Be();
+$e();
 //#endregion
 //#region src/modeler/solvers/index.ts
-var Ve = /* @__PURE__ */ he({
-	HIGHS_CONSTANTS: () => ie,
-	HIGHS_STATUS_NAMES: () => le,
-	HiGHS: () => G,
-	Highs: () => P,
-	HighsError: () => te,
-	HighsModel: () => se,
-	HighsSolver: () => W,
-	HighsUnsupportedOptionError: () => ae,
-	MockSolver: () => ze,
-	OFFICIAL_HIGHS_CDN_WASM_URL: () => ce,
-	bindHighsFunctions: () => ne,
-	getHighs: () => oe,
-	getHighsWasmUrl: () => I,
-	getSolver: () => D,
-	isValidWasmHeader: () => re,
+var et = /* @__PURE__ */ _e({
+	HIGHS_CONSTANTS: () => oe,
+	HIGHS_STATUS_NAMES: () => de,
+	HiGHS: () => Ke,
+	Highs: () => ne,
+	HighsError: () => re,
+	HighsModel: () => le,
+	HighsSolver: () => J,
+	HighsUnsupportedOptionError: () => se,
+	MockSolver: () => Qe,
+	OFFICIAL_HIGHS_CDN_WASM_URL: () => ue,
+	bindHighsFunctions: () => ie,
+	getHighs: () => ce,
+	getHighsWasmUrl: () => P,
+	getSolver: () => E,
+	isValidWasmHeader: () => ae,
 	listAvailableSolvers: () => S,
-	mapHighsStatus: () => U,
-	mapHighsTerminationStatus: () => H,
-	probeWasmUrl: () => M,
-	registerHighsSolver: () => K,
-	registerMockSolver: () => Be,
-	registerSolver: () => T,
-	resolveBrowserWasmUrl: () => F,
+	mapHighsStatus: () => Ge,
+	mapHighsTerminationStatus: () => q,
+	probeWasmUrl: () => j,
+	registerHighsSolver: () => qe,
+	registerMockSolver: () => $e,
+	registerSolver: () => w,
+	resolveBrowserWasmUrl: () => N,
 	setDefaultSolver: () => _,
-	setHighsWasmUrl: () => L,
-	solveLp: () => V,
-	solveLpWithHighs: () => N
+	setHighsWasmUrl: () => F,
+	solveLp: () => We,
+	solveLpWithHighs: () => M
 });
-R(Ve, Re);
+I(et, Ze);
 //#endregion
 //#region src/modeler/solution-validator.ts
-function He(e, t) {
+function tt(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 Ue(e, t = {}) {
-	let r = He(t.feasibilityTolerance, "feasibilityTolerance"), i = He(t.integralityTolerance, "integralityTolerance"), a = t.evaluateLogicalConstraints === void 0 || !!t.evaluateLogicalConstraints, s = t.values !== void 0 && t.values !== null;
+function nt(e, t = {}) {
+	let r = tt(t.feasibilityTolerance, "feasibilityTolerance"), i = tt(t.integralityTolerance, "integralityTolerance"), a = t.evaluateLogicalConstraints === void 0 || !!t.evaluateLogicalConstraints, s = 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 l = t.values, u = [], d = Object.create(null), f = [], p = [], m = 0, h = (e) => {
 		typeof e == "number" && !Number.isNaN(e) && e > m && (m = e);
@@ -996,7 +1424,7 @@ function Ue(e, t = {}) {
 			ok: !0,
 			value: n
 		};
-	}, w = (e, t = r) => {
+	}, ee = (e, t = r) => {
 		if (typeof e.rhs != "number" || !Number.isFinite(e.rhs)) return {
 			status: "unchecked",
 			reason: `non-finite right-hand side (${String(e.rhs)})`
@@ -1026,7 +1454,7 @@ function Ue(e, t = {}) {
 		};
 	};
 	for (let t of e.constraints) {
-		let e = w(t);
+		let e = ee(t);
 		e.status === "unchecked" ? (f.push(t.name), g({
 			type: "unchecked_constraint",
 			target: "constraint",
@@ -1049,7 +1477,7 @@ function Ue(e, t = {}) {
 			message: e.message
 		})) : (x++, h(e.violation));
 	}
-	let T = (e) => {
+	let w = (e) => {
 		if (e instanceof o) return v.has(e) ? {
 			ok: !0,
 			value: v.get(e),
@@ -1059,7 +1487,7 @@ function Ue(e, t = {}) {
 			reason: `missing or invalid value for Boolean variable "${e.name}"`
 		};
 		if (e instanceof c) {
-			let t = w(e, 0);
+			let t = ee(e, 0);
 			if (t.status === "unchecked") return {
 				ok: !1,
 				reason: t.reason
@@ -1079,7 +1507,7 @@ function Ue(e, t = {}) {
 		}
 		if (e instanceof n) switch (e.op) {
 			case "not": {
-				let t = T(e.children[0]);
+				let t = w(e.children[0]);
 				return t.ok ? {
 					ok: !0,
 					value: !t.value,
@@ -1089,7 +1517,7 @@ function Ue(e, t = {}) {
 			case "and": {
 				let t = 0;
 				for (let n of e.children) {
-					let e = T(n);
+					let e = w(n);
 					if (!e.ok) return e;
 					if (!e.value) return {
 						ok: !0,
@@ -1107,7 +1535,7 @@ function Ue(e, t = {}) {
 			case "or": {
 				let t = !1, n = Infinity;
 				for (let r of e.children) {
-					let e = T(r);
+					let e = w(r);
 					if (!e.ok) return e;
 					e.value && (t = !0, e.violation < n && (n = e.violation));
 				}
@@ -1118,14 +1546,14 @@ function Ue(e, t = {}) {
 				};
 			}
 			case "implies": {
-				let t = T(e.children[0]);
+				let t = w(e.children[0]);
 				if (!t.ok) return t;
 				if (!t.value) return {
 					ok: !0,
 					value: !0,
 					violation: 0
 				};
-				let n = T(e.children[1]);
+				let n = w(e.children[1]);
 				return n.ok ? {
 					ok: !0,
 					value: n.value,
@@ -1135,7 +1563,7 @@ function Ue(e, t = {}) {
 			case "xor": {
 				let t = !1, n = 0;
 				for (let r of e.children) {
-					let e = T(r);
+					let e = w(r);
 					if (!e.ok) return e;
 					e.value && (t = !t, e.violation > n && (n = e.violation));
 				}
@@ -1167,7 +1595,7 @@ function Ue(e, t = {}) {
 			});
 			continue;
 		}
-		let i = T(n.expr);
+		let i = w(n.expr);
 		if (!i.ok) {
 			f.push(r), g({
 				type: "unchecked_constraint",
@@ -1189,10 +1617,10 @@ function Ue(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 && f.length === 0 && p.length === 0;
+	let T = y === e.variables.length && b === e.boolVars.length && x === e.constraints.length && S === e.logicalConstraints.length && f.length === 0 && p.length === 0;
 	return {
-		valid: E && u.length === 0,
-		complete: E,
+		valid: T && u.length === 0,
+		complete: T,
 		violations: u,
 		violationsByName: d,
 		uncheckedConstraints: f,
@@ -1212,10 +1640,10 @@ function Ue(e, t = {}) {
 }
 //#endregion
 //#region src/modeler/big-m.ts
-function We(e, t) {
+function rt(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 Ge(e, t, n) {
+function it(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;
@@ -1226,8 +1654,8 @@ function Ge(e, t, n) {
 	}
 	return i;
 }
-function q(e, t, n) {
-	let r = Ge(e, t, n), i = 0;
+function at(e, t, n) {
+	let r = it(e, t, n), i = 0;
 	for (let [t, r] of e.terms) {
 		if (r === 0) continue;
 		let e;
@@ -1247,8 +1675,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 = Ge(e, t, n), i = 0;
+function ot(e, t, n) {
+	let r = it(e, t, n), i = 0;
 	for (let [t, r] of e.terms) {
 		if (r === 0) continue;
 		let e;
@@ -1271,7 +1699,7 @@ function J(e, t, n) {
 function Y(e, t, n, r, i, a, o) {
 	if (!(e instanceof b && (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 = Ge(t, r, o);
+	let s = it(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}.`);
@@ -1282,16 +1710,16 @@ function Y(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 j(d, 0),
+		lhs: new A(d, 0),
 		rhs: u
 	};
 }
 //#endregion
 //#region src/modeler/linearizer.ts
 function X(e, t = 0) {
-	return new j(new Map(e), t);
+	return new A(new Map(e), t);
 }
-function Ke(e, t, r, i) {
+function st(e, t, r, i) {
 	let a = [...e], s = [...r], l = /* @__PURE__ */ new Map(), u = /* @__PURE__ */ new Map();
 	for (let e of r) u.set(e, e.name);
 	let d = new Set(e.map((e) => e.name)), f = 0;
@@ -1314,7 +1742,7 @@ function Ke(e, t, r, i) {
 		l.set(e, n), a.push(n);
 	}
 	function m(e, t) {
-		if (e instanceof qe) return e.wrappedVar;
+		if (e instanceof ct) return e.wrappedVar;
 		if (e instanceof o) {
 			let n = l.get(e);
 			if (!n) throw Error(`Unregistered BoolVar "${e.name}" in logical constraint "${t}".`);
@@ -1536,7 +1964,7 @@ function Ke(e, t, r, i) {
 				}
 				if (i instanceof n) {
 					if (i.op === "and") {
-						for (let e = 0; e < i.children.length; e++) _(new n("implies", [d instanceof b ? new qe(d) : r, i.children[e]]), `${t}_and_${e}`);
+						for (let e = 0; e < i.children.length; e++) _(new n("implies", [d instanceof b ? new ct(d) : r, i.children[e]]), `${t}_and_${e}`);
 						return;
 					}
 					if (i.op === "not") {
@@ -1555,10 +1983,10 @@ function Ke(e, t, r, i) {
 	function v(e, t, n, r, i) {
 		let { lhs: a, sense: o, rhs: l } = t;
 		if (o === "<=" || o === ">=") {
-			let t = Y(e, a, o, l, n, o === "<=" ? q(a, l, r) : J(a, l, r), r), d = new c(t.lhs, o, t.rhs, r);
+			let t = Y(e, a, o, l, n, o === "<=" ? at(a, l, r) : ot(a, l, r), r), d = new c(t.lhs, o, t.rhs, r);
 			s.push(d), u.set(d, i);
 		} else {
-			let t = q(a, l, `${r}_le`), o = J(a, l, `${r}_ge`), d = Y(e, a, "<=", l, n, t, `${r}_le`), f = Y(e, a, ">=", l, n, o, `${r}_ge`), p = new c(d.lhs, "<=", d.rhs, `${r}_le`), m = new c(f.lhs, ">=", f.rhs, `${r}_ge`);
+			let t = at(a, l, `${r}_le`), o = ot(a, l, `${r}_ge`), d = Y(e, a, "<=", l, n, t, `${r}_le`), f = Y(e, a, ">=", l, n, o, `${r}_ge`), p = new c(d.lhs, "<=", d.rhs, `${r}_le`), m = new c(f.lhs, ">=", f.rhs, `${r}_ge`);
 			s.push(p, m), u.set(p, i), u.set(m, i);
 		}
 	}
@@ -1569,7 +1997,7 @@ function Ke(e, t, r, i) {
 		constraintToOriginalName: u
 	};
 }
-var qe = class extends o {
+var ct = class extends o {
 	wrappedVar;
 	constructor(e) {
 		super(e.name), this.wrappedVar = e;
@@ -1577,7 +2005,7 @@ var qe = class extends o {
 };
 //#endregion
 //#region src/decomposition/column-generation.ts
-async function Je(e) {
+async function lt(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;
@@ -1648,7 +2076,7 @@ async function Je(e) {
 }
 //#endregion
 //#region src/modeler/objective.ts
-function Ye(e, t) {
+function ut(e, t) {
 	let n = e;
 	if (n instanceof c || 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}\`)).`);
@@ -1656,27 +2084,27 @@ function Ye(e, t) {
 		if (!Number.isFinite(n)) throw Error(`Invalid non-finite objective constant "${n}" passed to ${t}().`);
 		return n;
 	}
-	if (typeof n == "string" || n instanceof j || n instanceof A || n instanceof b || 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;
+	if (typeof n == "string" || n instanceof A || n instanceof k || n instanceof b || 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 Xe(e) {
+function dt(e) {
 	return {
-		expr: Ye(e, "maximize"),
+		expr: ut(e, "maximize"),
 		sense: "Maximize"
 	};
 }
-function Ze(e) {
+function ft(e) {
 	return {
-		expr: Ye(e, "minimize"),
+		expr: ut(e, "minimize"),
 		sense: "Minimize"
 	};
 }
 //#endregion
 //#region src/decomposition/benders.ts
-function Qe(e) {
+function pt(e) {
 	return !!(e && typeof e == "object" && "constraints" in e && "variables" in e && typeof e.solve == "function");
 }
-async function $e(e, t, n, r, i, a, o, s, l = 1) {
+async function mt(e, t, n, r, i, a, o, s, l = 1) {
 	let u = [];
 	for (let r = 0; r < t.length; r++) {
 		let a = t[r], o = a.lhs, s = a.sense, d = a.rhs - (o.constant || 0), f = [], p = [], m = 0;
@@ -1685,7 +2113,7 @@ async function $e(e, t, n, r, i, a, o, s, l = 1) {
 			let n = i[e.name] ?? 0;
 			m += t * n;
 		} else f.push([e, t]);
-		let h = d - m, g = new j();
+		let h = d - m, g = new A();
 		for (let [e, t] of f) g.addTerm(e, t);
 		let _ = `__benders_link_${l}_${r}`, v = new c(g, s, h, _);
 		e.constraint(v), u.push({
@@ -1721,7 +2149,7 @@ async function $e(e, t, n, r, i, a, o, s, l = 1) {
 			}
 		}
 	}
-	let v = new j();
+	let v = new A();
 	v.addTerm(r, 1);
 	for (let [e, t] of g.entries()) Math.abs(t) > 1e-12 && v.addTerm(e, t);
 	let y = new c(v, a ? ">=" : "<=", h, `__benders_opt_cut_${l}`), b = (n.objectiveValue ?? 0) - p + f;
@@ -1732,7 +2160,7 @@ async function $e(e, t, n, r, i, a, o, s, l = 1) {
 		subproblemObjective: b
 	};
 }
-async function et(e) {
+async function ht(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;
@@ -1756,10 +2184,10 @@ async function et(e) {
 			master: t
 		}), x = [];
 		if (b) {
-			if (Qe(b)) {
+			if (pt(b)) {
 				let n = b, r = n.linkingConstraints;
-				c || (c = t.continuous("__benders_theta", { lb: 0 }), v ? t.objective(Ze(t.objectiveExpr.add(c))) : t.objective(Xe(t.objectiveExpr.sub(c))));
-				let i = await $e(n, r, t, c, y, v, a, o, e);
+				c || (c = t.continuous("__benders_theta", { lb: 0 }), v ? t.objective(ft(t.objectiveExpr.add(c))) : t.objective(dt(t.objectiveExpr.sub(c))));
+				let i = await mt(n, r, t, c, y, v, a, o, e);
 				i && x.push(i);
 			} else Array.isArray(b) ? x.push(...b) : x.push(b);
 		}
@@ -1815,13 +2243,13 @@ function Z(e) {
 function Q(e) {
 	return typeof e == "object" && !!e && !Array.isArray(e) && !(e instanceof String) && typeof e[Symbol.iterator] != "function";
 }
-function tt(e) {
+function gt(e) {
 	return e instanceof b || typeof e == "object" && !!e && !(e instanceof r) && !(e instanceof c) && "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 nt = class {
+var _t = class {
 	name;
 	_sense;
 	_objectiveExpr;
@@ -1864,13 +2292,13 @@ var nt = class {
 		n = typeof e == "string" ? {
 			...t,
 			name: e
-		} : e, this.name = n.name || "OptimizationModel", this._sense = _e(n.sense), this._objectiveExpr = new j(), n.solver && (this.solver = D(n.solver));
+		} : e, this.name = n.name || "OptimizationModel", this._sense = ye(n.sense), this._objectiveExpr = new A(), n.solver && (this.solver = E(n.solver));
 	}
 	get sense() {
 		return this._sense;
 	}
 	set sense(e) {
-		let t = _e(e);
+		let t = ye(e);
 		this._sense !== t && (this._sense = t, this.recordModelMutation());
 	}
 	get objectiveExpr() {
@@ -2162,30 +2590,31 @@ var nt = class {
 	}
 	applyObjective(e, t) {
 		if (e instanceof c || 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 : _e(t), r;
-		if (typeof e == "string") r = Se(e, (e) => this.getVarByName(e));
-		else if (typeof e == "number") r = new j(/* @__PURE__ */ new Map(), e);
+		let n = t === void 0 ? this.sense : ye(t), r;
+		if (typeof e == "string") r = Ne(e, (e) => this.getVarByName(e));
+		else if (typeof e == "number") r = new A(/* @__PURE__ */ new Map(), e);
+		else if (e instanceof k) r = e.clone();
 		else if (e instanceof A) r = e.clone();
-		else if (e instanceof j) 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 A(t.linearTerms, t.quadTerms, t.constant);
+			r = new k(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 j(t.terms, t.constant);
-		} else if (e instanceof b || typeof e == "object" && e && "id" in e && "name" in e && "lb" in e && "ub" in e) r = new j(/* @__PURE__ */ new Map([[e, 1]]), 0);
+			r = new A(t.terms, t.constant);
+		} else if (e instanceof b || typeof e == "object" && e && "id" in e && "name" in e && "lb" in e && "ub" in e) r = new A(/* @__PURE__ */ new Map([[e, 1]]), 0);
 		else throw Error("Invalid objective expression: expected a finite number, Var, LinExpr, QuadExpr, or arithmetic expression string.");
-		ee(r, this.name, (e) => this.varMapByName.get(e.name) === e), this._sense = n, this._objectiveExpr = r, this.recordModelMutation();
+		te(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 A || 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 j || 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 (tt(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 (e instanceof k || 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 A || 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 (gt(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;
@@ -2199,9 +2628,9 @@ var nt = class {
 		return null;
 	}
 	addConstraint(e, t) {
-		if (e instanceof A || 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 j || 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 (tt(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 k || 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 A || 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 (gt(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 r) {
 			let n = typeof t == "string" && t.trim().length > 0 ? t.trim() : void 0;
 			if (n !== void 0) {
@@ -2214,14 +2643,14 @@ var nt = class {
 			} catch (e) {
 				throw n === void 0 && (this.logicalConstrCounter = r), e;
 			}
-			O(e, this, this.batchDepth > 0 ? this.batchUndoActions : void 0);
+			D(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" ? we(e, (e) => this.getVarByName(e), t) : e;
+		let n = typeof e == "string" ? Ie(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 && (h(n, this.name, (e) => this.varMapByName.get(e.name) === e, n.name), p(n, this));
 		let i = typeof t == "string" && t.trim().length > 0 ? t.trim() : n.hasExplicitName ? n.name.trim() : void 0;
@@ -2244,7 +2673,7 @@ var nt = class {
 		if (e instanceof r) 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 b)) 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 A || 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 (t instanceof k || 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 i = t, a = n.activeValue === void 0 ? 1 : n.activeValue;
 		if (a !== 0 && a !== 1) throw Error(`Invalid activeValue: ${a}. Indicator activeValue must be 0 or 1.`);
@@ -2260,15 +2689,15 @@ var nt = class {
 		try {
 			if ((u === "<=" || u === "==") && (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`);
 			if ((u === ">=" || u === "==") && (this.hasConstraintName(m) || this.hasBoolVarName(m))) throw Error(this.hasBoolVarName(m) ? `Constraint name '${m}' conflicts with an existing Boolean variable in model` : `Constraint with name '${m}' already exists in model`);
-			n.M !== void 0 && We(n.M, f);
+			n.M !== void 0 && rt(n.M, f);
 			let t = (e) => this.varMapByName.get(e.name) === e;
 			for (let [e] of l.terms) if (!t(e)) throw Error(`Variable "${e.name}" in constraint "${f}" does not belong to model "${this.name}". All variables must belong to the model by object identity.`);
 			if (u === "<=" || u === "==") {
-				let t = Y(e, l, "<=", d, a, n.M === void 0 ? q(l, d, p) : n.M, p);
+				let t = Y(e, l, "<=", d, a, n.M === void 0 ? at(l, d, p) : n.M, p);
 				g.push([new c(t.lhs, "<=", t.rhs, p), p]);
 			}
 			if (u === ">=" || u === "==") {
-				let t = Y(e, l, ">=", d, a, n.M === void 0 ? J(l, d, m) : n.M, m);
+				let t = Y(e, l, ">=", d, a, n.M === void 0 ? ot(l, d, m) : n.M, m);
 				g.push([new c(t.lhs, ">=", t.rhs, m), m]);
 			}
 			for (let [e, n] of g) h(e, this.name, t, n);
@@ -2289,7 +2718,7 @@ var nt = class {
 		return e;
 	}
 	validateIntegrity() {
-		k(this);
+		O(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.`);
@@ -2309,6 +2738,9 @@ var nt = 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 || {};
@@ -2327,16 +2759,16 @@ var nt = class {
 		if (typeof e == "string") {
 			let { solver: n, ...r } = t || {};
 			return {
-				activeSolver: D(e, r),
+				activeSolver: E(e, r),
 				activeOptions: r
 			};
 		}
 		let { solver: n, ...r } = e || {};
 		return n ? {
-			activeSolver: D(n, r),
+			activeSolver: E(n, r),
 			activeOptions: r
 		} : {
-			activeSolver: this.solver || D(),
+			activeSolver: this.solver || E(),
 			activeOptions: r
 		};
 	}
@@ -2354,9 +2786,9 @@ var nt = class {
 		let n = ++this.activeOperationId, r = this.modelRevision;
 		this.clearSolutionFields(), this.validateIntegrity();
 		let { activeSolver: i, activeOptions: a } = this.resolveSolverAndOptions(e, t);
-		if (this._objectiveExpr instanceof A && 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._objectiveExpr instanceof k && 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 = Ke(this.variables, this.boolVars, this.constraints, this.logicalConstraints), o = {
+		if (this.logicalConstraints.length > 0 && i.capabilities?.supportsSMT !== !0 ? (s = st(this.variables, this.boolVars, this.constraints, this.logicalConstraints), o = {
 			name: this.name,
 			sense: this.sense,
 			objective: this._objectiveExpr,
@@ -2395,7 +2827,11 @@ var nt = 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);
@@ -2481,8 +2917,12 @@ var nt = 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));
@@ -2496,7 +2936,7 @@ var nt = class {
 				runTime: this.runTime
 			};
 		}
-		let u = this.logicalConstraints.length > 0 || this.boolVars.length > 0 ? Ke(this.variables, this.boolVars, this.constraints, this.logicalConstraints) : {
+		let u = this.logicalConstraints.length > 0 || this.boolVars.length > 0 ? st(this.variables, this.boolVars, this.constraints, this.logicalConstraints) : {
 			variables: [...this.variables],
 			constraints: [...this.constraints],
 			boolVarToBinary: /* @__PURE__ */ new Map(),
@@ -2512,7 +2952,7 @@ var nt = class {
 					ub: Infinity
 				});
 				f.push(r), p.push([r, 1]), m.set(r, t);
-				let a = n.clone().add(new j(/* @__PURE__ */ new Map([[r, -1]]), 0));
+				let a = n.clone().add(new A(/* @__PURE__ */ new Map([[r, -1]]), 0));
 				d.push(new c(a, "<=", i, `${e.name}_slack`));
 			} else if (r === ">=") {
 				let r = new b({
@@ -2522,7 +2962,7 @@ var nt = class {
 					ub: Infinity
 				});
 				f.push(r), p.push([r, 1]), m.set(r, t);
-				let a = n.clone().add(new j(/* @__PURE__ */ new Map([[r, 1]]), 0));
+				let a = n.clone().add(new A(/* @__PURE__ */ new Map([[r, 1]]), 0));
 				d.push(new c(a, ">=", i, `${e.name}_slack`));
 			} else {
 				let r = new b({
@@ -2537,14 +2977,14 @@ var nt = class {
 					ub: Infinity
 				});
 				f.push(r, a), p.push([r, 1], [a, 1]), m.set(r, t), m.set(a, t);
-				let o = n.clone().add(new j(/* @__PURE__ */ new Map([[r, -1], [a, 1]]), 0));
+				let o = n.clone().add(new A(/* @__PURE__ */ new Map([[r, -1], [a, 1]]), 0));
 				d.push(new c(o, "==", i, `${e.name}_slack`));
 			}
 		}
 		let g = {
 			name: `${this.name}_elastic_check`,
 			sense: "Minimize",
-			objective: new j(new Map(p), 0),
+			objective: new A(new Map(p), 0),
 			constraints: d,
 			variables: [...u.variables, ...f]
 		}, _;
@@ -2554,40 +2994,43 @@ var nt = class {
 			throw this.activeOperationId === n && this.clearSolutionFields(), e;
 		}
 		this.ensureExecutionValid(r, n, "check"), this.runTime = _.runTime ?? 0;
-		let v = _.status, y = _.terminationStatus ?? v, x = this.hasPrimalFromResult(_), S = typeof _.objectiveValue == "number" && Number.isFinite(_.objectiveValue) ? _.objectiveValue : Infinity, C = (v === "Optimal" || v === "Feasible" || x) && S <= 1e-5, w = typeof _.objectiveBound == "number" && Number.isFinite(_.objectiveBound) && _.objectiveBound > 1e-5, T = !C && (v === "Infeasible" || v === "Optimal" && S > 1e-5 || w), E = C ? "Sat" : T ? "Unsat" : "Unknown";
-		this.status = E, this.terminationStatus = a.signal?.aborted || y === "Interrupted" ? "Interrupted" : y === "Optimal" || y === "Feasible" || y === "Infeasible" ? E : y, this.hasPrimalSolution = C, 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 = {};
+		let v = _.status, y = _.terminationStatus ?? v, x = this.hasPrimalFromResult(_), S = typeof _.objectiveValue == "number" && Number.isFinite(_.objectiveValue) ? _.objectiveValue : Infinity, C = (v === "Optimal" || v === "Feasible" || x) && S <= 1e-5, ee = typeof _.objectiveBound == "number" && Number.isFinite(_.objectiveBound) && _.objectiveBound > 1e-5, w = !C && (v === "Infeasible" || v === "Optimal" && S > 1e-5 || ee), T = C ? "Sat" : w ? "Unsat" : "Unknown";
+		this.status = T, this.terminationStatus = a.signal?.aborted || y === "Interrupted" ? "Interrupted" : y === "Optimal" || y === "Feasible" || y === "Infeasible" ? T : y, this.hasPrimalSolution = C, 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 E = {};
 		if (C && _.values) {
 			for (let e of this.variables) {
 				let t = _.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(E, e.name, n);
+				}
 			}
 			for (let e of this.boolVars) {
 				let t = u.boolVarToBinary.get(e), n = t ? _.values[t.name] : _.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);
+					e.value = t, this.values.set(e.name, t), s(E, e.name, t);
 				}
 			}
 		}
-		let O = /* @__PURE__ */ new Set();
-		if (T && _.values) for (let [e, t] of m.entries()) {
+		let D = /* @__PURE__ */ new Set();
+		if (w && _.values) for (let [e, t] of m.entries()) {
 			let n = _.values[e.name];
-			typeof n == "number" && n > 1e-5 && O.add(t);
+			typeof n == "number" && n > 1e-5 && D.add(t);
 		}
-		return this.conflicts = T ? Object.freeze(Array.from(O)) : void 0, this.unsatCore = void 0, this.hasSolutionState = !0, {
-			status: E,
-			values: D,
+		return this.conflicts = w ? Object.freeze(Array.from(D)) : void 0, this.unsatCore = void 0, this.hasSolutionState = !0, {
+			status: T,
+			values: E,
 			conflicts: this.conflicts,
 			unsatCore: this.unsatCore,
 			runTime: this.runTime
 		};
 	}
 	validateSolution(e = {}) {
-		return Ue(this, e);
+		return nt(this, e);
 	}
 	link(e) {
-		if (e instanceof A || typeof e == "object" && e && "quadTerms" in e) throw Error("Linking constraint cannot be a quadratic expression.");
+		if (e instanceof k || typeof e == "object" && e && "quadTerms" in e) throw Error("Linking constraint cannot be a quadratic expression.");
 		if (!(e instanceof c) && (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;
@@ -2597,79 +3040,79 @@ var nt = class {
 		return this._linkingConstraints ?? [];
 	}
 	async solveBenders(e) {
-		let t = await et({
+		let t = await ht({
 			master: this,
 			...e
 		});
 		return this.decomposition = t, t;
 	}
 	async solveColumnGeneration(e) {
-		let t = await Je({
+		let t = await lt({
 			master: this,
 			...e
 		});
 		return this.decomposition = t, t;
 	}
 };
-R(/* @__PURE__ */ he({
+I(/* @__PURE__ */ _e({
 	BoolExpr: () => r,
 	BoolOp: () => n,
 	BoolVar: () => o,
 	Constraint: () => c,
-	HIGHS_CONSTANTS: () => ie,
-	HIGHS_STATUS_NAMES: () => le,
-	HiGHS: () => G,
-	Highs: () => P,
-	HighsError: () => te,
-	HighsModel: () => se,
-	HighsSolver: () => W,
-	HighsUnsupportedOptionError: () => ae,
-	LinExpr: () => j,
-	MockSolver: () => ze,
-	Model: () => nt,
-	OFFICIAL_HIGHS_CDN_WASM_URL: () => ce,
-	QuadExpr: () => A,
+	HIGHS_CONSTANTS: () => oe,
+	HIGHS_STATUS_NAMES: () => de,
+	HiGHS: () => Ke,
+	Highs: () => ne,
+	HighsError: () => re,
+	HighsModel: () => le,
+	HighsSolver: () => J,
+	HighsUnsupportedOptionError: () => se,
+	LinExpr: () => A,
+	MockSolver: () => Qe,
+	Model: () => _t,
+	OFFICIAL_HIGHS_CDN_WASM_URL: () => ue,
+	QuadExpr: () => k,
 	Var: () => b,
 	and: () => y,
-	bindHighsFunctions: () => ne,
+	bindHighsFunctions: () => ie,
 	buildIndicatorLinearization: () => Y,
 	buildLpSymbolMaps: () => u,
-	deriveBigMForGe: () => J,
-	deriveBigMForLe: () => q,
+	deriveBigMForGe: () => ot,
+	deriveBigMForLe: () => at,
 	dot: () => s,
-	expr: () => ke,
+	expr: () => Re,
 	generateLpString: () => C,
-	getHighs: () => oe,
-	getHighsWasmUrl: () => I,
-	getSolver: () => D,
+	getHighs: () => ce,
+	getHighsWasmUrl: () => P,
+	getSolver: () => E,
 	implies: () => e,
-	isLpExportResult: () => E,
-	isValidWasmHeader: () => re,
-	linearizeModelForMip: () => Ke,
+	isLpExportResult: () => T,
+	isValidWasmHeader: () => ae,
+	linearizeModelForMip: () => st,
 	listAvailableSolvers: () => S,
-	mapHighsStatus: () => U,
-	mapHighsTerminationStatus: () => H,
-	maximize: () => Xe,
-	minimize: () => Ze,
+	mapHighsStatus: () => Ge,
+	mapHighsTerminationStatus: () => q,
+	maximize: () => dt,
+	minimize: () => ft,
 	not: () => v,
 	or: () => i,
-	parseConstraint: () => we,
-	parseExpr: () => Se,
-	probeWasmUrl: () => M,
-	registerHighsSolver: () => K,
-	registerMockSolver: () => Be,
-	registerSolver: () => T,
-	resolveBrowserWasmUrl: () => F,
+	parseConstraint: () => Ie,
+	parseExpr: () => Ne,
+	probeWasmUrl: () => j,
+	registerHighsSolver: () => qe,
+	registerMockSolver: () => $e,
+	registerSolver: () => w,
+	resolveBrowserWasmUrl: () => N,
 	sanitizeIdentifier: () => f,
 	setDefaultSolver: () => _,
-	setHighsWasmUrl: () => L,
-	solveLp: () => V,
-	solveLpWithHighs: () => N,
+	setHighsWasmUrl: () => F,
+	solveLp: () => We,
+	solveLpWithHighs: () => M,
 	sum: () => t,
-	validateModelIntegrity: () => k,
-	validateModelSolution: () => Ue,
-	validateUserBigM: () => We,
+	validateModelIntegrity: () => O,
+	validateModelSolution: () => nt,
+	validateUserBigM: () => rt,
 	xor: () => a
-}), Ve);
+}), et);
 //#endregion
-export { r as BoolExpr, n as BoolOp, o as BoolVar, c as Constraint, G as HiGHS, P as Highs, W as HighsSolver, j as LinExpr, ze as MockSolver, nt as Model, A as QuadExpr, b as Var, y as and, Y as buildIndicatorLinearization, u as buildLpSymbolMaps, J as deriveBigMForGe, q as deriveBigMForLe, s as dot, ke as expr, C as generateLpString, oe as getHighs, I as getHighsWasmUrl, D as getSolver, e as implies, E as isLpExportResult, Ke as linearizeModelForMip, S as listAvailableSolvers, Xe as maximize, Ze as minimize, _e as normalizeSense, v as not, i as or, we as parseConstraint, Se as parseExpr, T as registerSolver, f as sanitizeIdentifier, _ as setDefaultSolver, L as setHighsWasmUrl, et as solveBenders, Je as solveColumnGeneration, N as solveLpWithHighs, t as sum, k as validateModelIntegrity, Ue as validateModelSolution, We as validateUserBigM, a as xor };
+export { r as BoolExpr, n as BoolOp, o as BoolVar, c as Constraint, Ke as HiGHS, ne as Highs, J as HighsSolver, A as LinExpr, Qe as MockSolver, _t as Model, k as QuadExpr, b as Var, y as and, Y as buildIndicatorLinearization, u as buildLpSymbolMaps, ot as deriveBigMForGe, at as deriveBigMForLe, s as dot, Re as expr, C as generateLpString, ce as getHighs, P as getHighsWasmUrl, E as getSolver, e as implies, T as isLpExportResult, st as linearizeModelForMip, S as listAvailableSolvers, dt as maximize, ft as minimize, ye as normalizeSense, v as not, i as or, Ie as parseConstraint, Ne as parseExpr, w as registerSolver, f as sanitizeIdentifier, _ as setDefaultSolver, F as setHighsWasmUrl, ht as solveBenders, lt as solveColumnGeneration, M as solveLpWithHighs, t as sum, O as validateModelIntegrity, nt as validateModelSolution, rt as validateUserBigM, a as xor };