@ohtaman/washi 0.3.0 → 0.4.0

package/dist/lib/washi.js

@@ -76,20 +76,45 @@ var D = 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()");
@@ -113,6 +138,22 @@ var D = 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 = E(t, n);
 		return i.quadTerms.set(a, {
@@ -158,9 +199,27 @@ var D = class e {
 			}
 			return n;
 		}
+		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();
-		Math.abs(this.constant) >= 1e-12 && n.linearTerms.set(t, this.constant);
-		for (let [e, r] of this.terms) n = n.add(D.fromProduct(e, t, r));
+		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) {
@@ -318,13 +377,13 @@ function A(e, t) {
 }
 //#endregion
 //#region src/modeler/variable.ts
-var ie = 0;
-function ae(e) {
+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 j = class e {
+var M = class e {
 	id;
 	name;
 	type;
@@ -333,11 +392,18 @@ var j = class e {
 	value = null;
 	reducedCost = null;
 	constructor(e = {}) {
-		this.id = ++ie, this.name = e.name || `x_${this.id}`, this.type = ae(e.type), this.type === "Binary" ? (this.lb = 0, this.ub = 1) : (this.lb = e.lb === void 0 ? 0 : e.lb, this.ub = e.ub === void 0 ? Infinity : e.ub);
+		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 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) {
@@ -379,7 +445,7 @@ var j = class e {
 };
 //#endregion
 //#region src/modeler/parser.ts
-function M(e) {
+function ae(e) {
 	let t = [], n = 0, r = e.length;
 	for (; n < r;) {
 		let i = e[n];
@@ -395,9 +461,16 @@ function M(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",
@@ -435,7 +508,24 @@ function M(e) {
 	}
 	return t;
 }
-var N = 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;
@@ -456,11 +546,11 @@ var N = 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();
@@ -470,55 +560,81 @@ var N = 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 O(/* @__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 O(/* @__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)`);
+	}
+	getRemainingToken() {
+		return this.peek();
 	}
-	resolveVariable(e) {
+	resolve(e) {
 		let t = this.resolver(e);
 		if (!t) throw Error(`Unknown variable '${e}' in expression`);
 		return t;
 	}
 };
 function P(e, t) {
-	return new N(M(e), t).parseExpression();
+	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 F(e, t, n) {
 	let r = e.match(/(<=|>=|==|=<|=>|=)/);
@@ -529,19 +645,18 @@ function F(e, t, n) {
 	else if (i === "==" || i === "=") c = "==";
 	else throw Error(`Unsupported operator "${i}"`);
 	let l = P(o, t), u = P(s, t);
-	return c === "<=" ? l.le(u, n) : c === ">=" ? l.ge(u, n) : l.eq(u, n);
+	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 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 O) {
-			`${i}`, r += `(${e.toString()})`;
-			for (let [t] of e.terms) n.set(t.name, t);
 		}
 	}
 	return {
@@ -636,8 +751,8 @@ function B(e) {
 }
 //#endregion
 //#region src/modeler/solvers/highs/worker-client.ts
-var V = null, oe = 0, H = /* @__PURE__ */ new Map();
-function se() {
+var V = null, le = 0, H = /* @__PURE__ */ new Map();
+function ue() {
 	if (typeof window > "u" || typeof Worker > "u") return null;
 	if (!V) try {
 		V = ee();
@@ -663,12 +778,12 @@ function se() {
 	return V;
 }
 async function U(e, t = {}) {
-	let n = await _(t.wasmUrl), r = t.useWorker ?? typeof window < "u" ? se() : null;
+	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_${++oe}`;
+	}, a = `req_${++le}`;
 	return new Promise((t, n) => {
 		H.set(a, {
 			resolve: t,
@@ -795,10 +910,10 @@ var J = /* @__PURE__ */ S({
 	solveLp: () => U,
 	solveLpWithHighs: () => m
 });
-import * as ce from "./highs-worker-factory.js";
-w(J, ce);
-import * as le from "./highs-assets.js";
-w(J, le);
+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 Y = /* @__PURE__ */ S({
@@ -887,6 +1002,8 @@ var $ = 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;
@@ -966,65 +1083,60 @@ var $ = class {
 	continuous(e, t, n) {
 		return this.createDomainVars("Continuous", e, t, n);
 	}
-	addVar(e, t, n, r) {
-		let i;
-		i = typeof e == "string" ? {
-			name: e,
-			type: t,
-			lb: n,
-			ub: r
-		} : e || {};
-		let a = new j(i);
-		if (this.varMapByName.has(a.name)) throw Error(`Variable with name '${a.name}' already exists in model`);
-		return this.variables.push(a), this.varMapByName.set(a.name, a), a;
-	}
-	addVars(e, t, n) {
+	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);
 	}
@@ -1043,12 +1155,13 @@ var $ = class {
 			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 j) return e.value;
+		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 = {};
@@ -1057,11 +1170,8 @@ var $ = class {
 		}
 		return null;
 	}
-	addBoolVar(e) {
-		let t = new n(e);
-		return this.boolVars.push(t), t;
-	}
 	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}`;
@@ -1074,20 +1184,15 @@ var $ = class {
 		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);
+		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) {
@@ -1111,9 +1216,6 @@ var $ = class {
 		}
 		return s;
 	}
-	addIndicator(e, t, n = {}) {
-		return this.indicator(e, t, n);
-	}
 	toLpString() {
 		let { lpString: e } = B({
 			name: this.name,
@@ -1127,6 +1229,7 @@ var $ = 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 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,
@@ -1232,7 +1335,7 @@ w(/* @__PURE__ */ S({
 	Model: () => $,
 	OFFICIAL_HIGHS_CDN_WASM_URL: () => b,
 	QuadExpr: () => D,
-	Var: () => j,
+	Var: () => M,
 	and: () => e,
 	c: () => L,
 	dot: () => A,
@@ -1262,4 +1365,4 @@ w(/* @__PURE__ */ S({
 	xor: () => r
 }), Q);
 //#endregion
-export { i as BoolExpr, o as BoolOp, n as BoolVar, c as Constraint, K as HiGHS, G as HighsSolver, O as LinExpr, X as MockSolver, $ as Model, b as OFFICIAL_HIGHS_CDN_WASM_URL, D as QuadExpr, j as Var, e as and, L as c, A as dot, R as expr, B as generateLpString, g as getHighs, v as getHighsWasmUrl, f as getSolver, a as implies, h as isValidWasmHeader, u as listAvailableSolvers, T as normalizeSense, s as not, t as or, F as parseConstraint, P as parseExpr, p as probeWasmUrl, d as registerSolver, _ as resolveBrowserWasmUrl, l as setDefaultSolver, y as setHighsWasmUrl, m as solveLpWithHighs, k as sum, r as xor };
+export { 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 };

package/dist/types/modeler/expression.d.ts

@@ -1,4 +1,4 @@
-import type { Var } from "./variable.js";
+import { Var } from "./variable.js";
 import { Constraint } from "./constraint.js";
 import { QuadExpr } from "./quad-expr.js";
 /**
@@ -17,16 +17,21 @@ export declare class LinExpr {
      */
     add(other: QuadExpr): QuadExpr;
     add(other: LinExpr | Var | number): LinExpr;
+    add(other: QuadExpr | LinExpr | Var | number): LinExpr | QuadExpr;
     /**
      * Subtract another expression, variable, or number
      */
     sub(other: QuadExpr): QuadExpr;
     sub(other: LinExpr | Var | number): LinExpr;
+    sub(other: QuadExpr | LinExpr | Var | number): LinExpr | QuadExpr;
     /**
-     * Multiply this expression by a scalar coefficient or variable
+     * Multiply this expression by a scalar coefficient, variable, or expression
      */
     mul(scalar: number): LinExpr;
     mul(v: Var): QuadExpr;
+    mul(other: LinExpr): LinExpr | QuadExpr;
+    mul(other: QuadExpr): QuadExpr;
+    mul(operand: number | Var | LinExpr | QuadExpr): LinExpr | QuadExpr;
     /**
      * Divide this expression by a non-zero scalar
      */

package/dist/types/modeler/expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../../src/modeler/expression.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../../src/modeler/expression.ts"],"names":[],"mappings":"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"}