@ohtaman/washi 0.3.0 → 0.5.0

package/dist/lib/washi.js

@@ -1,441 +1,119 @@
-import { a as e, c as t, i as n, l as r, n as i, o as a, r as o, s, t as c } from "./constraint-BRuB3ooC.js";
-import { i as l, n as u, r as d, t as f } from "./registry-DksqCSjI.js";
-import { a as p, c as m, i as h, n as g, o as _, r as v, s as y, t as b } from "./loader-Dti0v9yC.js";
-import { createHighsWorker as ee } 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 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-BEfvpZW3.js";
+import { a as M, c as N, i as P, n as F, o as I, r as L, s as R, t as te } from "./loader-DmNC_UNk.js";
+import { createHighsWorker as ne } from "./highs-worker-factory.js";
 //#region \0rolldown/runtime.js
-var x = Object.defineProperty, te = Object.getOwnPropertyDescriptor, ne = Object.getOwnPropertyNames, re = Object.prototype.hasOwnProperty, S = (e, t) => {
+var re = Object.defineProperty, ie = Object.getOwnPropertyDescriptor, ae = Object.getOwnPropertyNames, oe = Object.prototype.hasOwnProperty, se = (e, t) => {
 	let n = {};
-	for (var r in e) x(n, r, {
+	for (var r in e) re(n, r, {
 		get: e[r],
 		enumerable: !0
 	});
-	return t || x(n, Symbol.toStringTag, { value: "Module" }), n;
-}, C = (e, t, n, r) => {
-	if (t && typeof t == "object" || typeof t == "function") for (var i = ne(t), a = 0, o = i.length, s; a < o; a++) s = i[a], !re.call(e, s) && s !== n && x(e, s, {
+	return t || re(n, Symbol.toStringTag, { value: "Module" }), n;
+}, ce = (e, t, n, r) => {
+	if (t && typeof t == "object" || typeof t == "function") for (var i = ae(t), a = 0, o = i.length, s; a < o; a++) s = i[a], !oe.call(e, s) && s !== n && re(e, s, {
 		get: ((e) => t[e]).bind(null, s),
-		enumerable: !(r = te(t, s)) || r.enumerable
+		enumerable: !(r = ie(t, s)) || r.enumerable
 	});
 	return e;
-}, w = (e, t, n) => (C(e, t, "default"), n && C(n, t, "default"));
+}, z = (e, t, n) => (ce(e, t, "default"), n && ce(n, t, "default"));
 //#endregion
 //#region src/modeler/types.ts
-function T(e) {
-	return e && e.toLowerCase() === "maximize" ? "Maximize" : "Minimize";
+function le(e) {
+	if (e === void 0) return "Minimize";
+	if (typeof e == "string") {
+		let t = e.toLowerCase();
+		if (t === "maximize") return "Maximize";
+		if (t === "minimize") return "Minimize";
+	}
+	throw Error(`Invalid optimization sense "${String(e)}": expected "Maximize", "Minimize", "maximize", or "minimize".`);
 }
 //#endregion
-//#region src/modeler/quad-expr.ts
-function E(e, t) {
-	let n = e.id, r = t.id;
-	return n <= r ? `${n}:${r}` : `${r}:${n}`;
-}
-var D = class e {
-	linearTerms;
-	quadTerms;
-	constant;
-	constructor(e = /* @__PURE__ */ new Map(), t = /* @__PURE__ */ new Map(), n = 0) {
-		this.linearTerms = new Map(e), this.quadTerms = /* @__PURE__ */ new Map();
-		for (let [e, n] of t) this.quadTerms.set(e, { ...n });
-		this.constant = n;
-	}
-	clone() {
-		return new e(this.linearTerms, this.quadTerms, this.constant);
-	}
-	getQuadCoeff(e, t) {
-		let n = E(e, t), r = this.quadTerms.get(n);
-		return r ? r.coeff : 0;
-	}
-	add(t) {
-		let n = this.clone();
-		if (typeof t == "number") return n.constant += t, n;
-		if (t instanceof e) {
-			for (let [e, r] of t.quadTerms) {
-				let t = n.quadTerms.get(e), i = (t ? t.coeff : 0) + r.coeff;
-				Math.abs(i) < 1e-12 ? n.quadTerms.delete(e) : n.quadTerms.set(e, {
-					var1: r.var1,
-					var2: r.var2,
-					coeff: i
-				});
-			}
-			for (let [e, r] of t.linearTerms) {
-				let t = (n.linearTerms.get(e) || 0) + r;
-				Math.abs(t) < 1e-12 ? n.linearTerms.delete(e) : n.linearTerms.set(e, t);
-			}
-			return n.constant += t.constant, n;
-		}
-		if ("terms" in t && t.terms instanceof Map) {
-			for (let [e, r] of t.terms) {
-				let t = (n.linearTerms.get(e) || 0) + r;
-				Math.abs(t) < 1e-12 ? n.linearTerms.delete(e) : n.linearTerms.set(e, t);
-			}
-			return n.constant += t.constant, n;
-		}
-		let r = t, i = (n.linearTerms.get(r) || 0) + 1;
-		return Math.abs(i) < 1e-12 ? n.linearTerms.delete(r) : n.linearTerms.set(r, i), n;
-	}
-	sub(t) {
-		return typeof t == "number" ? this.add(-t) : t instanceof e ? this.add(t.neg()) : ("terms" in t && t.terms instanceof Map, this.add(t.mul(-1)));
-	}
-	mul(t) {
-		let n = new e(/* @__PURE__ */ new Map(), /* @__PURE__ */ new Map(), this.constant * t);
-		for (let [e, r] of this.linearTerms) {
-			let i = r * t;
-			Math.abs(i) >= 1e-12 && n.linearTerms.set(e, i);
-		}
-		for (let [e, r] of this.quadTerms) {
-			let i = r.coeff * t;
-			Math.abs(i) >= 1e-12 && n.quadTerms.set(e, {
-				var1: r.var1,
-				var2: r.var2,
-				coeff: i
-			});
-		}
-		return n;
-	}
-	div(e) {
-		if (Math.abs(e) < 1e-12) throw Error("Division by zero in QuadExpr.div()");
-		return this.mul(1 / e);
-	}
-	neg() {
-		return this.mul(-1);
-	}
-	get value() {
-		let e = this.constant;
-		for (let [t, n] of this.linearTerms) {
-			if (t.value === null) return null;
-			e += n * t.value;
-		}
-		for (let t of this.quadTerms.values()) {
-			if (t.var1.value === null || t.var2.value === null) return null;
-			e += t.coeff * t.var1.value * t.var2.value;
-		}
-		return e;
-	}
-	getValue() {
-		return this.value;
-	}
-	static fromProduct(t, n, r = 1) {
-		let i = new e(), a = E(t, n);
-		return i.quadTerms.set(a, {
-			var1: t.id <= n.id ? t : n,
-			var2: t.id <= n.id ? n : t,
-			coeff: r
-		}), i;
-	}
-}, O = class e {
-	terms;
-	constant;
-	constructor(e = /* @__PURE__ */ new Map(), t = 0) {
-		this.terms = new Map(e), this.constant = t;
-	}
-	clone() {
-		return new e(this.terms, this.constant);
-	}
-	add(e) {
-		if (e instanceof D) return e.add(this);
-		let t = this.clone();
-		if (typeof e == "number") t.constant += e;
-		else if ("terms" in e) {
-			for (let [n, r] of e.terms) {
-				let e = (t.terms.get(n) || 0) + r;
-				Math.abs(e) < 1e-12 ? t.terms.delete(n) : t.terms.set(n, e);
-			}
-			t.constant += e.constant;
-		} else {
-			let n = (t.terms.get(e) || 0) + 1;
-			Math.abs(n) < 1e-12 ? t.terms.delete(e) : t.terms.set(e, n);
-		}
-		return t;
-	}
-	sub(e) {
-		return e instanceof D ? e.neg().add(this) : typeof e == "number" ? this.add(-e) : ("terms" in e, this.add(e.mul(-1)));
-	}
-	mul(t) {
-		if (typeof t == "number") {
-			let n = new e(/* @__PURE__ */ new Map(), this.constant * t);
-			for (let [e, r] of this.terms) {
-				let i = r * t;
-				Math.abs(i) >= 1e-12 && n.terms.set(e, i);
-			}
-			return n;
-		}
-		let n = new D();
-		Math.abs(this.constant) >= 1e-12 && n.linearTerms.set(t, this.constant);
-		for (let [e, r] of this.terms) n = n.add(D.fromProduct(e, t, r));
-		return n;
-	}
-	div(e) {
-		if (Math.abs(e) < 1e-12) throw Error("Division by zero in LinExpr.div()");
-		return this.mul(1 / e);
-	}
-	neg() {
-		return this.mul(-1);
-	}
-	get value() {
-		let e = this.constant;
-		for (let [t, n] of this.terms) {
-			if (t.value === null) return null;
-			e += n * t.value;
-		}
-		return e;
-	}
-	getValue() {
-		return this.value;
-	}
-	le(e, t) {
-		return this.toConstraint("<=", e, t);
-	}
-	lessThanOrEqual(e, t) {
-		return this.le(e, t);
-	}
-	ge(e, t) {
-		return this.toConstraint(">=", e, t);
-	}
-	greaterThanOrEqual(e, t) {
-		return this.ge(e, t);
-	}
-	eq(e, t) {
-		return this.toConstraint("==", e, t);
-	}
-	equalTo(e, t) {
-		return this.eq(e, t);
-	}
-	toConstraint(t, n, r) {
-		let i = this.clone(), a = 0;
-		typeof n == "number" ? a = n : "terms" in n ? (i = i.sub(new e(n.terms, 0)), a = n.constant) : i = i.sub(n);
-		let o = a - i.constant;
-		return i.constant = 0, new c(i, t, o, r);
-	}
-	toString() {
-		let e = [], t = !0;
-		for (let [n, r] of this.terms) {
-			let i = r >= 0 ? t ? "" : "+ " : "- ", a = Math.abs(r), o = a === 1 ? "" : `${a} `;
-			e.push(`${i}${o}${n.name}`), t = !1;
-		}
-		if (this.constant !== 0 || e.length === 0) {
-			let n = this.constant >= 0 ? t ? "" : "+ " : "- ";
-			e.push(`${n}${Math.abs(this.constant)}`);
-		}
-		return e.join(" ") || "0";
-	}
-};
-function k(e, t) {
-	let n = /* @__PURE__ */ new Map(), r = 0;
-	function i(e) {
-		if (e != null) {
-			if (typeof e == "number") r += e;
-			else if (typeof e == "object" && "terms" in e) {
-				let t = e;
-				for (let [e, r] of t.terms) {
-					let t = n.get(e) || 0;
-					n.set(e, t + r);
-				}
-				r += t.constant;
-			} else {
-				let t = e, r = n.get(t) || 0;
-				n.set(t, r + 1);
-			}
-		}
-	}
-	if (typeof e == "number") {
-		let n = e, r = t;
-		for (let e = 0; e < n; e++) i(r(e, e));
-	} else {
-		let n = 0;
-		for (let r of e) i(t ? t(r, n++) : r);
-	}
-	for (let [e, t] of n) Math.abs(t) < 1e-12 && n.delete(e);
-	return new O(n, r);
-}
-function A(e, t) {
-	let n = /* @__PURE__ */ new Map(), r = 0;
-	function i(e) {
-		return typeof e == "object" && !!e && typeof e.id == "number" && typeof e.name == "string" && typeof e.mul == "function" && typeof e.le == "function";
-	}
-	function a(e) {
-		return i(e) || e instanceof O || e instanceof D;
-	}
-	function o(e, t) {
-		if (typeof t == "number") r += e * t;
-		else if (t instanceof O) {
-			for (let [r, i] of t.terms) {
-				let t = n.get(r) || 0;
-				n.set(r, t + e * i);
-			}
-			r += e * t.constant;
-		} else if (i(t)) {
-			let r = t, i = n.get(r) || 0;
-			n.set(r, i + e);
-		} else throw Error("Cannot multiply number by non-variable/expression operand in dot().");
-	}
-	function s(e) {
-		return typeof e == "object" && !!e && !Array.isArray(e) && !a(e);
-	}
-	function c(e, t, n = "") {
-		if (e === void 0 || t === void 0 || e === null || t === null) throw Error(`Nullish or undefined operand encountered in dot() at '${n || "root"}'.`);
-		if (typeof e == "number") {
-			o(e, t);
-			return;
-		}
-		if (typeof t == "number") {
-			o(t, e);
-			return;
-		}
-		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 dot() at '${n || "root"}': received lengths ${e.length} and ${t.length}.`);
-				for (let r = 0; r < e.length; r++) c(e[r], t[r], n ? `${n}[${r}]` : `[${r}]`);
-				return;
-			}
-			let r = Array.isArray(e) ? e : t, i = Array.isArray(e) ? t : e;
-			if (s(i)) {
-				let a = Object.keys(i);
-				if (a.length > 0 && a.every((e) => /^\d+$/.test(e))) {
-					if (a.length !== r.length) throw Error(`Array length mismatch in dot() at '${n || "root"}': array has length ${r.length}, but object has ${a.length} indices.`);
-					let o = [];
-					for (let e = 0; e < r.length; e++) !(e in i) && !(String(e) in i) && o.push(e);
-					if (o.length > 0) throw Error(`Key mismatch in dot() at '${n || "root"}': missing indices [${o.join(", ")}] in numeric record.`);
-					for (let i = 0; i < r.length; i++) c(e[i], t[i], n ? `${n}[${i}]` : `[${i}]`);
-					return;
-				}
-				throw Error(`Type mismatch in dot() at '${n || "root"}': one operand is an Array while the other is an Object with keys [${a.slice(0, 5).join(", ")}].`);
-			}
-			throw Error(`Type mismatch in dot() at '${n || "root"}': one operand is an Array while the other is not.`);
-		}
-		if (s(e) && s(t)) {
-			let r = Object.keys(e), i = Object.keys(t), a = r.filter((e) => !(e in t)), o = i.filter((t) => !(t in e));
-			if (a.length > 0 || o.length > 0) {
-				let e = [];
-				throw a.length > 0 && e.push(`missing in second operand: [${a.join(", ")}]`), o.length > 0 && e.push(`missing in first operand: [${o.join(", ")}]`), Error(`Key mismatch in dot() at '${n || "root"}': ${e.join("; ")}.`);
-			}
-			for (let i of r) c(e[i], t[i], n ? `${n}.${i}` : i);
-			return;
-		}
-		throw Error(`Unsupported operand types in dot() at '${n || "root"}'.`);
-	}
-	c(e, t);
-	for (let [e, t] of n) Math.abs(t) < 1e-12 && n.delete(e);
-	return new O(n, r);
-}
-//#endregion
-//#region src/modeler/variable.ts
-var ie = 0;
-function ae(e) {
-	if (!e) return "Continuous";
-	let t = e.toLowerCase();
-	return t === "binary" || t === "bin" ? "Binary" : t === "integer" || t === "int" ? "Integer" : "Continuous";
-}
-var j = class e {
-	id;
-	name;
-	type;
-	lb;
-	ub;
-	value = null;
-	reducedCost = null;
-	constructor(e = {}) {
-		this.id = ++ie, this.name = e.name || `x_${this.id}`, this.type = ae(e.type), this.type === "Binary" ? (this.lb = 0, this.ub = 1) : (this.lb = e.lb === void 0 ? 0 : e.lb, this.ub = e.ub === void 0 ? Infinity : e.ub);
-	}
-	mul(t) {
-		if (typeof t == "number") return new O(/* @__PURE__ */ new Map([[this, t]]), 0);
-		if (t instanceof e) return D.fromProduct(this, t, 1);
-		let n = new D();
-		Math.abs(t.constant) >= 1e-12 && n.linearTerms.set(this, t.constant);
-		for (let [e, r] of t.terms) {
-			let t = D.fromProduct(this, e, r);
-			n = n.add(t);
-		}
-		return n;
-	}
-	add(e) {
-		return e instanceof D ? e.add(this) : new O(/* @__PURE__ */ new Map([[this, 1]]), 0).add(e);
-	}
-	sub(e) {
-		return e instanceof D ? e.neg().add(this) : new O(/* @__PURE__ */ new Map([[this, 1]]), 0).sub(e);
-	}
-	neg() {
-		return this.mul(-1);
-	}
-	le(e, t) {
-		return new O(/* @__PURE__ */ new Map([[this, 1]]), 0).le(e, t);
-	}
-	lessThanOrEqual(e, t) {
-		return this.le(e, t);
-	}
-	ge(e, t) {
-		return new O(/* @__PURE__ */ new Map([[this, 1]]), 0).ge(e, t);
-	}
-	greaterThanOrEqual(e, t) {
-		return this.ge(e, t);
-	}
-	eq(e, t) {
-		return new O(/* @__PURE__ */ new Map([[this, 1]]), 0).eq(e, t);
-	}
-	equalTo(e, t) {
-		return this.eq(e, t);
-	}
-	toString() {
-		return this.name;
-	}
-};
-//#endregion
 //#region src/modeler/parser.ts
-function M(e) {
-	let t = [], n = 0, r = e.length;
-	for (; n < r;) {
-		let i = e[n];
-		if (/\s/.test(i)) {
-			n++;
+var ue = /^(?:[0-9]+(?:\.[0-9]+)?|\.[0-9]+)(?:[eE][+-]?[0-9]+)?$/;
+function de(e, t) {
+	let n = [], r = 0, i = e.length;
+	for (; r < i;) {
+		let a = e[r];
+		if (/\s/.test(a)) {
+			r++;
 			continue;
 		}
-		if (i === "+") t.push({
+		if (a === "+") n.push({
 			type: "PLUS",
 			value: "+"
-		}), n++;
-		else if (i === "-") t.push({
+		}), r++;
+		else if (a === "-") n.push({
 			type: "MINUS",
 			value: "-"
-		}), n++;
-		else if (i === "*") t.push({
+		}), r++;
+		else if (a === "*") r + 1 < i && e[r + 1] === "*" ? (n.push({
+			type: "CARET",
+			value: "**"
+		}), r += 2) : (n.push({
 			type: "STAR",
 			value: "*"
-		}), n++;
-		else if (i === "/") t.push({
+		}), r++);
+		else if (a === "^") n.push({
+			type: "CARET",
+			value: "^"
+		}), r++;
+		else if (a === "/") n.push({
 			type: "SLASH",
 			value: "/"
-		}), n++;
-		else if (i === "(") t.push({
+		}), r++;
+		else if (a === "(") n.push({
 			type: "LPAREN",
 			value: "("
-		}), n++;
-		else if (i === ")") t.push({
+		}), r++;
+		else if (a === ")") n.push({
 			type: "RPAREN",
 			value: ")"
-		}), n++;
-		else if (i === "<" || i === ">" || i === "=") {
-			let a = i;
-			n + 1 < r && (e[n + 1] === "=" || e[n + 1] === "<" || e[n + 1] === ">") ? (a += e[n + 1], n += 2) : n++, t.push({
+		}), r++;
+		else if (a === "<" || a === ">" || a === "=") {
+			let t = a;
+			r + 1 < i && (e[r + 1] === "=" || e[r + 1] === "<" || e[r + 1] === ">") ? (t += e[r + 1], r += 2) : r++, n.push({
 				type: "COMP",
-				value: a
+				value: t
 			});
-		} else if (/[0-9.]/.test(i)) {
-			let i = "";
-			for (; n < r && /[0-9.]/.test(e[n]);) i += e[n], n++;
-			t.push({
+		} else if (/[0-9.]/.test(a)) {
+			let t = r, a = "";
+			for (; r < i && /[0-9]/.test(e[r]);) a += e[r++];
+			if (r < i && e[r] === ".") for (a += e[r++]; r < i && /[0-9]/.test(e[r]);) a += e[r++];
+			if (r < i && (e[r] === "e" || e[r] === "E")) {
+				let t = r + 1 < i ? e[r + 1] : "";
+				if (!/[a-zA-Z_]/.test(t)) {
+					for (a += e[r++], r < i && (e[r] === "+" || e[r] === "-") && (a += e[r++]); r < i && /[0-9]/.test(e[r]);) a += e[r++];
+					for (; r < i && (e[r] === "." || e[r] === "e" || e[r] === "E" || /[0-9]/.test(e[r]));) a += e[r++];
+				}
+			} else for (; r < i && (e[r] === "." || /[0-9]/.test(e[r]));) a += e[r++];
+			if (!ue.test(a)) throw Error(`Invalid numeric literal '${a}' at position ${t} in: "${e}"`);
+			let o = Number(a);
+			if (!Number.isFinite(o)) throw Error(`Numeric literal '${a}' overflows finite floating-point range in: "${e}"`);
+			if (o === 0 && !/^[0.]+(?:[eE][+-]?\d+)?$/.test(a)) throw Error(`Numeric literal '${a}' underflows to zero at position ${t} in: "${e}"`);
+			n.push({
 				type: "NUMBER",
-				value: i
+				value: a,
+				numericValue: o
 			});
-		} else if (/[a-zA-Z_]/.test(i)) {
-			let i = "";
-			for (; n < r && /[a-zA-Z0-9_]/.test(e[n]);) i += e[n], n++;
-			t.push({
+		} else if (/[a-zA-Z_]/.test(a)) {
+			let a = "";
+			for (; r < i && /[a-zA-Z0-9_]/.test(e[r]);) a += e[r], r++;
+			if (t && t.has(a)) {
+				let e = t.get(a);
+				n.push({
+					type: "NUMBER",
+					value: String(e),
+					numericValue: e
+				});
+			} else n.push({
 				type: "IDENT",
-				value: i
+				value: a
 			});
-		} else throw Error(`Unexpected character '${i}' at position ${n} in: "${e}"`);
+		} else throw Error(`Unexpected character '${a}' at position ${r} in: "${e}"`);
 	}
-	return t;
+	return n;
 }
-var N = class {
+var fe = class {
 	tokens;
 	pos = 0;
 	resolver;
@@ -460,199 +138,246 @@ var N = class {
 			else if (t.type === "MINUS") this.consume(), e = e.sub(this.parseTerm());
 			else break;
 		}
-		return e;
+		return e instanceof A && e.quadTerms.size === 0 ? new j(e.linearTerms, e.constant) : e;
 	}
 	parseTerm() {
 		let e = this.parseFactor();
 		for (; this.pos < this.tokens.length;) {
 			let t = this.peek();
 			if (!t) break;
-			if (t.type === "STAR") {
-				this.consume();
-				let t = this.parseFactor();
-				e = this.multiplyExpressions(e, t);
-			} else if (t.type === "SLASH") {
-				this.consume();
-				let t = this.parseFactor();
-				if (t.terms.size > 0) throw Error("Cannot divide by variable in linear expression");
-				if (Math.abs(t.constant) < 1e-12) throw Error("Division by zero in expression");
-				e = e.div(t.constant);
-			} else break;
+			if (t.type === "STAR") this.consume(), e = e.mul(this.parseFactor());
+			else if (t.type === "SLASH") this.consume(), e = e.div(this.parseFactor());
+			else break;
 		}
 		return e;
 	}
-	multiplyExpressions(e, t) {
-		if (e.terms.size > 0 && t.terms.size > 0) throw Error("Multiplication of two variables creates a non-linear term (not allowed in MILP/LP)");
-		return e.terms.size === 0 ? t.mul(e.constant) : e.mul(t.constant);
-	}
 	parseFactor() {
 		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();
+		let t;
 		if (e.type === "NUMBER") {
 			this.consume();
-			let t = parseFloat(e.value);
-			if (this.peek()?.type === "IDENT") {
-				let e = this.consume();
-				return this.resolveVariable(e.value).mul(t);
+			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);
 			}
-			return new O(/* @__PURE__ */ new Map(), t);
-		}
-		if (e.type === "IDENT") {
+			t = new j(/* @__PURE__ */ new Map(), n);
+		} else if (e.type === "IDENT") {
 			this.consume();
-			let t = this.resolveVariable(e.value);
-			return new O(/* @__PURE__ */ new Map([[t, 1]]), 0);
+			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");
+		else throw Error(`Unexpected token '${e.value}' in expression`);
+		return this.applyPower(t);
+	}
+	applyPower(e) {
+		if (this.peek()?.type !== "CARET") return e;
+		let t = [];
+		for (; this.peek()?.type === "CARET";) {
+			this.consume();
+			let e = this.tokens[this.pos]?.type === "LPAREN" && this.tokens[this.pos + 1]?.type === "NUMBER" && this.tokens[this.pos + 2]?.type === "RPAREN";
+			e && this.consume("LPAREN");
+			let n = this.peek();
+			if (!n || n.type !== "NUMBER") throw Error("Exponent must be a non-negative integer number");
+			this.consume(), e && this.consume("RPAREN");
+			let r = n.numericValue ?? Number(n.value);
+			if (!Number.isInteger(r) || r < 0) throw Error("Exponent must be a non-negative integer");
+			t.push(r);
 		}
-		if (e.type === "LPAREN") {
-			this.consume("LPAREN");
-			let e = this.parseExpression();
-			return this.consume("RPAREN"), e;
+		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);
 		}
-		throw Error(`Unexpected token '${e.value}' in expression`);
+		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)`);
+	}
+	getRemainingToken() {
+		return this.peek();
 	}
-	resolveVariable(e) {
+	resolve(e) {
 		let t = this.resolver(e);
 		if (!t) throw Error(`Unknown variable '${e}' in expression`);
 		return t;
 	}
 };
-function P(e, t) {
-	return new N(M(e), t).parseExpression();
+function B(e, t, n) {
+	let r = new fe(de(e, n), t), i = r.parseExpression(), a = r.getRemainingToken();
+	if (a) throw Error(`Unexpected token '${a.value}' after expression in "${e}"`);
+	return _e(i), i;
+}
+function pe(e, t) {
+	return B(e, t);
+}
+function me(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 = B(s, t, r), d = B(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), _e(m.lhs), !Number.isFinite(m.rhs)) throw Error(`Invalid non-finite right-hand side "${m.rhs}" in constraint.`);
+	return m;
 }
-function F(e, t, n) {
-	let r = e.match(/(<=|>=|==|=<|=>|=)/);
-	if (!r) throw Error(`Constraint must contain a comparison operator (<=, >=, ==, =): "${e}"`);
-	let i = r[0], a = r.index, o = e.substring(0, a).trim(), s = e.substring(a + i.length).trim(), c;
-	if (i === "<=" || i === "=<") c = "<=";
-	else if (i === ">=" || i === "=>") c = ">=";
-	else if (i === "==" || i === "=") c = "==";
-	else throw Error(`Unsupported operator "${i}"`);
-	let l = P(o, t), u = P(s, t);
-	return c === "<=" ? l.le(u, n) : c === ">=" ? l.ge(u, n) : l.eq(u, n);
+function he(e, t, n) {
+	return me(e, t, n);
 }
-function I(e, t) {
-	let n = /* @__PURE__ */ new Map(), r = "";
-	for (let i = 0; i < e.length; i++) if (r += e[i], i < t.length) {
+function ge(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 _e(e) {
+	if ("constant" in e && !Number.isFinite(e.constant)) throw Error(`Invalid non-finite constant "${e.constant}" in expression.`);
+	if ("terms" in e && e.terms instanceof Map) {
+		for (let [, t] of e.terms) if (!Number.isFinite(t)) throw Error(`Invalid non-finite coefficient "${t}" in expression.`);
+	}
+	if ("linearTerms" in e && e.linearTerms instanceof Map) {
+		for (let [, t] of e.linearTerms) if (!Number.isFinite(t)) throw Error(`Invalid non-finite coefficient "${t}" in expression.`);
+	}
+	if ("quadTerms" in e && e.quadTerms instanceof Map) {
+		for (let [, t] of e.quadTerms) if (!Number.isFinite(t.coeff)) throw Error(`Invalid non-finite quadratic coefficient "${t.coeff}" in expression.`);
+	}
+}
+function ve(e) {
+	return e instanceof c || typeof e == "object" && !!e && "sense" in e && "lhs" in e && "rhs" in e;
+}
+function ye(e, t) {
+	let n = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Map(), i = e.join(""), a = "__washi_";
+	for (; i.includes(a);) a += "_";
+	let o = "";
+	for (let i = 0; i < e.length; i++) if (o += e[i], i < t.length) {
 		let e = t[i];
-		if (typeof e == "number") r += `(${e})`;
-		else if (e instanceof j) {
-			let t = `__v_${i}__`;
-			n.set(t, e), r += t;
-		} else if (e instanceof O) {
-			`${i}`, r += `(${e.toString()})`;
-			for (let [t] of e.terms) n.set(t.name, t);
-		}
+		if (typeof e == "number") {
+			if (!Number.isFinite(e)) throw Error(`Invalid numeric value "${e}" in template expression: interpolated numbers must be finite.`);
+			let t = `${a}num_${i}__`;
+			r.set(t, e), o += `(${t})`;
+		} else if (ve(e)) throw Error("Cannot interpolate a constraint comparison (<=, >=, ==) inside a template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
+		else if (ge(e)) {
+			_e(e);
+			let t = `${a}ph_${i}__`;
+			n.set(t, e), o += ` ${t} `;
+		} else throw Error("Unsupported interpolation value in template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
 	}
 	return {
-		fullText: r,
-		resolver: (e) => n.get(e)
+		fullText: o,
+		resolver: (e) => n.get(e),
+		numberMap: r
 	};
 }
-function L(e, ...t) {
-	let { fullText: n, resolver: r } = I(e, t);
-	return F(n, r);
-}
-function R(e, ...t) {
-	let { fullText: n, resolver: r } = I(e, t);
-	return /(<=|>=|==|=<|=>|=)/.test(n) ? F(n, r) : P(n, r);
+function be(e, ...t) {
+	let { fullText: n, resolver: r, numberMap: i } = ye(e, t);
+	return /(<=|>=|==|=<|=>|=)/.test(n) ? me(n, r, void 0, i) : B(n, r, i);
 }
 //#endregion
-//#region src/modeler/lp-writer.ts
-function z(e, t, n) {
-	let r = e.replace(/[^a-zA-Z0-9_]/g, "_");
-	return /^[0-9]/.test(r) && (r = `${t}_${r}`), (!r || r.length === 0) && (r = `${t}_${n}`), r;
+//#region src/modeler/solvers/highs/worker-client.ts
+var V = null, xe = 0, H = /* @__PURE__ */ new Map();
+function Se(e, t) {
+	return e ? {
+		Status: "Interrupted",
+		StatusCode: 17,
+		HasPrimalSolution: !0,
+		IsMip: !0,
+		ObjectiveValue: e.objectiveValue,
+		ObjectiveOffsetApplied: !0,
+		...t?.objectiveBound === void 0 ? e.mipDualBound === void 0 ? {} : { MipDualBound: e.mipDualBound } : { MipDualBound: t.objectiveBound },
+		...t?.relGap === void 0 ? e.mipGap === void 0 ? {} : { MipGap: e.mipGap } : { MipGap: t.relGap },
+		Columns: e.columns,
+		Rows: []
+	} : {
+		Status: "Interrupted",
+		StatusCode: 17,
+		HasPrimalSolution: !1,
+		ObjectiveValue: NaN,
+		ObjectiveOffsetApplied: !0,
+		...t?.objectiveBound === void 0 ? {} : { MipDualBound: t.objectiveBound },
+		...t?.relGap === void 0 ? {} : { MipGap: t.relGap },
+		Columns: {},
+		Rows: []
+	};
 }
-function B(e) {
-	let { sense: t, objective: n, constraints: r, variables: i } = e, a = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Set();
-	for (let e of i) {
-		let t = z(e.name, "x", e.id), n = t, r = 1;
-		for (; c.has(n);) n = `${t}_${r++}`;
-		c.add(n), o.set(e, n), a.set(n, e);
-	}
-	let l = /* @__PURE__ */ new Set(), u = /* @__PURE__ */ new Map();
-	for (let e of r) {
-		let t = z(e.name, "c", e.id), n = t, r = 1;
-		for (; l.has(n);) n = `${t}_${r++}`;
-		l.add(n), u.set(e, n), s.set(n, e);
-	}
-	let d = [];
-	d.push(t && t.toLowerCase() === "maximize" ? "Maximize" : "Minimize");
-	let f = [], p = !0, m = n instanceof D ? n.linearTerms : n.terms;
-	if (m) for (let [e, t] of m) {
-		if (Math.abs(t) < 1e-12) continue;
-		let n = o.get(e), r = t >= 0 ? p ? "" : "+ " : "- ", i = Math.abs(t), a = i === 1 ? "" : `${i} `;
-		f.push(`${r}${a}${n}`), p = !1;
-	}
-	if (n instanceof D && n.quadTerms.size > 0) {
-		let e = [], t = !0;
-		for (let r of n.quadTerms.values()) {
-			if (Math.abs(r.coeff) < 1e-12) continue;
-			let n = 2 * r.coeff, i = n >= 0 ? t ? "" : "+ " : "- ", a = Math.abs(n), s = a === 1 ? "" : `${a} `, c = o.get(r.var1), l = o.get(r.var2);
-			r.var1 === r.var2 ? e.push(`${i}${s}${c} ^ 2`) : e.push(`${i}${s}${c} * ${l}`), t = !1;
-		}
-		if (e.length > 0) {
-			let t = `[ ${e.join(" ")} ] / 2`;
-			f.length > 0 ? f.push("+", t) : f.push(t);
+function U(e) {
+	let t = H.values().next().value;
+	if (t && !t.dispatched) {
+		t.dispatched = !0;
+		try {
+			e.postMessage({
+				type: "SOLVE",
+				id: t.id,
+				lpString: t.lpString,
+				options: t.workerOptions,
+				...t.reportProgress ? { reportProgress: !0 } : {}
+			});
+		} catch (n) {
+			H.delete(t.id), t.cleanupAbort?.(), t.reject(n), U(e);
 		}
 	}
-	let h = f.length > 0 ? f.join(" ") : "0";
-	d.push(` obj: ${h}`), d.push("Subject To");
-	for (let e of r) {
-		let t = u.get(e), n = [], r = !0;
-		for (let [t, i] of e.lhs.terms) {
-			if (Math.abs(i) < 1e-12) continue;
-			let e = o.get(t), a = i >= 0 ? r ? "" : "+ " : "- ", s = Math.abs(i), c = s === 1 ? "" : `${s} `;
-			n.push(`${a}${c}${e}`), r = !1;
-		}
-		let i = n.length > 0 ? n.join(" ") : "0", a = e.sense === "==" ? "=" : e.sense;
-		d.push(` ${t}: ${i} ${a} ${e.rhs}`);
-	}
-	d.push("Bounds");
-	let g = [], _ = [];
-	for (let e of i) {
-		let t = o.get(e);
-		if (e.type === "Binary") {
-			_.push(t);
-			continue;
+}
+function Ce() {
+	let e = V;
+	e && (V = null, e.terminate());
+	for (let e of H.values()) e.dispatched = !1;
+	if (H.size > 0) {
+		let e = we();
+		if (e) U(e);
+		else {
+			let e = /* @__PURE__ */ Error("[WaSHI] Failed to recreate HiGHS Worker after interruption.");
+			for (let t of Array.from(H.values())) H.delete(t.id), t.cleanupAbort?.(), t.reject(e);
 		}
-		e.type === "Integer" && g.push(t);
-		let n = e.lb === -Infinity, r = e.ub === Infinity;
-		n && r ? d.push(` ${t} free`) : n && !r ? d.push(` -infinity <= ${t} <= ${e.ub}`) : !n && r ? e.lb !== 0 && d.push(` ${t} >= ${e.lb}`) : d.push(` ${e.lb} <= ${t} <= ${e.ub}`);
-	}
-	if (g.length > 0) {
-		d.push("Generals");
-		for (let e = 0; e < g.length; e += 10) d.push(" " + g.slice(e, e + 10).join(" "));
-	}
-	if (_.length > 0) {
-		d.push("Binary");
-		for (let e = 0; e < _.length; e += 10) d.push(" " + _.slice(e, e + 10).join(" "));
-	}
-	return d.push("End"), {
-		lpString: d.join("\n") + "\n",
-		nameToVar: a,
-		nameToConstraint: s
-	};
+	}
 }
-//#endregion
-//#region src/modeler/solvers/highs/worker-client.ts
-var V = null, oe = 0, H = /* @__PURE__ */ new Map();
-function se() {
+function we() {
 	if (typeof window > "u" || typeof Worker > "u") return null;
 	if (!V) try {
-		V = ee();
+		V = ne();
 		let e = V;
-		V.onmessage = (e) => {
-			let { type: t, id: n, result: r, runTime: i, error: a } = e.data, o = H.get(n);
-			o && (H.delete(n), t === "SOLVE_SUCCESS" ? o.resolve({
-				result: r,
-				runTime: i
-			}) : o.reject(Error(a || "Worker solve failed")));
+		V.onmessage = (t) => {
+			let { type: n, id: r, result: i, runTime: a, error: o, progress: s, incumbent: c } = t.data, l = H.get(r);
+			if (l) {
+				if (n === "SOLVE_PROGRESS") {
+					if (s) {
+						l.lastProgress = s;
+						try {
+							l.onProgress?.(s);
+						} catch (e) {
+							let t = H.get(r);
+							if (t) {
+								let n = H.keys().next().value;
+								H.delete(r), t.cleanupAbort?.(), n === r && Ce(), t.reject(e);
+							}
+						}
+					}
+					return;
+				}
+				if (n === "SOLVE_INCUMBENT") {
+					c && (l.lastIncumbent = c);
+					return;
+				}
+				H.delete(r), l.cleanupAbort?.(), n === "SOLVE_SUCCESS" ? l.resolve({
+					result: i,
+					runTime: a
+				}) : l.reject(Error(o || "Worker solve failed")), V === e && U(e);
+			}
 		};
 		let t = (t) => {
 			if (V === e) {
 				V = null, e.terminate();
-				for (let e of H.values()) e.reject(t);
+				for (let e of H.values()) e.cleanupAbort?.(), e.reject(t);
 				H.clear();
 			}
 		};
@@ -662,47 +387,97 @@ function se() {
 	}
 	return V;
 }
-async function U(e, t = {}) {
-	let n = await _(t.wasmUrl), r = t.useWorker ?? typeof window < "u" ? se() : null;
-	if (!r) return m(e, t);
-	let i = {
-		...t,
-		wasmUrl: n
-	}, a = `req_${++oe}`;
+async function W(e, t = {}) {
+	if (t.signal?.aborted) return {
+		result: Se(),
+		runTime: 0
+	};
+	let n = await I(t.wasmUrl);
+	if (t.signal?.aborted) return {
+		result: Se(),
+		runTime: 0
+	};
+	let r = t.useWorker ?? typeof window < "u" ? we() : 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_${++xe}`, u = performance.now();
 	return new Promise((t, n) => {
-		H.set(a, {
+		let o = {
+			id: l,
+			lpString: e,
+			workerOptions: s,
+			reportProgress: c,
+			startTime: u,
+			onProgress: a,
 			resolve: t,
 			reject: n
-		});
-		try {
-			r.postMessage({
-				type: "SOLVE",
-				id: a,
-				lpString: e,
-				options: i
-			});
-		} catch (e) {
-			H.delete(a), n(e);
+		};
+		if (i) {
+			let e = () => {
+				let e = H.get(l);
+				if (!e) return;
+				let t = H.keys().next().value;
+				H.delete(l), e.cleanupAbort?.(), t === l && Ce();
+				let n = (performance.now() - e.startTime) / 1e3;
+				e.resolve({
+					result: Se(e.lastIncumbent, e.lastProgress),
+					runTime: n
+				});
+			};
+			i.addEventListener("abort", e, { once: !0 }), o.cleanupAbort = () => i.removeEventListener("abort", e);
 		}
+		H.set(l, o), U(r);
 	});
 }
 //#endregion
 //#region src/modeler/solvers/highs/solver.ts
-function W(e) {
+function G(e, t) {
+	if (typeof t == "number") switch (t) {
+		case 0: return "NotSolved";
+		case 1:
+		case 2:
+		case 3:
+		case 4:
+		case 5: return "Error";
+		case 6: return "Unknown";
+		case 7: return "Optimal";
+		case 8: return "Infeasible";
+		case 9: return "InfeasibleOrUnbounded";
+		case 10: return "Unbounded";
+		case 11: return "ObjectiveBound";
+		case 12: return "ObjectiveTarget";
+		case 13: return "TimeLimit";
+		case 14: return "IterationLimit";
+		case 15: return "Unknown";
+		case 16: return "SolutionLimit";
+		case 17: return "Interrupted";
+		case 18: return "MemoryLimit";
+	}
 	if (typeof e != "string") return "Unknown";
-	let t = e.trim();
-	if (!t) return "Unknown";
-	switch (t) {
+	let n = e.trim();
+	if (!n) return "Unknown";
+	switch (n) {
 		case "Optimal": return "Optimal";
 		case "Infeasible": return "Infeasible";
 		case "Unbounded": return "Unbounded";
-		case "Primal infeasible or unbounded": return "Unknown";
+		case "Primal infeasible or unbounded":
+		case "InfeasibleOrUnbounded": return "InfeasibleOrUnbounded";
 		case "Time limit reached":
 		case "TimeLimit": return "TimeLimit";
 		case "Iteration limit reached":
 		case "IterationLimit": return "IterationLimit";
+		case "Solution limit reached":
+		case "SolutionLimit": return "SolutionLimit";
+		case "Memory limit reached":
+		case "MemoryLimit": return "MemoryLimit";
 		case "Bound on objective reached":
+		case "ObjectiveBound": return "ObjectiveBound";
 		case "Target for objective reached":
+		case "ObjectiveTarget": return "ObjectiveTarget";
+		case "Interrupted":
+		case "User interrupt": return "Interrupted";
 		case "Feasible": return "Feasible";
 		case "Not Set": return "NotSolved";
 		case "Load error":
@@ -714,13 +489,32 @@ function W(e) {
 		case "Empty":
 		case "Unknown": return "Unknown";
 	}
-	let n = t.toLowerCase();
-	return n.includes("infeasible") && n.includes("unbounded") ? "Unknown" : n.includes("infeasible") ? "Infeasible" : n.includes("unbounded") ? "Unbounded" : n.includes("time limit") || n.includes("timelimit") ? "TimeLimit" : n.includes("iteration limit") || n.includes("iterationlimit") ? "IterationLimit" : n.includes("error") ? "Error" : n === "optimal" ? "Optimal" : "Unknown";
+	let r = n.toLowerCase();
+	return r.includes("infeasible") && r.includes("unbounded") ? "InfeasibleOrUnbounded" : r.includes("infeasible") ? "Infeasible" : r.includes("unbounded") ? "Unbounded" : r.includes("time limit") || r.includes("timelimit") ? "TimeLimit" : r.includes("iteration limit") || r.includes("iterationlimit") ? "IterationLimit" : r.includes("solution limit") || r.includes("solutionlimit") ? "SolutionLimit" : r.includes("memory limit") || r.includes("memorylimit") ? "MemoryLimit" : r.includes("bound on objective") ? "ObjectiveBound" : r.includes("target for objective") ? "ObjectiveTarget" : r.includes("interrupt") ? "Interrupted" : r.includes("error") ? "Error" : r === "optimal" ? "Optimal" : "Unknown";
+}
+function K(e, t, n) {
+	switch (G(e, t)) {
+		case "Optimal": return "Optimal";
+		case "Infeasible": return "Infeasible";
+		case "Unbounded": return "Unbounded";
+		case "TimeLimit": return "TimeLimit";
+		case "IterationLimit": return "IterationLimit";
+		case "Feasible": return "Feasible";
+		case "ObjectiveBound":
+		case "ObjectiveTarget":
+		case "SolutionLimit": return n === !1 ? "Unknown" : "Feasible";
+		case "MemoryLimit":
+		case "Interrupted": return n ? "Feasible" : "Unknown";
+		case "NotSolved": return "NotSolved";
+		case "Error": return "Error";
+		default: return "Unknown";
+	}
 }
-var G = class e {
+var q = class e {
 	static capabilities = {
 		supportsMIP: !0,
-		supportsQP: !0
+		supportsQP: !0,
+		supportsWarmStart: !0
 	};
 	name = "HiGHS";
 	version = "1.15.3";
@@ -729,182 +523,816 @@ var G = class e {
 	constructor(e = {}) {
 		this.options = e;
 	}
-	async solve(e, t, n = {}) {
-		let r = {
+	async solve(e, t = {}, n = {}) {
+		let r = E(t), i = r ? n : t, a = {
 			...this.options,
-			...n
-		}, { lpString: i, nameToVar: a, nameToConstraint: o } = t, { result: s, runTime: c } = await U(i, r), l = W(s?.Status);
-		if (l === "Infeasible" || l === "Unbounded") return {
-			status: l,
+			...i
+		}, o = e.objective.constant || 0;
+		for (let t of e.variables) d(t);
+		let { lpString: s, nameToVar: c, nameToConstraint: l } = r ? t : C(e), u = Object.create(null), p = !1, m = /* @__PURE__ */ new Set();
+		for (let [e, t] of c.entries()) {
+			m.add(t);
+			let n = w(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);
+				if (e !== void 0) {
+					let r = f(n.name, "x", t);
+					Object.prototype.hasOwnProperty.call(u, r) || (u[r] = e, p = !0);
+				}
+			}
+		}
+		let h = a;
+		(o !== 0 || p || h.initialValues !== void 0) && (h = {
+			...h,
+			...o === 0 ? {} : { objectiveOffset: o },
+			initialValues: p ? u : void 0
+		});
+		let { result: g, runTime: _ } = await W(s, h), v = g?.ObjectiveOffsetApplied ? 0 : o, y = G(g?.Status, g?.StatusCode), b = 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 = K(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);
+		if (!x) return {
+			status: S,
+			terminationStatus: y,
+			hasPrimalSolution: !1,
 			objectiveValue: null,
+			...D === void 0 ? {} : { objectiveBound: D },
+			...O === void 0 ? {} : {
+				relGap: O,
+				mipGap: O
+			},
+			...k === void 0 ? {} : { absGap: k },
 			values: {},
 			reducedCosts: {},
 			duals: {},
 			slacks: {},
-			runTime: c,
-			raw: s
+			runTime: _,
+			raw: g
 		};
-		let u = s.ObjectiveValue, d = typeof u == "number" ? u + e.objective.constant : null, f = {}, p = {}, m = {}, h = {};
-		if (s.Columns) for (let [e, t] of Object.entries(s.Columns)) {
-			let n = a.get(e);
+		let A = (e, t, n) => {
+			Object.defineProperty(e, t, {
+				value: n,
+				enumerable: !0,
+				writable: !0,
+				configurable: !0
+			});
+		}, j = {}, ee = {}, M = {}, N = {};
+		if (g.Columns) for (let [e, t] of Object.entries(g.Columns)) {
+			let n = c.get(e);
 			if (n) {
-				let e = Math.abs(t.Primal) < 1e-9 ? 0 : t.Primal;
-				f[n.name] = e, t.Dual !== void 0 && (m[n.name] = Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual);
+				if (typeof t.Primal == "number" && Number.isFinite(t.Primal)) {
+					let e = Math.abs(t.Primal) < 1e-9 ? 0 : t.Primal;
+					A(j, n.name, e);
+				}
+				typeof t.Dual == "number" && Number.isFinite(t.Dual) && A(M, n.name, Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual);
 			}
 		}
-		if (s.Rows) {
-			let e = Array.isArray(s.Rows) ? s.Rows : Object.values(s.Rows);
+		if (g.Rows) {
+			let e = Array.isArray(g.Rows) ? g.Rows : Object.values(g.Rows);
 			for (let t of e) {
-				let e = t.Name, n = o.get(e);
-				if (n && (t.Dual !== void 0 && (p[n.name] = Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual), t.Primal !== void 0)) {
+				let e = t.Name, n = e ? l.get(e) : void 0;
+				if (n && (typeof t.Dual == "number" && Number.isFinite(t.Dual) && A(ee, n.name, Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual), typeof t.Primal == "number" && Number.isFinite(t.Primal))) {
 					let e = n.rhs - t.Primal;
-					h[n.name] = Math.abs(e) < 1e-9 ? 0 : e;
+					A(N, n.name, Math.abs(e) < 1e-9 ? 0 : e);
 				}
 			}
 		}
 		return {
-			status: l,
-			objectiveValue: d,
-			values: f,
-			reducedCosts: m,
-			duals: p,
-			slacks: h,
-			runTime: c,
-			raw: s
+			status: S,
+			terminationStatus: y,
+			hasPrimalSolution: !0,
+			objectiveValue: T,
+			...D === void 0 ? {} : { objectiveBound: D },
+			...O === void 0 ? {} : {
+				relGap: O,
+				mipGap: O
+			},
+			...k === void 0 ? {} : { absGap: k },
+			values: j,
+			reducedCosts: M,
+			duals: ee,
+			slacks: N,
+			runTime: _,
+			raw: g
 		};
 	}
-}, K = G;
-function q() {
-	d("highs", (e) => new G(e)), l((e) => new G(e));
+}, J = q;
+function Y() {
+	T("highs", (e) => new q(e)), _((e) => new q(e));
 }
-q();
+Y();
 //#endregion
 //#region src/modeler/solvers/highs/index.ts
-var J = /* @__PURE__ */ S({
-	HiGHS: () => K,
-	HighsSolver: () => G,
-	OFFICIAL_HIGHS_CDN_WASM_URL: () => b,
-	getHighs: () => g,
-	getHighsWasmUrl: () => v,
-	isValidWasmHeader: () => h,
-	mapHighsStatus: () => W,
-	probeWasmUrl: () => p,
-	registerHighsSolver: () => q,
-	resolveBrowserWasmUrl: () => _,
-	setHighsWasmUrl: () => y,
-	solveLp: () => U,
-	solveLpWithHighs: () => m
+var Te = /* @__PURE__ */ se({
+	HiGHS: () => J,
+	HighsSolver: () => q,
+	OFFICIAL_HIGHS_CDN_WASM_URL: () => te,
+	getHighs: () => F,
+	getHighsWasmUrl: () => L,
+	isValidWasmHeader: () => P,
+	mapHighsStatus: () => K,
+	mapHighsTerminationStatus: () => G,
+	probeWasmUrl: () => M,
+	registerHighsSolver: () => Y,
+	resolveBrowserWasmUrl: () => I,
+	setHighsWasmUrl: () => R,
+	solveLp: () => W,
+	solveLpWithHighs: () => N
 });
-import * as ce from "./highs-worker-factory.js";
-w(J, ce);
-import * as le from "./highs-assets.js";
-w(J, le);
+import * as Ee from "./highs-worker-factory.js";
+z(Te, Ee);
+import * as De from "./highs-assets.js";
+z(Te, De);
 //#endregion
 //#region src/modeler/solvers/highs.ts
-var Y = /* @__PURE__ */ S({
-	HiGHS: () => K,
-	HighsSolver: () => G,
-	OFFICIAL_HIGHS_CDN_WASM_URL: () => b,
-	getHighs: () => g,
-	getHighsWasmUrl: () => v,
-	isValidWasmHeader: () => h,
-	mapHighsStatus: () => W,
-	probeWasmUrl: () => p,
-	registerHighsSolver: () => q,
-	resolveBrowserWasmUrl: () => _,
-	setHighsWasmUrl: () => y,
-	solveLp: () => U,
-	solveLpWithHighs: () => m
+var Oe = /* @__PURE__ */ se({
+	HiGHS: () => J,
+	HighsSolver: () => q,
+	OFFICIAL_HIGHS_CDN_WASM_URL: () => te,
+	getHighs: () => F,
+	getHighsWasmUrl: () => L,
+	isValidWasmHeader: () => P,
+	mapHighsStatus: () => K,
+	mapHighsTerminationStatus: () => G,
+	probeWasmUrl: () => M,
+	registerHighsSolver: () => Y,
+	resolveBrowserWasmUrl: () => I,
+	setHighsWasmUrl: () => R,
+	solveLp: () => W,
+	solveLpWithHighs: () => N
 });
-w(Y, J);
+z(Oe, Te);
 //#endregion
 //#region src/modeler/solvers/mock.ts
-var X = class {
+var ke = class {
 	name;
 	capabilities;
 	options;
 	constructor(e = {}) {
 		this.name = e.name || "MockSolver", this.capabilities = e.capabilities || {
 			supportsMIP: !0,
-			supportsQP: !0
+			supportsQP: !0,
+			supportsWarmStart: !0
 		}, this.options = e;
 	}
-	async solve(e, t, n = {}) {
-		let r = {
+	async solve(e, t = {}, n = {}) {
+		let r = E(t) ? n : t, i = {
 			...this.options,
-			...n
+			...r
+		}, a = !!(i.values && Object.keys(i.values).length > 0 || i.boolValues && Object.keys(i.boolValues).length > 0);
+		if (i.signal?.aborted) return {
+			status: "Unknown",
+			terminationStatus: "Interrupted",
+			hasPrimalSolution: !1,
+			objectiveValue: null,
+			values: {},
+			runTime: 0,
+			raw: { mock: !0 }
 		};
-		return r.delayMs && r.delayMs > 0 && await new Promise((e) => setTimeout(e, r.delayMs)), {
-			status: r.status || "Optimal",
-			objectiveValue: r.objectiveValue ?? 0,
-			values: r.values || {},
-			reducedCosts: r.reducedCosts,
-			duals: r.duals,
-			slacks: r.slacks,
+		if (i.delayMs && i.delayMs > 0 && (await new Promise((e) => {
+			let t = setTimeout(() => {
+				i.signal?.removeEventListener("abort", n), e();
+			}, i.delayMs), n = () => {
+				clearTimeout(t), e();
+			};
+			i.signal?.addEventListener("abort", n, { once: !0 });
+		}), i.signal?.aborted)) {
+			let e = !!(i.hasPrimalSolution ?? a);
+			return {
+				status: e ? "Feasible" : "Unknown",
+				terminationStatus: "Interrupted",
+				hasPrimalSolution: e,
+				objectiveValue: e ? i.objectiveValue ?? 0 : null,
+				...i.objectiveBound === void 0 ? {} : { objectiveBound: i.objectiveBound },
+				...i.relGap === void 0 ? i.mipGap === void 0 ? {} : {
+					relGap: i.mipGap,
+					mipGap: i.mipGap
+				} : {
+					relGap: i.relGap,
+					mipGap: i.relGap
+				},
+				...i.absGap === void 0 ? {} : { absGap: i.absGap },
+				values: e && i.values || {},
+				...e && i.boolValues !== void 0 ? { boolValues: i.boolValues } : {},
+				runTime: .001,
+				raw: { mock: !0 }
+			};
+		}
+		if (i.onProgress && Array.isArray(i.progressEvents)) for (let e of i.progressEvents) {
+			if (i.signal?.aborted) break;
+			i.onProgress(e);
+		}
+		let o = i.status || "Optimal", s = i.terminationStatus ?? o, c = i.hasPrimalSolution === void 0 ? o === "Optimal" || o === "Feasible" || o === "Sat" || (o === "TimeLimit" || o === "IterationLimit" || s === "Interrupted") && a : i.hasPrimalSolution;
+		if (i.onProgress && !Array.isArray(i.progressEvents) && !i.signal?.aborted) {
+			let e = c ? i.objectiveValue ?? 0 : void 0;
+			i.onProgress({
+				elapsedTime: .001,
+				elapsedSeconds: .001,
+				...typeof e == "number" && Number.isFinite(e) ? { objectiveValue: e } : {},
+				...i.objectiveBound === void 0 ? {} : { objectiveBound: i.objectiveBound },
+				...i.relGap === void 0 ? i.mipGap === void 0 ? {} : {
+					relGap: i.mipGap,
+					mipGap: i.mipGap
+				} : {
+					relGap: i.relGap,
+					mipGap: i.relGap
+				},
+				...i.absGap === void 0 ? {} : { absGap: i.absGap }
+			});
+		}
+		return i.signal?.aborted && (s = "Interrupted", c = i.hasPrimalSolution === void 0 ? a : i.hasPrimalSolution, o = c ? "Feasible" : "Unknown"), {
+			status: o,
+			terminationStatus: s,
+			hasPrimalSolution: c,
+			objectiveValue: c ? i.objectiveValue ?? 0 : null,
+			...i.objectiveBound === void 0 ? {} : { objectiveBound: i.objectiveBound },
+			...i.relGap === void 0 ? i.mipGap === void 0 ? {} : {
+				relGap: i.mipGap,
+				mipGap: i.mipGap
+			} : {
+				relGap: i.relGap,
+				mipGap: i.relGap
+			},
+			...i.absGap === void 0 ? {} : { absGap: i.absGap },
+			values: c && i.values || {},
+			...c && i.boolValues !== void 0 ? { boolValues: i.boolValues } : {},
+			reducedCosts: i.reducedCosts,
+			duals: i.duals,
+			slacks: i.slacks,
 			runTime: .001,
 			raw: { mock: !0 }
 		};
 	}
 };
-function Z() {
-	d("mock", (e) => new X(e));
+function Ae() {
+	T("mock", (e) => new ke(e));
 }
-Z();
+Ae();
 //#endregion
 //#region src/modeler/solvers/index.ts
-var Q = /* @__PURE__ */ S({
-	HiGHS: () => K,
-	HighsSolver: () => G,
-	MockSolver: () => X,
-	OFFICIAL_HIGHS_CDN_WASM_URL: () => b,
-	getHighs: () => g,
-	getHighsWasmUrl: () => v,
-	getSolver: () => f,
-	isValidWasmHeader: () => h,
-	listAvailableSolvers: () => u,
-	mapHighsStatus: () => W,
-	probeWasmUrl: () => p,
-	registerHighsSolver: () => q,
-	registerMockSolver: () => Z,
-	registerSolver: () => d,
-	resolveBrowserWasmUrl: () => _,
-	setDefaultSolver: () => l,
-	setHighsWasmUrl: () => y,
-	solveLp: () => U,
-	solveLpWithHighs: () => m
+var je = /* @__PURE__ */ se({
+	HiGHS: () => J,
+	HighsSolver: () => q,
+	MockSolver: () => ke,
+	OFFICIAL_HIGHS_CDN_WASM_URL: () => te,
+	getHighs: () => F,
+	getHighsWasmUrl: () => L,
+	getSolver: () => D,
+	isValidWasmHeader: () => P,
+	listAvailableSolvers: () => S,
+	mapHighsStatus: () => K,
+	mapHighsTerminationStatus: () => G,
+	probeWasmUrl: () => M,
+	registerHighsSolver: () => Y,
+	registerMockSolver: () => Ae,
+	registerSolver: () => T,
+	resolveBrowserWasmUrl: () => I,
+	setDefaultSolver: () => _,
+	setHighsWasmUrl: () => R,
+	solveLp: () => W,
+	solveLpWithHighs: () => N
 });
-w(Q, Y);
+z(je, Oe);
+//#endregion
+//#region src/modeler/solution-validator.ts
+function Me(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 Ne(e, t = {}) {
+	let r = Me(t.feasibilityTolerance, "feasibilityTolerance"), i = Me(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);
+	}, g = (e) => {
+		u.push(e), Object.prototype.hasOwnProperty.call(d, e.name) || (d[e.name] = []), d[e.name].push(e), e.type !== "missing_value" && e.type !== "unchecked_constraint" && h(e.violation);
+	}, _ = /* @__PURE__ */ new Map(), v = /* @__PURE__ */ new Map(), y = 0, b = 0, x = 0, S = 0;
+	for (let t of e.variables) {
+		let e = s ? Object.prototype.hasOwnProperty.call(l, t.name) ? l[t.name] : void 0 : t.value;
+		if (e == null) {
+			p.push(t.name), g({
+				type: "missing_value",
+				target: "variable",
+				name: t.name,
+				actual: e ?? null,
+				violation: Infinity,
+				message: `Variable "${t.name}" has no assigned solution value.`
+			});
+			continue;
+		}
+		if (typeof e != "number" || !Number.isFinite(e)) {
+			g({
+				type: "non_finite_value",
+				target: "variable",
+				name: t.name,
+				actual: e,
+				violation: Infinity,
+				message: `Variable "${t.name}" has non-finite or non-numeric value: ${String(e)}.`
+			});
+			continue;
+		}
+		_.set(t, e), y++;
+		let n = t.type === "Binary" || t.type === "BINARY", a = n || t.type === "Integer" || t.type === "INTEGER", o = n ? Math.max(0, t.lb) : t.lb, c = n ? Math.min(1, t.ub) : t.ub, u = typeof t.lb == "number" && !Number.isNaN(t.lb) && t.lb !== Infinity, d = typeof t.ub == "number" && !Number.isNaN(t.ub) && t.ub !== -Infinity;
+		if (!u) g({
+			type: "lower_bound",
+			target: "variable",
+			name: t.name,
+			actual: e,
+			limit: t.lb,
+			violation: Infinity,
+			message: `Variable "${t.name}" has invalid lower bound (${String(t.lb)}).`
+		});
+		else if (o !== -Infinity) {
+			let n = e - o, i = Math.max(0, o - e);
+			h(i), i > r && g({
+				type: "lower_bound",
+				target: "variable",
+				name: t.name,
+				actual: e,
+				limit: o,
+				violation: i,
+				signedViolation: n,
+				message: `Variable "${t.name}" value (${e}) violates lower bound (${o}) by ${i}.`
+			});
+		}
+		if (!d) g({
+			type: "upper_bound",
+			target: "variable",
+			name: t.name,
+			actual: e,
+			limit: t.ub,
+			violation: Infinity,
+			message: `Variable "${t.name}" has invalid upper bound (${String(t.ub)}).`
+		});
+		else if (c !== Infinity) {
+			let n = e - c, i = Math.max(0, e - c);
+			h(i), i > r && g({
+				type: "upper_bound",
+				target: "variable",
+				name: t.name,
+				actual: e,
+				limit: c,
+				violation: i,
+				signedViolation: n,
+				message: `Variable "${t.name}" value (${e}) violates upper bound (${c}) by ${i}.`
+			});
+		}
+		if (u && d && o > c && o - e <= r && e - c <= r) {
+			let n = o - c;
+			g({
+				type: "lower_bound",
+				target: "variable",
+				name: t.name,
+				actual: e,
+				limit: o,
+				violation: n,
+				signedViolation: e - o,
+				message: `Variable "${t.name}" has inverted bounds [${o}, ${c}].`
+			});
+		}
+		if (a) {
+			let r = Math.round(e), a = e - r, o = Math.abs(a);
+			h(o), o > i && g({
+				type: "integrality",
+				target: "variable",
+				name: t.name,
+				varType: n ? "Binary" : "Integer",
+				actual: e,
+				nearestInteger: r,
+				violation: o,
+				signedViolation: a,
+				message: `${n ? "Binary" : "Integer"} variable "${t.name}" value (${e}) violates integrality by ${o} (nearest integer: ${r}).`
+			});
+		}
+	}
+	for (let t of e.boolVars) {
+		let e = s ? Object.prototype.hasOwnProperty.call(l, t.name) ? l[t.name] : void 0 : t.value;
+		if (e == null) {
+			p.push(t.name), g({
+				type: "missing_value",
+				target: "bool_variable",
+				name: t.name,
+				actual: e ?? null,
+				violation: Infinity,
+				message: `Boolean variable "${t.name}" has no assigned solution value.`
+			});
+			continue;
+		}
+		if (typeof e != "boolean") {
+			g({
+				type: "invalid_boolean_value",
+				target: "bool_variable",
+				name: t.name,
+				actual: e,
+				violation: Infinity,
+				message: `Boolean variable "${t.name}" has non-boolean value: ${String(e)}.`
+			});
+			continue;
+		}
+		v.set(t, e), b++;
+	}
+	let C = (e) => {
+		let t = e.constant === void 0 ? 0 : e.constant;
+		if (typeof t != "number" || !Number.isFinite(t)) return {
+			ok: !1,
+			reason: `non-finite constant (${String(t)})`
+		};
+		let n = t;
+		for (let [t, r] of e.terms) {
+			if (typeof r != "number" || !Number.isFinite(r)) return {
+				ok: !1,
+				reason: `non-finite coefficient (${String(r)}) for variable "${t.name}"`
+			};
+			if (r !== 0) {
+				if (!_.has(t)) return {
+					ok: !1,
+					reason: `missing or invalid value for variable "${t.name}"`
+				};
+				if (n += r * _.get(t), !Number.isFinite(n)) return {
+					ok: !1,
+					reason: "linear expression evaluation overflowed finite range"
+				};
+			}
+		}
+		return {
+			ok: !0,
+			value: n
+		};
+	}, w = (e, t = r) => {
+		if (typeof e.rhs != "number" || !Number.isFinite(e.rhs)) return {
+			status: "unchecked",
+			reason: `non-finite right-hand side (${String(e.rhs)})`
+		};
+		let n = C(e.lhs);
+		if (!n.ok) return {
+			status: "unchecked",
+			reason: n.reason
+		};
+		let i = n.value, a = i - e.rhs;
+		if (!Number.isFinite(a)) return {
+			status: "unchecked",
+			reason: "constraint residual overflowed finite range"
+		};
+		let o = e.sense === "<=" ? Math.max(0, a) : e.sense === ">=" ? Math.max(0, -a) : Math.abs(a);
+		return o > t ? {
+			status: "violated",
+			lhsVal: i,
+			signed: a,
+			violation: o,
+			message: `Constraint "${e.name}" (${i} ${e.sense} ${e.rhs}) violated by ${o}.`
+		} : {
+			status: "satisfied",
+			lhsVal: i,
+			signed: a,
+			violation: o
+		};
+	};
+	for (let t of e.constraints) {
+		let e = w(t);
+		e.status === "unchecked" ? (f.push(t.name), g({
+			type: "unchecked_constraint",
+			target: "constraint",
+			name: t.name,
+			sense: t.sense,
+			limit: t.rhs,
+			rhs: t.rhs,
+			violation: Infinity,
+			message: `Constraint "${t.name}" could not be evaluated: ${e.reason}.`
+		})) : e.status === "violated" ? (x++, g({
+			type: "linear_constraint",
+			target: "constraint",
+			name: t.name,
+			sense: t.sense,
+			actual: e.lhsVal,
+			limit: t.rhs,
+			rhs: t.rhs,
+			violation: e.violation,
+			signedViolation: e.signed,
+			message: e.message
+		})) : (x++, h(e.violation));
+	}
+	let T = (e) => {
+		if (e instanceof o) return v.has(e) ? {
+			ok: !0,
+			value: v.get(e),
+			violation: 0
+		} : {
+			ok: !1,
+			reason: `missing or invalid value for Boolean variable "${e.name}"`
+		};
+		if (e instanceof c) {
+			let t = w(e, 0);
+			if (t.status === "unchecked") return {
+				ok: !1,
+				reason: t.reason
+			};
+			if (r > 0) {
+				let n = Math.abs(t.lhsVal - e.rhs);
+				if (n > 0 && n <= r) return {
+					ok: !1,
+					reason: `numeric comparison "${e.name}" lies within feasibilityTolerance (${r}) of boundary (${t.lhsVal} vs ${e.rhs})`
+				};
+			}
+			return {
+				ok: !0,
+				value: t.status === "satisfied",
+				violation: 0
+			};
+		}
+		if (e instanceof n) switch (e.op) {
+			case "not": {
+				let t = T(e.children[0]);
+				return t.ok ? {
+					ok: !0,
+					value: !t.value,
+					violation: 0
+				} : t;
+			}
+			case "and": {
+				let t = 0;
+				for (let n of e.children) {
+					let e = T(n);
+					if (!e.ok) return e;
+					if (!e.value) return {
+						ok: !0,
+						value: !1,
+						violation: 0
+					};
+					e.violation > t && (t = e.violation);
+				}
+				return {
+					ok: !0,
+					value: !0,
+					violation: t
+				};
+			}
+			case "or": {
+				let t = !1, n = Infinity;
+				for (let r of e.children) {
+					let e = T(r);
+					if (!e.ok) return e;
+					e.value && (t = !0, e.violation < n && (n = e.violation));
+				}
+				return {
+					ok: !0,
+					value: t,
+					violation: t ? n : 0
+				};
+			}
+			case "implies": {
+				let t = T(e.children[0]);
+				if (!t.ok) return t;
+				if (!t.value) return {
+					ok: !0,
+					value: !0,
+					violation: 0
+				};
+				let n = T(e.children[1]);
+				return n.ok ? {
+					ok: !0,
+					value: n.value,
+					violation: n.value ? n.violation : 0
+				} : n;
+			}
+			case "xor": {
+				let t = !1, n = 0;
+				for (let r of e.children) {
+					let e = T(r);
+					if (!e.ok) return e;
+					e.value && (t = !t, e.violation > n && (n = e.violation));
+				}
+				return {
+					ok: !0,
+					value: t,
+					violation: t ? n : 0
+				};
+			}
+			default: return {
+				ok: !1,
+				reason: `unsupported logical operator "${String(e.op)}"`
+			};
+		}
+		return {
+			ok: !1,
+			reason: "unsupported logical expression node"
+		};
+	};
+	for (let t = 0; t < e.logicalConstraints.length; t++) {
+		let n = e.logicalConstraints[t], r = n.name || `lc_${t + 1}`;
+		if (!a) {
+			f.push(r), g({
+				type: "unchecked_constraint",
+				target: "logical_constraint",
+				name: r,
+				violation: Infinity,
+				message: `Logical constraint "${r}" was not evaluated because evaluateLogicalConstraints is false.`
+			});
+			continue;
+		}
+		let i = T(n.expr);
+		if (!i.ok) {
+			f.push(r), g({
+				type: "unchecked_constraint",
+				target: "logical_constraint",
+				name: r,
+				violation: Infinity,
+				message: `Logical constraint "${r}" could not be evaluated: ${i.reason}.`
+			});
+			continue;
+		}
+		S++, i.value ? h(i.violation) : g({
+			type: "logical_constraint",
+			target: "logical_constraint",
+			name: r,
+			actual: !1,
+			limit: !0,
+			violation: 1,
+			signedViolation: -1,
+			message: `Logical constraint "${r}" evaluated to false.`
+		});
+	}
+	let E = 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,
+		violations: u,
+		violationsByName: d,
+		uncheckedConstraints: f,
+		missingVariables: p,
+		maxViolation: m,
+		summary: {
+			checkedVariables: y,
+			totalVariables: e.variables.length,
+			checkedBoolVariables: b,
+			totalBoolVariables: e.boolVars.length,
+			checkedLinearConstraints: x,
+			totalLinearConstraints: e.constraints.length,
+			checkedLogicalConstraints: S,
+			totalLogicalConstraints: e.logicalConstraints.length
+		}
+	};
+}
+//#endregion
+//#region src/modeler/big-m.ts
+function Pe(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 Fe(e, t, n) {
+	let r = e.constant === void 0 ? 0 : e.constant;
+	if (!Number.isFinite(t) || !Number.isFinite(r)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": constraint contains non-finite constant (${r}) or right-hand side (${t}).`);
+	let i = t - r;
+	if (!Number.isFinite(i)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": effective right-hand side (${t} - ${r}) overflows finite floating-point range. Please rescale coefficients/constants.`);
+	for (let [t, r] of e.terms) {
+		if (!Number.isFinite(r)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" has non-finite coefficient (${r}).`);
+		if (Number.isNaN(t.lb) || Number.isNaN(t.ub) || t.lb === Infinity || t.ub === -Infinity || t.lb > t.ub) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" has invalid bounds [${t.lb}, ${t.ub}].`);
+	}
+	return i;
+}
+function Ie(e, t, n) {
+	let r = Fe(e, t, n), i = 0;
+	for (let [t, r] of e.terms) {
+		if (r === 0) continue;
+		let e;
+		if (r > 0) {
+			if (!Number.isFinite(t.ub)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" lacks a finite upper bound (required because coefficient ${r} is positive in <= constraint). Please set an explicit finite upper bound on the variable or specify { M } explicitly in indicator options.`);
+			e = t.ub;
+		} else {
+			if (!Number.isFinite(t.lb)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" lacks a finite lower bound (required because coefficient ${r} is negative in <= constraint). Please set an explicit finite lower bound on the variable or specify { M } explicitly in indicator options.`);
+			e = t.lb;
+		}
+		let a = r * e;
+		if (i += a, !Number.isFinite(a) || !Number.isFinite(i)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": numeric overflow while bounding contribution of variable "${t.name}". Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	}
+	let a = i - r;
+	if (!Number.isFinite(a)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": numeric overflow while computing Big-M (${i} - ${r}). Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	let o = Math.max(0, a);
+	if (!Number.isFinite(o) || !Number.isFinite(r + o)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": derived Big-M (${o}) or shifted right-hand side overflows finite floating-point range. Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	return o;
+}
+function Le(e, t, n) {
+	let r = Fe(e, t, n), i = 0;
+	for (let [t, r] of e.terms) {
+		if (r === 0) continue;
+		let e;
+		if (r > 0) {
+			if (!Number.isFinite(t.lb)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" lacks a finite lower bound (required because coefficient ${r} is positive in >= constraint). Please set an explicit finite lower bound on the variable or specify { M } explicitly in indicator options.`);
+			e = t.lb;
+		} else {
+			if (!Number.isFinite(t.ub)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" lacks a finite upper bound (required because coefficient ${r} is negative in >= constraint). Please set an explicit finite upper bound on the variable or specify { M } explicitly in indicator options.`);
+			e = t.ub;
+		}
+		let a = r * e;
+		if (i += a, !Number.isFinite(a) || !Number.isFinite(i)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": numeric overflow while bounding contribution of variable "${t.name}". Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	}
+	let a = r - i;
+	if (!Number.isFinite(a)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": numeric overflow while computing Big-M (${r} - ${i}). Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	let o = Math.max(0, a);
+	if (!Number.isFinite(o) || !Number.isFinite(r - o)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": derived Big-M (${o}) or shifted right-hand side overflows finite floating-point range. Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	return o;
+}
+function X(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 = Fe(t, r, o);
+	if (i !== 0 && i !== 1) throw Error(`Invalid activeValue: ${i}. Indicator activation value must be 0 or 1.`);
+	if (n !== "<=" && n !== ">=") throw Error(`Invalid indicator sense for "${o}": expected "<=" or ">=", received "${String(n)}".`);
+	if (!Number.isFinite(a) || a < 0) throw Error(`Invalid Big-M value for indicator constraint "${o}": expected a finite non-negative number, received ${a}.`);
+	let c = t.terms.get(e);
+	if (c !== void 0 && c !== 0) throw Error(`Indicator constraint "${o}" cannot include its own binary activation variable "${e.name}" in the linear expression.`);
+	let l, u;
+	if (i === 1 ? n === "<=" ? (l = a, u = s + a) : (l = -a, u = s - a) : n === "<=" ? (l = -a, u = s) : (l = a, u = s), !Number.isFinite(u)) throw Error(`Cannot construct finite indicator constraint "${o}": shifted right-hand side overflows finite floating-point range. Please rescale coefficients/bounds or specify a smaller finite { M }.`);
+	let d = /* @__PURE__ */ new Map();
+	for (let [e, n] of t.terms) n !== 0 && d.set(e, n);
+	return l !== 0 && d.set(e, l), {
+		lhs: new j(d, 0),
+		rhs: u
+	};
+}
 //#endregion
 //#region src/modeler/model.ts
-var $ = class {
+function Z(e) {
+	return Array.isArray(e) || typeof e == "object" && !!e && !(e instanceof String) && typeof e[Symbol.iterator] == "function";
+}
+function Q(e) {
+	return typeof e == "object" && !!e && !Array.isArray(e) && !(e instanceof String) && typeof e[Symbol.iterator] != "function";
+}
+function $(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 Re = class {
 	name;
-	sense;
-	objective;
+	_sense;
+	_objectiveExpr;
 	variables = [];
 	constraints = [];
 	boolVars = [];
 	logicalConstraints = [];
-	unsatCore = [];
+	unsatCore = void 0;
 	values = /* @__PURE__ */ new Map();
 	varMapByName = /* @__PURE__ */ new Map();
+	varPrefixCounters = /* @__PURE__ */ new Map();
+	boolVarMapByName = /* @__PURE__ */ new Map();
+	boolVarPrefixCounters = /* @__PURE__ */ new Map();
 	constrMapByName = /* @__PURE__ */ new Map();
+	constrPrefixCounters = /* @__PURE__ */ new Map();
+	logicalConstrMapByName = /* @__PURE__ */ new Map();
+	logicalConstrCounter = 0;
 	status = "NotSolved";
+	terminationStatus = "NotSolved";
+	hasPrimalSolution = !1;
 	objectiveValue = null;
+	objectiveBound = void 0;
+	relGap = void 0;
+	mipGap = void 0;
+	absGap = void 0;
 	runTime = 0;
 	solution = null;
 	solver = null;
+	hasSolutionState = !1;
+	modelRevision = 0;
+	activeOperationId = 0;
+	batchDepth = 0;
+	batchMutated = !1;
+	batchUndoActions = [];
 	constructor(e = {}, t) {
 		let n;
 		n = typeof e == "string" ? {
 			...t,
 			name: e
-		} : e, this.name = n.name || "OptimizationModel", this.sense = T(n.sense), this.objective = new O(), n.solver && (this.solver = f(n.solver));
+		} : e, this.name = n.name || "OptimizationModel", this._sense = le(n.sense), this._objectiveExpr = new j(), n.solver && (this.solver = D(n.solver));
+	}
+	get sense() {
+		return this._sense;
 	}
-	get vars() {
-		return this.variables;
+	set sense(e) {
+		let t = le(e);
+		this._sense !== t && (this._sense = t, this.recordModelMutation());
 	}
-	get constrs() {
-		return this.constraints;
+	get objectiveExpr() {
+		return this._objectiveExpr.clone();
+	}
+	set objectiveExpr(e) {
+		this.applyObjective(e);
+	}
+	get conflicts() {
+		return this.unsatCore;
 	}
 	get numVars() {
 		return this.variables.length;
@@ -912,50 +1340,123 @@ var $ = class {
 	get numConstrs() {
 		return this.constraints.length;
 	}
-	createDomainVars(e, t, n, r) {
-		if (typeof n == "number" || Array.isArray(n)) {
-			let i = typeof t == "number" ? Array.from({ length: t }, (e, t) => t) : t, a = typeof n == "number" ? Array.from({ length: n }, (e, t) => t) : n, o = r || {}, s = o.prefix || o.name || "x", c = {};
-			for (let t of i) {
-				c[t] = {};
-				for (let n of a) c[t][n] = this.addVar({
-					...o,
-					type: e,
-					name: `${s}_${t}_${n}`
-				});
+	clearSolutionFields() {
+		if (this.hasSolutionState || this.status !== "NotSolved" || this.terminationStatus !== "NotSolved" || this.hasPrimalSolution || this.solution !== null || this.unsatCore !== void 0) {
+			this.hasSolutionState = !1, this.status = "NotSolved", this.terminationStatus = "NotSolved", this.hasPrimalSolution = !1, this.objectiveValue = null, this.objectiveBound = void 0, this.relGap = void 0, this.mipGap = void 0, this.absGap = void 0, this.solution = null, this.runTime = 0, this.unsatCore = void 0, this.values.clear();
+			for (let e of this.variables) e.value = null, e.reducedCost = null;
+			for (let e of this.boolVars) e.value = null;
+			for (let e of this.constraints) e.dual = null, e.slack = null;
+		}
+	}
+	recordModelMutation() {
+		if (this.batchDepth > 0) {
+			this.batchMutated = !0;
+			return;
+		}
+		this.modelRevision++, this.clearSolutionFields();
+	}
+	notifyMutation() {
+		this.recordModelMutation();
+	}
+	resetSolutionState() {
+		this.recordModelMutation();
+	}
+	runTransactionalBatch(e) {
+		if (this.batchDepth > 0) return e();
+		let t = this.variables.length, n = this.boolVars.length, r = this.constraints.length, i = this.logicalConstraints.length, a = new Map(this.varPrefixCounters), o = new Map(this.boolVarPrefixCounters), s = new Map(this.constrPrefixCounters), c = this.logicalConstrCounter;
+		this.batchDepth = 1, this.batchMutated = !1, this.batchUndoActions = [];
+		try {
+			let t = e();
+			this.batchDepth = 0;
+			let n = this.batchMutated;
+			return this.batchMutated = !1, this.batchUndoActions = [], n && this.recordModelMutation(), t;
+		} catch (e) {
+			this.batchDepth = 0, this.batchMutated = !1;
+			for (let e = t; e < this.variables.length; e++) {
+				let t = this.variables[e];
+				this.varMapByName.delete(t.name), t.ownerModel = null, g(t, this);
 			}
-			return c;
+			this.variables.length = t;
+			for (let e = n; e < this.boolVars.length; e++) {
+				let t = this.boolVars[e];
+				this.boolVarMapByName.delete(t.name);
+			}
+			this.boolVars.length = n;
+			for (let e = r; e < this.constraints.length; e++) {
+				let t = this.constraints[e];
+				this.constrMapByName.delete(t.name);
+			}
+			this.constraints.length = r;
+			for (let e = i; e < this.logicalConstraints.length; e++) {
+				let t = this.logicalConstraints[e];
+				this.logicalConstrMapByName.delete(t.name);
+			}
+			this.logicalConstraints.length = i;
+			for (let e = this.batchUndoActions.length - 1; e >= 0; e--) this.batchUndoActions[e]();
+			throw this.batchUndoActions = [], this.varPrefixCounters = a, this.boolVarPrefixCounters = o, this.constrPrefixCounters = s, this.logicalConstrCounter = c, e;
+		}
+	}
+	createDomainVars(e, t, n, r) {
+		let i = e.toLowerCase(), a = typeof t == "number", o = typeof n == "number", s = Z(t), c = Z(n);
+		if (o || c) {
+			if (a && $(t, i), o && $(n, i), !a && !s || r !== void 0 && !Q(r)) throw Error(`Invalid arguments provided for ${i} variable creation`);
+			let c = a ? Array.from({ length: t }, (e, t) => t) : Array.from(t), l = o ? Array.from({ length: n }, (e, t) => t) : n === t ? c : Array.from(n), u = r || {}, d = u.prefix || u.name || "x";
+			return this.runTransactionalBatch(() => {
+				let t = a ? [] : {};
+				for (let n of c) {
+					let r = o ? [] : {};
+					for (let t of l) r[t] = this.addVar({
+						...u,
+						type: e,
+						name: `${d}_${n}_${t}`
+					});
+					t[n] = r;
+				}
+				return t;
+			});
 		}
-		if (typeof t == "string") {
-			let r = n || {};
+		if (typeof t == "string" || t === void 0) {
+			if (n !== void 0 && !Q(n)) throw Error(`Invalid arguments provided for ${i} variable creation`);
+			let r = n || {}, a = typeof t == "string" ? t : r.name;
 			return this.addVar({
 				...r,
 				type: e,
-				name: t
+				name: a
+			});
+		}
+		if (Q(t)) {
+			if (n !== void 0) throw Error(`Invalid arguments provided for ${i} variable creation`);
+			let r = t;
+			return this.addVar({
+				...r,
+				type: e
 			});
 		}
-		let i = n || {}, a = i.prefix || i.name;
-		if (typeof t == "number") {
-			let n = [], r = a || "x";
-			for (let a = 0; a < t; a++) n.push(this.addVar({
-				...i,
+		if (n !== void 0 && !Q(n)) throw Error(`Invalid arguments provided for ${i} variable creation`);
+		let l = n || {}, u = l.prefix || l.name;
+		if (typeof t == "number") return $(t, i), this.runTransactionalBatch(() => {
+			let n = [], r = u || "x";
+			for (let i = 0; i < t; i++) n.push(this.addVar({
+				...l,
 				type: e,
-				name: `${r}_${a}`
+				name: void 0,
+				prefix: r
 			}));
 			return n;
-		}
-		if (Array.isArray(t) || t && typeof t[Symbol.iterator] == "function") {
+		});
+		if (Z(t)) return this.runTransactionalBatch(() => {
 			let n = {};
 			for (let r of t) {
-				let t = a ? `${a}_${r}` : `${r}`;
+				let t = u ? `${u}_${r}` : `${r}`;
 				n[r] = this.addVar({
-					...i,
+					...l,
 					type: e,
 					name: t
 				});
 			}
 			return n;
-		}
-		throw Error(`Invalid arguments provided for ${e.toLowerCase()} variable creation`);
+		});
+		throw Error(`Invalid arguments provided for ${i} variable creation`);
 	}
 	binary(e, t, n) {
 		return this.createDomainVars("Binary", e, t, n);
@@ -966,89 +1467,142 @@ var $ = class {
 	continuous(e, t, n) {
 		return this.createDomainVars("Continuous", e, t, n);
 	}
-	addVar(e, t, n, r) {
-		let i;
-		i = typeof e == "string" ? {
-			name: e,
-			type: t,
-			lb: n,
-			ub: r
-		} : e || {};
-		let a = new j(i);
-		if (this.varMapByName.has(a.name)) throw Error(`Variable with name '${a.name}' already exists in model`);
-		return this.variables.push(a), this.varMapByName.set(a.name, a), a;
-	}
-	addVars(e, t, n) {
-		if (typeof t == "number" || Array.isArray(t)) {
-			let r = typeof e == "number" ? Array.from({ length: e }, (e, t) => t) : e, i = typeof t == "number" ? Array.from({ length: t }, (e, t) => t) : t, a = n || {}, o = a.prefix || a.name || "x", s = {};
-			for (let e of r) {
-				s[e] = {};
-				for (let t of i) s[e][t] = this.addVar({
-					...a,
-					name: `${o}_${e}_${t}`
-				});
-			}
-			return s;
+	bool(e, t, n) {
+		let r = typeof e == "number", i = typeof t == "number", a = Z(e), o = Z(t);
+		if (i || o) {
+			if (r && $(e, "boolean"), i && $(t, "boolean"), !r && !a || n !== void 0 && !Q(n)) throw Error("Invalid arguments provided for boolean variable creation");
+			let o = r ? Array.from({ length: e }, (e, t) => t) : Array.from(e), s = i ? Array.from({ length: t }, (e, t) => t) : t === e ? o : Array.from(t), c = n || {}, l = c.prefix || c.name || "p";
+			return this.runTransactionalBatch(() => {
+				let e = r ? [] : {};
+				for (let t of o) {
+					let n = i ? [] : {};
+					for (let e of s) n[e] = this.createBoolVar(`${l}_${t}_${e}`);
+					e[t] = n;
+				}
+				return e;
+			});
 		}
-		let r = t || {}, i = r.prefix || r.name;
-		if (typeof e == "number") {
-			let t = [], n = i || "x";
-			for (let i = 0; i < e; i++) t.push(this.addVar({
-				...r,
-				name: `${n}_${i}`
-			}));
-			return t;
+		if (typeof e == "string" || e === void 0) {
+			if (t !== void 0 && !Q(t)) throw Error("Invalid arguments provided for boolean variable creation");
+			let n = t || {}, r = typeof e == "string" ? e : n.name;
+			return this.createBoolVar(r, n.prefix);
 		}
-		{
+		if (Q(e)) {
+			if (t !== void 0) throw Error("Invalid arguments provided for boolean variable creation");
+			let n = e;
+			return this.createBoolVar(n.name, n.prefix);
+		}
+		if (t !== void 0 && !Q(t)) throw Error("Invalid arguments provided for boolean variable creation");
+		let s = t || {}, c = s.prefix || s.name;
+		if (typeof e == "number") return $(e, "boolean"), this.runTransactionalBatch(() => {
+			let t = [], n = c || "p";
+			for (let r = 0; r < e; r++) t.push(this.createBoolVar(void 0, n));
+			return t;
+		});
+		if (Z(e)) return this.runTransactionalBatch(() => {
 			let t = {};
 			for (let n of e) {
-				let e = i ? `${i}_${n}` : `${n}`;
-				t[n] = this.addVar({
-					...r,
-					name: e
-				});
+				let e = c ? `${c}_${n}` : `${n}`;
+				t[n] = this.createBoolVar(e);
 			}
 			return t;
-		}
-	}
-	addVars2D(e, t, n) {
-		let r = {}, i = n?.name || "x";
-		for (let a of e) {
-			r[a] = {};
-			for (let e of t) r[a][e] = this.addVar({
-				...n,
-				name: `${i}_${a}_${e}`
+		});
+		throw Error("Invalid arguments provided for boolean variable creation");
+	}
+	hasVarName(e) {
+		return this.varMapByName.has(e) || this.boolVarMapByName.has(e);
+	}
+	getNextVarName(e) {
+		let t = this.varPrefixCounters.get(e) ?? 0, n = `${e}_${t}`;
+		for (; this.hasVarName(n);) t++, n = `${e}_${t}`;
+		return this.varPrefixCounters.set(e, t + 1), n;
+	}
+	getNextBoolVarName(e) {
+		let t = this.boolVarPrefixCounters.get(e) ?? 0, n = `${e}_${t}`;
+		for (; this.hasVarName(n) || this.hasConstraintName(n);) t++, n = `${e}_${t}`;
+		return this.boolVarPrefixCounters.set(e, t + 1), n;
+	}
+	hasConstraintName(e) {
+		return this.constrMapByName.has(e) || this.logicalConstrMapByName.has(e);
+	}
+	hasBoolVarName(e) {
+		return this.boolVarMapByName.has(e);
+	}
+	getNextConstrName(e = "c") {
+		let t = this.constrPrefixCounters.get(e) ?? 1, n = `${e}_${t}`;
+		for (; this.hasConstraintName(n) || this.hasBoolVarName(n);) t++, n = `${e}_${t}`;
+		return this.constrPrefixCounters.set(e, t + 1), n;
+	}
+	getNextLogicalConstrName() {
+		let e = this.logicalConstrCounter + 1, t = `lc_${e}`;
+		for (; this.hasConstraintName(t) || this.hasBoolVarName(t);) e++, t = `lc_${e}`;
+		return this.logicalConstrCounter = e, t;
+	}
+	createBoolVar(e, t) {
+		let n = typeof e == "string" ? e.trim() : void 0, r = typeof t == "string" ? t.trim() : "", i = r.length > 0 ? r : "p", a = n && n.length > 0 ? n : this.getNextBoolVarName(i);
+		if (this.hasVarName(a)) throw Error(`Variable with name '${a}' already exists in model`);
+		if (this.hasConstraintName(a)) throw Error(`Boolean variable name '${a}' conflicts with an existing constraint in model`);
+		let s = new o(a);
+		return this.boolVars.push(s), this.boolVarMapByName.set(s.name, s), this.recordModelMutation(), s;
+	}
+	addVar(e) {
+		let t = e || {}, n = typeof t.name == "string" ? t.name.trim() : void 0, r = n && n.length > 0 ? n : void 0, i = typeof t.prefix == "string" ? t.prefix.trim() : "", a = i.length > 0 ? i : "x", o = this.varPrefixCounters.get(a), s = r ?? this.getNextVarName(a);
+		try {
+			if (this.hasVarName(s)) throw Error(`Variable with name '${s}' already exists in model`);
+			let e = new b({
+				...t,
+				name: s,
+				prefix: a
 			});
+			return e.hasExplicitName = r !== void 0, d(e), m(e, this), e.ownerModel = this, this.variables.push(e), this.varMapByName.set(e.name, e), this.recordModelMutation(), e;
+		} catch (e) {
+			throw r === void 0 && (o === void 0 ? this.varPrefixCounters.delete(a) : this.varPrefixCounters.set(a, o)), e;
 		}
-		return r;
 	}
 	getVarByName(e) {
 		return this.varMapByName.get(e);
 	}
+	getBoolVarByName(e) {
+		return this.boolVarMapByName.get(e);
+	}
 	getConstraintByName(e) {
 		return this.constrMapByName.get(e);
 	}
-	setObjective(e, t) {
-		if (e instanceof c) throw Error("Cannot set objective to a constraint comparison (<=, >=, ==). Did you mean to use m.constrain(expr`... <= ...`)? For objectives, supply an unconstrained expression like expr`45 * ${x} + 80 * ${y}`.");
-		t && (this.sense = T(t)), this.objective = typeof e == "string" ? P(e, (e) => this.getVarByName(e)) : typeof e == "number" ? new O(/* @__PURE__ */ new Map(), e) : e instanceof D || "terms" in e ? e.clone() : new O(/* @__PURE__ */ new Map([[e, 1]]), 0);
-	}
-	maximize(e) {
-		this.setObjective(e, "Maximize");
-	}
-	minimize(e) {
-		this.setObjective(e, "Minimize");
-	}
-	constrain(e, t) {
-		if (Array.isArray(e)) {
-			for (let t of e) this.constrain(t);
+	getLogicalConstraintByName(e) {
+		return this.logicalConstrMapByName.get(e);
+	}
+	objective(e) {
+		return e ? (this.applyObjective(e.expr, e.sense), this) : this.objectiveExpr;
+	}
+	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`... <= ...`)?" : "Cannot use a Constraint as an objective. Did you mean to use m.constraint(expr`... <= ...`)? For objectives, supply an unconstrained expression like expr`45 * ${x} + 80 * ${y}`.");
+		let n = t === void 0 ? this.sense : le(t), r;
+		if (typeof e == "string") r = pe(e, (e) => this.getVarByName(e));
+		else if (typeof e == "number") r = new j(/* @__PURE__ */ new Map(), e);
+		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);
+		} 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);
+		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();
+	}
+	constraint(e, t) {
+		if (Array.isArray(e)) return this.runTransactionalBatch(() => {
+			for (let t of e) this.constraint(t);
 			return this;
-		}
-		if (e instanceof O) throw Error("Cannot add a linear expression without a comparison operator (<=, >=, ==) as a constraint. Use expr`... <= ...` or .le(), .ge(), .eq().");
+		});
+		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().");
 		return this.addConstraint(e, t), this;
 	}
 	getValues(e) {
 		if (e == null) return null;
-		if (e instanceof j) return e.value;
+		if (e instanceof b || e instanceof o) return e.value;
 		if (Array.isArray(e)) return e.map((e) => this.getValues(e));
 		if (typeof e == "object") {
 			let t = {};
@@ -1057,209 +1611,397 @@ var $ = class {
 		}
 		return null;
 	}
-	addBoolVar(e) {
-		let t = new n(e);
-		return this.boolVars.push(t), t;
-	}
 	addConstraint(e, t) {
-		if (e instanceof O) throw Error("Cannot add a linear expression without a comparison operator (<=, >=, ==) as a constraint. Use expr`... <= ...` or .le(), .ge(), .eq().");
-		if (e instanceof i) {
-			let n = t || `lc_${this.logicalConstraints.length + 1}`;
-			return this.logicalConstraints.push({
-				name: n,
+		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 (e instanceof r) {
+			let n = typeof t == "string" && t.trim().length > 0 ? t.trim() : void 0;
+			if (n !== void 0) {
+				if (this.hasConstraintName(n)) throw Error(`Constraint with name '${n}' already exists in model`);
+				if (this.hasBoolVarName(n)) throw Error(`Constraint name '${n}' conflicts with an existing Boolean variable in model`);
+			}
+			let r = this.logicalConstrCounter, i = n ?? this.getNextLogicalConstrName();
+			try {
+				l(e, i, this.name, (e) => this.varMapByName.get(e.name) === e, (e) => this.boolVarMapByName.get(e.name) === e, this);
+			} catch (e) {
+				throw n === void 0 && (this.logicalConstrCounter = r), e;
+			}
+			O(e, this, this.batchDepth > 0 ? this.batchUndoActions : void 0);
+			let a = {
+				name: i,
 				expr: e
-			}), e;
+			};
+			return this.logicalConstraints.push(a), this.logicalConstrMapByName.set(i, a), this.recordModelMutation(), e;
 		}
-		let n;
-		if (typeof e == "string" ? n = F(e, (e) => this.getVarByName(e), t) : (n = e, t && (n.name = t)), this.constrMapByName.has(n.name)) throw Error(`Constraint with name '${n.name}' already exists in model`);
-		return this.constraints.push(n), this.constrMapByName.set(n.name, n), n;
-	}
-	addConstr(e, t) {
-		return this.addConstraint(e, t);
-	}
-	addConstrs(e) {
-		return e.map((e) => this.addConstraint(e));
-	}
-	add(e, t) {
-		if (Array.isArray(e)) {
-			for (let t of e) this.add(t);
-			return this;
+		let n = typeof e == "string" ? he(e, (e) => this.getVarByName(e), t) : e;
+		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;
+		if (i !== void 0) {
+			if (this.hasConstraintName(i)) throw Error(`Constraint with name '${i}' already exists in model`);
+			if (this.hasBoolVarName(i)) throw Error(`Constraint name '${i}' conflicts with an existing Boolean variable in model`);
 		}
-		return e instanceof j ? (this.varMapByName.has(e.name) || (this.variables.push(e), this.varMapByName.set(e.name, e)), this) : (this.addConstraint(e, t), this);
+		let a = this.constrPrefixCounters.get("c"), o = i ?? this.getNextConstrName("c"), s;
+		try {
+			h(n, this.name, (e) => this.varMapByName.get(e.name) === e, o), s = p(n, this);
+		} catch (e) {
+			throw i === void 0 && (a === void 0 ? this.constrPrefixCounters.delete("c") : this.constrPrefixCounters.set("c", a)), e;
+		}
+		let c = n.name, u = n.hasExplicitName, d = n.ownerModel, f = s;
+		return this.batchUndoActions.push(() => {
+			n.ownerModel = d, n._assignModelName(c, u), x(n, this, f);
+		}), this.batchDepth === 0 && (this.batchUndoActions = []), n._assignModelName(o, !0), n.ownerModel = this, this.constraints.push(n), this.constrMapByName.set(n.name, n), this.recordModelMutation(), n;
 	}
 	indicator(e, t, n = {}) {
+		if (!(e instanceof b)) throw Error("Invalid binary variable passed to indicator(). Expected a binary Var instance.");
+		if (!(e.type === "Binary" || e.type === "Integer" && e.lb === 0 && e.ub === 1)) throw Error(`Invalid variable "${e.name}" passed to indicator(): variable has type "${e.type}" with bounds [${e.lb}, ${e.ub}]. Indicator activation variable must be a Binary variable (or Integer variable with bounds [0, 1]).`);
+		if (t instanceof A) throw Error("Quadratic expressions or constraints are not supported in indicator constraints (only linear constraints are allowed).");
 		if (!("sense" in t) || !("lhs" in t)) throw Error("Invalid constraint expression passed to indicator(). Expression must include a comparison operator (<=, >=, ==).");
-		let r = t, i = n.activeValue === void 0 ? 1 : n.activeValue, a = n.M === void 0 ? 1e5 : n.M, o = n.name || `ind_${e.name}_${r.name}`, s = [], { lhs: c, sense: l, rhs: u } = r;
-		if (i === 1) {
-			if (l === "<=" || l === "==") {
-				let t = this.addConstraint(c.add(e.mul(a)).le(u + a), l === "==" ? `${o}_le` : o);
-				s.push(t);
-			}
-			if (l === ">=" || l === "==") {
-				let t = this.addConstraint(c.sub(e.mul(a)).ge(u - a), l === "==" ? `${o}_ge` : o);
-				s.push(t);
-			}
-		} else {
+		let r = t, i = n.activeValue === void 0 ? 1 : n.activeValue;
+		if (i !== 0 && i !== 1) throw Error(`Invalid activeValue: ${i}. Indicator activeValue must be 0 or 1.`);
+		if (this.varMapByName.get(e.name) !== e) throw Error(`Variable "${e.name}" passed to indicator() does not belong to model "${this.name}". All variables must belong to the model by object identity.`);
+		let a = typeof n.name == "string" && n.name.trim().length > 0 ? n.name.trim() : void 0, o = this.constrPrefixCounters.get("c"), { lhs: s, sense: l, rhs: u } = r, d, f, p;
+		if (a !== void 0) d = a, f = l === "==" ? `${d}_le` : d, p = l === "==" ? `${d}_ge` : d;
+		else if (r.hasExplicitName) d = `ind_${e.name}_${r.name.trim()}`, f = l === "==" ? `${d}_le` : d, p = l === "==" ? `${d}_ge` : d;
+		else do {
+			let t = this.getNextConstrName("c");
+			d = `ind_${e.name}_${t}`, f = l === "==" ? `${d}_le` : d, p = l === "==" ? `${d}_ge` : d;
+		} while ((l === "<=" || l === "==") && (this.hasConstraintName(f) || this.hasBoolVarName(f)) || (l === ">=" || l === "==") && (this.hasConstraintName(p) || this.hasBoolVarName(p)));
+		let m = [];
+		try {
+			if ((l === "<=" || l === "==") && (this.hasConstraintName(f) || this.hasBoolVarName(f))) throw Error(this.hasBoolVarName(f) ? `Constraint name '${f}' conflicts with an existing Boolean variable in model` : `Constraint with name '${f}' already exists in model`);
+			if ((l === ">=" || l === "==") && (this.hasConstraintName(p) || this.hasBoolVarName(p))) throw Error(this.hasBoolVarName(p) ? `Constraint name '${p}' conflicts with an existing Boolean variable in model` : `Constraint with name '${p}' already exists in model`);
+			n.M !== void 0 && Pe(n.M, d);
+			let t = (e) => this.varMapByName.get(e.name) === e;
+			for (let [e] of s.terms) if (!t(e)) throw Error(`Variable "${e.name}" in constraint "${d}" does not belong to model "${this.name}". All variables must belong to the model by object identity.`);
 			if (l === "<=" || l === "==") {
-				let t = this.addConstraint(c.sub(e.mul(a)).le(u), l === "==" ? `${o}_le` : o);
-				s.push(t);
+				let t = X(e, s, "<=", u, i, n.M === void 0 ? Ie(s, u, f) : n.M, f);
+				m.push([new c(t.lhs, "<=", t.rhs, f), f]);
 			}
 			if (l === ">=" || l === "==") {
-				let t = this.addConstraint(c.add(e.mul(a)).ge(u), l === "==" ? `${o}_ge` : o);
-				s.push(t);
+				let t = X(e, s, ">=", u, i, n.M === void 0 ? Le(s, u, p) : n.M, p);
+				m.push([new c(t.lhs, ">=", t.rhs, p), p]);
 			}
+			for (let [e, n] of m) h(e, this.name, t, n);
+		} catch (e) {
+			throw o === void 0 ? this.constrPrefixCounters.delete("c") : this.constrPrefixCounters.set("c", o), e;
 		}
-		return s;
-	}
-	addIndicator(e, t, n = {}) {
-		return this.indicator(e, t, n);
+		return this.runTransactionalBatch(() => m.map(([e, t]) => this.addConstraint(e, t)));
 	}
 	toLpString() {
-		let { lpString: e } = B({
+		this.validateIntegrity();
+		let { lpString: e } = C({
 			name: this.name,
 			sense: this.sense,
-			objective: this.objective,
+			objective: this.objectiveExpr,
 			constraints: this.constraints,
 			variables: this.variables
 		});
 		return e;
 	}
-	async optimize(e, t) {
-		let n, r;
-		if (e && typeof e == "object" && "solve" in e && typeof e.solve == "function" ? (n = e, r = t || {}) : typeof e == "function" ? (n = new e(t), r = t || {}) : typeof e == "string" ? (n = f(e, t), r = t || {}) : (r = { ...e }, r.solver ? (n = f(r.solver, r), delete r.solver) : n = this.solver || f()), this.objective instanceof D && this.objective.quadTerms.size > 0 && n.capabilities?.supportsQP === !1) throw Error(`Solver "${n.name}" does not support quadratic objectives (QP). Please use a QP-capable solver such as HiGHS or Clarabel.`);
-		let i = {
+	validateIntegrity() {
+		k(this);
+	}
+	ensureExecutionValid(e, t, n) {
+		if (this.modelRevision !== e) throw this.activeOperationId === t && this.clearSolutionFields(), Error(`Model "${this.name}" was modified while ${n}() was in progress; stale solver result was discarded.`);
+		if (this.activeOperationId !== t) throw Error(`Stale ${n}() result discarded because a newer solve or check operation was started on model "${this.name}".`);
+	}
+	wrapSolveOptions(e, t, n) {
+		let r = e.onProgress;
+		return r ? {
+			...e,
+			onProgress: (e) => {
+				this.activeOperationId === n && this.modelRevision === t && r(e);
+			}
+		} : e;
+	}
+	hasPrimalFromResult(e) {
+		if (typeof e.hasPrimalSolution == "boolean") return e.hasPrimalSolution;
+		let t = e.status, n = e.terminationStatus ?? t, r = e.values || {}, i = e.boolValues || {};
+		return t !== "Infeasible" && t !== "Unsat" && t !== "Unbounded" && t !== "Error" && t !== "NotSolved" && n !== "Infeasible" && n !== "Unsat" && n !== "Unbounded" && n !== "InfeasibleOrUnbounded" && n !== "Error" && n !== "NotSolved" && (t === "Optimal" || t === "Feasible" || t === "Sat" || n === "Optimal" || n === "Feasible" || n === "Sat" || typeof e.objectiveValue == "number" && Number.isFinite(e.objectiveValue) || Object.values(r).some((e) => typeof e == "number" && Number.isFinite(e) || typeof e == "boolean") || Object.values(i).some((e) => typeof e == "boolean"));
+	}
+	resolveSolverAndOptions(e, t) {
+		if (e && typeof e == "object" && "solve" in e && typeof e.solve == "function") {
+			let { solver: n, ...r } = t || {};
+			return {
+				activeSolver: e,
+				activeOptions: r
+			};
+		}
+		if (typeof e == "function") {
+			let { solver: n, ...r } = t || {};
+			return {
+				activeSolver: new e(r),
+				activeOptions: r
+			};
+		}
+		if (typeof e == "string") {
+			let { solver: n, ...r } = t || {};
+			return {
+				activeSolver: D(e, r),
+				activeOptions: r
+			};
+		}
+		let { solver: n, ...r } = e || {};
+		return n ? {
+			activeSolver: D(n, r),
+			activeOptions: r
+		} : {
+			activeSolver: this.solver || D(),
+			activeOptions: r
+		};
+	}
+	async solve(e, t) {
+		let n = ++this.activeOperationId, r = this.modelRevision;
+		this.clearSolutionFields(), this.validateIntegrity();
+		let { activeSolver: i, activeOptions: a } = this.resolveSolverAndOptions(e, t);
+		if (this._objectiveExpr instanceof 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.logicalConstraints.length > 0 && i.capabilities?.supportsSMT !== !0) throw Error(`Solver "${i.name}" does not support SMT / logical constraints (or, implies, not, xor). Please use an SMT-capable solver such as Z3.`);
+		if (this.variables.some((e) => e.initialValue !== void 0) && i.capabilities?.supportsWarmStart !== !0) throw Error(`Solver "${i.name}" does not support primal initial values (initialValue). Please use a solver with warm-start support such as HiGHS.`);
+		let o = {
 			name: this.name,
 			sense: this.sense,
-			objective: this.objective,
+			objective: this._objectiveExpr,
 			constraints: this.constraints,
 			variables: this.variables,
 			logicalConstraints: this.logicalConstraints,
 			boolVars: this.boolVars
-		}, a = B(i), o = await n.solve(i, a, r);
-		this.runTime = o.runTime ?? 0, this.status = o.status, this.objectiveValue = o.objectiveValue ?? null;
-		let s = {}, c = {}, l = {}, u = {};
-		this.values.clear();
-		for (let e of this.variables) e.value = null, e.reducedCost = null;
-		for (let e of this.boolVars) e.value = null;
-		for (let e of this.constraints) e.dual = null, e.slack = null;
-		if (a?.nameToVar) for (let e of a.nameToVar.values()) e.value = null, e.reducedCost = null;
-		if (a?.nameToConstraint) for (let e of a.nameToConstraint.values()) e.dual = null, e.slack = null;
-		if (o.values && o.status !== "Infeasible" && o.status !== "Unbounded") {
-			for (let [e, t] of Object.entries(o.values)) if (typeof t == "number" && !Number.isNaN(t)) {
-				this.values.set(e, t);
-				let n = this.getVarByName(e) || a.nameToVar.get(e);
-				n && (n.value = t, s[n.name] = t);
-				let r = this.boolVars.find((t) => t.name === e);
-				r && (r.value = !!t);
+		}, s = this.wrapSolveOptions(a, r, n), c;
+		try {
+			c = await i.solve(o, s);
+		} catch (e) {
+			throw this.activeOperationId === n && this.clearSolutionFields(), e;
+		}
+		this.ensureExecutionValid(r, n, "solve"), this.runTime = c.runTime ?? 0, this.status = c.status, this.terminationStatus = c.terminationStatus ?? c.status;
+		let l = this.hasPrimalFromResult(c);
+		this.hasPrimalSolution = l, this.objectiveValue = l && typeof c.objectiveValue == "number" && Number.isFinite(c.objectiveValue) ? c.objectiveValue : null, this.objectiveBound = typeof c.objectiveBound == "number" && Number.isFinite(c.objectiveBound) ? c.objectiveBound : void 0;
+		let u = typeof c.relGap == "number" && Number.isFinite(c.relGap) ? c.relGap : typeof c.mipGap == "number" && Number.isFinite(c.mipGap) ? c.mipGap : void 0;
+		this.relGap = u, this.mipGap = u, this.absGap = typeof c.absGap == "number" && Number.isFinite(c.absGap) ? c.absGap : this.objectiveValue !== null && this.objectiveBound !== void 0 ? Math.abs(this.objectiveValue - this.objectiveBound) : void 0;
+		let d = (e, t, n) => {
+			Object.defineProperty(e, t, {
+				value: n,
+				enumerable: !0,
+				writable: !0,
+				configurable: !0
+			});
+		}, f = {}, p = {}, m = {}, h = {};
+		if (this.values.clear(), l && c.values) {
+			for (let [e, t] of Object.entries(c.values)) if (typeof t == "number" && Number.isFinite(t)) {
+				let n = this.getVarByName(e), r = this.getBoolVarByName(e);
+				n && (n.value = t, d(f, n.name, t), this.values.set(n.name, t)), r && (r.value = !!t, this.values.set(r.name, t)), !n && !r && this.values.set(e, t);
+			} else if (typeof t == "boolean") {
+				let n = t, r = this.getBoolVarByName(e);
+				r ? (r.value = n, d(f, r.name, +!!n), this.values.set(r.name, n)) : this.values.set(e, n);
 			}
 		}
-		if (o.reducedCosts) for (let [e, t] of Object.entries(o.reducedCosts)) {
-			let n = this.getVarByName(e) || a.nameToVar.get(e);
-			n && (n.reducedCost = t, l[n.name] = t);
+		if (l && c.boolValues) for (let [e, t] of Object.entries(c.boolValues)) {
+			if (typeof t != "boolean") continue;
+			let n = this.getBoolVarByName(e);
+			n ? (n.value = t, this.values.has(n.name) || this.values.set(n.name, t)) : this.values.has(e) || this.values.set(e, t);
 		}
-		if (o.duals) for (let [e, t] of Object.entries(o.duals)) {
-			let n = this.getConstraintByName(e) || a.nameToConstraint.get(e);
-			n && (n.dual = t, c[n.name] = t);
+		if (l && c.reducedCosts) for (let [e, t] of Object.entries(c.reducedCosts)) {
+			if (typeof t != "number" || !Number.isFinite(t)) continue;
+			let n = this.getVarByName(e);
+			n && (n.reducedCost = t, d(m, n.name, t));
 		}
-		if (o.slacks) for (let [e, t] of Object.entries(o.slacks)) {
-			let n = this.getConstraintByName(e) || a.nameToConstraint.get(e);
-			n && (n.slack = t, u[n.name] = t);
+		if (c.duals) for (let [e, t] of Object.entries(c.duals)) {
+			if (typeof t != "number" || !Number.isFinite(t)) continue;
+			let n = this.getConstraintByName(e);
+			n && (n.dual = t, d(p, n.name, t));
+		}
+		if (c.slacks) for (let [e, t] of Object.entries(c.slacks)) {
+			if (typeof t != "number" || !Number.isFinite(t)) continue;
+			let n = this.getConstraintByName(e);
+			n && (n.slack = t, d(h, n.name, t));
 		}
 		return this.solution = {
 			status: this.status,
+			terminationStatus: this.terminationStatus,
+			hasPrimalSolution: this.hasPrimalSolution,
 			objectiveValue: this.objectiveValue,
-			values: s,
-			duals: c,
-			reducedCosts: l,
-			slacks: u,
+			...this.objectiveBound === void 0 ? {} : { objectiveBound: this.objectiveBound },
+			...this.relGap === void 0 ? {} : {
+				relGap: this.relGap,
+				mipGap: this.mipGap
+			},
+			...this.absGap === void 0 ? {} : { absGap: this.absGap },
+			values: f,
+			duals: p,
+			reducedCosts: m,
+			slacks: h,
 			runTime: this.runTime,
-			raw: o.raw
-		}, this.status;
-	}
-	async solve(e, t) {
-		return this.optimize(e, t);
+			raw: c.raw
+		}, this.hasSolutionState = !0, this.status;
 	}
 	async check(e, t) {
-		let n, r;
-		if (e && typeof e == "object" && "solve" in e && typeof e.solve == "function" ? (n = e, r = t || {}) : typeof e == "function" ? (n = new e(t), r = t || {}) : typeof e == "string" ? (n = f(e, t), r = t || {}) : (r = { ...e }, r.solver ? (n = f(r.solver, r), delete r.solver) : n = this.solver || f()), this.logicalConstraints.length > 0 && n.capabilities?.supportsSMT !== !0) throw Error(`Solver "${n.name}" does not support SMT / logical constraints (or, implies, not, xor). Please use an SMT-capable solver such as Z3.`);
-		if (typeof n.check == "function") {
-			let e = await n.check({
-				name: this.name,
-				variables: this.variables,
-				boolVars: this.boolVars,
-				constraints: this.constraints,
-				logicalConstraints: this.logicalConstraints
-			}, r);
-			this.status = e.status, this.runTime = e.runTime ?? 0, this.unsatCore = e.unsatCore || [], this.values.clear();
-			for (let e of this.variables) e.value = null;
-			for (let e of this.boolVars) e.value = null;
-			if (e.values && e.status === "Sat") for (let [t, n] of Object.entries(e.values)) {
-				this.values.set(t, n);
-				let e = this.getVarByName(t);
-				e && typeof n == "number" && (e.value = n);
-				let r = this.boolVars.find((e) => e.name === t);
-				r && (r.value = !!n);
+		let n = ++this.activeOperationId, r = this.modelRevision;
+		this.clearSolutionFields(), this.validateIntegrity();
+		let { activeSolver: i, activeOptions: a } = this.resolveSolverAndOptions(e, t);
+		if (this.logicalConstraints.length > 0 && i.capabilities?.supportsSMT !== !0) throw Error(`Solver "${i.name}" does not support SMT / logical constraints (or, implies, not, xor). Please use an SMT-capable solver such as Z3.`);
+		if (this.variables.some((e) => e.initialValue !== void 0) && i.capabilities?.supportsWarmStart !== !0) throw Error(`Solver "${i.name}" does not support primal initial values (initialValue). Please use a solver with warm-start support such as HiGHS.`);
+		let o = this.wrapSolveOptions(a, r, n), s = (e, t, n) => {
+			Object.defineProperty(e, t, {
+				value: n,
+				enumerable: !0,
+				writable: !0,
+				configurable: !0
+			});
+		}, c = {
+			name: this.name,
+			variables: this.variables,
+			boolVars: this.boolVars,
+			constraints: this.constraints,
+			logicalConstraints: this.logicalConstraints
+		};
+		if (typeof i.check == "function") {
+			let e;
+			try {
+				e = await i.check(c, o);
+			} catch (e) {
+				throw this.activeOperationId === n && this.clearSolutionFields(), e;
 			}
-			return e;
-		}
-		let i = this.objective, a = this.sense;
-		try {
-			this.objective = new O(), this.sense = "Minimize";
-			let e = await this.optimize(n, r), t = e === "Optimal" || e === "Feasible", i = e === "Infeasible", a = {};
-			if (t) {
-				for (let e of this.variables) e.value !== null && (a[e.name] = e.value);
-				for (let e of this.boolVars) e.value !== null && (a[e.name] = e.value);
+			this.ensureExecutionValid(r, n, "check"), this.status = e.status, this.terminationStatus = a.signal?.aborted ? "Interrupted" : e.status, this.hasPrimalSolution = e.status === "Sat", this.runTime = e.runTime ?? 0, this.unsatCore = e.unsatCore === void 0 ? void 0 : Object.freeze([...e.unsatCore]);
+			let t = {};
+			if (e.values && e.status === "Sat") {
+				for (let [n, r] of Object.entries(e.values)) if (typeof r == "number") {
+					if (!Number.isFinite(r)) continue;
+					let e = this.getVarByName(n), i = this.getBoolVarByName(n);
+					e && (e.value = r, this.values.set(e.name, r), s(t, e.name, r)), i && (i.value = !!r, this.values.set(i.name, i.value), s(t, i.name, i.value)), !e && !i && (this.values.set(n, r), s(t, n, r));
+				} else if (typeof r == "boolean") {
+					let e = this.getBoolVarByName(n);
+					e ? (e.value = r, this.values.set(e.name, r), s(t, e.name, r)) : (this.values.set(n, r), s(t, n, r));
+				}
 			}
-			return {
-				status: t ? "Sat" : i ? "Unsat" : "Unknown",
-				values: a,
+			return this.hasSolutionState = !0, {
+				status: e.status,
+				values: t,
+				unsatCore: this.unsatCore,
+				conflicts: this.unsatCore,
 				runTime: this.runTime
 			};
-		} finally {
-			this.objective = i, this.sense = a;
 		}
+		let l = {
+			name: this.name,
+			sense: "Minimize",
+			objective: new j(),
+			constraints: this.constraints,
+			variables: this.variables,
+			logicalConstraints: this.logicalConstraints,
+			boolVars: this.boolVars
+		}, u;
+		try {
+			u = await i.solve(l, o);
+		} catch (e) {
+			throw this.activeOperationId === n && this.clearSolutionFields(), e;
+		}
+		this.ensureExecutionValid(r, n, "check"), this.runTime = u.runTime ?? 0;
+		let d = u.status, f = u.terminationStatus ?? d, p = this.hasPrimalFromResult(u) || d === "Optimal" || d === "Feasible", m = p ? "Sat" : d === "Infeasible" ? "Unsat" : "Unknown";
+		this.status = m, this.terminationStatus = a.signal?.aborted || f === "Interrupted" ? "Interrupted" : f === "Optimal" || f === "Feasible" || f === "Infeasible" ? m : f, this.hasPrimalSolution = p, this.objectiveValue = null, this.objectiveBound = void 0, this.relGap = void 0, this.mipGap = void 0, this.absGap = void 0, this.solution = null, this.values.clear();
+		let h = {};
+		if (p && u.values) {
+			for (let [e, t] of Object.entries(u.values)) if (typeof t == "number" && Number.isFinite(t)) {
+				let n = this.getVarByName(e), r = this.getBoolVarByName(e);
+				n && (n.value = t, this.values.set(n.name, t), s(h, n.name, t)), r && (r.value = !!t, this.values.set(r.name, r.value), s(h, r.name, r.value)), !n && !r && (this.values.set(e, t), s(h, e, t));
+			} else if (typeof t == "boolean") {
+				let n = t, r = this.getBoolVarByName(e);
+				r ? (r.value = n, this.values.set(r.name, n), s(h, r.name, n)) : (this.values.set(e, n), s(h, e, n));
+			}
+		}
+		if (p && u.boolValues) for (let [e, t] of Object.entries(u.boolValues)) {
+			if (typeof t != "boolean") continue;
+			let n = this.getBoolVarByName(e);
+			n ? (n.value = t, this.values.set(n.name, t), s(h, n.name, t)) : (this.values.set(e, t), s(h, e, t));
+		}
+		if (u.slacks) for (let [e, t] of Object.entries(u.slacks)) {
+			if (typeof t != "number" || !Number.isFinite(t)) continue;
+			let n = this.getConstraintByName(e);
+			n && (n.slack = t);
+		}
+		return this.hasSolutionState = !0, {
+			status: m,
+			values: h,
+			runTime: this.runTime
+		};
+	}
+	validateSolution(e = {}) {
+		return Ne(this, e);
 	}
 };
-w(/* @__PURE__ */ S({
-	BoolExpr: () => i,
-	BoolOp: () => o,
-	BoolVar: () => n,
+//#endregion
+//#region src/modeler/objective.ts
+function ze(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 model.constraint(expr\`... <= ...\`) for constraints, or supply an unconstrained arithmetic expression to ${t}().`);
+	if (typeof n == "string" && /(<=|>=|==|=<|=>|=)/.test(n)) throw Error(`Cannot use a comparison constraint as an objective in ${t}(). Use model.constraint(expr\`... <= ...\`) for constraints, or supply an unconstrained arithmetic expression to ${t}().`);
+	if (typeof n == "number") {
+		if (!Number.isFinite(n)) throw Error(`Invalid non-finite objective constant "${n}" passed to ${t}().`);
+		return n;
+	}
+	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;
+	throw Error(`Invalid expression passed to ${t}(): expected a finite number, Var, LinExpr, QuadExpr, or arithmetic expression string.`);
+}
+function Be(e) {
+	return {
+		expr: ze(e, "maximize"),
+		sense: "Maximize"
+	};
+}
+function Ve(e) {
+	return {
+		expr: ze(e, "minimize"),
+		sense: "Minimize"
+	};
+}
+z(/* @__PURE__ */ se({
+	BoolExpr: () => r,
+	BoolOp: () => n,
+	BoolVar: () => o,
 	Constraint: () => c,
-	HiGHS: () => K,
-	HighsSolver: () => G,
-	LinExpr: () => O,
-	MockSolver: () => X,
-	Model: () => $,
-	OFFICIAL_HIGHS_CDN_WASM_URL: () => b,
-	QuadExpr: () => D,
-	Var: () => j,
-	and: () => e,
-	c: () => L,
-	dot: () => A,
-	expr: () => R,
-	generateLpString: () => B,
-	getHighs: () => g,
-	getHighsWasmUrl: () => v,
-	getSolver: () => f,
-	implies: () => a,
-	isValidWasmHeader: () => h,
-	listAvailableSolvers: () => u,
-	mapHighsStatus: () => W,
-	not: () => s,
-	or: () => t,
-	parseConstraint: () => F,
-	parseExpr: () => P,
-	probeWasmUrl: () => p,
-	registerHighsSolver: () => q,
-	registerMockSolver: () => Z,
-	registerSolver: () => d,
-	resolveBrowserWasmUrl: () => _,
-	setDefaultSolver: () => l,
-	setHighsWasmUrl: () => y,
-	solveLp: () => U,
-	solveLpWithHighs: () => m,
-	sum: () => k,
-	xor: () => r
-}), Q);
+	HiGHS: () => J,
+	HighsSolver: () => q,
+	LinExpr: () => j,
+	MockSolver: () => ke,
+	Model: () => Re,
+	OFFICIAL_HIGHS_CDN_WASM_URL: () => te,
+	QuadExpr: () => A,
+	Var: () => b,
+	and: () => y,
+	buildIndicatorLinearization: () => X,
+	buildLpSymbolMaps: () => u,
+	deriveBigMForGe: () => Le,
+	deriveBigMForLe: () => Ie,
+	dot: () => s,
+	expr: () => be,
+	generateLpString: () => C,
+	getHighs: () => F,
+	getHighsWasmUrl: () => L,
+	getSolver: () => D,
+	implies: () => e,
+	isLpExportResult: () => E,
+	isValidWasmHeader: () => P,
+	listAvailableSolvers: () => S,
+	mapHighsStatus: () => K,
+	mapHighsTerminationStatus: () => G,
+	maximize: () => Be,
+	minimize: () => Ve,
+	not: () => v,
+	or: () => i,
+	parseConstraint: () => he,
+	parseExpr: () => pe,
+	probeWasmUrl: () => M,
+	registerHighsSolver: () => Y,
+	registerMockSolver: () => Ae,
+	registerSolver: () => T,
+	resolveBrowserWasmUrl: () => I,
+	sanitizeIdentifier: () => f,
+	setDefaultSolver: () => _,
+	setHighsWasmUrl: () => R,
+	solveLp: () => W,
+	solveLpWithHighs: () => N,
+	sum: () => t,
+	validateModelIntegrity: () => k,
+	validateModelSolution: () => Ne,
+	validateUserBigM: () => Pe,
+	xor: () => a
+}), je);
 //#endregion
-export { i as BoolExpr, o as BoolOp, n as BoolVar, c as Constraint, K as HiGHS, G as HighsSolver, O as LinExpr, X as MockSolver, $ as Model, b as OFFICIAL_HIGHS_CDN_WASM_URL, D as QuadExpr, j as Var, e as and, L as c, A as dot, R as expr, B as generateLpString, g as getHighs, v as getHighsWasmUrl, f as getSolver, a as implies, h as isValidWasmHeader, u as listAvailableSolvers, T as normalizeSense, s as not, t as or, F as parseConstraint, P as parseExpr, p as probeWasmUrl, d as registerSolver, _ as resolveBrowserWasmUrl, l as setDefaultSolver, y as setHighsWasmUrl, m as solveLpWithHighs, k as sum, r as xor };
+export { r as BoolExpr, n as BoolOp, o as BoolVar, c as Constraint, J as HiGHS, q as HighsSolver, j as LinExpr, ke as MockSolver, Re as Model, A as QuadExpr, b as Var, y as and, X as buildIndicatorLinearization, u as buildLpSymbolMaps, Le as deriveBigMForGe, Ie as deriveBigMForLe, s as dot, be as expr, C as generateLpString, F as getHighs, L as getHighsWasmUrl, D as getSolver, e as implies, E as isLpExportResult, S as listAvailableSolvers, Be as maximize, Ve as minimize, le as normalizeSense, v as not, i as or, he as parseConstraint, pe as parseExpr, T as registerSolver, f as sanitizeIdentifier, _ as setDefaultSolver, R as setHighsWasmUrl, N as solveLpWithHighs, t as sum, k as validateModelIntegrity, Ne as validateModelSolution, Pe as validateUserBigM, a as xor };