@ohtaman/washi 0.3.0 → 0.5.0

package/dist/browser/washi.js

@@ -1,97 +1,176 @@
-import { a as e, c as t, i as n, l as r, n as i, o as a, r as o, s, t as c } from "./loader-CVt4CloI.js";
+import { a as e, i as t, n, o as r, r as i, t as a } from "./loader-CtaDHef_.js";
 //#region src/modeler/types.ts
-function l(e) {
-	return e && e.toLowerCase() === "maximize" ? "Maximize" : "Minimize";
+function o(e) {
+	if (e === void 0) return "Minimize";
+	if (typeof e == "string") {
+		let t = e.toLowerCase();
+		if (t === "maximize") return "Maximize";
+		if (t === "minimize") return "Minimize";
+	}
+	throw Error(`Invalid optimization sense "${String(e)}": expected "Maximize", "Minimize", "maximize", or "minimize".`);
 }
 //#endregion
 //#region src/modeler/boolean-expr.ts
-var u = 0, d = class {
+var s = 0;
+function c(e, t) {
+	if (e instanceof l || e instanceof v) return e;
+	throw typeof e == "object" && e && ("terms" in e || "quadTerms" in e) ? Error(`Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical operator "${t}". Use a comparison constraint such as expr\`\${x} <= 10\` or a BoolVar/BoolExpr.`) : Error(`Invalid operand passed to logical operator "${t}": expected a BoolVar, BoolExpr, or Constraint.`);
+}
+var l = class {
 	and(e) {
-		return new p("and", [this, e]);
+		return new d("and", [this, c(e, "and")]);
 	}
 	or(e) {
-		return new p("or", [this, e]);
+		return new d("or", [this, c(e, "or")]);
 	}
 	implies(e) {
-		return new p("implies", [this, e]);
+		return new d("implies", [this, c(e, "implies")]);
 	}
 	xor(e) {
-		return new p("xor", [this, e]);
+		return new d("xor", [this, c(e, "xor")]);
 	}
 	not() {
-		return new p("not", [this]);
+		return new d("not", [this]);
 	}
-}, f = class extends d {
+}, u = class extends l {
 	id;
 	name;
 	value = null;
 	constructor(e) {
-		super(), this.id = ++u, this.name = e || `p_${this.id}`;
+		super(), this.id = ++s, this.name = e || `p_${this.id}`;
 	}
 	toString() {
 		return this.name;
 	}
-}, p = class extends d {
+}, d = class extends l {
 	op;
 	children;
 	constructor(e, t) {
-		super(), this.op = e, this.children = t;
+		super(), this.op = e, this.children = t.map((t) => c(t, e));
 	}
 	toString() {
 		return this.op === "not" ? `not(${this.children[0].toString()})` : `(${this.children.map((e) => e.toString()).join(` ${this.op} `)})`;
 	}
 };
-function m(...e) {
+function f(...e) {
 	if (e.length === 0) throw Error("and() requires at least one expression");
-	return new p("and", e);
+	return new d("and", e);
 }
-function h(...e) {
+function p(...e) {
 	if (e.length === 0) throw Error("or() requires at least one expression");
-	return new p("or", e);
+	return new d("or", e);
 }
-function g(e) {
-	return new p("not", [e]);
+function m(e) {
+	return new d("not", [e]);
 }
-function _(e, t) {
-	return new p("implies", [e, t]);
+function h(e, t) {
+	return new d("implies", [e, t]);
 }
-function v(...e) {
+function g(...e) {
 	if (e.length === 0) throw Error("xor() requires at least one expression");
-	return new p("xor", e);
+	return new d("xor", e);
 }
 //#endregion
 //#region src/modeler/constraint.ts
-var ee = 0, y = class {
+var _ = 0, v = class e {
+	kind = "constraint";
 	id;
-	lhs;
-	sense;
-	rhs;
-	name;
+	_lhs;
+	_sense;
+	_rhs;
+	_name;
+	hasExplicitName;
+	ownerModel = null;
 	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 = ++_, this._lhs = e, this._sense = t, this._rhs = n;
+		let i = typeof r == "string" ? r.trim() : void 0;
+		i && i.length > 0 ? (this._name = i, this.hasExplicitName = !0) : (this._name = `c_${this.id}`, this.hasExplicitName = !1);
+	}
+	get lhs() {
+		return this._lhs;
+	}
+	set lhs(e) {
+		this._lhs !== e && (this._lhs = e, this.ownerModel?.notifyMutation?.());
+	}
+	get sense() {
+		return this._sense;
+	}
+	set sense(e) {
+		this._sense !== e && (this._sense = e, this.ownerModel?.notifyMutation?.());
+	}
+	get rhs() {
+		return this._rhs;
+	}
+	set rhs(e) {
+		Object.is(this._rhs, e) || (this._rhs = e, this.ownerModel?.notifyMutation?.());
+	}
+	get name() {
+		return this._name;
+	}
+	set name(e) {
+		this._name !== e && (this._name = e, this.ownerModel?.notifyMutation?.()), this.hasExplicitName = !0;
+	}
+	_assignModelName(e, t) {
+		this._name = e, this.hasExplicitName = t;
 	}
 	and(e) {
-		return new p("and", [this, e]);
+		return new d("and", [this, e]);
 	}
 	or(e) {
-		return new p("or", [this, e]);
+		return new d("or", [this, e]);
 	}
 	implies(e) {
-		return new p("implies", [this, e]);
+		return new d("implies", [this, e]);
 	}
 	xor(e) {
-		return new p("xor", [this, e]);
+		return new d("xor", [this, e]);
 	}
 	not() {
-		return new p("not", [this]);
+		return new d("not", [this]);
+	}
+	add(e) {
+		throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+	}
+	sub(e) {
+		throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+	}
+	mul(e) {
+		throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+	}
+	div(e) {
+		throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+	}
+	neg() {
+		throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+	}
+	le(e, t) {
+		throw Error("Cannot compare a Constraint in (<=): expected a number, Var, or LinExpr.");
+	}
+	ge(e, t) {
+		throw Error("Cannot compare a Constraint in (>=): expected a number, Var, or LinExpr.");
+	}
+	eq(e, t) {
+		throw Error("Cannot compare a Constraint in (==): expected a number, Var, or LinExpr.");
+	}
+	get value() {
+		throw Error("Cannot read numeric value of a Constraint: expected a Var, LinExpr, or QuadExpr.");
+	}
+	get constant() {
+		throw Error("Cannot read numeric constant of a Constraint: expected a LinExpr or QuadExpr.");
+	}
+	clone() {
+		return new e(this._lhs.clone(), this._sense, this._rhs, this.hasExplicitName ? this._name : void 0);
 	}
 	toString() {
 		let e = this.sense === "==" ? "=" : this.sense;
 		return `${this.name}: ${this.lhs.toString()} ${e} ${this.rhs}`;
 	}
 };
+function y(e) {
+	return e instanceof v || typeof e == "object" && !!e && "sense" in e && "lhs" in e && "rhs" in e;
+}
 //#endregion
 //#region src/modeler/quad-expr.ts
 function b(e, t) {
@@ -99,6 +178,7 @@ function b(e, t) {
 	return n <= r ? `${n}:${r}` : `${r}:${n}`;
 }
 var x = class e {
+	kind = "quadratic";
 	linearTerms;
 	quadTerms;
 	constant;
@@ -115,55 +195,72 @@ var x = class e {
 		return r ? r.coeff : 0;
 	}
 	add(t) {
+		if (y(t)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
 		let n = this.clone();
 		if (typeof t == "number") return n.constant += t, n;
 		if (t instanceof e) {
 			for (let [e, r] of t.quadTerms) {
 				let t = n.quadTerms.get(e), i = (t ? t.coeff : 0) + r.coeff;
-				Math.abs(i) < 1e-12 ? n.quadTerms.delete(e) : n.quadTerms.set(e, {
+				i === 0 ? n.quadTerms.delete(e) : n.quadTerms.set(e, {
 					var1: r.var1,
 					var2: r.var2,
 					coeff: i
 				});
 			}
 			for (let [e, r] of t.linearTerms) {
-				let t = (n.linearTerms.get(e) || 0) + r;
-				Math.abs(t) < 1e-12 ? n.linearTerms.delete(e) : n.linearTerms.set(e, t);
+				let t = (n.linearTerms.get(e) ?? 0) + r;
+				t === 0 ? n.linearTerms.delete(e) : n.linearTerms.set(e, t);
 			}
 			return n.constant += t.constant, n;
 		}
 		if ("terms" in t && t.terms instanceof Map) {
 			for (let [e, r] of t.terms) {
-				let t = (n.linearTerms.get(e) || 0) + r;
-				Math.abs(t) < 1e-12 ? n.linearTerms.delete(e) : n.linearTerms.set(e, t);
+				let t = (n.linearTerms.get(e) ?? 0) + r;
+				t === 0 ? n.linearTerms.delete(e) : n.linearTerms.set(e, t);
 			}
 			return n.constant += t.constant, n;
 		}
-		let r = t, i = (n.linearTerms.get(r) || 0) + 1;
-		return Math.abs(i) < 1e-12 ? n.linearTerms.delete(r) : n.linearTerms.set(r, i), n;
+		let r = t, i = (n.linearTerms.get(r) ?? 0) + 1;
+		return i === 0 ? n.linearTerms.delete(r) : n.linearTerms.set(r, i), n;
 	}
-	sub(t) {
-		return typeof t == "number" ? this.add(-t) : t instanceof e ? this.add(t.neg()) : ("terms" in t && t.terms instanceof Map, this.add(t.mul(-1)));
+	sub(e) {
+		if (y(e)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+		return typeof e == "number" ? this.add(-e) : this.add(e.mul(-1));
 	}
 	mul(t) {
-		let n = new e(/* @__PURE__ */ new Map(), /* @__PURE__ */ new Map(), this.constant * t);
-		for (let [e, r] of this.linearTerms) {
-			let i = r * t;
-			Math.abs(i) >= 1e-12 && n.linearTerms.set(e, i);
-		}
-		for (let [e, r] of this.quadTerms) {
-			let i = r.coeff * t;
-			Math.abs(i) >= 1e-12 && n.quadTerms.set(e, {
-				var1: r.var1,
-				var2: r.var2,
-				coeff: i
-			});
+		if (y(t)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+		if (typeof t == "number") {
+			let n = this.linearTerms.size > 0 || this.quadTerms.size > 0, r = this.constant === 0 && n ? 0 : this.constant * t;
+			if (this.constant !== 0 && t !== 0 && r === 0) throw Error("Constant multiplication underflows to zero.");
+			let i = new e(/* @__PURE__ */ new Map(), /* @__PURE__ */ new Map(), r);
+			for (let [e, n] of this.linearTerms) {
+				let r = n * t;
+				if (n !== 0 && t !== 0 && r === 0) throw Error("Coefficient multiplication underflows to zero.");
+				r !== 0 && i.linearTerms.set(e, r);
+			}
+			for (let [e, n] of this.quadTerms) {
+				let r = n.coeff * t;
+				if (n.coeff !== 0 && t !== 0 && r === 0) throw Error("Coefficient multiplication underflows to zero.");
+				r !== 0 && i.quadTerms.set(e, {
+					var1: n.var1,
+					var2: n.var2,
+					coeff: r
+				});
+			}
+			return i;
 		}
-		return n;
+		let n = "id" in t && "name" in t && !("terms" in t) && !("quadTerms" in t), r = "quadTerms" in t ? t.quadTerms.size : 0, i = n ? /* @__PURE__ */ new Map([[t, 1]]) : "quadTerms" in t ? t.linearTerms : t.terms, a = n ? 0 : t.constant;
+		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(a);
+		if (this.quadTerms.size === 0 && this.linearTerms.size === 0 && !n) {
+			let n = t.mul(this.constant);
+			return "quadTerms" in n ? n : new e(n.terms, /* @__PURE__ */ new Map(), n.constant);
+		}
+		return e.multiplyLinearTerms(this.constant, this.linearTerms, a, i);
 	}
-	div(e) {
-		if (Math.abs(e) < 1e-12) throw Error("Division by zero in QuadExpr.div()");
-		return this.mul(1 / e);
+	div(t) {
+		let n = e.extractScalarDivisor(t, "QuadExpr.div()");
+		return this.mul(1 / n);
 	}
 	neg() {
 		return this.mul(-1);
@@ -180,18 +277,96 @@ var x = class e {
 		}
 		return e;
 	}
-	getValue() {
-		return this.value;
+	le(e, t) {
+		return this.toConstraint("<=", e, t);
+	}
+	ge(e, t) {
+		return this.toConstraint(">=", e, t);
+	}
+	eq(e, t) {
+		return this.toConstraint("==", e, t);
+	}
+	toConstraint(e, t, n) {
+		if (this.quadTerms.size > 0) throw Error(`Quadratic expressions are not supported in linear constraints (${e}): quadratic terms are only allowed in objectives.`);
+		let r = new S(this.linearTerms, this.constant);
+		return e === "<=" ? r.le(t, n) : e === ">=" ? r.ge(t, n) : r.eq(t, n);
+	}
+	and(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'and': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	or(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'or': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	implies(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'implies': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	xor(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'xor': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	not() {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'not': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	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();
+		if (r === 0) return i;
+		let a = b(t, n);
 		return i.quadTerms.set(a, {
 			var1: t.id <= n.id ? t : n,
 			var2: t.id <= n.id ? n : t,
 			coeff: r
 		}), i;
 	}
+	static multiplyLinearTerms(t, n, r, i) {
+		let a = n.size > 0 || i.size > 0, o = (t === 0 || r === 0) && a ? 0 : t * r;
+		if (t !== 0 && r !== 0 && o === 0) throw Error("Constant multiplication underflows to zero.");
+		let s = new e(/* @__PURE__ */ new Map(), /* @__PURE__ */ new Map(), o === 0 ? 0 : o);
+		if (r !== 0) for (let [e, t] of n) {
+			let n = t * r;
+			if (t !== 0 && n === 0) throw Error("Coefficient multiplication underflows to zero.");
+			n !== 0 && s.linearTerms.set(e, n);
+		}
+		if (t !== 0) for (let [e, n] of i) {
+			let r = s.linearTerms.get(e) ?? 0, i = n * t;
+			if (n !== 0 && i === 0) throw Error("Coefficient multiplication underflows to zero.");
+			let a = r + i;
+			a === 0 ? s.linearTerms.delete(e) : s.linearTerms.set(e, a);
+		}
+		for (let [t, r] of n) for (let [n, a] of i) {
+			let i = r * a;
+			if (r !== 0 && a !== 0 && i === 0) throw Error("Coefficient multiplication underflows to zero.");
+			s = s.add(e.fromProduct(t, n, i));
+		}
+		return s;
+	}
+	static extractScalarDivisor(e, t) {
+		if (y(e)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+		if (typeof e == "number") {
+			if (e === 0) throw Error(`Division by zero in ${t}`);
+			return e;
+		}
+		let n = "quadTerms" in e ? e.linearTerms.size : e.terms.size, r = "quadTerms" in e ? e.quadTerms.size : 0;
+		if (n > 0 || r > 0) throw Error("Cannot divide by variable in expression");
+		if (e.constant === 0) throw Error(`Division by zero in ${t}`);
+		return e.constant;
+	}
 }, S = class e {
+	kind = "linear";
 	terms;
 	constant;
 	constructor(e = /* @__PURE__ */ new Map(), t = 0) {
@@ -201,41 +376,44 @@ var x = class e {
 		return new e(this.terms, this.constant);
 	}
 	add(e) {
+		if (y(e)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
 		if (e instanceof x) return e.add(this);
 		let t = this.clone();
 		if (typeof e == "number") t.constant += e;
 		else if ("terms" in e) {
 			for (let [n, r] of e.terms) {
-				let e = (t.terms.get(n) || 0) + r;
-				Math.abs(e) < 1e-12 ? t.terms.delete(n) : t.terms.set(n, e);
+				let e = (t.terms.get(n) ?? 0) + r;
+				e === 0 ? t.terms.delete(n) : t.terms.set(n, e);
 			}
 			t.constant += e.constant;
 		} else {
-			let n = (t.terms.get(e) || 0) + 1;
-			Math.abs(n) < 1e-12 ? t.terms.delete(e) : t.terms.set(e, n);
+			let n = (t.terms.get(e) ?? 0) + 1;
+			n === 0 ? t.terms.delete(e) : t.terms.set(e, n);
 		}
 		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)));
+		if (y(e)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
+		return e instanceof x ? e.neg().add(this) : typeof e == "number" ? this.add(-e) : this.add(e.mul(-1));
 	}
 	mul(t) {
+		if (y(t)) throw Error("Cannot perform arithmetic on a Constraint: expected a number, Var, LinExpr, or QuadExpr.");
 		if (typeof t == "number") {
-			let n = new e(/* @__PURE__ */ new Map(), this.constant * t);
-			for (let [e, r] of this.terms) {
-				let i = r * t;
-				Math.abs(i) >= 1e-12 && n.terms.set(e, i);
+			let n = this.constant === 0 && this.terms.size > 0 ? 0 : this.constant * t;
+			if (this.constant !== 0 && t !== 0 && n === 0) throw Error("Constant multiplication underflows to zero.");
+			let r = new e(/* @__PURE__ */ new Map(), n);
+			for (let [e, n] of this.terms) {
+				let i = n * t;
+				if (n !== 0 && t !== 0 && i === 0) throw Error("Coefficient multiplication underflows to zero.");
+				i !== 0 && r.terms.set(e, i);
 			}
-			return n;
+			return r;
 		}
-		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));
-		return n;
+		return t instanceof N || typeof t == "object" && t && "id" in t && !("terms" in t) && !("quadTerms" in t) ? x.multiplyLinearTerms(this.constant, this.terms, 0, /* @__PURE__ */ new Map([[t, 1]])) : t instanceof x ? this.terms.size === 0 ? t.mul(this.constant) : new x(this.terms, /* @__PURE__ */ new Map(), this.constant).mul(t) : this.terms.size === 0 ? t.mul(this.constant) : t.terms.size === 0 ? this.mul(t.constant) : x.multiplyLinearTerms(this.constant, this.terms, t.constant, t.terms);
 	}
 	div(e) {
-		if (Math.abs(e) < 1e-12) throw Error("Division by zero in LinExpr.div()");
-		return this.mul(1 / e);
+		let t = x.extractScalarDivisor(e, "LinExpr.div()");
+		return this.mul(1 / t);
 	}
 	neg() {
 		return this.mul(-1);
@@ -248,32 +426,41 @@ var x = class e {
 		}
 		return e;
 	}
-	getValue() {
-		return this.value;
-	}
 	le(e, t) {
 		return this.toConstraint("<=", e, t);
 	}
-	lessThanOrEqual(e, t) {
-		return this.le(e, t);
-	}
 	ge(e, t) {
 		return this.toConstraint(">=", e, t);
 	}
-	greaterThanOrEqual(e, t) {
-		return this.ge(e, t);
-	}
 	eq(e, t) {
 		return this.toConstraint("==", e, t);
 	}
-	equalTo(e, t) {
-		return this.eq(e, t);
-	}
 	toConstraint(t, n, r) {
 		let i = this.clone(), a = 0;
-		typeof n == "number" ? a = n : "terms" in n ? (i = i.sub(new e(n.terms, 0)), a = n.constant) : i = i.sub(n);
+		if (typeof n == "number") a = n;
+		else if (n instanceof v || typeof n == "object" && n && "sense" in n && "lhs" in n) throw Error(`Cannot compare against a Constraint in (${t}): expected a number, Var, or LinExpr.`);
+		else if (n instanceof x || typeof n == "object" && n && "quadTerms" in n) {
+			let r = n;
+			if (r.quadTerms.size > 0) throw Error(`Quadratic expressions are not supported in linear constraints (${t}): quadratic terms are only allowed in objectives.`);
+			i = i.sub(new e(r.linearTerms, 0)), a = r.constant;
+		} else "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 v(i, t, o, r);
+	}
+	and(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'and': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	or(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'or': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	implies(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'implies': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	xor(e) {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'xor': expected a BoolVar, Constraint, or BoolOp.");
+	}
+	not() {
+		throw Error("Cannot use an arithmetic expression without a comparison operator (<=, >=, ==) in logical 'not': expected a BoolVar, Constraint, or BoolOp.");
 	}
 	toString() {
 		let e = [], t = !0;
@@ -293,17 +480,26 @@ function C(e, t) {
 	function i(e) {
 		if (e != null) {
 			if (typeof e == "number") r += e;
-			else if (typeof e == "object" && "terms" in e) {
+			else if (e instanceof v || typeof e == "object" && "sense" in e && "lhs" in e && "rhs" in e) throw Error("Cannot sum a constraint comparison (<=, >=, ==) in sum(): expected a number, Var, or LinExpr.");
+			else if (e instanceof x || typeof e == "object" && "quadTerms" in e && e.quadTerms instanceof Map) {
+				let t = e;
+				if (t.quadTerms.size > 0) throw Error("Quadratic expressions are not supported in sum(): sum() produces a linear expression (LinExpr).");
+				for (let [e, r] of t.linearTerms) {
+					let t = n.get(e) ?? 0;
+					n.set(e, t + r);
+				}
+				r += t.constant;
+			} else if (typeof e == "object" && "terms" in e) {
 				let t = e;
 				for (let [e, r] of t.terms) {
-					let t = n.get(e) || 0;
+					let t = n.get(e) ?? 0;
 					n.set(e, t + r);
 				}
 				r += t.constant;
-			} else {
-				let t = e, r = n.get(t) || 0;
+			} else if (typeof e == "object" && "id" in e && "name" in e && "lb" in e && "ub" in e) {
+				let t = e, r = n.get(t) ?? 0;
 				n.set(t, r + 1);
-			}
+			} else throw Error("Unsupported item in sum(): expected a number, Var, or LinExpr.");
 		}
 	}
 	if (typeof e == "number") {
@@ -313,41 +509,55 @@ function C(e, t) {
 		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);
+	for (let [e, t] of n) t === 0 && n.delete(e);
 	return new S(n, r);
 }
 function w(e, t) {
 	let n = /* @__PURE__ */ new Map(), r = 0;
 	function i(e) {
-		return typeof e == "object" && !!e && typeof e.id == "number" && typeof e.name == "string" && typeof e.mul == "function" && typeof e.le == "function";
+		return typeof e == "object" && !!e && !(e instanceof v) && typeof e.id == "number" && typeof e.name == "string" && typeof e.lb == "number" && typeof e.ub == "number" && typeof e.type == "string" && typeof e.mul == "function" && typeof e.le == "function";
 	}
 	function a(e) {
 		return i(e) || e instanceof S || e instanceof x;
 	}
-	function o(e, t) {
-		if (typeof t == "number") r += e * t;
-		else if (t instanceof S) {
+	function o(e, t, a) {
+		if (!Number.isFinite(e)) throw Error(`Invalid non-finite coefficient "${e}" in dot() at '${a || "root"}'.`);
+		if (t instanceof x) throw Error(`Quadratic expressions are not supported in dot() at '${a || "root"}': dot() produces a linear expression (LinExpr).`);
+		if (t instanceof S) {
+			if (!Number.isFinite(t.constant)) throw Error(`Invalid non-finite constant "${t.constant}" in dot() at '${a || "root"}'.`);
+			let i = e === 0 || t.constant === 0 ? 0 : e * t.constant;
+			if (e !== 0 && t.constant !== 0 && i === 0) throw Error("Constant multiplication underflows to zero.");
+			if (!Number.isFinite(i)) throw Error(`Coefficient multiplication overflows finite floating-point range in dot() at '${a || "root"}'.`);
+			let o = r + i;
+			if (!Number.isFinite(o)) throw Error(`Constant accumulation overflows finite floating-point range in dot() at '${a || "root"}'.`);
+			r = o;
 			for (let [r, i] of t.terms) {
-				let t = n.get(r) || 0;
-				n.set(r, t + e * i);
+				if (!Number.isFinite(i)) throw Error(`Invalid non-finite coefficient "${i}" in dot() at '${a || "root"}'.`);
+				let t = e * i;
+				if (e !== 0 && i !== 0 && t === 0) throw Error("Coefficient multiplication underflows to zero.");
+				if (!Number.isFinite(t)) throw Error(`Coefficient multiplication overflows finite floating-point range in dot() at '${a || "root"}'.`);
+				let o = (n.get(r) ?? 0) + t;
+				if (!Number.isFinite(o)) throw Error(`Coefficient accumulation overflows finite floating-point range in dot() at '${a || "root"}'.`);
+				n.set(r, o);
 			}
-			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().");
+			let r = t, i = (n.get(r) ?? 0) + e;
+			if (!Number.isFinite(i)) throw Error(`Coefficient accumulation overflows finite floating-point range in dot() at '${a || "root"}'.`);
+			n.set(r, i);
+		} else throw Error(`Cannot multiply number by non-variable/expression operand in dot() at '${a || "root"}'.`);
 	}
 	function s(e) {
-		return typeof e == "object" && !!e && !Array.isArray(e) && !a(e);
+		return typeof e == "object" && !!e && !Array.isArray(e) && !a(e) && !(e instanceof v) && e.kind !== "constraint";
 	}
 	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" && typeof t == "number") throw Error(`Cannot multiply two numbers in dot() at '${n || "root"}': expected one numeric coefficient and one Var or LinExpr.`);
 		if (typeof e == "number") {
-			o(e, t);
+			o(e, t, n);
 			return;
 		}
 		if (typeof t == "number") {
-			o(t, e);
+			o(t, e, n);
 			return;
 		}
 		if (Array.isArray(e) || Array.isArray(t)) {
@@ -358,21 +568,22 @@ function w(e, t) {
 			}
 			let r = Array.isArray(e) ? e : t, i = Array.isArray(e) ? t : e;
 			if (s(i)) {
+				if (Object.getOwnPropertySymbols(i).length > 0) throw Error(`Symbol keys are not supported in dot() at '${n || "root"}'.`);
 				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.`);
+				if (a.length === r.length && a.every((e) => /^(?:0|[1-9]\d*)$/.test(e))) {
+					let a = [];
+					for (let e = 0; e < r.length; e++) Object.prototype.hasOwnProperty.call(i, e) || a.push(e);
+					if (a.length > 0) throw Error(`Key mismatch in dot() at '${n || "root"}': missing indices [${a.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 a.length > 0 && a.every((e) => /^(?:0|[1-9]\d*)$/.test(e)) ? Error(`Array length mismatch in dot() at '${n || "root"}': array has length ${r.length}, but object has ${a.length} indices.`) : 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 (Object.getOwnPropertySymbols(e).length > 0 || Object.getOwnPropertySymbols(t).length > 0) throw Error(`Symbol keys are not supported in dot() at '${n || "root"}'.`);
+			let r = Object.keys(e), i = Object.keys(t), a = r.filter((e) => !Object.prototype.hasOwnProperty.call(t, e)), o = i.filter((t) => !Object.prototype.hasOwnProperty.call(e, t));
 			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("; ")}.`);
@@ -383,38 +594,207 @@ function w(e, t) {
 		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);
+	for (let [e, t] of n) t === 0 && n.delete(e);
 	return new S(n, r);
 }
 //#endregion
+//#region src/modeler/validation.ts
+var T = /* @__PURE__ */ new WeakMap(), E = /* @__PURE__ */ new WeakMap(), D = /* @__PURE__ */ new WeakMap();
+function O(e, t, n) {
+	if (e instanceof d) for (let r of e.children) O(r, t, n);
+	else if (e instanceof v) {
+		let r = e.ownerModel, i = E.get(e);
+		(r !== t || i !== t) && (n && n.push(() => {
+			e.ownerModel = r, i ? E.set(e, i) : E.delete(e);
+		}), e.ownerModel = t, E.set(e, t));
+	}
+}
+function k(e, t) {
+	let n = T.get(e);
+	if (n && n !== t) throw Error(`Variable "${e.name}" already belongs to model "${n.name}" and cannot be added to model "${t.name}".`);
+	T.set(e, t);
+}
+function ee(e, t) {
+	let n = D.get(e);
+	if (n) throw Error(n === t ? `Constraint "${e.name}" is already registered in model "${t.name}".` : `Constraint "${e.name}" already belongs to model "${n.name}" and cannot be added to model "${t.name}".`);
+	let r = E.get(e);
+	if (r && r !== t) throw Error(`Constraint "${e.name}" already belongs to model "${r.name}" and cannot be added to model "${t.name}".`);
+	return D.set(e, t), E.set(e, t), r;
+}
+function te(e, t) {
+	T.get(e) === t && T.delete(e);
+}
+function ne(e, t, n) {
+	D.get(e) === t && D.delete(e), E.get(e) === t && (n ? E.set(e, n) : E.delete(e));
+}
+var re = 1e-6;
+function A(e) {
+	if (typeof e.lb != "number" || Number.isNaN(e.lb)) throw Error(`Variable "${e.name}" has invalid lower bound: ${e.lb} (NaN or non-numeric bound is not allowed).`);
+	if (e.lb === Infinity) throw Error(`Variable "${e.name}" has invalid lower bound: +Infinity is not allowed as a lower bound.`);
+	if (typeof e.ub != "number" || Number.isNaN(e.ub)) throw Error(`Variable "${e.name}" has invalid upper bound: ${e.ub} (NaN or non-numeric bound is not allowed).`);
+	if (e.ub === -Infinity) throw Error(`Variable "${e.name}" has invalid upper bound: -Infinity is not allowed as an upper bound.`);
+	if (e.lb > e.ub) throw Error(`Variable "${e.name}" has invalid bounds: lower bound (${e.lb}) is strictly greater than upper bound (${e.ub}).`);
+	if (e.initialValue !== void 0) {
+		if (typeof e.initialValue != "number" || !Number.isFinite(e.initialValue)) throw Error(`Variable "${e.name}" has invalid initialValue: ${String(e.initialValue)} (initialValue must be a finite number).`);
+		let t = e.type === "Binary" ? Math.max(0, e.lb) : e.lb, n = e.type === "Binary" ? Math.min(1, e.ub) : e.ub;
+		if (e.initialValue < t - 1e-6 || e.initialValue > n + 1e-6) throw Error(`Variable "${e.name}" has initialValue (${e.initialValue}) outside its bounds [${t}, ${n}] (tolerance ${re}).`);
+		if (e.type === "Integer" || e.type === "Binary") {
+			let r = Math.round(e.initialValue);
+			if (Math.abs(e.initialValue - r) > 1e-6 || r < t || r > n) throw Error(`Variable "${e.name}" of type "${e.type}" has non-integral or out-of-domain initialValue: ${e.initialValue} (must be within ${re} of an integer in [${t}, ${n}]).`);
+		}
+	}
+}
+function ie(e) {
+	if (e.initialValue === void 0) return;
+	if (A(e), e.type === "Integer" || e.type === "Binary") {
+		let t = Math.round(e.initialValue);
+		return Object.is(t, -0) ? 0 : t;
+	}
+	let t = Math.min(e.ub, Math.max(e.lb, e.initialValue));
+	return Object.is(t, -0) ? 0 : t;
+}
+function ae(e, t, n) {
+	if (e instanceof x) {
+		if (!Number.isFinite(e.constant)) throw Error(`Objective function has invalid constant: ${e.constant}. Constant must be a finite number.`);
+		for (let [r, i] of e.linearTerms) {
+			if (!n(r)) throw Error(`Variable "${r.name}" in objective function does not belong to model "${t}". All variables must belong to the model by object identity.`);
+			if (!Number.isFinite(i)) throw Error(`Variable "${r.name}" in objective function has invalid coefficient: ${i}. Coefficients must be finite numbers.`);
+		}
+		for (let [, r] of e.quadTerms) {
+			if (!n(r.var1)) throw Error(`Variable "${r.var1.name}" in quadratic objective function does not belong to model "${t}". All variables must belong to the model by object identity.`);
+			if (!n(r.var2)) throw Error(`Variable "${r.var2.name}" in quadratic objective function does not belong to model "${t}". All variables must belong to the model by object identity.`);
+			if (!Number.isFinite(r.coeff) || !Number.isFinite(r.coeff * 2)) throw Error(`Quadratic term (${r.var1.name} * ${r.var2.name}) in objective function has invalid coefficient: ${r.coeff}.`);
+		}
+	} else if ("terms" in e) {
+		if (!Number.isFinite(e.constant)) throw Error(`Objective function has invalid constant: ${e.constant}. Constant must be a finite number.`);
+		for (let [r, i] of e.terms) {
+			if (!n(r)) throw Error(`Variable "${r.name}" in objective function does not belong to model "${t}". All variables must belong to the model by object identity.`);
+			if (!Number.isFinite(i)) throw Error(`Variable "${r.name}" in objective function has invalid coefficient: ${i}. Coefficients must be finite numbers.`);
+		}
+	}
+}
+function j(e, t, n, r = e.name) {
+	if (!Number.isFinite(e.rhs)) throw Error(`Constraint "${r}" has invalid right-hand side (RHS): ${e.rhs}. RHS must be a finite number.`);
+	if (e.lhs.constant !== void 0 && !Number.isFinite(e.lhs.constant)) throw Error(`Constraint "${r}" has invalid LHS constant: ${e.lhs.constant}. Constant must be a finite number.`);
+	for (let [i, a] of e.lhs.terms) {
+		if (!n(i)) throw Error(`Variable "${i.name}" in constraint "${r}" does not belong to model "${t}". All variables must belong to the model by object identity.`);
+		if (!Number.isFinite(a)) throw Error(`Variable "${i.name}" in constraint "${r}" has invalid coefficient: ${a}. Coefficients must be finite numbers.`);
+	}
+}
+function M(e, t, n, r, i, a) {
+	if (e instanceof u) {
+		if (!i(e)) throw Error(`Boolean variable "${e.name}" in logical constraint "${t}" does not belong to model "${n}".`);
+	} else if (e instanceof d) for (let o of e.children) M(o, t, n, r, i, a);
+	else if (e instanceof v) {
+		if (a) {
+			let r = E.get(e) ?? e.ownerModel ?? void 0;
+			if (r && r !== a) throw Error(`Constraint "${e.name}" embedded in logical constraint "${t}" already belongs to model "${r.name ?? "another model"}" and cannot be added to model "${n}".`);
+		}
+		if (!Number.isFinite(e.rhs)) throw Error(`Constraint "${e.name}" embedded in logical constraint "${t}" has invalid RHS: ${e.rhs}.`);
+		if (e.lhs.constant !== void 0 && !Number.isFinite(e.lhs.constant)) throw Error(`Constraint "${e.name}" embedded in logical constraint "${t}" has invalid LHS constant: ${e.lhs.constant}.`);
+		for (let [i, a] of e.lhs.terms) {
+			if (!r(i)) throw Error(`Variable "${i.name}" embedded in logical constraint "${t}" does not belong to model "${n}".`);
+			if (!Number.isFinite(a)) throw Error(`Variable "${i.name}" embedded in logical constraint "${t}" has invalid coefficient: ${a}.`);
+		}
+	}
+}
+function oe(e) {
+	let t = /* @__PURE__ */ new Set(), n = /* @__PURE__ */ new Set();
+	for (let r of e.variables) {
+		A(r);
+		let i = T.get(r);
+		if (i && i !== e || t.has(r.name) || e.getVarByName(r.name) !== r) throw Error(`Variable "${r.name}" is duplicated or not canonically registered in model "${e.name}".`);
+		t.add(r.name), n.add(r);
+	}
+	let r = /* @__PURE__ */ new Set(), i = /* @__PURE__ */ new Set();
+	for (let t of e.boolVars) {
+		if (r.has(t.name) || e.getBoolVarByName(t.name) !== t) throw Error(`Boolean variable "${t.name}" is duplicated or not canonically registered in model "${e.name}".`);
+		r.add(t.name), i.add(t);
+	}
+	let a = /* @__PURE__ */ new Set();
+	for (let t of e.constraints) {
+		if (r.has(t.name)) throw Error(`Constraint name "${t.name}" conflicts with Boolean variable "${t.name}" in model "${e.name}".`);
+		if (a.has(t.name)) throw Error(`Duplicate constraint name "${t.name}" in model "${e.name}".`);
+		a.add(t.name);
+	}
+	for (let t of e.logicalConstraints) {
+		if (r.has(t.name)) throw Error(`Logical constraint name "${t.name}" conflicts with Boolean variable "${t.name}" in model "${e.name}".`);
+		if (a.has(t.name)) throw Error(`Conflicting constraint name "${t.name}" across arithmetic and logical constraints in model "${e.name}".`);
+		a.add(t.name);
+	}
+	for (let t of e.constraints) {
+		let n = E.get(t);
+		if (n && n !== e || e.getConstraintByName(t.name) !== t) throw Error(`Constraint "${t.name}" is duplicated or not canonically registered in model "${e.name}".`);
+	}
+	for (let t of e.logicalConstraints) if (e.getLogicalConstraintByName(t.name) !== t) throw Error(`Logical constraint "${t.name}" is duplicated or not canonically registered in model "${e.name}".`);
+	e.objectiveExpr && ae(e.objectiveExpr, e.name, (e) => n.has(e));
+	for (let t of e.constraints) j(t, e.name, (e) => n.has(e));
+	for (let t of e.logicalConstraints) M(t.expr, t.name, e.name, (e) => n.has(e), (e) => i.has(e), e);
+}
+//#endregion
 //#region src/modeler/variable.ts
-var te = 0;
-function T(e) {
-	if (!e) return "Continuous";
-	let t = e.toLowerCase();
-	return t === "binary" || t === "bin" ? "Binary" : t === "integer" || t === "int" ? "Integer" : "Continuous";
+var se = 0;
+function ce(e) {
+	if (e === void 0) return "Continuous";
+	if (typeof e == "string") {
+		let t = e.toLowerCase();
+		if (t === "binary" || t === "bin") return "Binary";
+		if (t === "integer" || t === "int") return "Integer";
+		if (t === "continuous" || t === "cont") return "Continuous";
+	}
+	throw Error(`Invalid variable type "${String(e)}": expected "Continuous", "Integer", or "Binary".`);
 }
-var E = class e {
+var N = class {
 	id;
-	name;
-	type;
-	lb;
-	ub;
+	_name;
+	prefix;
+	hasExplicitName;
+	ownerModel = null;
+	_type;
+	_lb;
+	_ub;
+	_initialValue;
 	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 = ++se;
+		let t = typeof e.name == "string" ? e.name.trim() : "", n = typeof e.prefix == "string" ? e.prefix.trim() : "";
+		this.prefix = n.length > 0 ? n : "x", this.hasExplicitName = t.length > 0, this._name = this.hasExplicitName ? t : `${this.prefix}_${this.id}`, this._type = ce(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._initialValue = e.initialValue === void 0 ? void 0 : Object.is(e.initialValue, -0) ? 0 : e.initialValue, this._initialValue !== void 0 && A(this);
 	}
-	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();
-		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);
-			n = n.add(t);
-		}
-		return n;
+	get name() {
+		return this._name;
+	}
+	get type() {
+		return this._type;
+	}
+	set type(e) {
+		let t = ce(e);
+		this._type !== t && (this._type = t, this.ownerModel?.notifyMutation?.());
+	}
+	get lb() {
+		return this._lb;
+	}
+	set lb(e) {
+		Object.is(this._lb, e) || (this._lb = e, this.ownerModel?.notifyMutation?.());
+	}
+	get ub() {
+		return this._ub;
+	}
+	set ub(e) {
+		Object.is(this._ub, e) || (this._ub = e, this.ownerModel?.notifyMutation?.());
+	}
+	get initialValue() {
+		return this._initialValue;
+	}
+	set initialValue(e) {
+		let t = e !== void 0 && Object.is(e, -0) ? 0 : e;
+		Object.is(this._initialValue, t) || (this._initialValue = t, this.ownerModel?.notifyMutation?.());
+	}
+	_assignModelName(e) {
+		this._name = e;
+	}
+	mul(e) {
+		return typeof e == "number" ? new S(/* @__PURE__ */ new Map([[this, 1]]), 0).mul(e) : new x(/* @__PURE__ */ new Map([[this, 1]]), /* @__PURE__ */ new Map(), 0).mul(e);
 	}
 	add(e) {
 		return e instanceof x ? e.add(this) : new S(/* @__PURE__ */ new Map([[this, 1]]), 0).add(e);
@@ -428,84 +808,100 @@ var E = class e {
 	le(e, t) {
 		return new S(/* @__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);
 	}
-	greaterThanOrEqual(e, t) {
-		return this.ge(e, t);
-	}
 	eq(e, t) {
 		return new S(/* @__PURE__ */ new Map([[this, 1]]), 0).eq(e, t);
 	}
-	equalTo(e, t) {
-		return this.eq(e, t);
-	}
 	toString() {
 		return this.name;
 	}
-};
-//#endregion
-//#region src/modeler/parser.ts
-function D(e) {
-	let t = [], n = 0, r = e.length;
-	for (; n < r;) {
-		let i = e[n];
-		if (/\s/.test(i)) {
-			n++;
+}, le = /^(?:[0-9]+(?:\.[0-9]+)?|\.[0-9]+)(?:[eE][+-]?[0-9]+)?$/;
+function ue(e, t) {
+	let n = [], r = 0, i = e.length;
+	for (; r < i;) {
+		let a = e[r];
+		if (/\s/.test(a)) {
+			r++;
 			continue;
 		}
-		if (i === "+") t.push({
+		if (a === "+") n.push({
 			type: "PLUS",
 			value: "+"
-		}), n++;
-		else if (i === "-") t.push({
+		}), r++;
+		else if (a === "-") n.push({
 			type: "MINUS",
 			value: "-"
-		}), n++;
-		else if (i === "*") t.push({
+		}), r++;
+		else if (a === "*") r + 1 < i && e[r + 1] === "*" ? (n.push({
+			type: "CARET",
+			value: "**"
+		}), r += 2) : (n.push({
 			type: "STAR",
 			value: "*"
-		}), n++;
-		else if (i === "/") t.push({
+		}), r++);
+		else if (a === "^") n.push({
+			type: "CARET",
+			value: "^"
+		}), r++;
+		else if (a === "/") n.push({
 			type: "SLASH",
 			value: "/"
-		}), n++;
-		else if (i === "(") t.push({
+		}), r++;
+		else if (a === "(") n.push({
 			type: "LPAREN",
 			value: "("
-		}), n++;
-		else if (i === ")") t.push({
+		}), r++;
+		else if (a === ")") n.push({
 			type: "RPAREN",
 			value: ")"
-		}), n++;
-		else if (i === "<" || i === ">" || i === "=") {
-			let a = i;
-			n + 1 < r && (e[n + 1] === "=" || e[n + 1] === "<" || e[n + 1] === ">") ? (a += e[n + 1], n += 2) : n++, t.push({
+		}), r++;
+		else if (a === "<" || a === ">" || a === "=") {
+			let t = a;
+			r + 1 < i && (e[r + 1] === "=" || e[r + 1] === "<" || e[r + 1] === ">") ? (t += e[r + 1], r += 2) : r++, n.push({
 				type: "COMP",
-				value: a
+				value: t
 			});
-		} else if (/[0-9.]/.test(i)) {
-			let i = "";
-			for (; n < r && /[0-9.]/.test(e[n]);) i += e[n], n++;
-			t.push({
+		} else if (/[0-9.]/.test(a)) {
+			let t = r, a = "";
+			for (; r < i && /[0-9]/.test(e[r]);) a += e[r++];
+			if (r < i && e[r] === ".") for (a += e[r++]; r < i && /[0-9]/.test(e[r]);) a += e[r++];
+			if (r < i && (e[r] === "e" || e[r] === "E")) {
+				let t = r + 1 < i ? e[r + 1] : "";
+				if (!/[a-zA-Z_]/.test(t)) {
+					for (a += e[r++], r < i && (e[r] === "+" || e[r] === "-") && (a += e[r++]); r < i && /[0-9]/.test(e[r]);) a += e[r++];
+					for (; r < i && (e[r] === "." || e[r] === "e" || e[r] === "E" || /[0-9]/.test(e[r]));) a += e[r++];
+				}
+			} else for (; r < i && (e[r] === "." || /[0-9]/.test(e[r]));) a += e[r++];
+			if (!le.test(a)) throw Error(`Invalid numeric literal '${a}' at position ${t} in: "${e}"`);
+			let o = Number(a);
+			if (!Number.isFinite(o)) throw Error(`Numeric literal '${a}' overflows finite floating-point range in: "${e}"`);
+			if (o === 0 && !/^[0.]+(?:[eE][+-]?\d+)?$/.test(a)) throw Error(`Numeric literal '${a}' underflows to zero at position ${t} in: "${e}"`);
+			n.push({
 				type: "NUMBER",
-				value: i
+				value: a,
+				numericValue: o
 			});
-		} else if (/[a-zA-Z_]/.test(i)) {
-			let i = "";
-			for (; n < r && /[a-zA-Z0-9_]/.test(e[n]);) i += e[n], n++;
-			t.push({
+		} else if (/[a-zA-Z_]/.test(a)) {
+			let a = "";
+			for (; r < i && /[a-zA-Z0-9_]/.test(e[r]);) a += e[r], r++;
+			if (t && t.has(a)) {
+				let e = t.get(a);
+				n.push({
+					type: "NUMBER",
+					value: String(e),
+					numericValue: e
+				});
+			} else n.push({
 				type: "IDENT",
-				value: i
+				value: a
 			});
-		} else throw Error(`Unexpected character '${i}' at position ${n} in: "${e}"`);
+		} else throw Error(`Unexpected character '${a}' at position ${r} in: "${e}"`);
 	}
-	return t;
+	return n;
 }
-var O = class {
+var de = class {
 	tokens;
 	pos = 0;
 	resolver;
@@ -530,214 +926,296 @@ var O = class {
 			else if (t.type === "MINUS") this.consume(), e = e.sub(this.parseTerm());
 			else break;
 		}
-		return e;
+		return e instanceof x && e.quadTerms.size === 0 ? new S(e.linearTerms, e.constant) : e;
 	}
 	parseTerm() {
 		let e = this.parseFactor();
 		for (; this.pos < this.tokens.length;) {
 			let t = this.peek();
 			if (!t) break;
-			if (t.type === "STAR") {
-				this.consume();
-				let t = this.parseFactor();
-				e = this.multiplyExpressions(e, t);
-			} else if (t.type === "SLASH") {
-				this.consume();
-				let t = this.parseFactor();
-				if (t.terms.size > 0) throw Error("Cannot divide by variable in linear expression");
-				if (Math.abs(t.constant) < 1e-12) throw Error("Division by zero in expression");
-				e = e.div(t.constant);
-			} else break;
+			if (t.type === "STAR") this.consume(), e = e.mul(this.parseFactor());
+			else if (t.type === "SLASH") this.consume(), e = e.div(this.parseFactor());
+			else break;
 		}
 		return e;
 	}
-	multiplyExpressions(e, t) {
-		if (e.terms.size > 0 && t.terms.size > 0) throw Error("Multiplication of two variables creates a non-linear term (not allowed in MILP/LP)");
-		return e.terms.size === 0 ? t.mul(e.constant) : e.mul(t.constant);
-	}
 	parseFactor() {
 		let e = this.peek();
 		if (!e) throw Error("Unexpected end of expression");
 		if (e.type === "PLUS") return this.consume(), this.parseFactor();
 		if (e.type === "MINUS") return this.consume(), this.parseFactor().neg();
+		let t;
 		if (e.type === "NUMBER") {
 			this.consume();
-			let t = parseFloat(e.value);
-			if (this.peek()?.type === "IDENT") {
-				let e = this.consume();
-				return this.resolveVariable(e.value).mul(t);
+			let n = e.numericValue ?? Number(e.value);
+			if (this.peek()?.type === "IDENT" || this.peek()?.type === "LPAREN") {
+				let e;
+				if (this.peek()?.type === "IDENT") {
+					let t = this.consume(), n = this.resolve(t.value);
+					e = n instanceof N || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new S(/* @__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 S(/* @__PURE__ */ new Map(), n);
+		} else if (e.type === "IDENT") {
+			this.consume();
+			let n = this.resolve(e.value);
+			t = n instanceof N || "id" in n && !("terms" in n) && !("quadTerms" in n) ? new S(/* @__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 t = this.resolveVariable(e.value);
-			return new S(/* @__PURE__ */ new Map([[t, 1]]), 0);
+			let e = this.tokens[this.pos]?.type === "LPAREN" && this.tokens[this.pos + 1]?.type === "NUMBER" && this.tokens[this.pos + 2]?.type === "RPAREN";
+			e && this.consume("LPAREN");
+			let n = this.peek();
+			if (!n || n.type !== "NUMBER") throw Error("Exponent must be a non-negative integer number");
+			this.consume(), e && this.consume("RPAREN");
+			let r = n.numericValue ?? Number(n.value);
+			if (!Number.isInteger(r) || r < 0) throw Error("Exponent must be a non-negative integer");
+			t.push(r);
 		}
-		if (e.type === "LPAREN") {
-			this.consume("LPAREN");
-			let e = this.parseExpression();
-			return this.consume("RPAREN"), e;
+		let n = t[t.length - 1];
+		for (let e = t.length - 2; e >= 0; e--) n = t[e] ** +n;
+		if (!Number.isFinite(n) || n < 0) throw Error("Exponent creates an invalid or out-of-range power");
+		let r = e instanceof x, i = r ? e.quadTerms.size : 0, a = r ? e.linearTerms.size : e.terms.size;
+		if (i === 0 && a === 0) {
+			let t = e.constant ** +n;
+			if (e.constant !== 0 && n > 0 && t === 0) throw Error("Constant exponentiation underflows to zero.");
+			return new S(/* @__PURE__ */ new Map(), t);
 		}
-		throw Error(`Unexpected token '${e.value}' in expression`);
+		if (n === 0) return new S(/* @__PURE__ */ new Map(), 1);
+		if (n === 1) return e;
+		if (n === 2) return e.mul(e);
+		throw Error(`Exponent ${n} creates a non-linear term of degree > 2 (not allowed in MILP/LP/QP)`);
+	}
+	getRemainingToken() {
+		return this.peek();
 	}
-	resolveVariable(e) {
+	resolve(e) {
 		let t = this.resolver(e);
 		if (!t) throw Error(`Unknown variable '${e}' in expression`);
 		return t;
 	}
 };
-function k(e, t) {
-	return new O(D(e), t).parseExpression();
-}
-function A(e, t, n) {
-	let r = e.match(/(<=|>=|==|=<|=>|=)/);
-	if (!r) throw Error(`Constraint must contain a comparison operator (<=, >=, ==, =): "${e}"`);
-	let i = r[0], a = r.index, o = e.substring(0, a).trim(), s = e.substring(a + i.length).trim(), c;
-	if (i === "<=" || i === "=<") c = "<=";
-	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);
-}
-function j(e, t) {
-	let n = /* @__PURE__ */ new Map(), r = "";
-	for (let i = 0; i < e.length; i++) if (r += e[i], i < t.length) {
+function P(e, t, n) {
+	let r = new de(ue(e, n), t), i = r.parseExpression(), a = r.getRemainingToken();
+	if (a) throw Error(`Unexpected token '${a.value}' after expression in "${e}"`);
+	return F(i), i;
+}
+function fe(e, t) {
+	return P(e, t);
+}
+function pe(e, t, n, r) {
+	let i = e.match(/(<=|>=|==|=<|=>|=)/);
+	if (!i) throw Error(`Constraint must contain a comparison operator (<=, >=, ==, =): "${e}"`);
+	let a = i[0], o = i.index, s = e.substring(0, o).trim(), c = e.substring(o + a.length).trim(), l;
+	if (a === "<=" || a === "=<") l = "<=";
+	else if (a === ">=" || a === "=>") l = ">=";
+	else if (a === "==" || a === "=") l = "==";
+	else throw Error(`Unsupported operator "${a}"`);
+	let u = P(s, t, r), d = P(c, t, r);
+	if (u instanceof x && u.quadTerms.size > 0 || d instanceof x && d.quadTerms.size > 0) throw Error("Quadratic constraints are not supported (only linear constraints are allowed in MILP/LP/QP)");
+	let f = u instanceof x ? new S(u.linearTerms, u.constant) : u, p = d instanceof x ? new S(d.linearTerms, d.constant) : d, m;
+	if (m = l === "<=" ? f.le(p, n) : l === ">=" ? f.ge(p, n) : f.eq(p, n), F(m.lhs), !Number.isFinite(m.rhs)) throw Error(`Invalid non-finite right-hand side "${m.rhs}" in constraint.`);
+	return m;
+}
+function me(e, t, n) {
+	return pe(e, t, n);
+}
+function he(e) {
+	return e instanceof N || e instanceof S || e instanceof x ? !0 : typeof e != "object" || !e ? !1 : "terms" in e && e.terms instanceof Map || "quadTerms" in e && e.quadTerms instanceof Map || "id" in e && "name" in e && "lb" in e && "ub" in e && "type" in e && typeof e.mul == "function";
+}
+function F(e) {
+	if ("constant" in e && !Number.isFinite(e.constant)) throw Error(`Invalid non-finite constant "${e.constant}" in expression.`);
+	if ("terms" in e && e.terms instanceof Map) {
+		for (let [, t] of e.terms) if (!Number.isFinite(t)) throw Error(`Invalid non-finite coefficient "${t}" in expression.`);
+	}
+	if ("linearTerms" in e && e.linearTerms instanceof Map) {
+		for (let [, t] of e.linearTerms) if (!Number.isFinite(t)) throw Error(`Invalid non-finite coefficient "${t}" in expression.`);
+	}
+	if ("quadTerms" in e && e.quadTerms instanceof Map) {
+		for (let [, t] of e.quadTerms) if (!Number.isFinite(t.coeff)) throw Error(`Invalid non-finite quadratic coefficient "${t.coeff}" in expression.`);
+	}
+}
+function ge(e) {
+	return e instanceof v || typeof e == "object" && !!e && "sense" in e && "lhs" in e && "rhs" in e;
+}
+function _e(e, t) {
+	let n = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Map(), i = e.join(""), a = "__washi_";
+	for (; i.includes(a);) a += "_";
+	let o = "";
+	for (let i = 0; i < e.length; i++) if (o += e[i], i < t.length) {
 		let e = t[i];
-		if (typeof e == "number") r += `(${e})`;
-		else if (e instanceof E) {
-			let t = `__v_${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);
-		}
+		if (typeof e == "number") {
+			if (!Number.isFinite(e)) throw Error(`Invalid numeric value "${e}" in template expression: interpolated numbers must be finite.`);
+			let t = `${a}num_${i}__`;
+			r.set(t, e), o += `(${t})`;
+		} else if (ge(e)) throw Error("Cannot interpolate a constraint comparison (<=, >=, ==) inside a template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
+		else if (he(e)) {
+			F(e);
+			let t = `${a}ph_${i}__`;
+			n.set(t, e), o += ` ${t} `;
+		} else throw Error("Unsupported interpolation value in template expression: expected a finite number, Var, LinExpr, or QuadExpr.");
 	}
 	return {
-		fullText: r,
-		resolver: (e) => n.get(e)
+		fullText: o,
+		resolver: (e) => n.get(e),
+		numberMap: r
 	};
 }
-function M(e, ...t) {
-	let { fullText: n, resolver: r } = j(e, t);
-	return A(n, r);
-}
-function N(e, ...t) {
-	let { fullText: n, resolver: r } = j(e, t);
-	return /(<=|>=|==|=<|=>|=)/.test(n) ? A(n, r) : k(n, r);
+function ve(e, ...t) {
+	let { fullText: n, resolver: r, numberMap: i } = _e(e, t);
+	return /(<=|>=|==|=<|=>|=)/.test(n) ? pe(n, r, void 0, i) : P(n, r, i);
 }
 //#endregion
 //#region src/modeler/lp-writer.ts
-function P(e, t, n) {
+function I(e) {
+	return typeof e == "object" && !!e && typeof e.lpString == "string" && e.nameToVar instanceof Map && e.nameToConstraint instanceof Map;
+}
+function L(e, t = "x", n = 0) {
 	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) {
-	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;
-		for (; c.has(n);) n = `${t}_${r++}`;
-		c.add(n), o.set(e, n), a.set(n, e);
+function ye(e) {
+	let t = e.variables || [], n = e.constraints || [], r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Set();
+	for (let e = 0; e < t.length; e++) {
+		let n = t[e];
+		s.set(n, e);
+		let a = L(n.name, "x", e), o = a, l = 1;
+		for (; c.has(o);) o = `${a}_${l++}`;
+		c.add(o), i.set(n, o), r.set(o, n);
+	}
+	let l = /* @__PURE__ */ new Set();
+	for (let e = 0; e < n.length; e++) {
+		let t = n[e], r = L(t.name, "c", e + 1), i = r, s = 1;
+		for (; l.has(i);) i = `${r}_${s++}`;
+		l.add(i), o.set(t, i), a.set(i, t);
 	}
-	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;
-		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;
-	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;
+	return {
+		nameToVar: r,
+		varToName: i,
+		nameToConstraint: a,
+		constraintToName: o,
+		constrToName: o,
+		varOrder: s
+	};
+}
+function R(e) {
+	let { sense: t, objective: n, constraints: r, variables: i } = e, { nameToVar: a, varToName: o, nameToConstraint: s, constrToName: c, varOrder: l } = ye(e), u = [];
+	u.push(t && t.toLowerCase() === "maximize" ? "Maximize" : "Minimize");
+	let d = [], f = !0, p = n instanceof x ? n.linearTerms : n.terms;
+	if (p) for (let [e, t] of p) {
+		if (t === 0) continue;
+		let n = o.get(e), r = t >= 0 ? f ? "" : "+ " : "- ", i = Math.abs(t), a = i === 1 ? "" : `${i} `;
+		d.push(`${r}${a}${n}`), f = !1;
 	}
 	if (n instanceof x && n.quadTerms.size > 0) {
-		let e = [], t = !0;
-		for (let r of n.quadTerms.values()) {
-			if (Math.abs(r.coeff) < 1e-12) continue;
-			let n = 2 * r.coeff, i = n >= 0 ? t ? "" : "+ " : "- ", a = Math.abs(n), s = a === 1 ? "" : `${a} `, c = o.get(r.var1), l = o.get(r.var2);
-			r.var1 === r.var2 ? e.push(`${i}${s}${c} ^ 2`) : e.push(`${i}${s}${c} * ${l}`), t = !1;
+		let e = [], t = !0, r = Array.from(n.quadTerms.values()).filter((e) => e.coeff !== 0).map((e) => {
+			let t = l.get(e.var1) ?? e.var1.id, n = l.get(e.var2) ?? e.var2.id, [r, i, a, o] = t <= n ? [
+				e.var1,
+				e.var2,
+				t,
+				n
+			] : [
+				e.var2,
+				e.var1,
+				n,
+				t
+			];
+			return {
+				firstVar: r,
+				secondVar: i,
+				firstIdx: a,
+				secondIdx: o,
+				coeff: e.coeff
+			};
+		}).sort((e, t) => e.firstIdx - t.firstIdx || e.secondIdx - t.secondIdx);
+		for (let n of r) {
+			let r = 2 * n.coeff, i = r >= 0 ? t ? "" : "+ " : "- ", a = Math.abs(r), s = a === 1 ? "" : `${a} `, c = o.get(n.firstVar), l = o.get(n.secondVar);
+			n.firstVar === n.secondVar ? e.push(`${i}${s}${c} ^ 2`) : e.push(`${i}${s}${c} * ${l}`), t = !1;
 		}
 		if (e.length > 0) {
 			let t = `[ ${e.join(" ")} ] / 2`;
-			f.length > 0 ? f.push("+", t) : f.push(t);
+			d.length > 0 ? d.push("+", t) : d.push(t);
 		}
 	}
-	let h = f.length > 0 ? f.join(" ") : "0";
-	d.push(` obj: ${h}`), d.push("Subject To");
+	let m = d.length > 0 ? d.join(" ") : "0";
+	u.push(` obj: ${m}`), u.push("Subject To");
 	for (let e of r) {
-		let t = u.get(e), n = [], r = !0;
+		let t = c.get(e), n = [], r = !0;
 		for (let [t, i] of e.lhs.terms) {
-			if (Math.abs(i) < 1e-12) continue;
+			if (i === 0) continue;
 			let e = o.get(t), a = i >= 0 ? r ? "" : "+ " : "- ", s = Math.abs(i), c = s === 1 ? "" : `${s} `;
 			n.push(`${a}${c}${e}`), r = !1;
 		}
 		let i = n.length > 0 ? n.join(" ") : "0", a = e.sense === "==" ? "=" : e.sense;
-		d.push(` ${t}: ${i} ${a} ${e.rhs}`);
+		u.push(` ${t}: ${i} ${a} ${e.rhs}`);
 	}
-	d.push("Bounds");
-	let g = [], _ = [];
+	u.push("Bounds");
+	let h = [], g = [];
 	for (let e of i) {
 		let t = o.get(e);
 		if (e.type === "Binary") {
-			_.push(t);
+			g.push(t);
 			continue;
 		}
-		e.type === "Integer" && g.push(t);
+		e.type === "Integer" && h.push(t);
 		let n = e.lb === -Infinity, r = e.ub === Infinity;
-		n && r ? d.push(` ${t} free`) : n && !r ? d.push(` -infinity <= ${t} <= ${e.ub}`) : !n && r ? e.lb !== 0 && d.push(` ${t} >= ${e.lb}`) : d.push(` ${e.lb} <= ${t} <= ${e.ub}`);
+		n && r ? u.push(` ${t} free`) : n && !r ? u.push(` -infinity <= ${t} <= ${e.ub}`) : !n && r ? (e.lb !== 0 || e.initialValue !== void 0) && u.push(` ${t} >= ${e.lb}`) : u.push(` ${e.lb} <= ${t} <= ${e.ub}`);
 	}
-	if (g.length > 0) {
-		d.push("Generals");
-		for (let e = 0; e < g.length; e += 10) d.push(" " + g.slice(e, e + 10).join(" "));
+	if (h.length > 0) {
+		u.push("Generals");
+		for (let e = 0; e < h.length; e += 10) u.push(" " + h.slice(e, e + 10).join(" "));
 	}
-	if (_.length > 0) {
-		d.push("Binary");
-		for (let e = 0; e < _.length; e += 10) d.push(" " + _.slice(e, e + 10).join(" "));
+	if (g.length > 0) {
+		u.push("Binary");
+		for (let e = 0; e < g.length; e += 10) u.push(" " + g.slice(e, e + 10).join(" "));
 	}
-	return d.push("End"), {
-		lpString: d.join("\n") + "\n",
+	return u.push("End"), {
+		lpString: u.join("\n") + "\n",
 		nameToVar: a,
 		nameToConstraint: s
 	};
 }
 //#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 be = Symbol.for("washi.solverRegistry"), xe = Symbol.for("washi.defaultSolverFactory"), z = globalThis;
+z[be] || (z[be] = /* @__PURE__ */ new Map());
+var B = z[be];
+function V(e, t) {
+	B.set(e.toLowerCase(), t);
 }
-function V(e) {
+function Se(e) {
 	if (typeof e == "string") {
-		let t = z.get(e.toLowerCase());
+		let t = B.get(e.toLowerCase());
 		if (!t) throw Error(`Solver '${e}' is not registered.`);
-		R[L] = t;
-	} else R[L] = typeof e == "function" ? e : () => e;
+		z[xe] = t;
+	} else z[xe] = typeof e == "function" ? e : () => e;
 }
 function H(e, t) {
 	if (!e) {
-		let e = R[L] || z.get("highs");
+		let e = z[xe] || B.get("highs");
 		if (!e) throw Error(`No default solver available. Available solvers: ${U().join(", ")}`);
 		return e(t);
 	}
 	if (typeof e == "string") {
-		let n = e.toLowerCase(), r = z.get(n);
+		let n = e.toLowerCase(), r = B.get(n);
 		if (!r) throw Error(n === "glpk" ? `Solver 'glpk' not found. Available solvers: ${U().join(", ")}. Please import '@ohtaman/washi/solvers/glpk' before selecting this solver.` : n === "z3" ? `Solver 'z3' not found. Available solvers: ${U().join(", ")}. Please import '@ohtaman/washi/solvers/z3' before selecting this solver.` : `Solver '${e}' not found. Available solvers: ${U().join(", ")}`);
 		return r(t);
 	}
 	return e;
 }
 function U() {
-	return Array.from(z.keys());
+	return Array.from(B.keys());
 }
 //#endregion
 //#region \0washi-browser-worker-factory
-function W() {
+function Ce() {
 	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,73 +1228,198 @@ function W() {
 }
 //#endregion
 //#region src/modeler/solvers/highs/worker-client.ts
-var G = null, K = 0, q = /* @__PURE__ */ new Map();
-function J() {
+var W = null, we = 0, G = /* @__PURE__ */ new Map();
+function K(e, t) {
+	return e ? {
+		Status: "Interrupted",
+		StatusCode: 17,
+		HasPrimalSolution: !0,
+		IsMip: !0,
+		ObjectiveValue: e.objectiveValue,
+		ObjectiveOffsetApplied: !0,
+		...t?.objectiveBound === void 0 ? e.mipDualBound === void 0 ? {} : { MipDualBound: e.mipDualBound } : { MipDualBound: t.objectiveBound },
+		...t?.relGap === void 0 ? e.mipGap === void 0 ? {} : { MipGap: e.mipGap } : { MipGap: t.relGap },
+		Columns: e.columns,
+		Rows: []
+	} : {
+		Status: "Interrupted",
+		StatusCode: 17,
+		HasPrimalSolution: !1,
+		ObjectiveValue: NaN,
+		ObjectiveOffsetApplied: !0,
+		...t?.objectiveBound === void 0 ? {} : { MipDualBound: t.objectiveBound },
+		...t?.relGap === void 0 ? {} : { MipGap: t.relGap },
+		Columns: {},
+		Rows: []
+	};
+}
+function q(e) {
+	let t = G.values().next().value;
+	if (t && !t.dispatched) {
+		t.dispatched = !0;
+		try {
+			e.postMessage({
+				type: "SOLVE",
+				id: t.id,
+				lpString: t.lpString,
+				options: t.workerOptions,
+				...t.reportProgress ? { reportProgress: !0 } : {}
+			});
+		} catch (n) {
+			G.delete(t.id), t.cleanupAbort?.(), t.reject(n), q(e);
+		}
+	}
+}
+function Te() {
+	let e = W;
+	e && (W = null, e.terminate());
+	for (let e of G.values()) e.dispatched = !1;
+	if (G.size > 0) {
+		let e = Ee();
+		if (e) q(e);
+		else {
+			let e = /* @__PURE__ */ Error("[WaSHI] Failed to recreate HiGHS Worker after interruption.");
+			for (let t of Array.from(G.values())) G.delete(t.id), t.cleanupAbort?.(), t.reject(e);
+		}
+	}
+}
+function Ee() {
 	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({
-				result: r,
-				runTime: i
-			}) : o.reject(Error(a || "Worker solve failed")));
+	if (!W) try {
+		W = Ce();
+		let e = W;
+		W.onmessage = (t) => {
+			let { type: n, id: r, result: i, runTime: a, error: o, progress: s, incumbent: c } = t.data, l = G.get(r);
+			if (l) {
+				if (n === "SOLVE_PROGRESS") {
+					if (s) {
+						l.lastProgress = s;
+						try {
+							l.onProgress?.(s);
+						} catch (e) {
+							let t = G.get(r);
+							if (t) {
+								let n = G.keys().next().value;
+								G.delete(r), t.cleanupAbort?.(), n === r && Te(), t.reject(e);
+							}
+						}
+					}
+					return;
+				}
+				if (n === "SOLVE_INCUMBENT") {
+					c && (l.lastIncumbent = c);
+					return;
+				}
+				G.delete(r), l.cleanupAbort?.(), n === "SOLVE_SUCCESS" ? l.resolve({
+					result: i,
+					runTime: a
+				}) : l.reject(Error(o || "Worker solve failed")), W === e && q(e);
+			}
 		};
 		let t = (t) => {
-			if (G === e) {
-				G = null, e.terminate();
-				for (let e of q.values()) e.reject(t);
-				q.clear();
+			if (W === e) {
+				W = null, e.terminate();
+				for (let e of G.values()) e.cleanupAbort?.(), e.reject(t);
+				G.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."));
+		W.onerror = (e) => t(/* @__PURE__ */ Error(`[WaSHI] HiGHS Worker failed to load or execute. Check Worker assets, CORS and CSP. ${e?.message || ""}`)), W.onmessageerror = () => t(/* @__PURE__ */ Error("[WaSHI] Could not deserialize the HiGHS Worker response."));
 	} catch {
-		G = null;
-	}
-	return G;
-}
-async function Y(e, n = {}) {
-	let r = await a(n.wasmUrl), i = n.useWorker ?? typeof window < "u" ? J() : null;
-	if (!i) return t(e, n);
-	let o = {
-		...n,
-		wasmUrl: r
-	}, s = `req_${++K}`;
-	return new Promise((t, n) => {
-		q.set(s, {
-			resolve: t,
+		W = null;
+	}
+	return W;
+}
+async function De(t, n = {}) {
+	if (n.signal?.aborted) return {
+		result: K(),
+		runTime: 0
+	};
+	let r = await i(n.wasmUrl);
+	if (n.signal?.aborted) return {
+		result: K(),
+		runTime: 0
+	};
+	let a = n.useWorker ?? typeof window < "u" ? Ee() : null;
+	if (!a) return e(t, n);
+	let { signal: o, onProgress: s, ...c } = n, l = {};
+	for (let [e, t] of Object.entries(c)) typeof t != "function" && (l[e] = t);
+	l.wasmUrl = r;
+	let u = !!(s || o), d = `req_${++we}`, f = performance.now();
+	return new Promise((e, n) => {
+		let r = {
+			id: d,
+			lpString: t,
+			workerOptions: l,
+			reportProgress: u,
+			startTime: f,
+			onProgress: s,
+			resolve: e,
 			reject: n
-		});
-		try {
-			i.postMessage({
-				type: "SOLVE",
-				id: s,
-				lpString: e,
-				options: o
-			});
-		} catch (e) {
-			q.delete(s), n(e);
+		};
+		if (o) {
+			let e = () => {
+				let e = G.get(d);
+				if (!e) return;
+				let t = G.keys().next().value;
+				G.delete(d), e.cleanupAbort?.(), t === d && Te();
+				let n = (performance.now() - e.startTime) / 1e3;
+				e.resolve({
+					result: K(e.lastIncumbent, e.lastProgress),
+					runTime: n
+				});
+			};
+			o.addEventListener("abort", e, { once: !0 }), r.cleanupAbort = () => o.removeEventListener("abort", e);
 		}
+		G.set(d, r), q(a);
 	});
 }
 //#endregion
 //#region src/modeler/solvers/highs/solver.ts
-function X(e) {
+function Oe(e, t) {
+	if (typeof t == "number") switch (t) {
+		case 0: return "NotSolved";
+		case 1:
+		case 2:
+		case 3:
+		case 4:
+		case 5: return "Error";
+		case 6: return "Unknown";
+		case 7: return "Optimal";
+		case 8: return "Infeasible";
+		case 9: return "InfeasibleOrUnbounded";
+		case 10: return "Unbounded";
+		case 11: return "ObjectiveBound";
+		case 12: return "ObjectiveTarget";
+		case 13: return "TimeLimit";
+		case 14: return "IterationLimit";
+		case 15: return "Unknown";
+		case 16: return "SolutionLimit";
+		case 17: return "Interrupted";
+		case 18: return "MemoryLimit";
+	}
 	if (typeof e != "string") return "Unknown";
-	let t = e.trim();
-	if (!t) return "Unknown";
-	switch (t) {
+	let n = e.trim();
+	if (!n) return "Unknown";
+	switch (n) {
 		case "Optimal": return "Optimal";
 		case "Infeasible": return "Infeasible";
 		case "Unbounded": return "Unbounded";
-		case "Primal infeasible or unbounded": return "Unknown";
+		case "Primal infeasible or unbounded":
+		case "InfeasibleOrUnbounded": return "InfeasibleOrUnbounded";
 		case "Time limit reached":
 		case "TimeLimit": return "TimeLimit";
 		case "Iteration limit reached":
 		case "IterationLimit": return "IterationLimit";
+		case "Solution limit reached":
+		case "SolutionLimit": return "SolutionLimit";
+		case "Memory limit reached":
+		case "MemoryLimit": return "MemoryLimit";
 		case "Bound on objective reached":
+		case "ObjectiveBound": return "ObjectiveBound";
 		case "Target for objective reached":
+		case "ObjectiveTarget": return "ObjectiveTarget";
+		case "Interrupted":
+		case "User interrupt": return "Interrupted";
 		case "Feasible": return "Feasible";
 		case "Not Set": return "NotSolved";
 		case "Load error":
@@ -828,13 +1431,32 @@ function X(e) {
 		case "Empty":
 		case "Unknown": return "Unknown";
 	}
-	let n = t.toLowerCase();
-	return n.includes("infeasible") && n.includes("unbounded") ? "Unknown" : n.includes("infeasible") ? "Infeasible" : n.includes("unbounded") ? "Unbounded" : n.includes("time limit") || n.includes("timelimit") ? "TimeLimit" : n.includes("iteration limit") || n.includes("iterationlimit") ? "IterationLimit" : n.includes("error") ? "Error" : n === "optimal" ? "Optimal" : "Unknown";
+	let r = n.toLowerCase();
+	return r.includes("infeasible") && r.includes("unbounded") ? "InfeasibleOrUnbounded" : r.includes("infeasible") ? "Infeasible" : r.includes("unbounded") ? "Unbounded" : r.includes("time limit") || r.includes("timelimit") ? "TimeLimit" : r.includes("iteration limit") || r.includes("iterationlimit") ? "IterationLimit" : r.includes("solution limit") || r.includes("solutionlimit") ? "SolutionLimit" : r.includes("memory limit") || r.includes("memorylimit") ? "MemoryLimit" : r.includes("bound on objective") ? "ObjectiveBound" : r.includes("target for objective") ? "ObjectiveTarget" : r.includes("interrupt") ? "Interrupted" : r.includes("error") ? "Error" : r === "optimal" ? "Optimal" : "Unknown";
 }
-var Z = class e {
+function ke(e, t, n) {
+	switch (Oe(e, t)) {
+		case "Optimal": return "Optimal";
+		case "Infeasible": return "Infeasible";
+		case "Unbounded": return "Unbounded";
+		case "TimeLimit": return "TimeLimit";
+		case "IterationLimit": return "IterationLimit";
+		case "Feasible": return "Feasible";
+		case "ObjectiveBound":
+		case "ObjectiveTarget":
+		case "SolutionLimit": return n === !1 ? "Unknown" : "Feasible";
+		case "MemoryLimit":
+		case "Interrupted": return n ? "Feasible" : "Unknown";
+		case "NotSolved": return "NotSolved";
+		case "Error": return "Error";
+		default: return "Unknown";
+	}
+}
+var J = class e {
 	static capabilities = {
 		supportsMIP: !0,
-		supportsQP: !0
+		supportsQP: !0,
+		supportsWarmStart: !0
 	};
 	name = "HiGHS";
 	version = "1.15.3";
@@ -843,119 +1465,750 @@ var Z = class e {
 	constructor(e = {}) {
 		this.options = e;
 	}
-	async solve(e, t, n = {}) {
-		let r = {
+	async solve(e, t = {}, n = {}) {
+		let r = I(t), i = r ? n : t, a = {
 			...this.options,
-			...n
-		}, { lpString: i, nameToVar: a, nameToConstraint: o } = t, { result: s, runTime: c } = await Y(i, r), l = X(s?.Status);
-		if (l === "Infeasible" || l === "Unbounded") return {
-			status: l,
+			...i
+		}, o = e.objective.constant || 0;
+		for (let t of e.variables) A(t);
+		let { lpString: s, nameToVar: c, nameToConstraint: l } = r ? t : R(e), u = Object.create(null), d = !1, f = /* @__PURE__ */ new Set();
+		for (let [e, t] of c.entries()) {
+			f.add(t);
+			let n = ie(t);
+			n !== void 0 && (u[e] = n, d = !0);
+		}
+		for (let t = 0; t < e.variables.length; t++) {
+			let n = e.variables[t];
+			if (!f.has(n)) {
+				let e = ie(n);
+				if (e !== void 0) {
+					let r = L(n.name, "x", t);
+					Object.prototype.hasOwnProperty.call(u, r) || (u[r] = e, d = !0);
+				}
+			}
+		}
+		let p = a;
+		(o !== 0 || d || p.initialValues !== void 0) && (p = {
+			...p,
+			...o === 0 ? {} : { objectiveOffset: o },
+			initialValues: d ? u : void 0
+		});
+		let { result: m, runTime: h } = await De(s, p), g = m?.ObjectiveOffsetApplied ? 0 : o, _ = Oe(m?.Status, m?.StatusCode), v = typeof m?.IsMip == "boolean" ? m.IsMip : e.variables.some((e) => e.type === "Integer" || e.type === "Binary"), y;
+		if (typeof m?.HasPrimalSolution == "boolean") y = m.HasPrimalSolution;
+		else {
+			let e = m?.Columns ? Object.values(m.Columns) : [], t = e.length > 0 && e.some((e) => typeof e?.Primal == "number" && Number.isFinite(e.Primal)), n = typeof m?.ObjectiveValue == "number" && Number.isFinite(m.ObjectiveValue);
+			y = _ === "Infeasible" || _ === "Unbounded" || _ === "InfeasibleOrUnbounded" || _ === "Error" || _ === "NotSolved" ? !1 : _ === "Optimal" || _ === "Feasible" ? n || t : n && (e.length === 0 || t);
+		}
+		let b = ke(m?.Status, m?.StatusCode, y), x = null;
+		y && typeof m?.ObjectiveValue == "number" && Number.isFinite(m.ObjectiveValue) && (x = m.ObjectiveValue + g);
+		let S, C, w;
+		if (typeof m?.MipDualBound == "number" && Number.isFinite(m.MipDualBound) ? S = m.MipDualBound + g : !v && _ === "Optimal" && x !== null && (S = x), x !== null && S !== void 0 && Number.isFinite(S) && (w = Math.abs(x - S)), g !== 0 && v && x !== null && S !== void 0 && w !== void 0) {
+			if (w === 0) C = 0;
+			else if (Math.abs(x) > 0) {
+				let e = w / Math.abs(x);
+				C = Number.isFinite(e) ? e : void 0;
+			} else C = void 0;
+		} else typeof m?.MipGap == "number" && Number.isFinite(m.MipGap) ? C = m.MipGap : v && _ === "Optimal" && y && (w === void 0 || w === 0) && (C = 0);
+		if (!y) return {
+			status: b,
+			terminationStatus: _,
+			hasPrimalSolution: !1,
 			objectiveValue: null,
+			...S === void 0 ? {} : { objectiveBound: S },
+			...C === void 0 ? {} : {
+				relGap: C,
+				mipGap: C
+			},
+			...w === void 0 ? {} : { absGap: w },
 			values: {},
 			reducedCosts: {},
 			duals: {},
 			slacks: {},
-			runTime: c,
-			raw: s
+			runTime: h,
+			raw: m
 		};
-		let u = s.ObjectiveValue, d = typeof u == "number" ? u + e.objective.constant : null, f = {}, p = {}, m = {}, h = {};
-		if (s.Columns) for (let [e, t] of Object.entries(s.Columns)) {
-			let n = a.get(e);
+		let T = (e, t, n) => {
+			Object.defineProperty(e, t, {
+				value: n,
+				enumerable: !0,
+				writable: !0,
+				configurable: !0
+			});
+		}, E = {}, D = {}, O = {}, k = {};
+		if (m.Columns) for (let [e, t] of Object.entries(m.Columns)) {
+			let n = c.get(e);
 			if (n) {
-				let e = Math.abs(t.Primal) < 1e-9 ? 0 : t.Primal;
-				f[n.name] = e, t.Dual !== void 0 && (m[n.name] = Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual);
+				if (typeof t.Primal == "number" && Number.isFinite(t.Primal)) {
+					let e = Math.abs(t.Primal) < 1e-9 ? 0 : t.Primal;
+					T(E, n.name, e);
+				}
+				typeof t.Dual == "number" && Number.isFinite(t.Dual) && T(O, n.name, Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual);
 			}
 		}
-		if (s.Rows) {
-			let e = Array.isArray(s.Rows) ? s.Rows : Object.values(s.Rows);
+		if (m.Rows) {
+			let e = Array.isArray(m.Rows) ? m.Rows : Object.values(m.Rows);
 			for (let t of e) {
-				let e = t.Name, n = o.get(e);
-				if (n && (t.Dual !== void 0 && (p[n.name] = Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual), t.Primal !== void 0)) {
+				let e = t.Name, n = e ? l.get(e) : void 0;
+				if (n && (typeof t.Dual == "number" && Number.isFinite(t.Dual) && T(D, n.name, Math.abs(t.Dual) < 1e-9 ? 0 : t.Dual), typeof t.Primal == "number" && Number.isFinite(t.Primal))) {
 					let e = n.rhs - t.Primal;
-					h[n.name] = Math.abs(e) < 1e-9 ? 0 : e;
+					T(k, n.name, Math.abs(e) < 1e-9 ? 0 : e);
 				}
 			}
 		}
 		return {
-			status: l,
-			objectiveValue: d,
-			values: f,
-			reducedCosts: m,
-			duals: p,
-			slacks: h,
-			runTime: c,
-			raw: s
+			status: b,
+			terminationStatus: _,
+			hasPrimalSolution: !0,
+			objectiveValue: x,
+			...S === void 0 ? {} : { objectiveBound: S },
+			...C === void 0 ? {} : {
+				relGap: C,
+				mipGap: C
+			},
+			...w === void 0 ? {} : { absGap: w },
+			values: E,
+			reducedCosts: O,
+			duals: D,
+			slacks: k,
+			runTime: h,
+			raw: m
 		};
 	}
-}, Q = Z;
-function ne() {
-	B("highs", (e) => new Z(e)), V((e) => new Z(e));
+}, Ae = J;
+function je() {
+	V("highs", (e) => new J(e)), Se((e) => new J(e));
 }
-ne();
+je();
 //#endregion
 //#region src/modeler/solvers/mock.ts
-var $ = class {
+var Me = class {
 	name;
 	capabilities;
 	options;
 	constructor(e = {}) {
 		this.name = e.name || "MockSolver", this.capabilities = e.capabilities || {
 			supportsMIP: !0,
-			supportsQP: !0
+			supportsQP: !0,
+			supportsWarmStart: !0
 		}, this.options = e;
 	}
-	async solve(e, t, n = {}) {
-		let r = {
+	async solve(e, t = {}, n = {}) {
+		let r = I(t) ? n : t, i = {
 			...this.options,
-			...n
+			...r
+		}, a = !!(i.values && Object.keys(i.values).length > 0 || i.boolValues && Object.keys(i.boolValues).length > 0);
+		if (i.signal?.aborted) return {
+			status: "Unknown",
+			terminationStatus: "Interrupted",
+			hasPrimalSolution: !1,
+			objectiveValue: null,
+			values: {},
+			runTime: 0,
+			raw: { mock: !0 }
 		};
-		return r.delayMs && r.delayMs > 0 && await new Promise((e) => setTimeout(e, r.delayMs)), {
-			status: r.status || "Optimal",
-			objectiveValue: r.objectiveValue ?? 0,
-			values: r.values || {},
-			reducedCosts: r.reducedCosts,
-			duals: r.duals,
-			slacks: r.slacks,
+		if (i.delayMs && i.delayMs > 0 && (await new Promise((e) => {
+			let t = setTimeout(() => {
+				i.signal?.removeEventListener("abort", n), e();
+			}, i.delayMs), n = () => {
+				clearTimeout(t), e();
+			};
+			i.signal?.addEventListener("abort", n, { once: !0 });
+		}), i.signal?.aborted)) {
+			let e = !!(i.hasPrimalSolution ?? a);
+			return {
+				status: e ? "Feasible" : "Unknown",
+				terminationStatus: "Interrupted",
+				hasPrimalSolution: e,
+				objectiveValue: e ? i.objectiveValue ?? 0 : null,
+				...i.objectiveBound === void 0 ? {} : { objectiveBound: i.objectiveBound },
+				...i.relGap === void 0 ? i.mipGap === void 0 ? {} : {
+					relGap: i.mipGap,
+					mipGap: i.mipGap
+				} : {
+					relGap: i.relGap,
+					mipGap: i.relGap
+				},
+				...i.absGap === void 0 ? {} : { absGap: i.absGap },
+				values: e && i.values || {},
+				...e && i.boolValues !== void 0 ? { boolValues: i.boolValues } : {},
+				runTime: .001,
+				raw: { mock: !0 }
+			};
+		}
+		if (i.onProgress && Array.isArray(i.progressEvents)) for (let e of i.progressEvents) {
+			if (i.signal?.aborted) break;
+			i.onProgress(e);
+		}
+		let o = i.status || "Optimal", s = i.terminationStatus ?? o, c = i.hasPrimalSolution === void 0 ? o === "Optimal" || o === "Feasible" || o === "Sat" || (o === "TimeLimit" || o === "IterationLimit" || s === "Interrupted") && a : i.hasPrimalSolution;
+		if (i.onProgress && !Array.isArray(i.progressEvents) && !i.signal?.aborted) {
+			let e = c ? i.objectiveValue ?? 0 : void 0;
+			i.onProgress({
+				elapsedTime: .001,
+				elapsedSeconds: .001,
+				...typeof e == "number" && Number.isFinite(e) ? { objectiveValue: e } : {},
+				...i.objectiveBound === void 0 ? {} : { objectiveBound: i.objectiveBound },
+				...i.relGap === void 0 ? i.mipGap === void 0 ? {} : {
+					relGap: i.mipGap,
+					mipGap: i.mipGap
+				} : {
+					relGap: i.relGap,
+					mipGap: i.relGap
+				},
+				...i.absGap === void 0 ? {} : { absGap: i.absGap }
+			});
+		}
+		return i.signal?.aborted && (s = "Interrupted", c = i.hasPrimalSolution === void 0 ? a : i.hasPrimalSolution, o = c ? "Feasible" : "Unknown"), {
+			status: o,
+			terminationStatus: s,
+			hasPrimalSolution: c,
+			objectiveValue: c ? i.objectiveValue ?? 0 : null,
+			...i.objectiveBound === void 0 ? {} : { objectiveBound: i.objectiveBound },
+			...i.relGap === void 0 ? i.mipGap === void 0 ? {} : {
+				relGap: i.mipGap,
+				mipGap: i.mipGap
+			} : {
+				relGap: i.relGap,
+				mipGap: i.relGap
+			},
+			...i.absGap === void 0 ? {} : { absGap: i.absGap },
+			values: c && i.values || {},
+			...c && i.boolValues !== void 0 ? { boolValues: i.boolValues } : {},
+			reducedCosts: i.reducedCosts,
+			duals: i.duals,
+			slacks: i.slacks,
 			runTime: .001,
 			raw: { mock: !0 }
 		};
 	}
 };
-function re() {
-	B("mock", (e) => new $(e));
+function Ne() {
+	V("mock", (e) => new Me(e));
+}
+Ne();
+//#endregion
+//#region src/modeler/solution-validator.ts
+function Pe(e, t) {
+	if (e === void 0) return 1e-6;
+	if (typeof e != "number" || !Number.isFinite(e) || e < 0) throw Error(`Invalid ${t}: expected a finite non-negative number, received ${String(e)}.`);
+	return e;
+}
+function Fe(e, t = {}) {
+	let n = Pe(t.feasibilityTolerance, "feasibilityTolerance"), r = Pe(t.integralityTolerance, "integralityTolerance"), i = t.evaluateLogicalConstraints === void 0 || !!t.evaluateLogicalConstraints, a = t.values !== void 0 && t.values !== null;
+	if (t.values !== void 0 && (typeof t.values != "object" || t.values === null || Array.isArray(t.values))) throw Error("Invalid values option: expected a plain object mapping variable names to values.");
+	let o = t.values, s = [], c = Object.create(null), l = [], f = [], p = 0, m = (e) => {
+		typeof e == "number" && !Number.isNaN(e) && e > p && (p = e);
+	}, h = (e) => {
+		s.push(e), Object.prototype.hasOwnProperty.call(c, e.name) || (c[e.name] = []), c[e.name].push(e), e.type !== "missing_value" && e.type !== "unchecked_constraint" && m(e.violation);
+	}, g = /* @__PURE__ */ new Map(), _ = /* @__PURE__ */ new Map(), y = 0, b = 0, x = 0, S = 0;
+	for (let t of e.variables) {
+		let e = a ? Object.prototype.hasOwnProperty.call(o, t.name) ? o[t.name] : void 0 : t.value;
+		if (e == null) {
+			f.push(t.name), h({
+				type: "missing_value",
+				target: "variable",
+				name: t.name,
+				actual: e ?? null,
+				violation: Infinity,
+				message: `Variable "${t.name}" has no assigned solution value.`
+			});
+			continue;
+		}
+		if (typeof e != "number" || !Number.isFinite(e)) {
+			h({
+				type: "non_finite_value",
+				target: "variable",
+				name: t.name,
+				actual: e,
+				violation: Infinity,
+				message: `Variable "${t.name}" has non-finite or non-numeric value: ${String(e)}.`
+			});
+			continue;
+		}
+		g.set(t, e), y++;
+		let i = t.type === "Binary" || t.type === "BINARY", s = i || t.type === "Integer" || t.type === "INTEGER", c = i ? Math.max(0, t.lb) : t.lb, l = i ? Math.min(1, t.ub) : t.ub, u = typeof t.lb == "number" && !Number.isNaN(t.lb) && t.lb !== Infinity, d = typeof t.ub == "number" && !Number.isNaN(t.ub) && t.ub !== -Infinity;
+		if (!u) h({
+			type: "lower_bound",
+			target: "variable",
+			name: t.name,
+			actual: e,
+			limit: t.lb,
+			violation: Infinity,
+			message: `Variable "${t.name}" has invalid lower bound (${String(t.lb)}).`
+		});
+		else if (c !== -Infinity) {
+			let r = e - c, i = Math.max(0, c - e);
+			m(i), i > n && h({
+				type: "lower_bound",
+				target: "variable",
+				name: t.name,
+				actual: e,
+				limit: c,
+				violation: i,
+				signedViolation: r,
+				message: `Variable "${t.name}" value (${e}) violates lower bound (${c}) by ${i}.`
+			});
+		}
+		if (!d) h({
+			type: "upper_bound",
+			target: "variable",
+			name: t.name,
+			actual: e,
+			limit: t.ub,
+			violation: Infinity,
+			message: `Variable "${t.name}" has invalid upper bound (${String(t.ub)}).`
+		});
+		else if (l !== Infinity) {
+			let r = e - l, i = Math.max(0, e - l);
+			m(i), i > n && h({
+				type: "upper_bound",
+				target: "variable",
+				name: t.name,
+				actual: e,
+				limit: l,
+				violation: i,
+				signedViolation: r,
+				message: `Variable "${t.name}" value (${e}) violates upper bound (${l}) by ${i}.`
+			});
+		}
+		if (u && d && c > l && c - e <= n && e - l <= n) {
+			let n = c - l;
+			h({
+				type: "lower_bound",
+				target: "variable",
+				name: t.name,
+				actual: e,
+				limit: c,
+				violation: n,
+				signedViolation: e - c,
+				message: `Variable "${t.name}" has inverted bounds [${c}, ${l}].`
+			});
+		}
+		if (s) {
+			let n = Math.round(e), a = e - n, o = Math.abs(a);
+			m(o), o > r && h({
+				type: "integrality",
+				target: "variable",
+				name: t.name,
+				varType: i ? "Binary" : "Integer",
+				actual: e,
+				nearestInteger: n,
+				violation: o,
+				signedViolation: a,
+				message: `${i ? "Binary" : "Integer"} variable "${t.name}" value (${e}) violates integrality by ${o} (nearest integer: ${n}).`
+			});
+		}
+	}
+	for (let t of e.boolVars) {
+		let e = a ? Object.prototype.hasOwnProperty.call(o, t.name) ? o[t.name] : void 0 : t.value;
+		if (e == null) {
+			f.push(t.name), h({
+				type: "missing_value",
+				target: "bool_variable",
+				name: t.name,
+				actual: e ?? null,
+				violation: Infinity,
+				message: `Boolean variable "${t.name}" has no assigned solution value.`
+			});
+			continue;
+		}
+		if (typeof e != "boolean") {
+			h({
+				type: "invalid_boolean_value",
+				target: "bool_variable",
+				name: t.name,
+				actual: e,
+				violation: Infinity,
+				message: `Boolean variable "${t.name}" has non-boolean value: ${String(e)}.`
+			});
+			continue;
+		}
+		_.set(t, e), b++;
+	}
+	let C = (e) => {
+		let t = e.constant === void 0 ? 0 : e.constant;
+		if (typeof t != "number" || !Number.isFinite(t)) return {
+			ok: !1,
+			reason: `non-finite constant (${String(t)})`
+		};
+		let n = t;
+		for (let [t, r] of e.terms) {
+			if (typeof r != "number" || !Number.isFinite(r)) return {
+				ok: !1,
+				reason: `non-finite coefficient (${String(r)}) for variable "${t.name}"`
+			};
+			if (r !== 0) {
+				if (!g.has(t)) return {
+					ok: !1,
+					reason: `missing or invalid value for variable "${t.name}"`
+				};
+				if (n += r * g.get(t), !Number.isFinite(n)) return {
+					ok: !1,
+					reason: "linear expression evaluation overflowed finite range"
+				};
+			}
+		}
+		return {
+			ok: !0,
+			value: n
+		};
+	}, w = (e, t = n) => {
+		if (typeof e.rhs != "number" || !Number.isFinite(e.rhs)) return {
+			status: "unchecked",
+			reason: `non-finite right-hand side (${String(e.rhs)})`
+		};
+		let r = C(e.lhs);
+		if (!r.ok) return {
+			status: "unchecked",
+			reason: r.reason
+		};
+		let i = r.value, a = i - e.rhs;
+		if (!Number.isFinite(a)) return {
+			status: "unchecked",
+			reason: "constraint residual overflowed finite range"
+		};
+		let o = e.sense === "<=" ? Math.max(0, a) : e.sense === ">=" ? Math.max(0, -a) : Math.abs(a);
+		return o > t ? {
+			status: "violated",
+			lhsVal: i,
+			signed: a,
+			violation: o,
+			message: `Constraint "${e.name}" (${i} ${e.sense} ${e.rhs}) violated by ${o}.`
+		} : {
+			status: "satisfied",
+			lhsVal: i,
+			signed: a,
+			violation: o
+		};
+	};
+	for (let t of e.constraints) {
+		let e = w(t);
+		e.status === "unchecked" ? (l.push(t.name), h({
+			type: "unchecked_constraint",
+			target: "constraint",
+			name: t.name,
+			sense: t.sense,
+			limit: t.rhs,
+			rhs: t.rhs,
+			violation: Infinity,
+			message: `Constraint "${t.name}" could not be evaluated: ${e.reason}.`
+		})) : e.status === "violated" ? (x++, h({
+			type: "linear_constraint",
+			target: "constraint",
+			name: t.name,
+			sense: t.sense,
+			actual: e.lhsVal,
+			limit: t.rhs,
+			rhs: t.rhs,
+			violation: e.violation,
+			signedViolation: e.signed,
+			message: e.message
+		})) : (x++, m(e.violation));
+	}
+	let T = (e) => {
+		if (e instanceof u) return _.has(e) ? {
+			ok: !0,
+			value: _.get(e),
+			violation: 0
+		} : {
+			ok: !1,
+			reason: `missing or invalid value for Boolean variable "${e.name}"`
+		};
+		if (e instanceof v) {
+			let t = w(e, 0);
+			if (t.status === "unchecked") return {
+				ok: !1,
+				reason: t.reason
+			};
+			if (n > 0) {
+				let r = Math.abs(t.lhsVal - e.rhs);
+				if (r > 0 && r <= n) return {
+					ok: !1,
+					reason: `numeric comparison "${e.name}" lies within feasibilityTolerance (${n}) of boundary (${t.lhsVal} vs ${e.rhs})`
+				};
+			}
+			return {
+				ok: !0,
+				value: t.status === "satisfied",
+				violation: 0
+			};
+		}
+		if (e instanceof d) switch (e.op) {
+			case "not": {
+				let t = T(e.children[0]);
+				return t.ok ? {
+					ok: !0,
+					value: !t.value,
+					violation: 0
+				} : t;
+			}
+			case "and": {
+				let t = 0;
+				for (let n of e.children) {
+					let e = T(n);
+					if (!e.ok) return e;
+					if (!e.value) return {
+						ok: !0,
+						value: !1,
+						violation: 0
+					};
+					e.violation > t && (t = e.violation);
+				}
+				return {
+					ok: !0,
+					value: !0,
+					violation: t
+				};
+			}
+			case "or": {
+				let t = !1, n = Infinity;
+				for (let r of e.children) {
+					let e = T(r);
+					if (!e.ok) return e;
+					e.value && (t = !0, e.violation < n && (n = e.violation));
+				}
+				return {
+					ok: !0,
+					value: t,
+					violation: t ? n : 0
+				};
+			}
+			case "implies": {
+				let t = T(e.children[0]);
+				if (!t.ok) return t;
+				if (!t.value) return {
+					ok: !0,
+					value: !0,
+					violation: 0
+				};
+				let n = T(e.children[1]);
+				return n.ok ? {
+					ok: !0,
+					value: n.value,
+					violation: n.value ? n.violation : 0
+				} : n;
+			}
+			case "xor": {
+				let t = !1, n = 0;
+				for (let r of e.children) {
+					let e = T(r);
+					if (!e.ok) return e;
+					e.value && (t = !t, e.violation > n && (n = e.violation));
+				}
+				return {
+					ok: !0,
+					value: t,
+					violation: t ? n : 0
+				};
+			}
+			default: return {
+				ok: !1,
+				reason: `unsupported logical operator "${String(e.op)}"`
+			};
+		}
+		return {
+			ok: !1,
+			reason: "unsupported logical expression node"
+		};
+	};
+	for (let t = 0; t < e.logicalConstraints.length; t++) {
+		let n = e.logicalConstraints[t], r = n.name || `lc_${t + 1}`;
+		if (!i) {
+			l.push(r), h({
+				type: "unchecked_constraint",
+				target: "logical_constraint",
+				name: r,
+				violation: Infinity,
+				message: `Logical constraint "${r}" was not evaluated because evaluateLogicalConstraints is false.`
+			});
+			continue;
+		}
+		let a = T(n.expr);
+		if (!a.ok) {
+			l.push(r), h({
+				type: "unchecked_constraint",
+				target: "logical_constraint",
+				name: r,
+				violation: Infinity,
+				message: `Logical constraint "${r}" could not be evaluated: ${a.reason}.`
+			});
+			continue;
+		}
+		S++, a.value ? m(a.violation) : h({
+			type: "logical_constraint",
+			target: "logical_constraint",
+			name: r,
+			actual: !1,
+			limit: !0,
+			violation: 1,
+			signedViolation: -1,
+			message: `Logical constraint "${r}" evaluated to false.`
+		});
+	}
+	let E = y === e.variables.length && b === e.boolVars.length && x === e.constraints.length && S === e.logicalConstraints.length && l.length === 0 && f.length === 0;
+	return {
+		valid: E && s.length === 0,
+		complete: E,
+		violations: s,
+		violationsByName: c,
+		uncheckedConstraints: l,
+		missingVariables: f,
+		maxViolation: p,
+		summary: {
+			checkedVariables: y,
+			totalVariables: e.variables.length,
+			checkedBoolVariables: b,
+			totalBoolVariables: e.boolVars.length,
+			checkedLinearConstraints: x,
+			totalLinearConstraints: e.constraints.length,
+			checkedLogicalConstraints: S,
+			totalLogicalConstraints: e.logicalConstraints.length
+		}
+	};
+}
+//#endregion
+//#region src/modeler/big-m.ts
+function Ie(e, t) {
+	if (typeof e != "number" || !Number.isFinite(e) || e <= 0) throw Error(`Invalid Big-M value for indicator constraint "${t}": expected a finite positive number, received ${e}.`);
+}
+function Y(e, t, n) {
+	let r = e.constant === void 0 ? 0 : e.constant;
+	if (!Number.isFinite(t) || !Number.isFinite(r)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": constraint contains non-finite constant (${r}) or right-hand side (${t}).`);
+	let i = t - r;
+	if (!Number.isFinite(i)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": effective right-hand side (${t} - ${r}) overflows finite floating-point range. Please rescale coefficients/constants.`);
+	for (let [t, r] of e.terms) {
+		if (!Number.isFinite(r)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" has non-finite coefficient (${r}).`);
+		if (Number.isNaN(t.lb) || Number.isNaN(t.ub) || t.lb === Infinity || t.ub === -Infinity || t.lb > t.ub) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" has invalid bounds [${t.lb}, ${t.ub}].`);
+	}
+	return i;
+}
+function Le(e, t, n) {
+	let r = Y(e, t, n), i = 0;
+	for (let [t, r] of e.terms) {
+		if (r === 0) continue;
+		let e;
+		if (r > 0) {
+			if (!Number.isFinite(t.ub)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" lacks a finite upper bound (required because coefficient ${r} is positive in <= constraint). Please set an explicit finite upper bound on the variable or specify { M } explicitly in indicator options.`);
+			e = t.ub;
+		} else {
+			if (!Number.isFinite(t.lb)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" lacks a finite lower bound (required because coefficient ${r} is negative in <= constraint). Please set an explicit finite lower bound on the variable or specify { M } explicitly in indicator options.`);
+			e = t.lb;
+		}
+		let a = r * e;
+		if (i += a, !Number.isFinite(a) || !Number.isFinite(i)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": numeric overflow while bounding contribution of variable "${t.name}". Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	}
+	let a = i - r;
+	if (!Number.isFinite(a)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": numeric overflow while computing Big-M (${i} - ${r}). Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	let o = Math.max(0, a);
+	if (!Number.isFinite(o) || !Number.isFinite(r + o)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": derived Big-M (${o}) or shifted right-hand side overflows finite floating-point range. Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	return o;
+}
+function Re(e, t, n) {
+	let r = Y(e, t, n), i = 0;
+	for (let [t, r] of e.terms) {
+		if (r === 0) continue;
+		let e;
+		if (r > 0) {
+			if (!Number.isFinite(t.lb)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" lacks a finite lower bound (required because coefficient ${r} is positive in >= constraint). Please set an explicit finite lower bound on the variable or specify { M } explicitly in indicator options.`);
+			e = t.lb;
+		} else {
+			if (!Number.isFinite(t.ub)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": variable "${t.name}" lacks a finite upper bound (required because coefficient ${r} is negative in >= constraint). Please set an explicit finite upper bound on the variable or specify { M } explicitly in indicator options.`);
+			e = t.ub;
+		}
+		let a = r * e;
+		if (i += a, !Number.isFinite(a) || !Number.isFinite(i)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": numeric overflow while bounding contribution of variable "${t.name}". Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	}
+	let a = r - i;
+	if (!Number.isFinite(a)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": numeric overflow while computing Big-M (${r} - ${i}). Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	let o = Math.max(0, a);
+	if (!Number.isFinite(o) || !Number.isFinite(r - o)) throw Error(`Cannot derive safe Big-M for indicator constraint "${n}": derived Big-M (${o}) or shifted right-hand side overflows finite floating-point range. Please rescale coefficients/bounds or specify a finite { M } explicitly.`);
+	return o;
+}
+function X(e, t, n, r, i, a, o) {
+	if (!(e instanceof N && (e.type === "Binary" || e.type === "Integer" && e.lb === 0 && e.ub === 1))) throw Error(`Indicator variable "${e?.name ?? String(e)}" must be a Binary variable (or Integer variable with bounds [0, 1]), received "${e?.type ?? typeof e}" with bounds [${e?.lb}, ${e?.ub}].`);
+	if (!Number.isFinite(e.lb) || !Number.isFinite(e.ub) || e.lb < 0 || e.ub > 1 || e.lb > e.ub) throw Error(`Binary indicator variable "${e.name}" has invalid bounds [${e.lb}, ${e.ub}]. Binary variables must stay within [0, 1] with lb <= ub.`);
+	let s = Y(t, r, o);
+	if (i !== 0 && i !== 1) throw Error(`Invalid activeValue: ${i}. Indicator activation value must be 0 or 1.`);
+	if (n !== "<=" && n !== ">=") throw Error(`Invalid indicator sense for "${o}": expected "<=" or ">=", received "${String(n)}".`);
+	if (!Number.isFinite(a) || a < 0) throw Error(`Invalid Big-M value for indicator constraint "${o}": expected a finite non-negative number, received ${a}.`);
+	let c = t.terms.get(e);
+	if (c !== void 0 && c !== 0) throw Error(`Indicator constraint "${o}" cannot include its own binary activation variable "${e.name}" in the linear expression.`);
+	let l, u;
+	if (i === 1 ? n === "<=" ? (l = a, u = s + a) : (l = -a, u = s - a) : n === "<=" ? (l = -a, u = s) : (l = a, u = s), !Number.isFinite(u)) throw Error(`Cannot construct finite indicator constraint "${o}": shifted right-hand side overflows finite floating-point range. Please rescale coefficients/bounds or specify a smaller finite { M }.`);
+	let d = /* @__PURE__ */ new Map();
+	for (let [e, n] of t.terms) n !== 0 && d.set(e, n);
+	return l !== 0 && d.set(e, l), {
+		lhs: new S(d, 0),
+		rhs: u
+	};
 }
-re();
 //#endregion
 //#region src/modeler/model.ts
-var ie = class {
+function Z(e) {
+	return Array.isArray(e) || typeof e == "object" && !!e && !(e instanceof String) && typeof e[Symbol.iterator] == "function";
+}
+function Q(e) {
+	return typeof e == "object" && !!e && !Array.isArray(e) && !(e instanceof String) && typeof e[Symbol.iterator] != "function";
+}
+function $(e, t) {
+	if (!Number.isInteger(e) || e < 0) throw Error(`Invalid count (${e}) for ${t} variable creation: count must be a non-negative integer.`);
+}
+var ze = class {
 	name;
-	sense;
-	objective;
+	_sense;
+	_objectiveExpr;
 	variables = [];
 	constraints = [];
 	boolVars = [];
 	logicalConstraints = [];
-	unsatCore = [];
+	unsatCore = void 0;
 	values = /* @__PURE__ */ new Map();
 	varMapByName = /* @__PURE__ */ new Map();
+	varPrefixCounters = /* @__PURE__ */ new Map();
+	boolVarMapByName = /* @__PURE__ */ new Map();
+	boolVarPrefixCounters = /* @__PURE__ */ new Map();
 	constrMapByName = /* @__PURE__ */ new Map();
+	constrPrefixCounters = /* @__PURE__ */ new Map();
+	logicalConstrMapByName = /* @__PURE__ */ new Map();
+	logicalConstrCounter = 0;
 	status = "NotSolved";
+	terminationStatus = "NotSolved";
+	hasPrimalSolution = !1;
 	objectiveValue = null;
+	objectiveBound = void 0;
+	relGap = void 0;
+	mipGap = void 0;
+	absGap = void 0;
 	runTime = 0;
 	solution = null;
 	solver = null;
+	hasSolutionState = !1;
+	modelRevision = 0;
+	activeOperationId = 0;
+	batchDepth = 0;
+	batchMutated = !1;
+	batchUndoActions = [];
 	constructor(e = {}, t) {
 		let n;
 		n = typeof e == "string" ? {
 			...t,
 			name: e
-		} : e, this.name = n.name || "OptimizationModel", this.sense = l(n.sense), this.objective = new S(), n.solver && (this.solver = H(n.solver));
+		} : e, this.name = n.name || "OptimizationModel", this._sense = o(n.sense), this._objectiveExpr = new S(), n.solver && (this.solver = H(n.solver));
 	}
-	get vars() {
-		return this.variables;
+	get sense() {
+		return this._sense;
 	}
-	get constrs() {
-		return this.constraints;
+	set sense(e) {
+		let t = o(e);
+		this._sense !== t && (this._sense = t, this.recordModelMutation());
+	}
+	get objectiveExpr() {
+		return this._objectiveExpr.clone();
+	}
+	set objectiveExpr(e) {
+		this.applyObjective(e);
+	}
+	get conflicts() {
+		return this.unsatCore;
 	}
 	get numVars() {
 		return this.variables.length;
@@ -963,50 +2216,123 @@ var ie = class {
 	get numConstrs() {
 		return this.constraints.length;
 	}
-	createDomainVars(e, t, n, r) {
-		if (typeof n == "number" || Array.isArray(n)) {
-			let i = typeof t == "number" ? Array.from({ length: t }, (e, t) => t) : t, a = typeof n == "number" ? Array.from({ length: n }, (e, t) => t) : n, o = r || {}, s = o.prefix || o.name || "x", c = {};
-			for (let t of i) {
-				c[t] = {};
-				for (let n of a) c[t][n] = this.addVar({
-					...o,
-					type: e,
-					name: `${s}_${t}_${n}`
-				});
+	clearSolutionFields() {
+		if (this.hasSolutionState || this.status !== "NotSolved" || this.terminationStatus !== "NotSolved" || this.hasPrimalSolution || this.solution !== null || this.unsatCore !== void 0) {
+			this.hasSolutionState = !1, this.status = "NotSolved", this.terminationStatus = "NotSolved", this.hasPrimalSolution = !1, this.objectiveValue = null, this.objectiveBound = void 0, this.relGap = void 0, this.mipGap = void 0, this.absGap = void 0, this.solution = null, this.runTime = 0, this.unsatCore = void 0, this.values.clear();
+			for (let e of this.variables) e.value = null, e.reducedCost = null;
+			for (let e of this.boolVars) e.value = null;
+			for (let e of this.constraints) e.dual = null, e.slack = null;
+		}
+	}
+	recordModelMutation() {
+		if (this.batchDepth > 0) {
+			this.batchMutated = !0;
+			return;
+		}
+		this.modelRevision++, this.clearSolutionFields();
+	}
+	notifyMutation() {
+		this.recordModelMutation();
+	}
+	resetSolutionState() {
+		this.recordModelMutation();
+	}
+	runTransactionalBatch(e) {
+		if (this.batchDepth > 0) return e();
+		let t = this.variables.length, n = this.boolVars.length, r = this.constraints.length, i = this.logicalConstraints.length, a = new Map(this.varPrefixCounters), o = new Map(this.boolVarPrefixCounters), s = new Map(this.constrPrefixCounters), c = this.logicalConstrCounter;
+		this.batchDepth = 1, this.batchMutated = !1, this.batchUndoActions = [];
+		try {
+			let t = e();
+			this.batchDepth = 0;
+			let n = this.batchMutated;
+			return this.batchMutated = !1, this.batchUndoActions = [], n && this.recordModelMutation(), t;
+		} catch (e) {
+			this.batchDepth = 0, this.batchMutated = !1;
+			for (let e = t; e < this.variables.length; e++) {
+				let t = this.variables[e];
+				this.varMapByName.delete(t.name), t.ownerModel = null, te(t, this);
+			}
+			this.variables.length = t;
+			for (let e = n; e < this.boolVars.length; e++) {
+				let t = this.boolVars[e];
+				this.boolVarMapByName.delete(t.name);
+			}
+			this.boolVars.length = n;
+			for (let e = r; e < this.constraints.length; e++) {
+				let t = this.constraints[e];
+				this.constrMapByName.delete(t.name);
 			}
-			return c;
+			this.constraints.length = r;
+			for (let e = i; e < this.logicalConstraints.length; e++) {
+				let t = this.logicalConstraints[e];
+				this.logicalConstrMapByName.delete(t.name);
+			}
+			this.logicalConstraints.length = i;
+			for (let e = this.batchUndoActions.length - 1; e >= 0; e--) this.batchUndoActions[e]();
+			throw this.batchUndoActions = [], this.varPrefixCounters = a, this.boolVarPrefixCounters = o, this.constrPrefixCounters = s, this.logicalConstrCounter = c, e;
 		}
-		if (typeof t == "string") {
-			let r = n || {};
+	}
+	createDomainVars(e, t, n, r) {
+		let i = e.toLowerCase(), a = typeof t == "number", o = typeof n == "number", s = Z(t), c = Z(n);
+		if (o || c) {
+			if (a && $(t, i), o && $(n, i), !a && !s || r !== void 0 && !Q(r)) throw Error(`Invalid arguments provided for ${i} variable creation`);
+			let c = a ? Array.from({ length: t }, (e, t) => t) : Array.from(t), l = o ? Array.from({ length: n }, (e, t) => t) : n === t ? c : Array.from(n), u = r || {}, d = u.prefix || u.name || "x";
+			return this.runTransactionalBatch(() => {
+				let t = a ? [] : {};
+				for (let n of c) {
+					let r = o ? [] : {};
+					for (let t of l) r[t] = this.addVar({
+						...u,
+						type: e,
+						name: `${d}_${n}_${t}`
+					});
+					t[n] = r;
+				}
+				return t;
+			});
+		}
+		if (typeof t == "string" || t === void 0) {
+			if (n !== void 0 && !Q(n)) throw Error(`Invalid arguments provided for ${i} variable creation`);
+			let r = n || {}, a = typeof t == "string" ? t : r.name;
 			return this.addVar({
 				...r,
 				type: e,
-				name: t
+				name: a
 			});
 		}
-		let i = n || {}, a = i.prefix || i.name;
-		if (typeof t == "number") {
-			let n = [], r = a || "x";
-			for (let a = 0; a < t; a++) n.push(this.addVar({
-				...i,
+		if (Q(t)) {
+			if (n !== void 0) throw Error(`Invalid arguments provided for ${i} variable creation`);
+			let r = t;
+			return this.addVar({
+				...r,
+				type: e
+			});
+		}
+		if (n !== void 0 && !Q(n)) throw Error(`Invalid arguments provided for ${i} variable creation`);
+		let l = n || {}, u = l.prefix || l.name;
+		if (typeof t == "number") return $(t, i), this.runTransactionalBatch(() => {
+			let n = [], r = u || "x";
+			for (let i = 0; i < t; i++) n.push(this.addVar({
+				...l,
 				type: e,
-				name: `${r}_${a}`
+				name: void 0,
+				prefix: r
 			}));
 			return n;
-		}
-		if (Array.isArray(t) || t && typeof t[Symbol.iterator] == "function") {
+		});
+		if (Z(t)) return this.runTransactionalBatch(() => {
 			let n = {};
 			for (let r of t) {
-				let t = a ? `${a}_${r}` : `${r}`;
+				let t = u ? `${u}_${r}` : `${r}`;
 				n[r] = this.addVar({
-					...i,
+					...l,
 					type: e,
 					name: t
 				});
 			}
 			return n;
-		}
-		throw Error(`Invalid arguments provided for ${e.toLowerCase()} variable creation`);
+		});
+		throw Error(`Invalid arguments provided for ${i} variable creation`);
 	}
 	binary(e, t, n) {
 		return this.createDomainVars("Binary", e, t, n);
@@ -1017,89 +2343,142 @@ 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) {
-		if (typeof t == "number" || Array.isArray(t)) {
-			let r = typeof e == "number" ? Array.from({ length: e }, (e, t) => t) : e, i = typeof t == "number" ? Array.from({ length: t }, (e, t) => t) : t, a = n || {}, o = a.prefix || a.name || "x", s = {};
-			for (let e of r) {
-				s[e] = {};
-				for (let t of i) s[e][t] = this.addVar({
-					...a,
-					name: `${o}_${e}_${t}`
-				});
-			}
-			return s;
+	bool(e, t, n) {
+		let r = typeof e == "number", i = typeof t == "number", a = Z(e), o = Z(t);
+		if (i || o) {
+			if (r && $(e, "boolean"), i && $(t, "boolean"), !r && !a || n !== void 0 && !Q(n)) throw Error("Invalid arguments provided for boolean variable creation");
+			let o = r ? Array.from({ length: e }, (e, t) => t) : Array.from(e), s = i ? Array.from({ length: t }, (e, t) => t) : t === e ? o : Array.from(t), c = n || {}, l = c.prefix || c.name || "p";
+			return this.runTransactionalBatch(() => {
+				let e = r ? [] : {};
+				for (let t of o) {
+					let n = i ? [] : {};
+					for (let e of s) n[e] = this.createBoolVar(`${l}_${t}_${e}`);
+					e[t] = n;
+				}
+				return e;
+			});
 		}
-		let r = t || {}, i = r.prefix || r.name;
-		if (typeof e == "number") {
-			let t = [], n = i || "x";
-			for (let i = 0; i < e; i++) t.push(this.addVar({
-				...r,
-				name: `${n}_${i}`
-			}));
-			return t;
+		if (typeof e == "string" || e === void 0) {
+			if (t !== void 0 && !Q(t)) throw Error("Invalid arguments provided for boolean variable creation");
+			let n = t || {}, r = typeof e == "string" ? e : n.name;
+			return this.createBoolVar(r, n.prefix);
+		}
+		if (Q(e)) {
+			if (t !== void 0) throw Error("Invalid arguments provided for boolean variable creation");
+			let n = e;
+			return this.createBoolVar(n.name, n.prefix);
 		}
-		{
+		if (t !== void 0 && !Q(t)) throw Error("Invalid arguments provided for boolean variable creation");
+		let s = t || {}, c = s.prefix || s.name;
+		if (typeof e == "number") return $(e, "boolean"), this.runTransactionalBatch(() => {
+			let t = [], n = c || "p";
+			for (let r = 0; r < e; r++) t.push(this.createBoolVar(void 0, n));
+			return t;
+		});
+		if (Z(e)) return this.runTransactionalBatch(() => {
 			let t = {};
 			for (let n of e) {
-				let e = i ? `${i}_${n}` : `${n}`;
-				t[n] = this.addVar({
-					...r,
-					name: e
-				});
+				let e = c ? `${c}_${n}` : `${n}`;
+				t[n] = this.createBoolVar(e);
 			}
 			return t;
-		}
-	}
-	addVars2D(e, t, n) {
-		let r = {}, i = n?.name || "x";
-		for (let a of e) {
-			r[a] = {};
-			for (let e of t) r[a][e] = this.addVar({
-				...n,
-				name: `${i}_${a}_${e}`
+		});
+		throw Error("Invalid arguments provided for boolean variable creation");
+	}
+	hasVarName(e) {
+		return this.varMapByName.has(e) || this.boolVarMapByName.has(e);
+	}
+	getNextVarName(e) {
+		let t = this.varPrefixCounters.get(e) ?? 0, n = `${e}_${t}`;
+		for (; this.hasVarName(n);) t++, n = `${e}_${t}`;
+		return this.varPrefixCounters.set(e, t + 1), n;
+	}
+	getNextBoolVarName(e) {
+		let t = this.boolVarPrefixCounters.get(e) ?? 0, n = `${e}_${t}`;
+		for (; this.hasVarName(n) || this.hasConstraintName(n);) t++, n = `${e}_${t}`;
+		return this.boolVarPrefixCounters.set(e, t + 1), n;
+	}
+	hasConstraintName(e) {
+		return this.constrMapByName.has(e) || this.logicalConstrMapByName.has(e);
+	}
+	hasBoolVarName(e) {
+		return this.boolVarMapByName.has(e);
+	}
+	getNextConstrName(e = "c") {
+		let t = this.constrPrefixCounters.get(e) ?? 1, n = `${e}_${t}`;
+		for (; this.hasConstraintName(n) || this.hasBoolVarName(n);) t++, n = `${e}_${t}`;
+		return this.constrPrefixCounters.set(e, t + 1), n;
+	}
+	getNextLogicalConstrName() {
+		let e = this.logicalConstrCounter + 1, t = `lc_${e}`;
+		for (; this.hasConstraintName(t) || this.hasBoolVarName(t);) e++, t = `lc_${e}`;
+		return this.logicalConstrCounter = e, t;
+	}
+	createBoolVar(e, t) {
+		let n = typeof e == "string" ? e.trim() : void 0, r = typeof t == "string" ? t.trim() : "", i = r.length > 0 ? r : "p", a = n && n.length > 0 ? n : this.getNextBoolVarName(i);
+		if (this.hasVarName(a)) throw Error(`Variable with name '${a}' already exists in model`);
+		if (this.hasConstraintName(a)) throw Error(`Boolean variable name '${a}' conflicts with an existing constraint in model`);
+		let o = new u(a);
+		return this.boolVars.push(o), this.boolVarMapByName.set(o.name, o), this.recordModelMutation(), o;
+	}
+	addVar(e) {
+		let t = e || {}, n = typeof t.name == "string" ? t.name.trim() : void 0, r = n && n.length > 0 ? n : void 0, i = typeof t.prefix == "string" ? t.prefix.trim() : "", a = i.length > 0 ? i : "x", o = this.varPrefixCounters.get(a), s = r ?? this.getNextVarName(a);
+		try {
+			if (this.hasVarName(s)) throw Error(`Variable with name '${s}' already exists in model`);
+			let e = new N({
+				...t,
+				name: s,
+				prefix: a
 			});
+			return e.hasExplicitName = r !== void 0, A(e), k(e, this), e.ownerModel = this, this.variables.push(e), this.varMapByName.set(e.name, e), this.recordModelMutation(), e;
+		} catch (e) {
+			throw r === void 0 && (o === void 0 ? this.varPrefixCounters.delete(a) : this.varPrefixCounters.set(a, o)), e;
 		}
-		return r;
 	}
 	getVarByName(e) {
 		return this.varMapByName.get(e);
 	}
+	getBoolVarByName(e) {
+		return this.boolVarMapByName.get(e);
+	}
 	getConstraintByName(e) {
 		return this.constrMapByName.get(e);
 	}
-	setObjective(e, t) {
-		if (e instanceof y) throw Error("Cannot set objective to a constraint comparison (<=, >=, ==). Did you mean to use m.constrain(expr`... <= ...`)? For objectives, supply an unconstrained expression like expr`45 * ${x} + 80 * ${y}`.");
-		t && (this.sense = l(t)), this.objective = typeof e == "string" ? k(e, (e) => this.getVarByName(e)) : typeof e == "number" ? new S(/* @__PURE__ */ new Map(), e) : e instanceof x || "terms" in e ? e.clone() : new S(/* @__PURE__ */ new Map([[e, 1]]), 0);
-	}
-	maximize(e) {
-		this.setObjective(e, "Maximize");
-	}
-	minimize(e) {
-		this.setObjective(e, "Minimize");
-	}
-	constrain(e, t) {
-		if (Array.isArray(e)) {
-			for (let t of e) this.constrain(t);
+	getLogicalConstraintByName(e) {
+		return this.logicalConstrMapByName.get(e);
+	}
+	objective(e) {
+		return e ? (this.applyObjective(e.expr, e.sense), this) : this.objectiveExpr;
+	}
+	applyObjective(e, t) {
+		if (e instanceof v || typeof e == "object" && e && "sense" in e && "lhs" in e && "rhs" in e || typeof e == "string" && /(<=|>=|==|=<|=>|=)/.test(e)) throw Error(typeof e == "string" ? "Cannot use a comparison constraint as an objective. Did you mean to use m.constraint(expr`... <= ...`)?" : "Cannot use a Constraint as an objective. Did you mean to use m.constraint(expr`... <= ...`)? For objectives, supply an unconstrained expression like expr`45 * ${x} + 80 * ${y}`.");
+		let n = t === void 0 ? this.sense : o(t), r;
+		if (typeof e == "string") r = fe(e, (e) => this.getVarByName(e));
+		else if (typeof e == "number") r = new S(/* @__PURE__ */ new Map(), e);
+		else if (e instanceof x) r = e.clone();
+		else if (e instanceof S) r = e.clone();
+		else if (typeof e == "object" && e && "quadTerms" in e && e.quadTerms instanceof Map && "linearTerms" in e && e.linearTerms instanceof Map && typeof e.constant == "number") {
+			let t = e;
+			r = new x(t.linearTerms, t.quadTerms, t.constant);
+		} else if (typeof e == "object" && e && "terms" in e && e.terms instanceof Map && typeof e.constant == "number") {
+			let t = e;
+			r = new S(t.terms, t.constant);
+		} else if (e instanceof N || typeof e == "object" && e && "id" in e && "name" in e && "lb" in e && "ub" in e) r = new S(/* @__PURE__ */ new Map([[e, 1]]), 0);
+		else throw Error("Invalid objective expression: expected a finite number, Var, LinExpr, QuadExpr, or arithmetic expression string.");
+		ae(r, this.name, (e) => this.varMapByName.get(e.name) === e), this._sense = n, this._objectiveExpr = r, this.recordModelMutation();
+	}
+	constraint(e, t) {
+		if (Array.isArray(e)) return this.runTransactionalBatch(() => {
+			for (let t of e) this.constraint(t);
 			return this;
-		}
-		if (e instanceof S) throw Error("Cannot add a linear expression without a comparison operator (<=, >=, ==) as a constraint. Use expr`... <= ...` or .le(), .ge(), .eq().");
+		});
+		if (e instanceof x || typeof e == "object" && e && "quadTerms" in e) throw Error("Constraint must contain a comparison operator (<=, >=, ==): cannot add a quadratic expression as a constraint.");
+		if (e instanceof S || typeof e == "object" && e && "terms" in e) throw Error("Constraint must contain a comparison operator (<=, >=, ==): cannot add a linear expression without a comparison operator. Use expr`... <= ...` or .le(), .ge(), .eq().");
 		return this.addConstraint(e, t), this;
 	}
 	getValues(e) {
 		if (e == null) return null;
-		if (e instanceof E) return e.value;
+		if (e instanceof N || e instanceof u) return e.value;
 		if (Array.isArray(e)) return e.map((e) => this.getValues(e));
 		if (typeof e == "object") {
 			let t = {};
@@ -1108,168 +2487,345 @@ 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 d) {
-			let n = t || `lc_${this.logicalConstraints.length + 1}`;
-			return this.logicalConstraints.push({
-				name: n,
+		if (e instanceof x || typeof e == "object" && e && "quadTerms" in e) throw Error("Constraint must contain a comparison operator (<=, >=, ==): cannot add a quadratic expression as a constraint.");
+		if (e instanceof S || typeof e == "object" && e && "terms" in e) throw Error("Constraint must contain a comparison operator (<=, >=, ==): cannot add a linear expression without a comparison operator. Use expr`... <= ...` or .le(), .ge(), .eq().");
+		if (e instanceof l) {
+			let n = typeof t == "string" && t.trim().length > 0 ? t.trim() : void 0;
+			if (n !== void 0) {
+				if (this.hasConstraintName(n)) throw Error(`Constraint with name '${n}' already exists in model`);
+				if (this.hasBoolVarName(n)) throw Error(`Constraint name '${n}' conflicts with an existing Boolean variable in model`);
+			}
+			let r = this.logicalConstrCounter, i = n ?? this.getNextLogicalConstrName();
+			try {
+				M(e, i, this.name, (e) => this.varMapByName.get(e.name) === e, (e) => this.boolVarMapByName.get(e.name) === e, this);
+			} catch (e) {
+				throw n === void 0 && (this.logicalConstrCounter = r), e;
+			}
+			O(e, this, this.batchDepth > 0 ? this.batchUndoActions : void 0);
+			let a = {
+				name: i,
 				expr: e
-			}), e;
+			};
+			return this.logicalConstraints.push(a), this.logicalConstrMapByName.set(i, a), this.recordModelMutation(), e;
 		}
-		let n;
-		if (typeof e == "string" ? n = A(e, (e) => this.getVarByName(e), t) : (n = e, t && (n.name = t)), this.constrMapByName.has(n.name)) throw Error(`Constraint with name '${n.name}' already exists in model`);
-		return this.constraints.push(n), this.constrMapByName.set(n.name, n), n;
-	}
-	addConstr(e, t) {
-		return this.addConstraint(e, t);
-	}
-	addConstrs(e) {
-		return e.map((e) => this.addConstraint(e));
-	}
-	add(e, t) {
-		if (Array.isArray(e)) {
-			for (let t of e) this.add(t);
-			return this;
+		let n = typeof e == "string" ? me(e, (e) => this.getVarByName(e), t) : e;
+		n.ownerModel && n.ownerModel !== this && (j(n, this.name, (e) => this.varMapByName.get(e.name) === e, n.name), ee(n, this));
+		let r = typeof t == "string" && t.trim().length > 0 ? t.trim() : n.hasExplicitName ? n.name.trim() : void 0;
+		if (r !== void 0) {
+			if (this.hasConstraintName(r)) throw Error(`Constraint with name '${r}' already exists in model`);
+			if (this.hasBoolVarName(r)) throw Error(`Constraint name '${r}' conflicts with an existing Boolean variable in model`);
 		}
-		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);
+		let i = this.constrPrefixCounters.get("c"), a = r ?? this.getNextConstrName("c"), o;
+		try {
+			j(n, this.name, (e) => this.varMapByName.get(e.name) === e, a), o = ee(n, this);
+		} catch (e) {
+			throw r === void 0 && (i === void 0 ? this.constrPrefixCounters.delete("c") : this.constrPrefixCounters.set("c", i)), e;
+		}
+		let s = n.name, c = n.hasExplicitName, u = n.ownerModel, d = o;
+		return this.batchUndoActions.push(() => {
+			n.ownerModel = u, n._assignModelName(s, c), ne(n, this, d);
+		}), this.batchDepth === 0 && (this.batchUndoActions = []), n._assignModelName(a, !0), n.ownerModel = this, this.constraints.push(n), this.constrMapByName.set(n.name, n), this.recordModelMutation(), n;
 	}
 	indicator(e, t, n = {}) {
+		if (!(e instanceof N)) throw Error("Invalid binary variable passed to indicator(). Expected a binary Var instance.");
+		if (!(e.type === "Binary" || e.type === "Integer" && e.lb === 0 && e.ub === 1)) throw Error(`Invalid variable "${e.name}" passed to indicator(): variable has type "${e.type}" with bounds [${e.lb}, ${e.ub}]. Indicator activation variable must be a Binary variable (or Integer variable with bounds [0, 1]).`);
+		if (t instanceof x) throw Error("Quadratic expressions or constraints are not supported in indicator constraints (only linear constraints are allowed).");
 		if (!("sense" in t) || !("lhs" in t)) throw Error("Invalid constraint expression passed to indicator(). Expression must include a comparison operator (<=, >=, ==).");
-		let r = t, i = n.activeValue === void 0 ? 1 : n.activeValue, a = n.M === void 0 ? 1e5 : n.M, o = n.name || `ind_${e.name}_${r.name}`, s = [], { lhs: c, sense: l, rhs: u } = r;
-		if (i === 1) {
-			if (l === "<=" || l === "==") {
-				let t = this.addConstraint(c.add(e.mul(a)).le(u + a), l === "==" ? `${o}_le` : o);
-				s.push(t);
-			}
-			if (l === ">=" || l === "==") {
-				let t = this.addConstraint(c.sub(e.mul(a)).ge(u - a), l === "==" ? `${o}_ge` : o);
-				s.push(t);
-			}
-		} else {
-			if (l === "<=" || l === "==") {
-				let t = this.addConstraint(c.sub(e.mul(a)).le(u), l === "==" ? `${o}_le` : o);
-				s.push(t);
+		let r = t, i = n.activeValue === void 0 ? 1 : n.activeValue;
+		if (i !== 0 && i !== 1) throw Error(`Invalid activeValue: ${i}. Indicator activeValue must be 0 or 1.`);
+		if (this.varMapByName.get(e.name) !== e) throw Error(`Variable "${e.name}" passed to indicator() does not belong to model "${this.name}". All variables must belong to the model by object identity.`);
+		let a = typeof n.name == "string" && n.name.trim().length > 0 ? n.name.trim() : void 0, o = this.constrPrefixCounters.get("c"), { lhs: s, sense: c, rhs: l } = r, u, d, f;
+		if (a !== void 0) u = a, d = c === "==" ? `${u}_le` : u, f = c === "==" ? `${u}_ge` : u;
+		else if (r.hasExplicitName) u = `ind_${e.name}_${r.name.trim()}`, d = c === "==" ? `${u}_le` : u, f = c === "==" ? `${u}_ge` : u;
+		else do {
+			let t = this.getNextConstrName("c");
+			u = `ind_${e.name}_${t}`, d = c === "==" ? `${u}_le` : u, f = c === "==" ? `${u}_ge` : u;
+		} while ((c === "<=" || c === "==") && (this.hasConstraintName(d) || this.hasBoolVarName(d)) || (c === ">=" || c === "==") && (this.hasConstraintName(f) || this.hasBoolVarName(f)));
+		let p = [];
+		try {
+			if ((c === "<=" || c === "==") && (this.hasConstraintName(d) || this.hasBoolVarName(d))) throw Error(this.hasBoolVarName(d) ? `Constraint name '${d}' conflicts with an existing Boolean variable in model` : `Constraint with name '${d}' already exists in model`);
+			if ((c === ">=" || c === "==") && (this.hasConstraintName(f) || this.hasBoolVarName(f))) throw Error(this.hasBoolVarName(f) ? `Constraint name '${f}' conflicts with an existing Boolean variable in model` : `Constraint with name '${f}' already exists in model`);
+			n.M !== void 0 && Ie(n.M, u);
+			let t = (e) => this.varMapByName.get(e.name) === e;
+			for (let [e] of s.terms) if (!t(e)) throw Error(`Variable "${e.name}" in constraint "${u}" does not belong to model "${this.name}". All variables must belong to the model by object identity.`);
+			if (c === "<=" || c === "==") {
+				let t = X(e, s, "<=", l, i, n.M === void 0 ? Le(s, l, d) : n.M, d);
+				p.push([new v(t.lhs, "<=", t.rhs, d), d]);
 			}
-			if (l === ">=" || l === "==") {
-				let t = this.addConstraint(c.add(e.mul(a)).ge(u), l === "==" ? `${o}_ge` : o);
-				s.push(t);
+			if (c === ">=" || c === "==") {
+				let t = X(e, s, ">=", l, i, n.M === void 0 ? Re(s, l, f) : n.M, f);
+				p.push([new v(t.lhs, ">=", t.rhs, f), f]);
 			}
+			for (let [e, n] of p) j(e, this.name, t, n);
+		} catch (e) {
+			throw o === void 0 ? this.constrPrefixCounters.delete("c") : this.constrPrefixCounters.set("c", o), e;
 		}
-		return s;
-	}
-	addIndicator(e, t, n = {}) {
-		return this.indicator(e, t, n);
+		return this.runTransactionalBatch(() => p.map(([e, t]) => this.addConstraint(e, t)));
 	}
 	toLpString() {
-		let { lpString: e } = F({
+		this.validateIntegrity();
+		let { lpString: e } = R({
 			name: this.name,
 			sense: this.sense,
-			objective: this.objective,
+			objective: this.objectiveExpr,
 			constraints: this.constraints,
 			variables: this.variables
 		});
 		return e;
 	}
-	async optimize(e, t) {
-		let n, r;
-		if (e && typeof e == "object" && "solve" in e && typeof e.solve == "function" ? (n = e, r = t || {}) : typeof e == "function" ? (n = new e(t), r = t || {}) : typeof e == "string" ? (n = H(e, t), r = t || {}) : (r = { ...e }, r.solver ? (n = H(r.solver, r), delete r.solver) : n = this.solver || H()), this.objective instanceof x && this.objective.quadTerms.size > 0 && n.capabilities?.supportsQP === !1) throw Error(`Solver "${n.name}" does not support quadratic objectives (QP). Please use a QP-capable solver such as HiGHS or Clarabel.`);
-		let i = {
+	validateIntegrity() {
+		oe(this);
+	}
+	ensureExecutionValid(e, t, n) {
+		if (this.modelRevision !== e) throw this.activeOperationId === t && this.clearSolutionFields(), Error(`Model "${this.name}" was modified while ${n}() was in progress; stale solver result was discarded.`);
+		if (this.activeOperationId !== t) throw Error(`Stale ${n}() result discarded because a newer solve or check operation was started on model "${this.name}".`);
+	}
+	wrapSolveOptions(e, t, n) {
+		let r = e.onProgress;
+		return r ? {
+			...e,
+			onProgress: (e) => {
+				this.activeOperationId === n && this.modelRevision === t && r(e);
+			}
+		} : e;
+	}
+	hasPrimalFromResult(e) {
+		if (typeof e.hasPrimalSolution == "boolean") return e.hasPrimalSolution;
+		let t = e.status, n = e.terminationStatus ?? t, r = e.values || {}, i = e.boolValues || {};
+		return t !== "Infeasible" && t !== "Unsat" && t !== "Unbounded" && t !== "Error" && t !== "NotSolved" && n !== "Infeasible" && n !== "Unsat" && n !== "Unbounded" && n !== "InfeasibleOrUnbounded" && n !== "Error" && n !== "NotSolved" && (t === "Optimal" || t === "Feasible" || t === "Sat" || n === "Optimal" || n === "Feasible" || n === "Sat" || typeof e.objectiveValue == "number" && Number.isFinite(e.objectiveValue) || Object.values(r).some((e) => typeof e == "number" && Number.isFinite(e) || typeof e == "boolean") || Object.values(i).some((e) => typeof e == "boolean"));
+	}
+	resolveSolverAndOptions(e, t) {
+		if (e && typeof e == "object" && "solve" in e && typeof e.solve == "function") {
+			let { solver: n, ...r } = t || {};
+			return {
+				activeSolver: e,
+				activeOptions: r
+			};
+		}
+		if (typeof e == "function") {
+			let { solver: n, ...r } = t || {};
+			return {
+				activeSolver: new e(r),
+				activeOptions: r
+			};
+		}
+		if (typeof e == "string") {
+			let { solver: n, ...r } = t || {};
+			return {
+				activeSolver: H(e, r),
+				activeOptions: r
+			};
+		}
+		let { solver: n, ...r } = e || {};
+		return n ? {
+			activeSolver: H(n, r),
+			activeOptions: r
+		} : {
+			activeSolver: this.solver || H(),
+			activeOptions: r
+		};
+	}
+	async solve(e, t) {
+		let n = ++this.activeOperationId, r = this.modelRevision;
+		this.clearSolutionFields(), this.validateIntegrity();
+		let { activeSolver: i, activeOptions: a } = this.resolveSolverAndOptions(e, t);
+		if (this._objectiveExpr instanceof x && this._objectiveExpr.quadTerms.size > 0 && i.capabilities?.supportsQP === !1) throw Error(`Solver "${i.name}" does not support quadratic objectives (QP). Please use a QP-capable solver such as HiGHS or Clarabel.`);
+		if (this.logicalConstraints.length > 0 && i.capabilities?.supportsSMT !== !0) throw Error(`Solver "${i.name}" does not support SMT / logical constraints (or, implies, not, xor). Please use an SMT-capable solver such as Z3.`);
+		if (this.variables.some((e) => e.initialValue !== void 0) && i.capabilities?.supportsWarmStart !== !0) throw Error(`Solver "${i.name}" does not support primal initial values (initialValue). Please use a solver with warm-start support such as HiGHS.`);
+		let o = {
 			name: this.name,
 			sense: this.sense,
-			objective: this.objective,
+			objective: this._objectiveExpr,
 			constraints: this.constraints,
 			variables: this.variables,
 			logicalConstraints: this.logicalConstraints,
 			boolVars: this.boolVars
-		}, a = F(i), o = await n.solve(i, a, r);
-		this.runTime = o.runTime ?? 0, this.status = o.status, this.objectiveValue = o.objectiveValue ?? null;
-		let s = {}, c = {}, l = {}, u = {};
-		this.values.clear();
-		for (let e of this.variables) e.value = null, e.reducedCost = null;
-		for (let e of this.boolVars) e.value = null;
-		for (let e of this.constraints) e.dual = null, e.slack = null;
-		if (a?.nameToVar) for (let e of a.nameToVar.values()) e.value = null, e.reducedCost = null;
-		if (a?.nameToConstraint) for (let e of a.nameToConstraint.values()) e.dual = null, e.slack = null;
-		if (o.values && o.status !== "Infeasible" && o.status !== "Unbounded") {
-			for (let [e, t] of Object.entries(o.values)) if (typeof t == "number" && !Number.isNaN(t)) {
-				this.values.set(e, t);
-				let n = this.getVarByName(e) || a.nameToVar.get(e);
-				n && (n.value = t, s[n.name] = t);
-				let r = this.boolVars.find((t) => t.name === e);
-				r && (r.value = !!t);
+		}, s = this.wrapSolveOptions(a, r, n), c;
+		try {
+			c = await i.solve(o, s);
+		} catch (e) {
+			throw this.activeOperationId === n && this.clearSolutionFields(), e;
+		}
+		this.ensureExecutionValid(r, n, "solve"), this.runTime = c.runTime ?? 0, this.status = c.status, this.terminationStatus = c.terminationStatus ?? c.status;
+		let l = this.hasPrimalFromResult(c);
+		this.hasPrimalSolution = l, this.objectiveValue = l && typeof c.objectiveValue == "number" && Number.isFinite(c.objectiveValue) ? c.objectiveValue : null, this.objectiveBound = typeof c.objectiveBound == "number" && Number.isFinite(c.objectiveBound) ? c.objectiveBound : void 0;
+		let u = typeof c.relGap == "number" && Number.isFinite(c.relGap) ? c.relGap : typeof c.mipGap == "number" && Number.isFinite(c.mipGap) ? c.mipGap : void 0;
+		this.relGap = u, this.mipGap = u, this.absGap = typeof c.absGap == "number" && Number.isFinite(c.absGap) ? c.absGap : this.objectiveValue !== null && this.objectiveBound !== void 0 ? Math.abs(this.objectiveValue - this.objectiveBound) : void 0;
+		let d = (e, t, n) => {
+			Object.defineProperty(e, t, {
+				value: n,
+				enumerable: !0,
+				writable: !0,
+				configurable: !0
+			});
+		}, f = {}, p = {}, m = {}, h = {};
+		if (this.values.clear(), l && c.values) {
+			for (let [e, t] of Object.entries(c.values)) if (typeof t == "number" && Number.isFinite(t)) {
+				let n = this.getVarByName(e), r = this.getBoolVarByName(e);
+				n && (n.value = t, d(f, n.name, t), this.values.set(n.name, t)), r && (r.value = !!t, this.values.set(r.name, t)), !n && !r && this.values.set(e, t);
+			} else if (typeof t == "boolean") {
+				let n = t, r = this.getBoolVarByName(e);
+				r ? (r.value = n, d(f, r.name, +!!n), this.values.set(r.name, n)) : this.values.set(e, n);
 			}
 		}
-		if (o.reducedCosts) for (let [e, t] of Object.entries(o.reducedCosts)) {
-			let n = this.getVarByName(e) || a.nameToVar.get(e);
-			n && (n.reducedCost = t, l[n.name] = t);
+		if (l && c.boolValues) for (let [e, t] of Object.entries(c.boolValues)) {
+			if (typeof t != "boolean") continue;
+			let n = this.getBoolVarByName(e);
+			n ? (n.value = t, this.values.has(n.name) || this.values.set(n.name, t)) : this.values.has(e) || this.values.set(e, t);
+		}
+		if (l && c.reducedCosts) for (let [e, t] of Object.entries(c.reducedCosts)) {
+			if (typeof t != "number" || !Number.isFinite(t)) continue;
+			let n = this.getVarByName(e);
+			n && (n.reducedCost = t, d(m, n.name, t));
 		}
-		if (o.duals) for (let [e, t] of Object.entries(o.duals)) {
-			let n = this.getConstraintByName(e) || a.nameToConstraint.get(e);
-			n && (n.dual = t, c[n.name] = t);
+		if (c.duals) for (let [e, t] of Object.entries(c.duals)) {
+			if (typeof t != "number" || !Number.isFinite(t)) continue;
+			let n = this.getConstraintByName(e);
+			n && (n.dual = t, d(p, n.name, t));
 		}
-		if (o.slacks) for (let [e, t] of Object.entries(o.slacks)) {
-			let n = this.getConstraintByName(e) || a.nameToConstraint.get(e);
-			n && (n.slack = t, u[n.name] = t);
+		if (c.slacks) for (let [e, t] of Object.entries(c.slacks)) {
+			if (typeof t != "number" || !Number.isFinite(t)) continue;
+			let n = this.getConstraintByName(e);
+			n && (n.slack = t, d(h, n.name, t));
 		}
 		return this.solution = {
 			status: this.status,
+			terminationStatus: this.terminationStatus,
+			hasPrimalSolution: this.hasPrimalSolution,
 			objectiveValue: this.objectiveValue,
-			values: s,
-			duals: c,
-			reducedCosts: l,
-			slacks: u,
+			...this.objectiveBound === void 0 ? {} : { objectiveBound: this.objectiveBound },
+			...this.relGap === void 0 ? {} : {
+				relGap: this.relGap,
+				mipGap: this.mipGap
+			},
+			...this.absGap === void 0 ? {} : { absGap: this.absGap },
+			values: f,
+			duals: p,
+			reducedCosts: m,
+			slacks: h,
 			runTime: this.runTime,
-			raw: o.raw
-		}, this.status;
-	}
-	async solve(e, t) {
-		return this.optimize(e, t);
+			raw: c.raw
+		}, this.hasSolutionState = !0, this.status;
 	}
 	async check(e, t) {
-		let n, r;
-		if (e && typeof e == "object" && "solve" in e && typeof e.solve == "function" ? (n = e, r = t || {}) : typeof e == "function" ? (n = new e(t), r = t || {}) : typeof e == "string" ? (n = H(e, t), r = t || {}) : (r = { ...e }, r.solver ? (n = H(r.solver, r), delete r.solver) : n = this.solver || H()), this.logicalConstraints.length > 0 && n.capabilities?.supportsSMT !== !0) throw Error(`Solver "${n.name}" does not support SMT / logical constraints (or, implies, not, xor). Please use an SMT-capable solver such as Z3.`);
-		if (typeof n.check == "function") {
-			let e = await n.check({
-				name: this.name,
-				variables: this.variables,
-				boolVars: this.boolVars,
-				constraints: this.constraints,
-				logicalConstraints: this.logicalConstraints
-			}, r);
-			this.status = e.status, this.runTime = e.runTime ?? 0, this.unsatCore = e.unsatCore || [], this.values.clear();
-			for (let e of this.variables) e.value = null;
-			for (let e of this.boolVars) e.value = null;
-			if (e.values && e.status === "Sat") for (let [t, n] of Object.entries(e.values)) {
-				this.values.set(t, n);
-				let e = this.getVarByName(t);
-				e && typeof n == "number" && (e.value = n);
-				let r = this.boolVars.find((e) => e.name === t);
-				r && (r.value = !!n);
+		let n = ++this.activeOperationId, r = this.modelRevision;
+		this.clearSolutionFields(), this.validateIntegrity();
+		let { activeSolver: i, activeOptions: a } = this.resolveSolverAndOptions(e, t);
+		if (this.logicalConstraints.length > 0 && i.capabilities?.supportsSMT !== !0) throw Error(`Solver "${i.name}" does not support SMT / logical constraints (or, implies, not, xor). Please use an SMT-capable solver such as Z3.`);
+		if (this.variables.some((e) => e.initialValue !== void 0) && i.capabilities?.supportsWarmStart !== !0) throw Error(`Solver "${i.name}" does not support primal initial values (initialValue). Please use a solver with warm-start support such as HiGHS.`);
+		let o = this.wrapSolveOptions(a, r, n), s = (e, t, n) => {
+			Object.defineProperty(e, t, {
+				value: n,
+				enumerable: !0,
+				writable: !0,
+				configurable: !0
+			});
+		}, c = {
+			name: this.name,
+			variables: this.variables,
+			boolVars: this.boolVars,
+			constraints: this.constraints,
+			logicalConstraints: this.logicalConstraints
+		};
+		if (typeof i.check == "function") {
+			let e;
+			try {
+				e = await i.check(c, o);
+			} catch (e) {
+				throw this.activeOperationId === n && this.clearSolutionFields(), e;
 			}
-			return e;
-		}
-		let i = this.objective, a = this.sense;
-		try {
-			this.objective = new S(), this.sense = "Minimize";
-			let e = await this.optimize(n, r), t = e === "Optimal" || e === "Feasible", i = e === "Infeasible", a = {};
-			if (t) {
-				for (let e of this.variables) e.value !== null && (a[e.name] = e.value);
-				for (let e of this.boolVars) e.value !== null && (a[e.name] = e.value);
+			this.ensureExecutionValid(r, n, "check"), this.status = e.status, this.terminationStatus = a.signal?.aborted ? "Interrupted" : e.status, this.hasPrimalSolution = e.status === "Sat", this.runTime = e.runTime ?? 0, this.unsatCore = e.unsatCore === void 0 ? void 0 : Object.freeze([...e.unsatCore]);
+			let t = {};
+			if (e.values && e.status === "Sat") {
+				for (let [n, r] of Object.entries(e.values)) if (typeof r == "number") {
+					if (!Number.isFinite(r)) continue;
+					let e = this.getVarByName(n), i = this.getBoolVarByName(n);
+					e && (e.value = r, this.values.set(e.name, r), s(t, e.name, r)), i && (i.value = !!r, this.values.set(i.name, i.value), s(t, i.name, i.value)), !e && !i && (this.values.set(n, r), s(t, n, r));
+				} else if (typeof r == "boolean") {
+					let e = this.getBoolVarByName(n);
+					e ? (e.value = r, this.values.set(e.name, r), s(t, e.name, r)) : (this.values.set(n, r), s(t, n, r));
+				}
 			}
-			return {
-				status: t ? "Sat" : i ? "Unsat" : "Unknown",
-				values: a,
+			return this.hasSolutionState = !0, {
+				status: e.status,
+				values: t,
+				unsatCore: this.unsatCore,
+				conflicts: this.unsatCore,
 				runTime: this.runTime
 			};
-		} finally {
-			this.objective = i, this.sense = a;
 		}
+		let l = {
+			name: this.name,
+			sense: "Minimize",
+			objective: new S(),
+			constraints: this.constraints,
+			variables: this.variables,
+			logicalConstraints: this.logicalConstraints,
+			boolVars: this.boolVars
+		}, u;
+		try {
+			u = await i.solve(l, o);
+		} catch (e) {
+			throw this.activeOperationId === n && this.clearSolutionFields(), e;
+		}
+		this.ensureExecutionValid(r, n, "check"), this.runTime = u.runTime ?? 0;
+		let d = u.status, f = u.terminationStatus ?? d, p = this.hasPrimalFromResult(u) || d === "Optimal" || d === "Feasible", m = p ? "Sat" : d === "Infeasible" ? "Unsat" : "Unknown";
+		this.status = m, this.terminationStatus = a.signal?.aborted || f === "Interrupted" ? "Interrupted" : f === "Optimal" || f === "Feasible" || f === "Infeasible" ? m : f, this.hasPrimalSolution = p, this.objectiveValue = null, this.objectiveBound = void 0, this.relGap = void 0, this.mipGap = void 0, this.absGap = void 0, this.solution = null, this.values.clear();
+		let h = {};
+		if (p && u.values) {
+			for (let [e, t] of Object.entries(u.values)) if (typeof t == "number" && Number.isFinite(t)) {
+				let n = this.getVarByName(e), r = this.getBoolVarByName(e);
+				n && (n.value = t, this.values.set(n.name, t), s(h, n.name, t)), r && (r.value = !!t, this.values.set(r.name, r.value), s(h, r.name, r.value)), !n && !r && (this.values.set(e, t), s(h, e, t));
+			} else if (typeof t == "boolean") {
+				let n = t, r = this.getBoolVarByName(e);
+				r ? (r.value = n, this.values.set(r.name, n), s(h, r.name, n)) : (this.values.set(e, n), s(h, e, n));
+			}
+		}
+		if (p && u.boolValues) for (let [e, t] of Object.entries(u.boolValues)) {
+			if (typeof t != "boolean") continue;
+			let n = this.getBoolVarByName(e);
+			n ? (n.value = t, this.values.set(n.name, t), s(h, n.name, t)) : (this.values.set(e, t), s(h, e, t));
+		}
+		if (u.slacks) for (let [e, t] of Object.entries(u.slacks)) {
+			if (typeof t != "number" || !Number.isFinite(t)) continue;
+			let n = this.getConstraintByName(e);
+			n && (n.slack = t);
+		}
+		return this.hasSolutionState = !0, {
+			status: m,
+			values: h,
+			runTime: this.runTime
+		};
+	}
+	validateSolution(e = {}) {
+		return Fe(this, e);
 	}
 };
 //#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 };
+//#region src/modeler/objective.ts
+function Be(e, t) {
+	let n = e;
+	if (n instanceof v || typeof n == "object" && n && "sense" in n && "lhs" in n && "rhs" in n) throw Error(`Cannot use a Constraint as an objective in ${t}(). Use model.constraint(expr\`... <= ...\`) for constraints, or supply an unconstrained arithmetic expression to ${t}().`);
+	if (typeof n == "string" && /(<=|>=|==|=<|=>|=)/.test(n)) throw Error(`Cannot use a comparison constraint as an objective in ${t}(). Use model.constraint(expr\`... <= ...\`) for constraints, or supply an unconstrained arithmetic expression to ${t}().`);
+	if (typeof n == "number") {
+		if (!Number.isFinite(n)) throw Error(`Invalid non-finite objective constant "${n}" passed to ${t}().`);
+		return n;
+	}
+	if (typeof n == "string" || n instanceof S || n instanceof x || n instanceof N || typeof n == "object" && n && ("terms" in n && n.terms instanceof Map && typeof n.constant == "number" || "quadTerms" in n && n.quadTerms instanceof Map && "linearTerms" in n && n.linearTerms instanceof Map && typeof n.constant == "number" || "id" in n && "name" in n && "lb" in n && "ub" in n)) return n;
+	throw Error(`Invalid expression passed to ${t}(): expected a finite number, Var, LinExpr, QuadExpr, or arithmetic expression string.`);
+}
+function Ve(e) {
+	return {
+		expr: Be(e, "maximize"),
+		sense: "Maximize"
+	};
+}
+function He(e) {
+	return {
+		expr: Be(e, "minimize"),
+		sense: "Minimize"
+	};
+}
+//#endregion
+export { l as BoolExpr, d as BoolOp, u as BoolVar, v as Constraint, Ae as HiGHS, J as HighsSolver, S as LinExpr, Me as MockSolver, ze as Model, x as QuadExpr, N as Var, f as and, X as buildIndicatorLinearization, ye as buildLpSymbolMaps, Re as deriveBigMForGe, Le as deriveBigMForLe, w as dot, ve as expr, R as generateLpString, a as getHighs, n as getHighsWasmUrl, H as getSolver, h as implies, I as isLpExportResult, U as listAvailableSolvers, Ve as maximize, He as minimize, o as normalizeSense, m as not, p as or, me as parseConstraint, fe as parseExpr, V as registerSolver, L as sanitizeIdentifier, Se as setDefaultSolver, t as setHighsWasmUrl, e as solveLpWithHighs, C as sum, oe as validateModelIntegrity, Fe as validateModelSolution, Ie as validateUserBigM, g as xor };