@ohtaman/washi 0.3.0 → 0.4.0

package/dist/browser/washi.js

@@ -61,7 +61,7 @@ function v(...e) {
 }
 //#endregion
 //#region src/modeler/constraint.ts
-var ee = 0, y = class {
+var y = 0, b = class {
 	id;
 	lhs;
 	sense;
@@ -70,7 +70,7 @@ var ee = 0, y = class {
 	slack = null;
 	dual = null;
 	constructor(e, t, n, r) {
-		this.id = ++ee, this.lhs = e, this.sense = t, this.rhs = n, this.name = r || `c_${this.id}`;
+		this.id = ++y, this.lhs = e, this.sense = t, this.rhs = n, this.name = r || `c_${this.id}`;
 	}
 	and(e) {
 		return new p("and", [this, e]);
@@ -94,11 +94,11 @@ var ee = 0, y = class {
 };
 //#endregion
 //#region src/modeler/quad-expr.ts
-function b(e, t) {
+function x(e, t) {
 	let n = e.id, r = t.id;
 	return n <= r ? `${n}:${r}` : `${r}:${n}`;
 }
-var x = class e {
+var S = class e {
 	linearTerms;
 	quadTerms;
 	constant;
@@ -111,7 +111,7 @@ var x = class e {
 		return new e(this.linearTerms, this.quadTerms, this.constant);
 	}
 	getQuadCoeff(e, t) {
-		let n = b(e, t), r = this.quadTerms.get(n);
+		let n = x(e, t), r = this.quadTerms.get(n);
 		return r ? r.coeff : 0;
 	}
 	add(t) {
@@ -146,20 +146,45 @@ var x = 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()");
@@ -183,15 +208,31 @@ var x = 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 = b(t, n);
+		let i = new e(), a = x(t, n);
 		return i.quadTerms.set(a, {
 			var1: t.id <= n.id ? t : n,
 			var2: t.id <= n.id ? n : t,
 			coeff: r
 		}), i;
 	}
-}, S = class e {
+}, C = class e {
 	terms;
 	constant;
 	constructor(e = /* @__PURE__ */ new Map(), t = 0) {
@@ -201,7 +242,7 @@ var x = class e {
 		return new e(this.terms, this.constant);
 	}
 	add(e) {
-		if (e instanceof x) return e.add(this);
+		if (e instanceof S) return e.add(this);
 		let t = this.clone();
 		if (typeof e == "number") t.constant += e;
 		else if ("terms" in e) {
@@ -217,7 +258,7 @@ var x = class e {
 		return t;
 	}
 	sub(e) {
-		return e instanceof x ? e.neg().add(this) : typeof e == "number" ? this.add(-e) : ("terms" in e, this.add(e.mul(-1)));
+		return e instanceof S ? e.neg().add(this) : typeof e == "number" ? this.add(-e) : ("terms" in e, this.add(e.mul(-1)));
 	}
 	mul(t) {
 		if (typeof t == "number") {
@@ -228,9 +269,27 @@ var x = class e {
 			}
 			return n;
 		}
-		let n = new x();
-		Math.abs(this.constant) >= 1e-12 && n.linearTerms.set(t, this.constant);
-		for (let [e, r] of this.terms) n = n.add(x.fromProduct(e, t, r));
+		if (t instanceof D || typeof t == "object" && t && "id" in t && !("terms" in t) && !("quadTerms" in t)) {
+			let e = t, n = new S();
+			Math.abs(this.constant) >= 1e-12 && n.linearTerms.set(e, this.constant);
+			for (let [t, r] of this.terms) n = n.add(S.fromProduct(t, e, r));
+			return n;
+		}
+		if (t instanceof S) {
+			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 S();
+			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(S.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 S();
+		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(S.fromProduct(e, i, r * a));
 		return n;
 	}
 	div(e) {
@@ -273,7 +332,7 @@ var x = class e {
 		let i = this.clone(), a = 0;
 		typeof n == "number" ? a = n : "terms" in n ? (i = i.sub(new e(n.terms, 0)), a = n.constant) : i = i.sub(n);
 		let o = a - i.constant;
-		return i.constant = 0, new y(i, t, o, r);
+		return i.constant = 0, new b(i, t, o, r);
 	}
 	toString() {
 		let e = [], t = !0;
@@ -288,7 +347,7 @@ var x = class e {
 		return e.join(" ") || "0";
 	}
 };
-function C(e, t) {
+function w(e, t) {
 	let n = /* @__PURE__ */ new Map(), r = 0;
 	function i(e) {
 		if (e != null) {
@@ -314,19 +373,19 @@ function C(e, t) {
 		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);
+	return new C(n, r);
 }
-function w(e, t) {
+function ee(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;
+		return i(e) || e instanceof C || e instanceof S;
 	}
 	function o(e, t) {
 		if (typeof t == "number") r += e * t;
-		else if (t instanceof S) {
+		else if (t instanceof C) {
 			for (let [r, i] of t.terms) {
 				let t = n.get(r) || 0;
 				n.set(r, t + e * i);
@@ -384,17 +443,17 @@ function w(e, t) {
 	}
 	c(e, t);
 	for (let [e, t] of n) Math.abs(t) < 1e-12 && n.delete(e);
-	return new S(n, r);
+	return new C(n, r);
 }
 //#endregion
 //#region src/modeler/variable.ts
-var te = 0;
-function T(e) {
+var T = 0;
+function E(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 {
+var D = class e {
 	id;
 	name;
 	type;
@@ -403,42 +462,49 @@ var E = class e {
 	value = null;
 	reducedCost = null;
 	constructor(e = {}) {
-		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);
+		this.id = ++T, this.name = e.name || `x_${this.id}`, this.type = E(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);
-		if (t instanceof e) return x.fromProduct(this, t, 1);
-		let n = new x();
+		if (typeof t == "number") return new C(/* @__PURE__ */ new Map([[this, t]]), 0);
+		if (t instanceof e) return S.fromProduct(this, t, 1);
+		if (t instanceof S) {
+			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 S();
+			Math.abs(t.constant) >= 1e-12 && e.linearTerms.set(this, t.constant);
+			for (let [n, r] of t.linearTerms) e = e.add(S.fromProduct(this, n, r));
+			return e;
+		}
+		let n = new S();
 		Math.abs(t.constant) >= 1e-12 && n.linearTerms.set(this, t.constant);
 		for (let [e, r] of t.terms) {
-			let t = x.fromProduct(this, e, r);
+			let t = S.fromProduct(this, e, r);
 			n = n.add(t);
 		}
 		return n;
 	}
 	add(e) {
-		return e instanceof x ? e.add(this) : new S(/* @__PURE__ */ new Map([[this, 1]]), 0).add(e);
+		return e instanceof S ? e.add(this) : new C(/* @__PURE__ */ new Map([[this, 1]]), 0).add(e);
 	}
 	sub(e) {
-		return e instanceof x ? e.neg().add(this) : new S(/* @__PURE__ */ new Map([[this, 1]]), 0).sub(e);
+		return e instanceof S ? e.neg().add(this) : new C(/* @__PURE__ */ new Map([[this, 1]]), 0).sub(e);
 	}
 	neg() {
 		return this.mul(-1);
 	}
 	le(e, t) {
-		return new S(/* @__PURE__ */ new Map([[this, 1]]), 0).le(e, t);
+		return new C(/* @__PURE__ */ new Map([[this, 1]]), 0).le(e, t);
 	}
 	lessThanOrEqual(e, t) {
 		return this.le(e, t);
 	}
 	ge(e, t) {
-		return new S(/* @__PURE__ */ new Map([[this, 1]]), 0).ge(e, t);
+		return new C(/* @__PURE__ */ new Map([[this, 1]]), 0).ge(e, t);
 	}
 	greaterThanOrEqual(e, t) {
 		return this.ge(e, t);
 	}
 	eq(e, t) {
-		return new S(/* @__PURE__ */ new Map([[this, 1]]), 0).eq(e, t);
+		return new C(/* @__PURE__ */ new Map([[this, 1]]), 0).eq(e, t);
 	}
 	equalTo(e, t) {
 		return this.eq(e, t);
@@ -449,7 +515,7 @@ var E = class e {
 };
 //#endregion
 //#region src/modeler/parser.ts
-function D(e) {
+function O(e) {
 	let t = [], n = 0, r = e.length;
 	for (; n < r;) {
 		let i = e[n];
@@ -465,9 +531,16 @@ function D(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",
@@ -505,7 +578,24 @@ function D(e) {
 	}
 	return t;
 }
-var O = class {
+function k(e, t) {
+	return e instanceof S ? e.add(t) : t instanceof S ? t.add(e) : e.add(t);
+}
+function te(e, t) {
+	return e instanceof S ? e.sub(t) : t instanceof S ? t.neg().add(e) : e.sub(t);
+}
+function A(e, t) {
+	let n = e instanceof S ? e.quadTerms : /* @__PURE__ */ new Map(), r = t instanceof S ? t.quadTerms : /* @__PURE__ */ new Map(), i = e instanceof S ? e.linearTerms : e.terms, a = t instanceof S ? 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 S();
+	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(S.fromProduct(e, n, t * r));
+	return o;
+}
+var j = class {
 	tokens;
 	pos = 0;
 	resolver;
@@ -526,11 +616,11 @@ var O = 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 = k(e, this.parseTerm());
+			else if (t.type === "MINUS") this.consume(), e = te(e, this.parseTerm());
 			else break;
 		}
-		return e;
+		return e instanceof S && e.quadTerms.size === 0 ? new C(e.linearTerms, e.constant) : e;
 	}
 	parseTerm() {
 		let e = this.parseFactor();
@@ -540,57 +630,83 @@ var O = class {
 			if (t.type === "STAR") {
 				this.consume();
 				let t = this.parseFactor();
-				e = this.multiplyExpressions(e, t);
+				e = A(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 S ? t.linearTerms : t.terms, r = t instanceof S ? 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 D || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new C(/* @__PURE__ */ new Map([[n, 1]]), 0) : n.clone();
+				} else this.consume("LPAREN"), e = this.parseExpression(), this.consume("RPAREN");
+				return this.applyPower(e).mul(n);
 			}
-			return new S(/* @__PURE__ */ new Map(), t);
-		}
-		if (e.type === "IDENT") {
+			t = new C(/* @__PURE__ */ new Map(), n);
+		} else if (e.type === "IDENT") {
+			this.consume();
+			let n = this.resolve(e.value);
+			t = n instanceof D || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new C(/* @__PURE__ */ new Map([[n, 1]]), 0) : n.clone();
+		} else if (e.type === "LPAREN") this.consume("LPAREN"), t = this.parseExpression(), this.consume("RPAREN");
+		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 S(/* @__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 S, i = r ? e.quadTerms.size : 0, a = r ? e.linearTerms.size : e.terms.size;
+		if (i === 0 && a === 0) {
+			let t = e.constant ** +n;
+			return new C(/* @__PURE__ */ new Map(), t);
 		}
-		throw Error(`Unexpected token '${e.value}' in expression`);
+		if (n === 0) return new C(/* @__PURE__ */ new Map(), 1);
+		if (n === 1) return e;
+		if (n === 2) return A(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 k(e, t) {
-	return new O(D(e), t).parseExpression();
+function M(e, t) {
+	let n = new j(O(e), t), r = n.parseExpression(), i = n.getRemainingToken();
+	if (i) throw Error(`Unexpected token '${i.value}' after expression in "${e}"`);
+	return r;
 }
-function A(e, t, n) {
+function N(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;
@@ -598,20 +714,19 @@ function A(e, t, n) {
 	else if (i === ">=" || i === "=>") c = ">=";
 	else if (i === "==" || i === "=") c = "==";
 	else throw Error(`Unsupported operator "${i}"`);
-	let l = k(o, t), u = k(s, t);
-	return c === "<=" ? l.le(u, n) : c === ">=" ? l.ge(u, n) : l.eq(u, n);
+	let l = M(o, t), u = M(s, t);
+	if (l instanceof S && l.quadTerms.size > 0 || u instanceof S && u.quadTerms.size > 0) throw Error("Quadratic constraints are not supported (only linear constraints are allowed in MILP/LP/QP)");
+	let d = l instanceof S ? new C(l.linearTerms, l.constant) : l, f = u instanceof S ? new C(u.linearTerms, u.constant) : u;
+	return c === "<=" ? d.le(f, n) : c === ">=" ? d.ge(f, n) : d.eq(f, n);
 }
-function j(e, t) {
+function P(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 E) {
-			let t = `__v_${i}__`;
+		else if (e instanceof D || e instanceof C || e instanceof S || 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 S) {
-			`${i}`, r += `(${e.toString()})`;
-			for (let [t] of e.terms) n.set(t.name, t);
 		}
 	}
 	return {
@@ -619,42 +734,42 @@ function j(e, t) {
 		resolver: (e) => n.get(e)
 	};
 }
-function M(e, ...t) {
-	let { fullText: n, resolver: r } = j(e, t);
-	return A(n, r);
+function F(e, ...t) {
+	let { fullText: n, resolver: r } = P(e, t);
+	return N(n, r);
 }
-function N(e, ...t) {
-	let { fullText: n, resolver: r } = j(e, t);
-	return /(<=|>=|==|=<|=>|=)/.test(n) ? A(n, r) : k(n, r);
+function I(e, ...t) {
+	let { fullText: n, resolver: r } = P(e, t);
+	return /(<=|>=|==|=<|=>|=)/.test(n) ? N(n, r) : M(n, r);
 }
 //#endregion
 //#region src/modeler/lp-writer.ts
-function P(e, t, n) {
+function L(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 R(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 = P(e.name, "x", e.id), n = t, r = 1;
+		let t = L(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 = P(e.name, "c", e.id), n = t, r = 1;
+		let t = L(e.name, "c", e.id), n = t, r = 1;
 		for (; l.has(n);) n = `${t}_${r++}`;
 		l.add(n), u.set(e, n), s.set(n, e);
 	}
 	let d = [];
 	d.push(t && t.toLowerCase() === "maximize" ? "Maximize" : "Minimize");
-	let f = [], p = !0, m = n instanceof x ? n.linearTerms : n.terms;
+	let f = [], p = !0, m = n instanceof S ? 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 x && n.quadTerms.size > 0) {
+	if (n instanceof S && n.quadTerms.size > 0) {
 		let e = [], t = !0;
 		for (let r of n.quadTerms.values()) {
 			if (Math.abs(r.coeff) < 1e-12) continue;
@@ -706,38 +821,38 @@ function F(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);
+var z = Symbol.for("washi.solverRegistry"), B = Symbol.for("washi.defaultSolverFactory"), V = globalThis;
+V[z] || (V[z] = /* @__PURE__ */ new Map());
+var H = V[z];
+function U(e, t) {
+	H.set(e.toLowerCase(), t);
 }
-function V(e) {
+function W(e) {
 	if (typeof e == "string") {
-		let t = z.get(e.toLowerCase());
+		let t = H.get(e.toLowerCase());
 		if (!t) throw Error(`Solver '${e}' is not registered.`);
-		R[L] = t;
-	} else R[L] = typeof e == "function" ? e : () => e;
+		V[B] = t;
+	} else V[B] = typeof e == "function" ? e : () => e;
 }
-function H(e, t) {
+function G(e, t) {
 	if (!e) {
-		let e = R[L] || z.get("highs");
-		if (!e) throw Error(`No default solver available. Available solvers: ${U().join(", ")}`);
+		let e = V[B] || H.get("highs");
+		if (!e) throw Error(`No default solver available. Available solvers: ${K().join(", ")}`);
 		return e(t);
 	}
 	if (typeof e == "string") {
-		let n = e.toLowerCase(), r = 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(", ")}`);
+		let n = e.toLowerCase(), r = H.get(n);
+		if (!r) throw Error(n === "glpk" ? `Solver 'glpk' not found. Available solvers: ${K().join(", ")}. Please import '@ohtaman/washi/solvers/glpk' before selecting this solver.` : n === "z3" ? `Solver 'z3' not found. Available solvers: ${K().join(", ")}. Please import '@ohtaman/washi/solvers/z3' before selecting this solver.` : `Solver '${e}' not found. Available solvers: ${K().join(", ")}`);
 		return r(t);
 	}
 	return e;
 }
-function U() {
-	return Array.from(z.keys());
+function K() {
+	return Array.from(H.keys());
 }
 //#endregion
 //#region \0washi-browser-worker-factory
-function W() {
+function q() {
 	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" }));
@@ -750,41 +865,41 @@ function W() {
 }
 //#endregion
 //#region src/modeler/solvers/highs/worker-client.ts
-var G = null, K = 0, q = /* @__PURE__ */ new Map();
-function J() {
+var J = null, Y = 0, X = /* @__PURE__ */ new Map();
+function Z() {
 	if (typeof window > "u" || typeof Worker > "u") return null;
-	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({
+	if (!J) try {
+		J = q();
+		let e = J;
+		J.onmessage = (e) => {
+			let { type: t, id: n, result: r, runTime: i, error: a } = e.data, o = X.get(n);
+			o && (X.delete(n), t === "SOLVE_SUCCESS" ? o.resolve({
 				result: r,
 				runTime: i
 			}) : o.reject(Error(a || "Worker solve failed")));
 		};
 		let t = (t) => {
-			if (G === e) {
-				G = null, e.terminate();
-				for (let e of q.values()) e.reject(t);
-				q.clear();
+			if (J === e) {
+				J = null, e.terminate();
+				for (let e of X.values()) e.reject(t);
+				X.clear();
 			}
 		};
-		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."));
+		J.onerror = (e) => t(/* @__PURE__ */ Error(`[WaSHI] HiGHS Worker failed to load or execute. Check Worker assets, CORS and CSP. ${e?.message || ""}`)), J.onmessageerror = () => t(/* @__PURE__ */ Error("[WaSHI] Could not deserialize the HiGHS Worker response."));
 	} catch {
-		G = null;
+		J = null;
 	}
-	return G;
+	return J;
 }
-async function Y(e, n = {}) {
-	let r = await a(n.wasmUrl), i = n.useWorker ?? typeof window < "u" ? J() : null;
+async function ne(e, n = {}) {
+	let r = await a(n.wasmUrl), i = n.useWorker ?? typeof window < "u" ? Z() : null;
 	if (!i) return t(e, n);
 	let o = {
 		...n,
 		wasmUrl: r
-	}, s = `req_${++K}`;
+	}, s = `req_${++Y}`;
 	return new Promise((t, n) => {
-		q.set(s, {
+		X.set(s, {
 			resolve: t,
 			reject: n
 		});
@@ -796,13 +911,13 @@ async function Y(e, n = {}) {
 				options: o
 			});
 		} catch (e) {
-			q.delete(s), n(e);
+			X.delete(s), n(e);
 		}
 	});
 }
 //#endregion
 //#region src/modeler/solvers/highs/solver.ts
-function X(e) {
+function re(e) {
 	if (typeof e != "string") return "Unknown";
 	let t = e.trim();
 	if (!t) return "Unknown";
@@ -831,7 +946,7 @@ function X(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 Z = class e {
+var Q = class e {
 	static capabilities = {
 		supportsMIP: !0,
 		supportsQP: !0
@@ -847,7 +962,7 @@ var Z = class e {
 		let r = {
 			...this.options,
 			...n
-		}, { lpString: i, nameToVar: a, nameToConstraint: o } = t, { result: s, runTime: c } = await Y(i, r), l = X(s?.Status);
+		}, { lpString: i, nameToVar: a, nameToConstraint: o } = t, { result: s, runTime: c } = await ne(i, r), l = re(s?.Status);
 		if (l === "Infeasible" || l === "Unbounded") return {
 			status: l,
 			objectiveValue: null,
@@ -887,11 +1002,11 @@ var Z = class e {
 			raw: s
 		};
 	}
-}, Q = Z;
-function ne() {
-	B("highs", (e) => new Z(e)), V((e) => new Z(e));
+}, ie = Q;
+function ae() {
+	U("highs", (e) => new Q(e)), W((e) => new Q(e));
 }
-ne();
+ae();
 //#endregion
 //#region src/modeler/solvers/mock.ts
 var $ = class {
@@ -921,13 +1036,13 @@ var $ = class {
 		};
 	}
 };
-function re() {
-	B("mock", (e) => new $(e));
+function oe() {
+	U("mock", (e) => new $(e));
 }
-re();
+oe();
 //#endregion
 //#region src/modeler/model.ts
-var ie = class {
+var se = class {
 	name;
 	sense;
 	objective;
@@ -938,6 +1053,8 @@ var ie = 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;
@@ -949,7 +1066,7 @@ var ie = class {
 		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));
+		} : e, this.name = n.name || "OptimizationModel", this.sense = l(n.sense), this.objective = new C(), n.solver && (this.solver = G(n.solver));
 	}
 	get vars() {
 		return this.variables;
@@ -1017,71 +1134,66 @@ var ie = class {
 	continuous(e, t, n) {
 		return this.createDomainVars("Continuous", e, t, n);
 	}
-	addVar(e, t, n, r) {
-		let i;
-		i = typeof e == "string" ? {
-			name: e,
-			type: t,
-			lb: n,
-			ub: r
-		} : e || {};
-		let a = new 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;
-	}
-	addVars(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, n = t && t.length > 0 ? t : this.getNextBoolVarName("p");
+		if (this.hasVarName(n)) throw Error(`Variable with name '${n}' already exists in model`);
+		let r = new f(n);
+		return this.boolVars.push(r), this.boolVarMapByName.set(r.name, r), r;
+	}
+	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 D({
+			...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) {
-		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);
+		if (e instanceof b) 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" ? M(e, (e) => this.getVarByName(e)) : typeof e == "number" ? new C(/* @__PURE__ */ new Map(), e) : e instanceof S || "terms" in e ? e.clone() : new C(/* @__PURE__ */ new Map([[e, 1]]), 0);
 	}
 	maximize(e) {
 		this.setObjective(e, "Maximize");
@@ -1094,12 +1206,13 @@ var ie = class {
 			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().");
+		if (e instanceof S) 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 C) 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 (e instanceof D || e instanceof f) return e.value;
 		if (Array.isArray(e)) return e.map((e) => this.getValues(e));
 		if (typeof e == "object") {
 			let t = {};
@@ -1108,12 +1221,9 @@ var ie = class {
 		}
 		return null;
 	}
-	addBoolVar(e) {
-		let t = new f(e);
-		return this.boolVars.push(t), t;
-	}
 	addConstraint(e, t) {
-		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 S) 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 C) 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({
@@ -1122,23 +1232,18 @@ var ie = class {
 			}), e;
 		}
 		let n;
-		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`);
+		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`);
 		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 E ? (this.varMapByName.has(e.name) || (this.variables.push(e), this.varMapByName.set(e.name, e)), this) : (this.addConstraint(e, t), 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);
 	}
 	indicator(e, t, n = {}) {
+		if (t instanceof S) 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) {
@@ -1162,11 +1267,8 @@ var ie = class {
 		}
 		return s;
 	}
-	addIndicator(e, t, n = {}) {
-		return this.indicator(e, t, n);
-	}
 	toLpString() {
-		let { lpString: e } = F({
+		let { lpString: e } = R({
 			name: this.name,
 			sense: this.sense,
 			objective: this.objective,
@@ -1177,7 +1279,8 @@ var ie = 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 = 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.`);
+		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 = G(e, t), r = t || {}) : (r = { ...e }, r.solver ? (n = G(r.solver, r), delete r.solver) : n = this.solver || G()), this.objective instanceof S && 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,
@@ -1186,7 +1289,7 @@ var ie = class {
 			variables: this.variables,
 			logicalConstraints: this.logicalConstraints,
 			boolVars: this.boolVars
-		}, a = F(i), o = await n.solve(i, a, r);
+		}, a = R(i), o = await n.solve(i, a, r);
 		this.runTime = o.runTime ?? 0, this.status = o.status, this.objectiveValue = o.objectiveValue ?? null;
 		let s = {}, c = {}, l = {}, u = {};
 		this.values.clear();
@@ -1232,7 +1335,7 @@ var ie = 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 = 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 (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 = G(e, t), r = t || {}) : (r = { ...e }, r.solver ? (n = G(r.solver, r), delete r.solver) : n = this.solver || G()), 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,
@@ -1255,7 +1358,7 @@ var ie = class {
 		}
 		let i = this.objective, a = this.sense;
 		try {
-			this.objective = new S(), this.sense = "Minimize";
+			this.objective = new C(), this.sense = "Minimize";
 			let e = await this.optimize(n, r), t = e === "Optimal" || e === "Feasible", i = e === "Infeasible", a = {};
 			if (t) {
 				for (let e of this.variables) e.value !== null && (a[e.name] = e.value);
@@ -1272,4 +1375,4 @@ var ie = class {
 	}
 };
 //#endregion
-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 };
+export { d as BoolExpr, p as BoolOp, f as BoolVar, b as Constraint, ie as HiGHS, Q as HighsSolver, C as LinExpr, $ as MockSolver, se as Model, c as OFFICIAL_HIGHS_CDN_WASM_URL, S as QuadExpr, D as Var, m as and, F as c, ee as dot, I as expr, R as generateLpString, i as getHighs, o as getHighsWasmUrl, G as getSolver, _ as implies, n as isValidWasmHeader, K as listAvailableSolvers, l as normalizeSense, g as not, h as or, N as parseConstraint, M as parseExpr, e as probeWasmUrl, U as registerSolver, a as resolveBrowserWasmUrl, W as setDefaultSolver, s as setHighsWasmUrl, t as solveLpWithHighs, w as sum, v as xor };