@ohtaman/washi 0.1.2 → 0.3.0

package/dist/browser/washi.js

@@ -1,32 +1,37 @@
-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 "./highs-loader-T47YOyos.js";
+import { a as e, c as t, i as n, l as r, n as i, o as a, r as o, s, t as c } from "./loader-CVt4CloI.js";
+//#region src/modeler/types.ts
+function l(e) {
+	return e && e.toLowerCase() === "maximize" ? "Maximize" : "Minimize";
+}
+//#endregion
 //#region src/modeler/boolean-expr.ts
-var l = 0, u = class {
+var u = 0, d = class {
 	and(e) {
-		return new f("and", [this, e]);
+		return new p("and", [this, e]);
 	}
 	or(e) {
-		return new f("or", [this, e]);
+		return new p("or", [this, e]);
 	}
 	implies(e) {
-		return new f("implies", [this, e]);
+		return new p("implies", [this, e]);
 	}
 	xor(e) {
-		return new f("xor", [this, e]);
+		return new p("xor", [this, e]);
 	}
 	not() {
-		return new f("not", [this]);
+		return new p("not", [this]);
 	}
-}, d = class extends u {
+}, f = class extends d {
 	id;
 	name;
 	value = null;
 	constructor(e) {
-		super(), this.id = ++l, this.name = e || `p_${this.id}`;
+		super(), this.id = ++u, this.name = e || `p_${this.id}`;
 	}
 	toString() {
 		return this.name;
 	}
-}, f = class extends u {
+}, p = class extends d {
 	op;
 	children;
 	constructor(e, t) {
@@ -36,27 +41,27 @@ var l = 0, u = class {
 		return this.op === "not" ? `not(${this.children[0].toString()})` : `(${this.children.map((e) => e.toString()).join(` ${this.op} `)})`;
 	}
 };
-function p(...e) {
+function m(...e) {
 	if (e.length === 0) throw Error("and() requires at least one expression");
-	return new f("and", e);
+	return new p("and", e);
 }
-function m(...e) {
+function h(...e) {
 	if (e.length === 0) throw Error("or() requires at least one expression");
-	return new f("or", e);
+	return new p("or", e);
 }
-function h(e) {
-	return new f("not", [e]);
+function g(e) {
+	return new p("not", [e]);
 }
-function g(e, t) {
-	return new f("implies", [e, t]);
+function _(e, t) {
+	return new p("implies", [e, t]);
 }
-function _(...e) {
+function v(...e) {
 	if (e.length === 0) throw Error("xor() requires at least one expression");
-	return new f("xor", e);
+	return new p("xor", e);
 }
 //#endregion
 //#region src/modeler/constraint.ts
-var v = 0, y = class {
+var ee = 0, y = class {
 	id;
 	lhs;
 	sense;
@@ -65,25 +70,22 @@ var v = 0, y = class {
 	slack = null;
 	dual = null;
 	constructor(e, t, n, r) {
-		this.id = ++v, this.lhs = e, this.sense = t, this.rhs = n, this.name = r || `c_${this.id}`;
-	}
-	get pi() {
-		return this.dual;
+		this.id = ++ee, this.lhs = e, this.sense = t, this.rhs = n, this.name = r || `c_${this.id}`;
 	}
 	and(e) {
-		return new f("and", [this, e]);
+		return new p("and", [this, e]);
 	}
 	or(e) {
-		return new f("or", [this, e]);
+		return new p("or", [this, e]);
 	}
 	implies(e) {
-		return new f("implies", [this, e]);
+		return new p("implies", [this, e]);
 	}
 	xor(e) {
-		return new f("xor", [this, e]);
+		return new p("xor", [this, e]);
 	}
 	not() {
-		return new f("not", [this]);
+		return new p("not", [this]);
 	}
 	toString() {
 		let e = this.sense === "==" ? "=" : this.sense;
@@ -287,26 +289,112 @@ var x = class e {
 	}
 };
 function C(e, t) {
-	let n = /* @__PURE__ */ new Map(), r = 0, i = 0;
-	for (let a of e) {
-		let e = t ? t(a, i++) : a;
-		if (typeof e == "number") r += e;
-		else if (e && 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);
+	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 S(n, r);
+}
+function w(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 S || e instanceof x;
+	}
+	function o(e, t) {
+		if (typeof t == "number") r += e * t;
+		else if (t instanceof S) {
+			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(", ")}].`);
 			}
-			r += t.constant;
-		} else if (e) {
-			let t = e, r = n.get(t) || 0;
-			n.set(t, r + 1);
+			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 S(n, r);
 }
-var w = C, T = C, E = 0, D = class e {
+//#endregion
+//#region src/modeler/variable.ts
+var te = 0;
+function T(e) {
+	if (!e) return "Continuous";
+	let t = e.toLowerCase();
+	return t === "binary" || t === "bin" ? "Binary" : t === "integer" || t === "int" ? "Integer" : "Continuous";
+}
+var E = class e {
 	id;
 	name;
 	type;
@@ -315,13 +403,7 @@ var w = C, T = C, E = 0, D = class e {
 	value = null;
 	reducedCost = null;
 	constructor(e = {}) {
-		this.id = ++E, this.name = e.name || `x_${this.id}`, this.type = e.type || "Continuous", 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);
-	}
-	get x() {
-		return this.value;
-	}
-	get varValue() {
-		return this.value;
+		this.id = ++te, this.name = e.name || `x_${this.id}`, this.type = T(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 S(/* @__PURE__ */ new Map([[this, t]]), 0);
@@ -367,7 +449,7 @@ var w = C, T = C, E = 0, D = class e {
 };
 //#endregion
 //#region src/modeler/parser.ts
-function ee(e) {
+function D(e) {
 	let t = [], n = 0, r = e.length;
 	for (; n < r;) {
 		let i = e[n];
@@ -423,7 +505,7 @@ function ee(e) {
 	}
 	return t;
 }
-var te = class {
+var O = class {
 	tokens;
 	pos = 0;
 	resolver;
@@ -505,10 +587,10 @@ var te = class {
 		return t;
 	}
 };
-function O(e, t) {
-	return new te(ee(e), t).parseExpression();
+function k(e, t) {
+	return new O(D(e), t).parseExpression();
 }
-function k(e, t, n) {
+function A(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;
@@ -516,15 +598,15 @@ function k(e, t, n) {
 	else if (i === ">=" || i === "=>") c = ">=";
 	else if (i === "==" || i === "=") c = "==";
 	else throw Error(`Unsupported operator "${i}"`);
-	let l = O(o, t), u = O(s, t);
+	let l = k(o, t), u = k(s, t);
 	return c === "<=" ? l.le(u, n) : c === ">=" ? l.ge(u, n) : l.eq(u, n);
 }
-function A(e, t) {
+function j(e, t) {
 	let n = /* @__PURE__ */ new Map(), r = "";
 	for (let i = 0; i < e.length; i++) if (r += e[i], i < t.length) {
 		let e = t[i];
 		if (typeof e == "number") r += `(${e})`;
-		else if (e instanceof D) {
+		else if (e instanceof E) {
 			let t = `__v_${i}__`;
 			n.set(t, e), r += t;
 		} else if (e instanceof S) {
@@ -537,35 +619,35 @@ function A(e, t) {
 		resolver: (e) => n.get(e)
 	};
 }
-function ne(e, ...t) {
-	let { fullText: n, resolver: r } = A(e, t);
-	return k(n, r);
+function M(e, ...t) {
+	let { fullText: n, resolver: r } = j(e, t);
+	return A(n, r);
 }
-function re(e, ...t) {
-	let { fullText: n, resolver: r } = A(e, t);
-	return /(<=|>=|==|=<|=>|=)/.test(n) ? k(n, r) : O(n, r);
+function N(e, ...t) {
+	let { fullText: n, resolver: r } = j(e, t);
+	return /(<=|>=|==|=<|=>|=)/.test(n) ? A(n, r) : k(n, r);
 }
 //#endregion
 //#region src/modeler/lp-writer.ts
-function j(e, t, n) {
+function P(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;
 }
-function M(e) {
+function F(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 = j(e.name, "x", e.id), n = t, r = 1;
+		let t = P(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 = j(e.name, "c", e.id), n = t, r = 1;
+		let t = P(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 === "Maximize" ? "Maximize" : "Minimize");
+	d.push(t && t.toLowerCase() === "maximize" ? "Maximize" : "Minimize");
 	let f = [], p = !0, m = n instanceof x ? n.linearTerms : n.terms;
 	if (m) for (let [e, t] of m) {
 		if (Math.abs(t) < 1e-12) continue;
@@ -623,8 +705,39 @@ function M(e) {
 	};
 }
 //#endregion
+//#region src/modeler/solvers/registry.ts
+var I = Symbol.for("washi.solverRegistry"), L = Symbol.for("washi.defaultSolverFactory"), R = globalThis;
+R[I] || (R[I] = /* @__PURE__ */ new Map());
+var z = R[I];
+function B(e, t) {
+	z.set(e.toLowerCase(), t);
+}
+function V(e) {
+	if (typeof e == "string") {
+		let t = z.get(e.toLowerCase());
+		if (!t) throw Error(`Solver '${e}' is not registered.`);
+		R[L] = t;
+	} else R[L] = typeof e == "function" ? e : () => e;
+}
+function H(e, t) {
+	if (!e) {
+		let e = R[L] || z.get("highs");
+		if (!e) throw Error(`No default solver available. Available solvers: ${U().join(", ")}`);
+		return e(t);
+	}
+	if (typeof e == "string") {
+		let n = e.toLowerCase(), r = z.get(n);
+		if (!r) throw Error(n === "glpk" ? `Solver 'glpk' not found. Available solvers: ${U().join(", ")}. Please import '@ohtaman/washi/solvers/glpk' before selecting this solver.` : n === "z3" ? `Solver 'z3' not found. Available solvers: ${U().join(", ")}. Please import '@ohtaman/washi/solvers/z3' before selecting this solver.` : `Solver '${e}' not found. Available solvers: ${U().join(", ")}`);
+		return r(t);
+	}
+	return e;
+}
+function U() {
+	return Array.from(z.keys());
+}
+//#endregion
 //#region \0washi-browser-worker-factory
-function ie() {
+function W() {
 	let e = r("highs-worker.js");
 	if (new URL(e).origin === window.location.origin) return new Worker(e, { type: "module" });
 	let t = URL.createObjectURL(new Blob(["import " + JSON.stringify(e) + ";"], { type: "text/javascript" }));
@@ -636,42 +749,42 @@ function ie() {
 	}
 }
 //#endregion
-//#region src/highs-worker-client.ts
-var N = null, ae = 0, P = /* @__PURE__ */ new Map();
-function oe() {
+//#region src/modeler/solvers/highs/worker-client.ts
+var G = null, K = 0, q = /* @__PURE__ */ new Map();
+function J() {
 	if (typeof window > "u" || typeof Worker > "u") return null;
-	if (!N) try {
-		N = ie();
-		let e = N;
-		N.onmessage = (e) => {
-			let { type: t, id: n, result: r, runTime: i, error: a } = e.data, o = P.get(n);
-			o && (P.delete(n), t === "SOLVE_SUCCESS" ? o.resolve({
+	if (!G) try {
+		G = W();
+		let e = G;
+		G.onmessage = (e) => {
+			let { type: t, id: n, result: r, runTime: i, error: a } = e.data, o = q.get(n);
+			o && (q.delete(n), t === "SOLVE_SUCCESS" ? o.resolve({
 				result: r,
 				runTime: i
 			}) : o.reject(Error(a || "Worker solve failed")));
 		};
 		let t = (t) => {
-			if (N === e) {
-				N = null, e.terminate();
-				for (let e of P.values()) e.reject(t);
-				P.clear();
+			if (G === e) {
+				G = null, e.terminate();
+				for (let e of q.values()) e.reject(t);
+				q.clear();
 			}
 		};
-		N.onerror = (e) => t(/* @__PURE__ */ Error(`[WaSHI] HiGHS Worker failed to load or execute. Check Worker assets, CORS and CSP. ${e.message || ""}`)), N.onmessageerror = () => t(/* @__PURE__ */ Error("[WaSHI] Could not deserialize the HiGHS Worker response."));
-	} catch (e) {
-		console.warn("Could not instantiate Web Worker, falling back to main thread:", e), N = null;
+		G.onerror = (e) => t(/* @__PURE__ */ Error(`[WaSHI] HiGHS Worker failed to load or execute. Check Worker assets, CORS and CSP. ${e?.message || ""}`)), G.onmessageerror = () => t(/* @__PURE__ */ Error("[WaSHI] Could not deserialize the HiGHS Worker response."));
+	} catch {
+		G = null;
 	}
-	return N;
+	return G;
 }
-async function se(e, n = {}) {
-	let r = await a(n.wasmUrl), i = n.useWorker ?? typeof window < "u" ? oe() : null;
+async function Y(e, n = {}) {
+	let r = await a(n.wasmUrl), i = n.useWorker ?? typeof window < "u" ? J() : null;
 	if (!i) return t(e, n);
 	let o = {
 		...n,
 		wasmUrl: r
-	}, s = `req_${++ae}`;
+	}, s = `req_${++K}`;
 	return new Promise((t, n) => {
-		P.set(s, {
+		q.set(s, {
 			resolve: t,
 			reject: n
 		});
@@ -683,13 +796,13 @@ async function se(e, n = {}) {
 				options: o
 			});
 		} catch (e) {
-			P.delete(s), n(e);
+			q.delete(s), n(e);
 		}
 	});
 }
 //#endregion
-//#region src/modeler/solvers/highs.ts
-function ce(e) {
+//#region src/modeler/solvers/highs/solver.ts
+function X(e) {
 	if (typeof e != "string") return "Unknown";
 	let t = e.trim();
 	if (!t) return "Unknown";
@@ -718,7 +831,7 @@ function ce(e) {
 	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";
 }
-var F = class e {
+var Z = class e {
 	static capabilities = {
 		supportsMIP: !0,
 		supportsQP: !0
@@ -734,7 +847,18 @@ var F = class e {
 		let r = {
 			...this.options,
 			...n
-		}, { lpString: i, nameToVar: a, nameToConstraint: o } = t, { result: s, runTime: c } = await se(i, r), l = ce(s?.Status), u = s.ObjectiveValue, d = typeof u == "number" ? u + e.objective.constant : null, f = {}, p = {}, m = {}, h = {};
+		}, { lpString: i, nameToVar: a, nameToConstraint: o } = t, { result: s, runTime: c } = await Y(i, r), l = X(s?.Status);
+		if (l === "Infeasible" || l === "Unbounded") return {
+			status: l,
+			objectiveValue: null,
+			values: {},
+			reducedCosts: {},
+			duals: {},
+			slacks: {},
+			runTime: c,
+			raw: s
+		};
+		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);
 			if (n) {
@@ -763,129 +887,14 @@ var F = class e {
 			raw: s
 		};
 	}
-}, le = F, I = null;
-async function L() {
-	return I || (I = (async () => {
-		try {
-			let e = await import("./_washi-optional-engine-282Ug7Gw.js");
-			return await (e.default || e)();
-		} catch (e) {
-			throw Error("[WaSHI] Could not load GLPK. Install the optional glpk.js dependency before selecting this solver.", { cause: e });
-		}
-	})(), I);
+}, Q = Z;
+function ne() {
+	B("highs", (e) => new Z(e)), V((e) => new Z(e));
 }
+ne();
 //#endregion
-//#region src/modeler/solvers/glpk.ts
-var R = class e {
-	static capabilities = {
-		supportsMIP: !0,
-		supportsQP: !1
-	};
-	name = "GLPK";
-	version = "5.0.0";
-	capabilities = e.capabilities;
-	options;
-	constructor(e = {}) {
-		this.options = e;
-	}
-	async solve(e, t, n = {}) {
-		let r = {
-			...this.options,
-			...n
-		}, i = await L(), { nameToVar: a, nameToConstraint: o } = t, s = /* @__PURE__ */ new Map();
-		for (let [e, t] of a.entries()) s.set(t, e);
-		let c = /* @__PURE__ */ new Map();
-		for (let [e, t] of o.entries()) c.set(t, e);
-		let l = [], u = "linearTerms" in e.objective ? e.objective.linearTerms : e.objective.terms;
-		if (u) for (let [e, t] of u) {
-			if (Math.abs(t) < 1e-12) continue;
-			let n = s.get(e) || e.name;
-			l.push({
-				name: n,
-				coef: Number(t)
-			});
-		}
-		let d = [];
-		for (let t of e.constraints) {
-			let e = c.get(t) || t.name || `c_${d.length + 1}`, n = [];
-			for (let [e, r] of t.lhs.terms) {
-				if (Math.abs(r) < 1e-12) continue;
-				let t = s.get(e) || e.name;
-				n.push({
-					name: t,
-					coef: Number(r)
-				});
-			}
-			let r;
-			r = t.sense === "==" ? {
-				type: i.GLP_FX,
-				lb: t.rhs,
-				ub: t.rhs
-			} : t.sense === "<=" ? {
-				type: i.GLP_UP,
-				lb: -Infinity,
-				ub: t.rhs
-			} : {
-				type: i.GLP_LO,
-				lb: t.rhs,
-				ub: Infinity
-			}, d.push({
-				name: e,
-				vars: n,
-				bnds: r
-			});
-		}
-		let f = [], p = [], m = [];
-		for (let t of e.variables) {
-			let e = s.get(t) || t.name;
-			t.type === "Binary" ? f.push(e) : t.type === "Integer" && p.push(e);
-			let n = t.lb, r = t.ub, a;
-			a = n === -Infinity && r === Infinity ? i.GLP_FR : n !== -Infinity && r === Infinity ? i.GLP_LO : n === -Infinity && r !== Infinity ? i.GLP_UP : n === r ? i.GLP_FX : i.GLP_DB, m.push({
-				name: e,
-				type: a,
-				lb: n === -Infinity ? 0 : n,
-				ub: r === Infinity ? 0 : r
-			});
-		}
-		let h = {
-			name: e.name || "GLPK_Model",
-			objective: {
-				direction: e.sense === "Maximize" ? i.GLP_MAX : i.GLP_MIN,
-				name: "obj",
-				vars: l
-			},
-			subjectTo: d
-		};
-		m.length > 0 && (h.bounds = m), f.length > 0 && (h.binaries = f), p.length > 0 && (h.generals = p);
-		let g = {
-			msglev: r.verbose ? i.GLP_MSG_ALL : i.GLP_MSG_OFF,
-			presol: r.presolve !== "off"
-		};
-		typeof r.timeLimit == "number" && (g.tmlim = r.timeLimit), typeof r.mipGap == "number" && (g.mipgap = r.mipGap);
-		let _ = performance.now(), v = await i.solve(h, g), y = (performance.now() - _) / 1e3, b = v?.result?.status, x;
-		x = b === i.GLP_OPT ? "Optimal" : b === i.GLP_FEAS ? "Feasible" : b === i.GLP_INFEAS || b === i.GLP_NOFEAS ? "Infeasible" : b === i.GLP_UNBND ? "Unbounded" : "Optimal";
-		let S = v?.result?.z, C = typeof S == "number" ? S + e.objective.constant : null, w = {}, T = v?.result?.vars || {};
-		for (let [e, t] of Object.entries(T)) {
-			let n = a.get(e), r = n ? n.name : e;
-			w[r] = typeof t == "number" ? Math.abs(t) < 1e-9 ? 0 : t : 0;
-		}
-		for (let t of e.variables) w[t.name] === void 0 && (w[t.name] = 0);
-		let E = {};
-		if (v?.result?.dual) for (let [e, t] of Object.entries(v.result.dual)) {
-			let n = o.get(e), r = n ? n.name : e;
-			E[r] = Number(t);
-		}
-		return {
-			status: x,
-			objectiveValue: C,
-			values: w,
-			duals: E,
-			runTime: v?.time || y,
-			logs: [`GLPK solved in ${(v?.time || y) * 1e3} ms.`],
-			raw: v
-		};
-	}
-}, z = class {
+//#region src/modeler/solvers/mock.ts
+var $ = class {
 	name;
 	capabilities;
 	options;
@@ -911,268 +920,14 @@ var R = class e {
 			raw: { mock: !0 }
 		};
 	}
-}, B = /* @__PURE__ */ new Map();
-B.set("highs", (e) => new F(e)), B.set("glpk", (e) => new R(e)), B.set("mock", (e) => new z(e));
-var V = (e) => new F(e);
-function H(e, t) {
-	B.set(e.toLowerCase(), t);
-}
-function ue(e) {
-	if (typeof e == "string") {
-		let t = B.get(e.toLowerCase());
-		if (!t) throw Error(`Solver '${e}' is not registered.`);
-		V = t;
-	} else V = typeof e == "function" ? e : () => e;
-}
-function U(e, t) {
-	if (!e) return V(t);
-	if (typeof e == "string") {
-		let n = B.get(e.toLowerCase());
-		if (!n) throw Error(`Solver '${e}' not found. Available solvers: ${W().join(", ")}`);
-		return n(t);
-	}
-	return e;
-}
-function W() {
-	return Array.from(B.keys());
-}
-//#endregion
-//#region src/modeler/solvers/z3.ts
-var G = null;
-async function K() {
-	if (!G) {
-		let e = (async () => {
-			try {
-				return await (await import("./_washi-optional-engine-282Ug7Gw.js")).init();
-			} catch (e) {
-				throw Error(`[WaSHI] Failed to load z3-solver. Ensure the optional dependency is installed (npm install z3-solver) and supported in this environment. Error: ${e instanceof Error ? e.message : String(e)}`, { cause: e });
-			}
-		})();
-		e.catch(() => {
-			G === e && (G = null);
-		}), G = e;
-	}
-	return G;
-}
-var q = class {
-	name = "z3";
-	capabilities = {
-		supportsMIP: !0,
-		supportsQP: !1,
-		supportsSMT: !0,
-		supportsUnsatCore: !0
-	};
-	createContextTranslator(e) {
-		let t = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map();
-		function r(n) {
-			if (!t.has(n.name)) {
-				let r = n.type === "Continuous" || n.type === "CONTINUOUS" ? e.Real.const(n.name) : e.Int.const(n.name);
-				t.set(n.name, r);
-			}
-			return t.get(n.name);
-		}
-		function i(t) {
-			if (!n.has(t.name)) {
-				let r = e.Bool.const(t.name);
-				n.set(t.name, r);
-			}
-			return n.get(t.name);
-		}
-		function a(t) {
-			return typeof e.isInt == "function" && e.isInt(t) ? e.ToReal(t) : t;
-		}
-		function o(t, n) {
-			let r = typeof e.isInt == "function" && e.isInt(t), i = typeof e.isInt == "function" && e.isInt(n);
-			return r && i ? t.add(n) : a(t).add(a(n));
-		}
-		function s(t, n) {
-			return typeof e.isInt == "function" && e.isInt(t) && Number.isInteger(n) ? t.mul(e.Int.val(n)) : a(t).mul(e.Real.val(n));
-		}
-		function c(t, n) {
-			let r = typeof e.isInt == "function" && e.isInt(t), i = typeof e.isInt == "function" && e.isInt(n);
-			return r && i ? t.mul(n) : a(t).mul(a(n));
-		}
-		function l(t, n) {
-			return n && Number.isInteger(t) ? e.Int.val(t) : e.Real.val(t);
-		}
-		function u(t, n, r) {
-			let i = typeof e.isInt == "function" && e.isInt(t) && Number.isInteger(r), o = i ? t : a(t), s = i ? e.Int.val(r) : e.Real.val(r);
-			return n === "<=" ? o.le(s) : n === ">=" ? o.ge(s) : o.eq(s);
-		}
-		function p(t) {
-			let n = null;
-			if (t && t.terms) for (let [e, i] of t.terms.entries()) {
-				let t = s(r(e), i);
-				n = n === null ? t : o(n, t);
-			}
-			let i = t && typeof t.constant == "number" ? t.constant : 0;
-			if (i !== 0 || n === null) {
-				let t = l(i, n === null || typeof e.isInt == "function" && e.isInt(n));
-				n = n === null ? t : o(n, t);
-			}
-			return n;
-		}
-		function m(t) {
-			let n = null;
-			if (t.linearTerms) for (let [e, i] of t.linearTerms.entries()) {
-				let t = s(r(e), i);
-				n = n === null ? t : o(n, t);
-			}
-			if (t.quadTerms) for (let e of t.quadTerms.values()) {
-				let t = s(c(r(e.var1), r(e.var2)), e.coeff);
-				n = n === null ? t : o(n, t);
-			}
-			let i = t && typeof t.constant == "number" ? t.constant : 0;
-			if (i !== 0 || n === null) {
-				let t = l(i, n === null || typeof e.isInt == "function" && e.isInt(n));
-				n = n === null ? t : o(n, t);
-			}
-			return n;
-		}
-		function h(e) {
-			let t = e.lhs instanceof Object && "quadTerms" in e.lhs ? m(e.lhs) : p(e.lhs), n = typeof e.rhs == "number" ? e.rhs : 0;
-			return u(t, e.sense, n);
-		}
-		function g(t) {
-			if (t instanceof d) return i(t);
-			if (t instanceof y) return h(t);
-			if (t instanceof f) switch (t.op) {
-				case "and": return e.And(...t.children.map(g));
-				case "or": return e.Or(...t.children.map(g));
-				case "not": return e.Not(g(t.children[0]));
-				case "implies": return e.Implies(g(t.children[0]), g(t.children[1]));
-				case "xor": return e.Xor(g(t.children[0]), g(t.children[1]));
-				default: throw Error(`Unsupported boolean operation: ${t.op}`);
-			}
-			throw Error(`Unknown logic element: ${String(t)}`);
-		}
-		function _(e) {
-			if (!e) return 0;
-			if (typeof e.asNumber == "function") return e.asNumber();
-			let t = e.toString();
-			if (t.startsWith("(/ ")) {
-				let e = t.slice(3, -1).trim().split(/\s+/);
-				if (e.length === 2) return Number(e[0]) / Number(e[1]);
-			}
-			return Number(t);
-		}
-		return {
-			getVarAst: r,
-			getBoolVarAst: i,
-			compareAstWithNumber: u,
-			translateLinExpr: p,
-			translateQuadExpr: m,
-			translateConstraint: h,
-			translateBoolExpr: g,
-			parseAstValue: _,
-			varAstMap: t,
-			boolVarAstMap: n
-		};
-	}
-	async check(e, t = {}) {
-		let { Context: n } = await K(), r = new n(`check_${Date.now()}_${Math.random().toString(36).substring(2, 7)}`), i = new r.Solver(), a = this.createContextTranslator(r), o = e.variables || e.vars || [], s = e.boolVars || [], c = e.constraints || [], l = e.logicalConstraints || [];
-		for (let e of o) {
-			let t = a.getVarAst(e);
-			e.lb !== -Infinity && i.add(a.compareAstWithNumber(t, ">=", e.lb)), e.ub !== Infinity && i.add(a.compareAstWithNumber(t, "<=", e.ub)), (e.type === "Binary" || e.type === "BINARY") && (i.add(a.compareAstWithNumber(t, ">=", 0)), i.add(a.compareAstWithNumber(t, "<=", 1)));
-		}
-		for (let e of c) {
-			let t = a.translateConstraint(e), n = r.Bool.const(e.name);
-			i.addAndTrack(t, n);
-		}
-		for (let e = 0; e < l.length; e++) {
-			let t = l[e], n = t && t.name || `lc_${e + 1}`, o = t && t.expr || t, s = a.translateBoolExpr(o), c = r.Bool.const(n);
-			i.addAndTrack(s, c);
-		}
-		let u = (await i.check()).toString();
-		if (u === "sat") {
-			let e = i.model(), t = {};
-			for (let n of o) {
-				let r = a.getVarAst(n), i = e.eval(r);
-				t[n.name] = a.parseAstValue(i);
-			}
-			for (let n of s) {
-				let r = a.getBoolVarAst(n), i = e.eval(r);
-				t[n.name] = i.toString() === "true";
-			}
-			return {
-				status: "Sat",
-				values: t
-			};
-		}
-		if (u === "unsat") {
-			let e = i.unsatCore(), t = [], n = typeof e.length == "function" ? e.length() : e.length;
-			for (let r = 0; r < n; r++) t.push(e.get(r).toString());
-			return {
-				status: "Unsat",
-				values: {},
-				unsatCore: t
-			};
-		}
-		return {
-			status: "Unknown",
-			values: {}
-		};
-	}
-	async solve(e, t, n = {}) {
-		if (!(e.objective !== null && e.objective !== void 0 && ("terms" in e.objective && e.objective.terms.size > 0 || "quadTerms" in e.objective && e.objective.quadTerms.length > 0 || e.objective.offset && e.objective.offset !== 0))) {
-			let t = await this.check(e, n), r = {};
-			for (let [e, n] of Object.entries(t.values)) r[e] = typeof n == "boolean" ? +!!n : n;
-			return {
-				status: t.status === "Sat" ? "Optimal" : t.status === "Unsat" ? "Infeasible" : "Error",
-				objectiveValue: 0,
-				values: r
-			};
-		}
-		let { Context: r } = await K(), i = new r(`opt_${Date.now()}_${Math.random().toString(36).substring(2, 7)}`), a = new i.Optimize(), o = this.createContextTranslator(i), s = e.variables || e.vars || [], c = e.boolVars || [], l = e.constraints || [], u = e.logicalConstraints || [];
-		for (let e of s) {
-			let t = o.getVarAst(e);
-			e.lb !== -Infinity && a.add(o.compareAstWithNumber(t, ">=", e.lb)), e.ub !== Infinity && a.add(o.compareAstWithNumber(t, "<=", e.ub)), (e.type === "Binary" || e.type === "BINARY") && (a.add(o.compareAstWithNumber(t, ">=", 0)), a.add(o.compareAstWithNumber(t, "<=", 1)));
-		}
-		for (let e of l) {
-			let t = o.translateConstraint(e);
-			a.add(t);
-		}
-		for (let e of u) {
-			let t = e && e.expr || e, n = o.translateBoolExpr(t);
-			a.add(n);
-		}
-		let d = e.objective instanceof Object && "quadTerms" in e.objective ? o.translateQuadExpr(e.objective) : o.translateLinExpr(e.objective);
-		(e.sense || "MINIMIZE").toUpperCase() === "MAXIMIZE" ? a.maximize(d) : a.minimize(d);
-		let f = (await a.check()).toString();
-		if (f === "sat") {
-			let e = a.model(), t = {};
-			for (let n of s) {
-				let r = o.getVarAst(n), i = e.eval(r);
-				t[n.name] = o.parseAstValue(i);
-			}
-			for (let n of c) {
-				let r = o.getBoolVarAst(n), i = e.eval(r);
-				t[n.name] = +(i.toString() === "true");
-			}
-			return {
-				status: "Optimal",
-				objectiveValue: o.parseAstValue(e.eval(d)),
-				values: t
-			};
-		}
-		return f === "unsat" ? {
-			status: "Infeasible",
-			objectiveValue: null,
-			values: {}
-		} : {
-			status: "Error",
-			objectiveValue: null,
-			values: {}
-		};
-	}
 };
-function J() {
-	H("z3", () => new q());
+function re() {
+	B("mock", (e) => new $(e));
 }
-J();
+re();
 //#endregion
 //#region src/modeler/model.ts
-var Y = class {
+var ie = class {
 	name;
 	sense;
 	objective;
@@ -1189,8 +944,12 @@ var Y = class {
 	runTime = 0;
 	solution = null;
 	solver = null;
-	constructor(e = {}) {
-		this.name = e.name || "OptimizationModel", this.sense = e.sense || "Minimize", this.objective = new S(), e.solver && (this.solver = U(e.solver));
+	constructor(e = {}, t) {
+		let n;
+		n = typeof e == "string" ? {
+			...t,
+			name: e
+		} : e, this.name = n.name || "OptimizationModel", this.sense = l(n.sense), this.objective = new S(), n.solver && (this.solver = H(n.solver));
 	}
 	get vars() {
 		return this.variables;
@@ -1204,6 +963,60 @@ var Y = 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}`
+				});
+			}
+			return c;
+		}
+		if (typeof t == "string") {
+			let r = n || {};
+			return this.addVar({
+				...r,
+				type: e,
+				name: t
+			});
+		}
+		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,
+				type: e,
+				name: `${r}_${a}`
+			}));
+			return n;
+		}
+		if (Array.isArray(t) || t && typeof t[Symbol.iterator] == "function") {
+			let n = {};
+			for (let r of t) {
+				let t = a ? `${a}_${r}` : `${r}`;
+				n[r] = this.addVar({
+					...i,
+					type: e,
+					name: t
+				});
+			}
+			return n;
+		}
+		throw Error(`Invalid arguments provided for ${e.toLowerCase()} variable creation`);
+	}
+	binary(e, t, n) {
+		return this.createDomainVars("Binary", e, t, n);
+	}
+	integer(e, t, n) {
+		return this.createDomainVars("Integer", e, t, n);
+	}
+	continuous(e, t, n) {
+		return this.createDomainVars("Continuous", e, t, n);
+	}
 	addVar(e, t, n, r) {
 		let i;
 		i = typeof e == "string" ? {
@@ -1212,7 +1025,7 @@ var Y = class {
 			lb: n,
 			ub: r
 		} : e || {};
-		let a = new D(i);
+		let a = new E(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;
 	}
@@ -1267,7 +1080,8 @@ var Y = class {
 		return this.constrMapByName.get(e);
 	}
 	setObjective(e, t) {
-		t && (this.sense = t), this.objective = typeof e == "string" ? O(e, (e) => this.getVarByName(e)) : typeof e == "number" ? new S(/* @__PURE__ */ new Map(), e) : e instanceof x || "terms" in e ? e.clone() : new S(/* @__PURE__ */ new Map([[e, 1]]), 0);
+		if (e instanceof y) throw Error("Cannot set objective to a constraint comparison (<=, >=, ==). Did you mean to use m.constrain(expr`... <= ...`)? For objectives, supply an unconstrained expression like expr`45 * ${x} + 80 * ${y}`.");
+		t && (this.sense = l(t)), this.objective = typeof e == "string" ? k(e, (e) => this.getVarByName(e)) : typeof e == "number" ? new S(/* @__PURE__ */ new Map(), e) : e instanceof x || "terms" in e ? e.clone() : new S(/* @__PURE__ */ new Map([[e, 1]]), 0);
 	}
 	maximize(e) {
 		this.setObjective(e, "Maximize");
@@ -1275,12 +1089,32 @@ var Y = class {
 	minimize(e) {
 		this.setObjective(e, "Minimize");
 	}
+	constrain(e, t) {
+		if (Array.isArray(e)) {
+			for (let t of e) this.constrain(t);
+			return this;
+		}
+		if (e instanceof S) throw Error("Cannot add a linear expression without a comparison operator (<=, >=, ==) as a constraint. Use expr`... <= ...` or .le(), .ge(), .eq().");
+		return this.addConstraint(e, t), this;
+	}
+	getValues(e) {
+		if (e == null) return null;
+		if (e instanceof E) return e.value;
+		if (Array.isArray(e)) return e.map((e) => this.getValues(e));
+		if (typeof e == "object") {
+			let t = {};
+			for (let [n, r] of Object.entries(e)) t[n] = this.getValues(r);
+			return t;
+		}
+		return null;
+	}
 	addBoolVar(e) {
-		let t = new d(e);
+		let t = new f(e);
 		return this.boolVars.push(t), t;
 	}
 	addConstraint(e, t) {
-		if (e instanceof u) {
+		if (e instanceof S) throw Error("Cannot add a linear expression without a comparison operator (<=, >=, ==) as a constraint. Use expr`... <= ...` or .le(), .ge(), .eq().");
+		if (e instanceof d) {
 			let n = t || `lc_${this.logicalConstraints.length + 1}`;
 			return this.logicalConstraints.push({
 				name: n,
@@ -1288,7 +1122,7 @@ var Y = class {
 			}), e;
 		}
 		let n;
-		if (typeof e == "string" ? n = k(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`);
+		if (typeof e == "string" ? n = A(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) {
@@ -1302,33 +1136,37 @@ var Y = class {
 			for (let t of e) this.add(t);
 			return this;
 		}
-		return e instanceof D ? (this.varMapByName.has(e.name) || (this.variables.push(e), this.varMapByName.set(e.name, e)), this) : (this.addConstraint(e, t), this);
+		return e instanceof E ? (this.varMapByName.has(e.name) || (this.variables.push(e), this.varMapByName.set(e.name, e)), this) : (this.addConstraint(e, t), this);
 	}
-	addIndicator(e, t, n = {}) {
-		let r = n.activeValue === void 0 ? 1 : n.activeValue, i = n.M === void 0 ? 1e5 : n.M, a = n.name || `ind_${e.name}_${t.name}`, o = [], { lhs: s, sense: c, rhs: l } = t;
-		if (r === 1) {
-			if (c === "<=" || c === "==") {
-				let t = this.addConstraint(s.add(e.mul(i)).le(l + i), c === "==" ? `${a}_le` : a);
-				o.push(t);
+	indicator(e, t, n = {}) {
+		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 (c === ">=" || c === "==") {
-				let t = this.addConstraint(s.sub(e.mul(i)).ge(l - i), c === "==" ? `${a}_ge` : a);
-				o.push(t);
+			if (l === ">=" || l === "==") {
+				let t = this.addConstraint(c.sub(e.mul(a)).ge(u - a), l === "==" ? `${o}_ge` : o);
+				s.push(t);
 			}
 		} else {
-			if (c === "<=" || c === "==") {
-				let t = this.addConstraint(s.sub(e.mul(i)).le(l), c === "==" ? `${a}_le` : a);
-				o.push(t);
+			if (l === "<=" || l === "==") {
+				let t = this.addConstraint(c.sub(e.mul(a)).le(u), l === "==" ? `${o}_le` : o);
+				s.push(t);
 			}
-			if (c === ">=" || c === "==") {
-				let t = this.addConstraint(s.add(e.mul(i)).ge(l), c === "==" ? `${a}_ge` : a);
-				o.push(t);
+			if (l === ">=" || l === "==") {
+				let t = this.addConstraint(c.add(e.mul(a)).ge(u), l === "==" ? `${o}_ge` : o);
+				s.push(t);
 			}
 		}
-		return o;
+		return s;
+	}
+	addIndicator(e, t, n = {}) {
+		return this.indicator(e, t, n);
 	}
 	toLpString() {
-		let { lpString: e } = M({
+		let { lpString: e } = F({
 			name: this.name,
 			sense: this.sense,
 			objective: this.objective,
@@ -1339,7 +1177,7 @@ var Y = class {
 	}
 	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 = U(e, t), r = t || {}) : (r = { ...e }, r.solver ? (n = U(r.solver, r), delete r.solver) : n = this.solver || U()), this.objective instanceof x && this.objective.quadTerms.size > 0 && n.capabilities?.supportsQP === !1) throw Error(`Solver "${n.name}" does not support quadratic objectives (QP). Please use a QP-capable solver such as HiGHS or Clarabel.`);
+		if (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 = H(e, t), r = t || {}) : (r = { ...e }, r.solver ? (n = H(r.solver, r), delete r.solver) : n = this.solver || H()), this.objective instanceof x && 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 = {
 			name: this.name,
 			sense: this.sense,
@@ -1348,13 +1186,23 @@ var Y = class {
 			variables: this.variables,
 			logicalConstraints: this.logicalConstraints,
 			boolVars: this.boolVars
-		}, a = M(i), o = await n.solve(i, a, r);
+		}, a = F(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 = {};
-		if (this.values.clear(), o.values) for (let [e, t] of Object.entries(o.values)) {
-			this.values.set(e, t);
-			let n = this.getVarByName(e) || a.nameToVar.get(e);
-			n && (n.value = t, s[n.name] = t);
+		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);
+			}
 		}
 		if (o.reducedCosts) for (let [e, t] of Object.entries(o.reducedCosts)) {
 			let n = this.getVarByName(e) || a.nameToVar.get(e);
@@ -1384,7 +1232,7 @@ var Y = class {
 	}
 	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 = U(e, t), r = t || {}) : (r = { ...e }, r.solver ? (n = U(r.solver, r), delete r.solver) : n = this.solver || U()), 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 (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 = H(e, t), r = t || {}) : (r = { ...e }, r.solver ? (n = H(r.solver, r), delete r.solver) : n = this.solver || H()), 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,
@@ -1393,13 +1241,15 @@ var Y = class {
 				constraints: this.constraints,
 				logicalConstraints: this.logicalConstraints
 			}, r);
-			if (this.status = e.status, this.runTime = e.runTime ?? 0, this.unsatCore = e.unsatCore || [], e.values) {
-				this.values.clear();
-				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);
-				}
+			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);
 			}
 			return e;
 		}
@@ -1407,7 +1257,10 @@ var Y = class {
 		try {
 			this.objective = new S(), this.sense = "Minimize";
 			let e = await this.optimize(n, r), t = e === "Optimal" || e === "Feasible", i = e === "Infeasible", a = {};
-			for (let e of this.variables) a[e.name] = e.value ?? 0;
+			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);
+			}
 			return {
 				status: t ? "Sat" : i ? "Unsat" : "Unknown",
 				values: a,
@@ -1417,131 +1270,6 @@ var Y = class {
 			this.objective = i, this.sense = a;
 		}
 	}
-}, X = "Minimize", de = "Maximize", fe = "Continuous", pe = "Integer", me = "Binary", he = {
-	Optimal: "Optimal",
-	Feasible: "Feasible",
-	Infeasible: "Infeasible",
-	Unbounded: "Unbounded",
-	TimeLimit: "Not Solved (Time Limit)",
-	IterationLimit: "Not Solved (Iteration Limit)",
-	Error: "Error",
-	NotSolved: "Not Solved",
-	Sat: "Sat",
-	Unsat: "Unsat",
-	Unknown: "Unknown"
-}, ge = class e extends D {
-	constructor(e, t, n, r = "Continuous") {
-		super({
-			name: e,
-			lb: t === void 0 ? 0 : t,
-			ub: n === void 0 ? Infinity : n,
-			type: r
-		});
-	}
-	static dicts(t, n, r, i, a = "Continuous") {
-		let o = {};
-		for (let s of n) {
-			let n = `${t}_${s}`;
-			o[s] = new e(n, r, i, a);
-		}
-		return o;
-	}
-};
-function _e(e) {
-	return e == null ? null : typeof e == "number" ? e : e.value;
-}
-var Z = class {
-	model;
-	constructor(e = "NoName", t = X) {
-		this.model = new Y({
-			name: e,
-			sense: t
-		});
-	}
-	get name() {
-		return this.model.name;
-	}
-	get sense() {
-		return this.model.sense;
-	}
-	set sense(e) {
-		this.model.sense = e;
-	}
-	get objective() {
-		return this.model.objective;
-	}
-	get variables() {
-		return this.model.variables;
-	}
-	get constraints() {
-		return this.model.constraints;
-	}
-	get status() {
-		return this.model.status;
-	}
-	get objectiveValue() {
-		return this.model.objectiveValue;
-	}
-	addVariable(e) {
-		return this.model.getVarByName(e.name) || (this.model.variables.push(e), this.model.varMapByName.set(e.name, e)), e;
-	}
-	setObjective(e) {
-		if (typeof e == "object" && e) {
-			if ("terms" in e) for (let [t] of e.terms) this.addVariable(t);
-			else e instanceof D && this.addVariable(e);
-		}
-		this.model.setObjective(e);
-	}
-	addConstraint(e, t) {
-		if (typeof e == "object" && e && "lhs" in e) for (let [t] of e.lhs.terms) this.addVariable(t);
-		return this.model.addConstraint(e, t);
-	}
-	add(e, t) {
-		typeof e == "string" ? /(<=|>=|==|=<|=>|=)/.test(e) ? this.addConstraint(e, t) : this.setObjective(e) : e instanceof y ? this.addConstraint(e, t) : this.setObjective(e);
-	}
-	async solve(e, t) {
-		return this.model.optimize(e, t);
-	}
-	toLpString() {
-		return this.model.toLpString();
-	}
-}, Q = "Minimize", $ = "Maximize", ve = "Binary", ye = "Integer", be = "Continuous";
-function xe(e) {
-	return {
-		expr: e,
-		sense: $
-	};
-}
-function Se(e) {
-	return {
-		expr: e,
-		sense: Q
-	};
-}
-var Ce = class extends Y {
-	constructor(e = "MipModel", t = Q) {
-		super({
-			name: e,
-			sense: t
-		});
-	}
-	add_var(e = {}) {
-		return this.addVar({
-			name: e.name,
-			type: e.var_type,
-			lb: e.lb,
-			ub: e.ub
-		});
-	}
-	set objective_spec(e) {
-		this.setObjective(e.expr, e.sense);
-	}
-	get objective_value() {
-		return this.objectiveValue;
-	}
-	add_constr(e, t) {
-		return this.addConstraint(e, t);
-	}
 };
 //#endregion
-export { ve as BINARY, u as BoolExpr, f as BoolOp, d as BoolVar, be as CONTINUOUS, y as Constraint, R as GLPKSolver, le as HiGHS, F as HighsSolver, ye as INTEGER, S as LinExpr, me as LpBinary, fe as LpContinuous, pe as LpInteger, de as LpMaximize, X as LpMinimize, Z as LpProblem, he as LpStatus, ge as LpVariable, $ as MAXIMIZE, Q as MINIMIZE, Ce as MipModel, z as MockSolver, Y as Model, c as OFFICIAL_HIGHS_CDN_WASM_URL, x as QuadExpr, D as Var, q as Z3Solver, p as and, ne as c, re as expr, M as generateLpString, L as getGlpk, i as getHighs, o as getHighsWasmUrl, U as getSolver, g as implies, n as isValidWasmHeader, W as listAvailableSolvers, T as lpSum, xe as maximize, Se as minimize, h as not, m as or, k as parseConstraint, O as parseExpr, e as probeWasmUrl, H as registerSolver, J as registerZ3Solver, a as resolveBrowserWasmUrl, ue as setDefaultSolver, s as setHighsWasmUrl, t as solveLpWithHighs, C as sum, _e as value, _ as xor, w as xsum };
+export { d as BoolExpr, p as BoolOp, f as BoolVar, y as Constraint, Q as HiGHS, Z as HighsSolver, S as LinExpr, $ as MockSolver, ie as Model, c as OFFICIAL_HIGHS_CDN_WASM_URL, x as QuadExpr, E as Var, m as and, M as c, w as dot, N as expr, F as generateLpString, i as getHighs, o as getHighsWasmUrl, H as getSolver, _ as implies, n as isValidWasmHeader, U as listAvailableSolvers, l as normalizeSense, g as not, h as or, A as parseConstraint, k as parseExpr, e as probeWasmUrl, B as registerSolver, a as resolveBrowserWasmUrl, V as setDefaultSolver, s as setHighsWasmUrl, t as solveLpWithHighs, C as sum, v as xor };