@ohtaman/washi 0.2.0 → 0.4.0

package/dist/lib/washi.js

@@ -1,4 +1,4 @@
-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-XWdn0ID9.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 "./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";
@@ -18,12 +18,17 @@ var x = Object.defineProperty, te = Object.getOwnPropertyDescriptor, ne = Object
 	return e;
 }, w = (e, t, n) => (C(e, t, "default"), n && C(n, t, "default"));
 //#endregion
+//#region src/modeler/types.ts
+function T(e) {
+	return e && e.toLowerCase() === "maximize" ? "Maximize" : "Minimize";
+}
+//#endregion
 //#region src/modeler/quad-expr.ts
-function T(e, t) {
+function E(e, t) {
 	let n = e.id, r = t.id;
 	return n <= r ? `${n}:${r}` : `${r}:${n}`;
 }
-var E = class e {
+var D = class e {
 	linearTerms;
 	quadTerms;
 	constant;
@@ -36,7 +41,7 @@ var E = class e {
 		return new e(this.linearTerms, this.quadTerms, this.constant);
 	}
 	getQuadCoeff(e, t) {
-		let n = T(e, t), r = this.quadTerms.get(n);
+		let n = E(e, t), r = this.quadTerms.get(n);
 		return r ? r.coeff : 0;
 	}
 	add(t) {
@@ -71,20 +76,45 @@ var E = class e {
 		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);
+		if (typeof t == "number") {
+			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;
 		}
-		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
-			});
+		if ("id" in t && "name" in t && !("terms" in t) && !("quadTerms" in t)) {
+			if (this.quadTerms.size > 0) throw Error("Multiplication creates a non-linear term of degree > 2 (not allowed in MILP/LP/QP)");
+			let n = new e();
+			Math.abs(this.constant) >= 1e-12 && n.linearTerms.set(t, this.constant);
+			for (let [r, i] of this.linearTerms) n = n.add(e.fromProduct(r, t, i));
+			return n;
 		}
-		return n;
+		let n = t, r = "quadTerms" in n ? n.quadTerms.size : 0, i = "quadTerms" in n ? n.linearTerms : n.terms;
+		if (this.quadTerms.size > 0 && (r > 0 || i.size > 0) || r > 0 && this.linearTerms.size > 0) throw Error("Multiplication creates a non-linear term of degree > 2 (not allowed in MILP/LP/QP)");
+		if (r === 0 && i.size === 0) return this.mul(n.constant);
+		if (this.quadTerms.size === 0 && this.linearTerms.size === 0) {
+			let t = n.mul(this.constant);
+			if (t instanceof e) return t;
+			let r = new e();
+			r.constant = t.constant;
+			for (let [e, n] of t.terms) r.linearTerms.set(e, n);
+			return r;
+		}
+		let a = new e();
+		if (a.constant = this.constant * n.constant, Math.abs(n.constant) >= 1e-12) for (let [e, t] of this.linearTerms) a.linearTerms.set(e, (a.linearTerms.get(e) || 0) + t * n.constant);
+		if (Math.abs(this.constant) >= 1e-12) for (let [e, t] of i) a.linearTerms.set(e, (a.linearTerms.get(e) || 0) + t * this.constant);
+		for (let [t, n] of this.linearTerms) for (let [r, o] of i) a = a.add(e.fromProduct(t, r, n * o));
+		return a;
 	}
 	div(e) {
 		if (Math.abs(e) < 1e-12) throw Error("Division by zero in QuadExpr.div()");
@@ -108,15 +138,31 @@ var E = class e {
 	getValue() {
 		return this.value;
 	}
+	toString() {
+		let e = [], t = !0;
+		for (let n of this.quadTerms.values()) {
+			let r = n.coeff, i = r >= 0 ? t ? "" : "+ " : "- ", a = Math.abs(r), o = a === 1 ? "" : `${a} `;
+			n.var1 === n.var2 ? e.push(`${i}${o}${n.var1.name}^2`) : e.push(`${i}${o}${n.var1.name} * ${n.var2.name}`), t = !1;
+		}
+		for (let [n, r] of this.linearTerms) {
+			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";
+	}
 	static fromProduct(t, n, r = 1) {
-		let i = new e(), a = T(t, n);
+		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;
 	}
-}, D = class e {
+}, O = class e {
 	terms;
 	constant;
 	constructor(e = /* @__PURE__ */ new Map(), t = 0) {
@@ -126,7 +172,7 @@ var E = class e {
 		return new e(this.terms, this.constant);
 	}
 	add(e) {
-		if (e instanceof E) return e.add(this);
+		if (e instanceof D) return e.add(this);
 		let t = this.clone();
 		if (typeof e == "number") t.constant += e;
 		else if ("terms" in e) {
@@ -142,7 +188,7 @@ var E = class e {
 		return t;
 	}
 	sub(e) {
-		return e instanceof E ? e.neg().add(this) : typeof e == "number" ? this.add(-e) : ("terms" in e, this.add(e.mul(-1)));
+		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") {
@@ -153,9 +199,27 @@ var E = class e {
 			}
 			return n;
 		}
-		let n = new E();
-		Math.abs(this.constant) >= 1e-12 && n.linearTerms.set(t, this.constant);
-		for (let [e, r] of this.terms) n = n.add(E.fromProduct(e, t, r));
+		if (t instanceof M || typeof t == "object" && t && "id" in t && !("terms" in t) && !("quadTerms" in t)) {
+			let e = t, n = new D();
+			Math.abs(this.constant) >= 1e-12 && n.linearTerms.set(e, this.constant);
+			for (let [t, r] of this.terms) n = n.add(D.fromProduct(t, e, r));
+			return n;
+		}
+		if (t instanceof D) {
+			if (t.quadTerms.size > 0 && this.terms.size > 0) throw Error("Multiplication creates a non-linear term of degree > 2 (not allowed in MILP/LP/QP)");
+			if (this.terms.size === 0) return t.mul(this.constant);
+			let e = new D();
+			if (e.constant = this.constant * t.constant, Math.abs(t.constant) >= 1e-12) for (let [n, r] of this.terms) e.linearTerms.set(n, (e.linearTerms.get(n) || 0) + r * t.constant);
+			if (Math.abs(this.constant) >= 1e-12) for (let [n, r] of t.linearTerms) e.linearTerms.set(n, (e.linearTerms.get(n) || 0) + r * this.constant);
+			for (let [n, r] of this.terms) for (let [i, a] of t.linearTerms) e = e.add(D.fromProduct(n, i, r * a));
+			return e;
+		}
+		if (this.terms.size === 0) return t.mul(this.constant);
+		if (t.terms.size === 0) return this.mul(t.constant);
+		let n = new D();
+		if (n.constant = this.constant * t.constant, Math.abs(t.constant) >= 1e-12) for (let [e, r] of this.terms) n.linearTerms.set(e, (n.linearTerms.get(e) || 0) + r * t.constant);
+		if (Math.abs(this.constant) >= 1e-12) for (let [e, r] of t.terms) n.linearTerms.set(e, (n.linearTerms.get(e) || 0) + r * this.constant);
+		for (let [e, r] of this.terms) for (let [i, a] of t.terms) n = n.add(D.fromProduct(e, i, r * a));
 		return n;
 	}
 	div(e) {
@@ -213,27 +277,113 @@ var E = class e {
 		return e.join(" ") || "0";
 	}
 };
-function O(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);
+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 += t.constant;
-		} else if (e) {
-			let t = e, r = n.get(t) || 0;
-			n.set(t, r + 1);
+			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 D(n, r);
+	return new O(n, r);
+}
+//#endregion
+//#region src/modeler/variable.ts
+var j = 0;
+function ie(e) {
+	if (!e) return "Continuous";
+	let t = e.toLowerCase();
+	return t === "binary" || t === "bin" ? "Binary" : t === "integer" || t === "int" ? "Integer" : "Continuous";
 }
-var k = O, A = O, ie = 0, j = class e {
+var M = class e {
 	id;
 	name;
 	type;
@@ -242,48 +392,49 @@ var k = O, A = O, ie = 0, j = class e {
 	value = null;
 	reducedCost = null;
 	constructor(e = {}) {
-		this.id = ++ie, 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 = ++j, this.name = e.name || `x_${this.id}`, this.type = ie(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 D(/* @__PURE__ */ new Map([[this, t]]), 0);
-		if (t instanceof e) return E.fromProduct(this, t, 1);
-		let n = new E();
+		if (typeof t == "number") return new O(/* @__PURE__ */ new Map([[this, t]]), 0);
+		if (t instanceof e) return D.fromProduct(this, t, 1);
+		if (t instanceof D) {
+			if (t.quadTerms.size > 0) throw Error("Multiplication creates a non-linear term of degree > 2 (not allowed in MILP/LP/QP)");
+			let e = new D();
+			Math.abs(t.constant) >= 1e-12 && e.linearTerms.set(this, t.constant);
+			for (let [n, r] of t.linearTerms) e = e.add(D.fromProduct(this, n, r));
+			return e;
+		}
+		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 = E.fromProduct(this, e, r);
+			let t = D.fromProduct(this, e, r);
 			n = n.add(t);
 		}
 		return n;
 	}
 	add(e) {
-		return e instanceof E ? e.add(this) : new D(/* @__PURE__ */ new Map([[this, 1]]), 0).add(e);
+		return e instanceof D ? e.add(this) : new O(/* @__PURE__ */ new Map([[this, 1]]), 0).add(e);
 	}
 	sub(e) {
-		return e instanceof E ? e.neg().add(this) : new D(/* @__PURE__ */ new Map([[this, 1]]), 0).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 D(/* @__PURE__ */ new Map([[this, 1]]), 0).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 D(/* @__PURE__ */ new Map([[this, 1]]), 0).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 D(/* @__PURE__ */ new Map([[this, 1]]), 0).eq(e, t);
+		return new O(/* @__PURE__ */ new Map([[this, 1]]), 0).eq(e, t);
 	}
 	equalTo(e, t) {
 		return this.eq(e, t);
@@ -310,9 +461,16 @@ function ae(e) {
 			type: "MINUS",
 			value: "-"
 		}), n++;
-		else if (i === "*") t.push({
+		else if (i === "*") n + 1 < r && e[n + 1] === "*" ? (t.push({
+			type: "CARET",
+			value: "**"
+		}), n += 2) : (t.push({
 			type: "STAR",
 			value: "*"
+		}), n++);
+		else if (i === "^") t.push({
+			type: "CARET",
+			value: "^"
 		}), n++;
 		else if (i === "/") t.push({
 			type: "SLASH",
@@ -350,7 +508,24 @@ function ae(e) {
 	}
 	return t;
 }
-var oe = class {
+function oe(e, t) {
+	return e instanceof D ? e.add(t) : t instanceof D ? t.add(e) : e.add(t);
+}
+function se(e, t) {
+	return e instanceof D ? e.sub(t) : t instanceof D ? t.neg().add(e) : e.sub(t);
+}
+function N(e, t) {
+	let n = e instanceof D ? e.quadTerms : /* @__PURE__ */ new Map(), r = t instanceof D ? t.quadTerms : /* @__PURE__ */ new Map(), i = e instanceof D ? e.linearTerms : e.terms, a = t instanceof D ? t.linearTerms : t.terms;
+	if (n.size > 0 && (r.size > 0 || a.size > 0) || r.size > 0 && (n.size > 0 || i.size > 0)) throw Error("Multiplication creates a non-linear term of degree > 2 (not allowed in MILP/LP/QP)");
+	if (n.size === 0 && i.size === 0) return t.mul(e.constant);
+	if (r.size === 0 && a.size === 0) return e.mul(t.constant);
+	let o = new D();
+	if (o.constant = e.constant * t.constant, Math.abs(t.constant) >= 1e-12) for (let [e, n] of i) o.linearTerms.set(e, (o.linearTerms.get(e) || 0) + n * t.constant);
+	if (Math.abs(e.constant) >= 1e-12) for (let [t, n] of a) o.linearTerms.set(t, (o.linearTerms.get(t) || 0) + n * e.constant);
+	for (let [e, t] of i) for (let [n, r] of a) o = o.add(D.fromProduct(e, n, t * r));
+	return o;
+}
+var ce = class {
 	tokens;
 	pos = 0;
 	resolver;
@@ -371,11 +546,11 @@ var oe = class {
 		for (; this.pos < this.tokens.length;) {
 			let t = this.peek();
 			if (!t) break;
-			if (t.type === "PLUS") this.consume(), e = e.add(this.parseTerm());
-			else if (t.type === "MINUS") this.consume(), e = e.sub(this.parseTerm());
+			if (t.type === "PLUS") this.consume(), e = oe(e, this.parseTerm());
+			else if (t.type === "MINUS") this.consume(), e = se(e, this.parseTerm());
 			else break;
 		}
-		return e;
+		return e instanceof D && e.quadTerms.size === 0 ? new O(e.linearTerms, e.constant) : e;
 	}
 	parseTerm() {
 		let e = this.parseFactor();
@@ -385,57 +560,83 @@ var oe = class {
 			if (t.type === "STAR") {
 				this.consume();
 				let t = this.parseFactor();
-				e = this.multiplyExpressions(e, t);
+				e = N(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");
+				let t = this.parseFactor(), n = t instanceof D ? t.linearTerms : t.terms, r = t instanceof D ? t.quadTerms.size : 0;
+				if (n.size > 0 || r > 0) throw Error("Cannot divide by variable in expression");
 				if (Math.abs(t.constant) < 1e-12) throw Error("Division by zero in expression");
 				e = e.div(t.constant);
 			} 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 = parseFloat(e.value);
+			if (this.peek()?.type === "IDENT" || this.peek()?.type === "LPAREN") {
+				let e;
+				if (this.peek()?.type === "IDENT") {
+					let t = this.consume(), n = this.resolve(t.value);
+					e = n instanceof M || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new O(/* @__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 D(/* @__PURE__ */ new Map(), t);
-		}
-		if (e.type === "IDENT") {
+			t = new O(/* @__PURE__ */ new Map(), n);
+		} else if (e.type === "IDENT") {
+			this.consume();
+			let n = this.resolve(e.value);
+			t = n instanceof M || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new O(/* @__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.peek();
+			if (!e || e.type !== "NUMBER") throw Error("Exponent must be a non-negative integer number");
 			this.consume();
-			let t = this.resolveVariable(e.value);
-			return new D(/* @__PURE__ */ new Map([[t, 1]]), 0);
+			let n = parseFloat(e.value);
+			if (!Number.isInteger(n) || n < 0) throw Error("Exponent must be a non-negative integer");
+			t.push(n);
 		}
-		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 D, i = r ? e.quadTerms.size : 0, a = r ? e.linearTerms.size : e.terms.size;
+		if (i === 0 && a === 0) {
+			let t = e.constant ** +n;
+			return new O(/* @__PURE__ */ new Map(), t);
 		}
-		throw Error(`Unexpected token '${e.value}' in expression`);
+		if (n === 0) return new O(/* @__PURE__ */ new Map(), 1);
+		if (n === 1) return e;
+		if (n === 2) return N(e, e);
+		throw Error(`Exponent ${n} creates a non-linear term of degree > 2 (not allowed in MILP/LP/QP)`);
 	}
-	resolveVariable(e) {
+	getRemainingToken() {
+		return this.peek();
+	}
+	resolve(e) {
 		let t = this.resolver(e);
 		if (!t) throw Error(`Unknown variable '${e}' in expression`);
 		return t;
 	}
 };
-function M(e, t) {
-	return new oe(ae(e), t).parseExpression();
+function P(e, t) {
+	let n = new ce(ae(e), t), r = n.parseExpression(), i = n.getRemainingToken();
+	if (i) throw Error(`Unexpected token '${i.value}' after expression in "${e}"`);
+	return r;
 }
-function N(e, t, n) {
+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;
@@ -443,20 +644,19 @@ function N(e, t, n) {
 	else if (i === ">=" || i === "=>") c = ">=";
 	else if (i === "==" || i === "=") c = "==";
 	else throw Error(`Unsupported operator "${i}"`);
-	let l = M(o, t), u = M(s, t);
-	return c === "<=" ? l.le(u, n) : c === ">=" ? l.ge(u, n) : l.eq(u, n);
+	let l = P(o, t), u = P(s, t);
+	if (l instanceof D && l.quadTerms.size > 0 || u instanceof D && u.quadTerms.size > 0) throw Error("Quadratic constraints are not supported (only linear constraints are allowed in MILP/LP/QP)");
+	let d = l instanceof D ? new O(l.linearTerms, l.constant) : l, f = u instanceof D ? new O(u.linearTerms, u.constant) : u;
+	return c === "<=" ? d.le(f, n) : c === ">=" ? d.ge(f, n) : d.eq(f, n);
 }
-function P(e, t) {
+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) {
 		let e = t[i];
 		if (typeof e == "number") r += `(${e})`;
-		else if (e instanceof j) {
-			let t = `__v_${i}__`;
+		else if (e instanceof M || e instanceof O || e instanceof D || typeof e == "object" && e && ("id" in e || "terms" in e || "quadTerms" in e)) {
+			let t = `__ph_${i}__`;
 			n.set(t, e), r += t;
-		} else if (e instanceof D) {
-			`${i}`, r += `(${e.toString()})`;
-			for (let [t] of e.terms) n.set(t.name, t);
 		}
 	}
 	return {
@@ -464,42 +664,42 @@ function P(e, t) {
 		resolver: (e) => n.get(e)
 	};
 }
-function se(e, ...t) {
-	let { fullText: n, resolver: r } = P(e, t);
-	return N(n, r);
+function L(e, ...t) {
+	let { fullText: n, resolver: r } = I(e, t);
+	return F(n, r);
 }
-function ce(e, ...t) {
-	let { fullText: n, resolver: r } = P(e, t);
-	return /(<=|>=|==|=<|=>|=)/.test(n) ? N(n, r) : M(n, r);
+function R(e, ...t) {
+	let { fullText: n, resolver: r } = I(e, t);
+	return /(<=|>=|==|=<|=>|=)/.test(n) ? F(n, r) : P(n, r);
 }
 //#endregion
 //#region src/modeler/lp-writer.ts
-function le(e, t, n) {
+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;
 }
-function F(e) {
+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 = le(e.name, "x", e.id), n = t, r = 1;
+		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 = le(e.name, "c", e.id), n = t, r = 1;
+		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 === "Maximize" ? "Maximize" : "Minimize");
-	let f = [], p = !0, m = n instanceof E ? n.linearTerms : n.terms;
+	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 E && n.quadTerms.size > 0) {
+	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;
@@ -551,41 +751,41 @@ function F(e) {
 }
 //#endregion
 //#region src/modeler/solvers/highs/worker-client.ts
-var I = null, ue = 0, L = /* @__PURE__ */ new Map();
-function de() {
+var V = null, le = 0, H = /* @__PURE__ */ new Map();
+function ue() {
 	if (typeof window > "u" || typeof Worker > "u") return null;
-	if (!I) try {
-		I = ee();
-		let e = I;
-		I.onmessage = (e) => {
-			let { type: t, id: n, result: r, runTime: i, error: a } = e.data, o = L.get(n);
-			o && (L.delete(n), t === "SOLVE_SUCCESS" ? o.resolve({
+	if (!V) try {
+		V = ee();
+		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")));
 		};
 		let t = (t) => {
-			if (I === e) {
-				I = null, e.terminate();
-				for (let e of L.values()) e.reject(t);
-				L.clear();
+			if (V === e) {
+				V = null, e.terminate();
+				for (let e of H.values()) e.reject(t);
+				H.clear();
 			}
 		};
-		I.onerror = (e) => t(/* @__PURE__ */ Error(`[WaSHI] HiGHS Worker failed to load or execute. Check Worker assets, CORS and CSP. ${e?.message || ""}`)), I.onmessageerror = () => t(/* @__PURE__ */ Error("[WaSHI] Could not deserialize the HiGHS Worker response."));
+		V.onerror = (e) => t(/* @__PURE__ */ Error(`[WaSHI] HiGHS Worker failed to load or execute. Check Worker assets, CORS and CSP. ${e?.message || ""}`)), V.onmessageerror = () => t(/* @__PURE__ */ Error("[WaSHI] Could not deserialize the HiGHS Worker response."));
 	} catch {
-		I = null;
+		V = null;
 	}
-	return I;
+	return V;
 }
-async function R(e, t = {}) {
-	let n = await _(t.wasmUrl), r = t.useWorker ?? typeof window < "u" ? de() : null;
+async function U(e, t = {}) {
+	let n = await _(t.wasmUrl), r = t.useWorker ?? typeof window < "u" ? ue() : null;
 	if (!r) return m(e, t);
 	let i = {
 		...t,
 		wasmUrl: n
-	}, a = `req_${++ue}`;
+	}, a = `req_${++le}`;
 	return new Promise((t, n) => {
-		L.set(a, {
+		H.set(a, {
 			resolve: t,
 			reject: n
 		});
@@ -597,13 +797,13 @@ async function R(e, t = {}) {
 				options: i
 			});
 		} catch (e) {
-			L.delete(a), n(e);
+			H.delete(a), n(e);
 		}
 	});
 }
 //#endregion
 //#region src/modeler/solvers/highs/solver.ts
-function z(e) {
+function W(e) {
 	if (typeof e != "string") return "Unknown";
 	let t = e.trim();
 	if (!t) return "Unknown";
@@ -632,7 +832,7 @@ function z(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 B = class e {
+var G = class e {
 	static capabilities = {
 		supportsMIP: !0,
 		supportsQP: !0
@@ -648,7 +848,18 @@ var B = class e {
 		let r = {
 			...this.options,
 			...n
-		}, { lpString: i, nameToVar: a, nameToConstraint: o } = t, { result: s, runTime: c } = await R(i, r), l = z(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 U(i, r), l = W(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) {
@@ -677,53 +888,53 @@ var B = class e {
 			raw: s
 		};
 	}
-}, V = B;
-function H() {
-	d("highs", (e) => new B(e)), l((e) => new B(e));
+}, K = G;
+function q() {
+	d("highs", (e) => new G(e)), l((e) => new G(e));
 }
-H();
+q();
 //#endregion
 //#region src/modeler/solvers/highs/index.ts
-var U = /* @__PURE__ */ S({
-	HiGHS: () => V,
-	HighsSolver: () => B,
+var J = /* @__PURE__ */ S({
+	HiGHS: () => K,
+	HighsSolver: () => G,
 	OFFICIAL_HIGHS_CDN_WASM_URL: () => b,
 	getHighs: () => g,
 	getHighsWasmUrl: () => v,
 	isValidWasmHeader: () => h,
-	mapHighsStatus: () => z,
+	mapHighsStatus: () => W,
 	probeWasmUrl: () => p,
-	registerHighsSolver: () => H,
+	registerHighsSolver: () => q,
 	resolveBrowserWasmUrl: () => _,
 	setHighsWasmUrl: () => y,
-	solveLp: () => R,
+	solveLp: () => U,
 	solveLpWithHighs: () => m
 });
-import * as fe from "./highs-worker-factory.js";
-w(U, fe);
-import * as pe from "./highs-assets.js";
-w(U, pe);
+import * as de from "./highs-worker-factory.js";
+w(J, de);
+import * as fe from "./highs-assets.js";
+w(J, fe);
 //#endregion
 //#region src/modeler/solvers/highs.ts
-var W = /* @__PURE__ */ S({
-	HiGHS: () => V,
-	HighsSolver: () => B,
+var Y = /* @__PURE__ */ S({
+	HiGHS: () => K,
+	HighsSolver: () => G,
 	OFFICIAL_HIGHS_CDN_WASM_URL: () => b,
 	getHighs: () => g,
 	getHighsWasmUrl: () => v,
 	isValidWasmHeader: () => h,
-	mapHighsStatus: () => z,
+	mapHighsStatus: () => W,
 	probeWasmUrl: () => p,
-	registerHighsSolver: () => H,
+	registerHighsSolver: () => q,
 	resolveBrowserWasmUrl: () => _,
 	setHighsWasmUrl: () => y,
-	solveLp: () => R,
+	solveLp: () => U,
 	solveLpWithHighs: () => m
 });
-w(W, U);
+w(Y, J);
 //#endregion
 //#region src/modeler/solvers/mock.ts
-var G = class {
+var X = class {
 	name;
 	capabilities;
 	options;
@@ -750,37 +961,37 @@ var G = class {
 		};
 	}
 };
-function K() {
-	d("mock", (e) => new G(e));
+function Z() {
+	d("mock", (e) => new X(e));
 }
-K();
+Z();
 //#endregion
 //#region src/modeler/solvers/index.ts
-var q = /* @__PURE__ */ S({
-	HiGHS: () => V,
-	HighsSolver: () => B,
-	MockSolver: () => G,
+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: () => z,
+	mapHighsStatus: () => W,
 	probeWasmUrl: () => p,
-	registerHighsSolver: () => H,
-	registerMockSolver: () => K,
+	registerHighsSolver: () => q,
+	registerMockSolver: () => Z,
 	registerSolver: () => d,
 	resolveBrowserWasmUrl: () => _,
 	setDefaultSolver: () => l,
 	setHighsWasmUrl: () => y,
-	solveLp: () => R,
+	solveLp: () => U,
 	solveLpWithHighs: () => m
 });
-w(q, W);
+w(Q, Y);
 //#endregion
 //#region src/modeler/model.ts
-var J = class {
+var $ = class {
 	name;
 	sense;
 	objective;
@@ -791,6 +1002,8 @@ var J = class {
 	unsatCore = [];
 	values = /* @__PURE__ */ new Map();
 	varMapByName = /* @__PURE__ */ new Map();
+	boolVarMapByName = /* @__PURE__ */ new Map();
+	boolVarPrefixCounters = /* @__PURE__ */ new Map();
 	constrMapByName = /* @__PURE__ */ new Map();
 	status = "NotSolved";
 	objectiveValue = null;
@@ -802,7 +1015,7 @@ var J = class {
 		n = typeof e == "string" ? {
 			...t,
 			name: e
-		} : e, this.name = n.name || "OptimizationModel", this.sense = n.sense || "Minimize", this.objective = new D(), n.solver && (this.solver = f(n.solver));
+		} : e, this.name = n.name || "OptimizationModel", this.sense = T(n.sense), this.objective = new O(), n.solver && (this.solver = f(n.solver));
 	}
 	get vars() {
 		return this.variables;
@@ -816,70 +1029,120 @@ var J = class {
 	get numConstrs() {
 		return this.constraints.length;
 	}
-	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) {
+	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);
+	}
+	bool(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 = {};
+			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 || "p", s = {};
 			for (let e of r) {
 				s[e] = {};
-				for (let t of i) s[e][t] = this.addVar({
-					...a,
-					name: `${o}_${e}_${t}`
-				});
+				for (let t of i) s[e][t] = this.createBoolVar(`${o}_${e}_${t}`);
 			}
 			return s;
 		}
+		if (typeof e == "string" || e === void 0) return this.createBoolVar(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}`
-			}));
+			let t = [], n = i || "p";
+			for (let r = 0; r < e; r++) t.push(this.createBoolVar(this.getNextBoolVarName(n)));
 			return t;
 		}
-		{
+		if (Array.isArray(e) || e && typeof e[Symbol.iterator] == "function") {
 			let t = {};
 			for (let n of e) {
 				let e = i ? `${i}_${n}` : `${n}`;
-				t[n] = this.addVar({
-					...r,
-					name: e
-				});
+				t[n] = this.createBoolVar(e);
 			}
 			return t;
 		}
+		throw Error("Invalid arguments provided for boolean variable creation");
 	}
-	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}`
-			});
-		}
-		return r;
+	hasVarName(e) {
+		return this.varMapByName.has(e) || this.boolVarMapByName.has(e);
+	}
+	getNextBoolVarName(e) {
+		let t = this.boolVarPrefixCounters.get(e) ?? 0, n = `${e}_${t}`;
+		for (; this.hasVarName(n);) t++, n = `${e}_${t}`;
+		return this.boolVarPrefixCounters.set(e, t + 1), n;
+	}
+	createBoolVar(e) {
+		let t = typeof e == "string" ? e.trim() : void 0, r = t && t.length > 0 ? t : this.getNextBoolVarName("p");
+		if (this.hasVarName(r)) throw Error(`Variable with name '${r}' already exists in model`);
+		let i = new n(r);
+		return this.boolVars.push(i), this.boolVarMapByName.set(i.name, i), i;
+	}
+	addVar(e) {
+		let t = e || {}, n = typeof t.name == "string" ? t.name.trim() : void 0, r = n && n.length > 0 ? n : void 0, i = new M({
+			...t,
+			name: r
+		});
+		if (this.hasVarName(i.name)) throw Error(`Variable with name '${i.name}' already exists in model`);
+		return this.variables.push(i), this.varMapByName.set(i.name, i), i;
 	}
 	getVarByName(e) {
 		return this.varMapByName.get(e);
 	}
+	getBoolVarByName(e) {
+		return this.boolVarMapByName.get(e);
+	}
 	getConstraintByName(e) {
 		return this.constrMapByName.get(e);
 	}
 	setObjective(e, t) {
-		t && (this.sense = t), this.objective = typeof e == "string" ? M(e, (e) => this.getVarByName(e)) : typeof e == "number" ? new D(/* @__PURE__ */ new Map(), e) : e instanceof E || "terms" in e ? e.clone() : new D(/* @__PURE__ */ new Map([[e, 1]]), 0);
+		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");
@@ -887,11 +1150,29 @@ var J = class {
 	minimize(e) {
 		this.setObjective(e, "Minimize");
 	}
-	addBoolVar(e) {
-		let t = new n(e);
-		return this.boolVars.push(t), t;
+	constrain(e, t) {
+		if (Array.isArray(e)) {
+			for (let t of e) this.constrain(t);
+			return this;
+		}
+		if (e instanceof D) throw Error("Cannot add a quadratic expression without a comparison operator (<=, >=, ==) as a constraint. Quadratic constraints are not supported (only linear constraints are allowed in MILP/LP/QP).");
+		if (e instanceof O) 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 M || e instanceof n) 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;
 	}
 	addConstraint(e, t) {
+		if (e instanceof D) throw Error("Cannot add a quadratic expression without a comparison operator (<=, >=, ==) as a constraint. Quadratic constraints are not supported (only linear constraints are allowed in MILP/LP/QP).");
+		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({
@@ -900,47 +1181,43 @@ var J = class {
 			}), e;
 		}
 		let n;
-		if (typeof e == "string" ? n = N(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 = 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;
 		}
-		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);
-	}
-	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);
+		return e instanceof M ? (this.varMapByName.has(e.name) || (this.variables.push(e), this.varMapByName.set(e.name, e)), this) : (this.addConstraint(e, t), this);
+	}
+	indicator(e, t, n = {}) {
+		if (t instanceof D) 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 (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;
 	}
 	toLpString() {
-		let { lpString: e } = F({
+		let { lpString: e } = B({
 			name: this.name,
 			sense: this.sense,
 			objective: this.objective,
@@ -951,7 +1228,8 @@ var J = 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 = f(e, t), r = t || {}) : (r = { ...e }, r.solver ? (n = f(r.solver, r), delete r.solver) : n = this.solver || f()), this.objective instanceof E && 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 = 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.`);
+		if (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.`);
 		let i = {
 			name: this.name,
 			sense: this.sense,
@@ -960,13 +1238,23 @@ var J = class {
 			variables: this.variables,
 			logicalConstraints: this.logicalConstraints,
 			boolVars: this.boolVars
-		}, a = F(i), o = await n.solve(i, a, r);
+		}, 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 = {};
-		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);
@@ -1005,21 +1293,26 @@ var J = 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;
 		}
 		let i = this.objective, a = this.sense;
 		try {
-			this.objective = new D(), this.sense = "Minimize";
+			this.objective = new O(), 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,
@@ -1029,190 +1322,47 @@ var J = class {
 			this.objective = i, this.sense = a;
 		}
 	}
-}, Y = "Minimize", me = "Maximize", he = "Continuous", ge = "Integer", _e = "Binary", ve = {
-	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"
-}, ye = class e extends j {
-	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 be(e) {
-	return e == null ? null : typeof e == "number" ? e : e.value;
-}
-var xe = class {
-	model;
-	constructor(e = "NoName", t = Y) {
-		this.model = new J({
-			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 j && 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 c ? this.addConstraint(e, t) : this.setObjective(e);
-	}
-	async solve(e, t) {
-		return this.model.optimize(e, t);
-	}
-	toLpString() {
-		return this.model.toLpString();
-	}
-}, X = "Minimize", Z = "Maximize", Q = "Binary", Se = "Integer", Ce = "Continuous";
-function we(e) {
-	return {
-		expr: e,
-		sense: Z
-	};
-}
-function Te(e) {
-	return {
-		expr: e,
-		sense: X
-	};
-}
-var $ = class extends J {
-	constructor(e = "MipModel", t = X) {
-		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);
-	}
 };
 w(/* @__PURE__ */ S({
-	BINARY: () => Q,
 	BoolExpr: () => i,
 	BoolOp: () => o,
 	BoolVar: () => n,
-	CONTINUOUS: () => Ce,
 	Constraint: () => c,
-	HiGHS: () => V,
-	HighsSolver: () => B,
-	INTEGER: () => Se,
-	LinExpr: () => D,
-	LpBinary: () => _e,
-	LpContinuous: () => he,
-	LpInteger: () => ge,
-	LpMaximize: () => me,
-	LpMinimize: () => Y,
-	LpProblem: () => xe,
-	LpStatus: () => ve,
-	LpVariable: () => ye,
-	MAXIMIZE: () => Z,
-	MINIMIZE: () => X,
-	MipModel: () => $,
-	MockSolver: () => G,
-	Model: () => J,
+	HiGHS: () => K,
+	HighsSolver: () => G,
+	LinExpr: () => O,
+	MockSolver: () => X,
+	Model: () => $,
 	OFFICIAL_HIGHS_CDN_WASM_URL: () => b,
-	QuadExpr: () => E,
-	Var: () => j,
+	QuadExpr: () => D,
+	Var: () => M,
 	and: () => e,
-	c: () => se,
-	expr: () => ce,
-	generateLpString: () => F,
+	c: () => L,
+	dot: () => A,
+	expr: () => R,
+	generateLpString: () => B,
 	getHighs: () => g,
 	getHighsWasmUrl: () => v,
 	getSolver: () => f,
 	implies: () => a,
 	isValidWasmHeader: () => h,
 	listAvailableSolvers: () => u,
-	lpSum: () => A,
-	mapHighsStatus: () => z,
-	maximize: () => we,
-	minimize: () => Te,
+	mapHighsStatus: () => W,
 	not: () => s,
 	or: () => t,
-	parseConstraint: () => N,
-	parseExpr: () => M,
+	parseConstraint: () => F,
+	parseExpr: () => P,
 	probeWasmUrl: () => p,
-	registerHighsSolver: () => H,
-	registerMockSolver: () => K,
+	registerHighsSolver: () => q,
+	registerMockSolver: () => Z,
 	registerSolver: () => d,
 	resolveBrowserWasmUrl: () => _,
 	setDefaultSolver: () => l,
 	setHighsWasmUrl: () => y,
-	solveLp: () => R,
+	solveLp: () => U,
 	solveLpWithHighs: () => m,
-	sum: () => O,
-	value: () => be,
-	xor: () => r,
-	xsum: () => k
-}), q);
+	sum: () => k,
+	xor: () => r
+}), Q);
 //#endregion
-export { Q as BINARY, i as BoolExpr, o as BoolOp, n as BoolVar, Ce as CONTINUOUS, c as Constraint, V as HiGHS, B as HighsSolver, Se as INTEGER, D as LinExpr, _e as LpBinary, he as LpContinuous, ge as LpInteger, me as LpMaximize, Y as LpMinimize, xe as LpProblem, ve as LpStatus, ye as LpVariable, Z as MAXIMIZE, X as MINIMIZE, $ as MipModel, G as MockSolver, J as Model, b as OFFICIAL_HIGHS_CDN_WASM_URL, E as QuadExpr, j as Var, e as and, se as c, ce as expr, F as generateLpString, g as getHighs, v as getHighsWasmUrl, f as getSolver, a as implies, h as isValidWasmHeader, u as listAvailableSolvers, A as lpSum, we as maximize, Te as minimize, s as not, t as or, N as parseConstraint, M as parseExpr, p as probeWasmUrl, d as registerSolver, _ as resolveBrowserWasmUrl, l as setDefaultSolver, y as setHighsWasmUrl, m as solveLpWithHighs, O as sum, be as value, r as xor, k as xsum };
+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, M 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 };