@ohtaman/washi 0.5.0 → 0.6.0

package/dist/lib/{registry-BEfvpZW3.js → registry-C20sxTwm.js}

@@ -2,7 +2,7 @@
 var e = 0;
 function t(e, t) {
 	if (e instanceof n || e instanceof d) 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.`);
+	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.`) : typeof e == "object" && e && "id" in e && "name" in e && "lb" in e && "ub" in e && !("sense" in e) ? Error(`Invalid operand passed to logical operator "${t}": expected a BoolVar, BoolExpr, or Constraint, but received numeric variable "${e.name}". Use m.bool() for propositional variables, add a comparison such as expr\`\${x} == 1\`, or use m.indicator(binVar, constraint) for 0-1 Big-M indicator constraints.`) : Error(`Invalid operand passed to logical operator "${t}": expected a BoolVar, BoolExpr, or Constraint.`);
 }
 var n = class {
 	and(e) {
@@ -71,6 +71,12 @@ var u = 0, d = class e {
 	ownerModel = null;
 	slack = null;
 	dual = null;
+	addTerm(e, t) {
+		return t === 0 ? this : (this._lhs.addTerm(e, t), this.ownerModel?.notifyMutation?.(), this);
+	}
+	setTerm(e, t) {
+		return this._lhs.setTerm(e, t), this.ownerModel?.notifyMutation?.(), this;
+	}
 	constructor(e, t, n, r) {
 		this.id = ++u, this._lhs = e, this._sense = t, this._rhs = n;
 		let i = typeof r == "string" ? r.trim() : void 0;
@@ -360,6 +366,13 @@ var m = class e {
 	constructor(e = /* @__PURE__ */ new Map(), t = 0) {
 		this.terms = new Map(e), this.constant = t;
 	}
+	setTerm(e, t) {
+		return t === 0 ? this.terms.delete(e) : this.terms.set(e, t), this;
+	}
+	addTerm(e, t) {
+		let n = (this.terms.get(e) ?? 0) + t;
+		return n === 0 ? this.terms.delete(e) : this.terms.set(e, n), this;
+	}
 	clone() {
 		return new e(this.terms, this.constant);
 	}
@@ -839,18 +852,18 @@ function R(e) {
 		varOrder: s
 	};
 }
-function z(e) {
-	let { sense: t, objective: n, constraints: r, variables: i } = e, { nameToVar: a, varToName: o, nameToConstraint: s, constrToName: c, varOrder: l } = R(e), u = [];
-	u.push(t && t.toLowerCase() === "maximize" ? "Maximize" : "Minimize");
-	let d = [], f = !0, p = n instanceof m ? n.linearTerms : n.terms;
-	if (p) for (let [e, t] of p) {
+function z(e, t) {
+	let { sense: n, objective: r, constraints: i, variables: a } = e, o = t?.relax === !0, { nameToVar: s, varToName: c, nameToConstraint: l, constrToName: u, varOrder: d } = R(e), f = [];
+	f.push(n && n.toLowerCase() === "maximize" ? "Maximize" : "Minimize");
+	let p = [], h = !0, g = r instanceof m ? r.linearTerms : r.terms;
+	if (g) for (let [e, t] of g) {
 		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;
+		let n = c.get(e), r = t >= 0 ? h ? "" : "+ " : "- ", i = Math.abs(t), a = i === 1 ? "" : `${i} `;
+		p.push(`${r}${a}${n}`), h = !1;
 	}
-	if (n instanceof m && n.quadTerms.size > 0) {
-		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 ? [
+	if (r instanceof m && r.quadTerms.size > 0) {
+		let e = [], t = !0, n = Array.from(r.quadTerms.values()).filter((e) => e.coeff !== 0).map((e) => {
+			let t = d.get(e.var1) ?? e.var1.id, n = d.get(e.var2) ?? e.var2.id, [r, i, a, o] = t <= n ? [
 				e.var1,
 				e.var2,
 				t,
@@ -869,51 +882,51 @@ function z(e) {
 				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;
+		for (let r of n) {
+			let n = 2 * r.coeff, i = n >= 0 ? t ? "" : "+ " : "- ", a = Math.abs(n), o = a === 1 ? "" : `${a} `, s = c.get(r.firstVar), l = c.get(r.secondVar);
+			r.firstVar === r.secondVar ? e.push(`${i}${o}${s} ^ 2`) : e.push(`${i}${o}${s} * ${l}`), t = !1;
 		}
 		if (e.length > 0) {
 			let t = `[ ${e.join(" ")} ] / 2`;
-			d.length > 0 ? d.push("+", t) : d.push(t);
+			p.length > 0 ? p.push("+", t) : p.push(t);
 		}
 	}
-	let h = d.length > 0 ? d.join(" ") : "0";
-	u.push(` obj: ${h}`), u.push("Subject To");
-	for (let e of r) {
-		let t = c.get(e), n = [], r = !0;
+	let _ = p.length > 0 ? p.join(" ") : "0";
+	f.push(` obj: ${_}`), f.push("Subject To");
+	for (let e of i) {
+		let t = u.get(e), n = [], r = !0;
 		for (let [t, i] of e.lhs.terms) {
 			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 e = c.get(t), a = i >= 0 ? r ? "" : "+ " : "- ", o = Math.abs(i), s = o === 1 ? "" : `${o} `;
+			n.push(`${a}${s}${e}`), r = !1;
 		}
 		let i = n.length > 0 ? n.join(" ") : "0", a = e.sense === "==" ? "=" : e.sense;
-		u.push(` ${t}: ${i} ${a} ${e.rhs}`);
-	}
-	u.push("Bounds");
-	let g = [], _ = [];
-	for (let e of i) {
-		let t = o.get(e);
-		if (e.type === "Binary") {
-			_.push(t);
+		f.push(` ${t}: ${i} ${a} ${e.rhs}`);
+	}
+	f.push("Bounds");
+	let v = [], y = [];
+	for (let e of a) {
+		let t = c.get(e);
+		if (!o && e.type === "Binary") {
+			y.push(t);
 			continue;
 		}
-		e.type === "Integer" && g.push(t);
+		!o && e.type === "Integer" && v.push(t);
 		let n = e.lb === -Infinity, r = e.ub === Infinity;
-		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}`);
+		n && r ? f.push(` ${t} free`) : n && !r ? f.push(` -infinity <= ${t} <= ${e.ub}`) : !n && r ? (e.lb !== 0 || e.initialValue !== void 0) && f.push(` ${t} >= ${e.lb}`) : f.push(` ${e.lb} <= ${t} <= ${e.ub}`);
 	}
-	if (g.length > 0) {
-		u.push("Generals");
-		for (let e = 0; e < g.length; e += 10) u.push(" " + g.slice(e, e + 10).join(" "));
+	if (v.length > 0) {
+		f.push("Generals");
+		for (let e = 0; e < v.length; e += 10) f.push(" " + v.slice(e, e + 10).join(" "));
 	}
-	if (_.length > 0) {
-		u.push("Binary");
-		for (let e = 0; e < _.length; e += 10) u.push(" " + _.slice(e, e + 10).join(" "));
+	if (y.length > 0) {
+		f.push("Binary");
+		for (let e = 0; e < y.length; e += 10) f.push(" " + y.slice(e, e + 10).join(" "));
 	}
-	return u.push("End"), {
-		lpString: u.join("\n") + "\n",
-		nameToVar: a,
-		nameToConstraint: s
+	return f.push("End"), {
+		lpString: f.join("\n") + "\n",
+		nameToVar: s,
+		nameToConstraint: l
 	};
 }
 //#endregion

package/dist/lib/solvers/glpk.js

@@ -1,4 +1,4 @@
-import { a as e, r as t, s as n } from "../registry-BEfvpZW3.js";
+import { a as e, r as t, s as n } from "../registry-C20sxTwm.js";
 //#region src/modeler/solvers/glpk/loader.ts
 var r = null, i = null;
 async function a() {
@@ -134,7 +134,7 @@ var l = class t {
 		let y = [], b = [], x = [];
 		for (let e of t.variables) {
 			let t = p.get(e) || e.name;
-			e.type === "Binary" ? y.push(t) : e.type === "Integer" && b.push(t);
+			!l.relax && e.type === "Binary" ? y.push(t) : !l.relax && e.type === "Integer" && b.push(t);
 			let n = e.lb, r = e.ub, i;
 			i = n === -Infinity && r === Infinity ? d.GLP_FR : n !== -Infinity && r === Infinity ? d.GLP_LO : n === -Infinity && r !== Infinity ? d.GLP_UP : n === r ? d.GLP_FX : d.GLP_DB, x.push({
 				name: t,

package/dist/lib/solvers/z3.js

@@ -1,4 +1,4 @@
-import { D as e, O as t, T as n, r, s as i } from "../registry-BEfvpZW3.js";
+import { D as e, O as t, T as n, r, s as i } from "../registry-C20sxTwm.js";
 import { getBundledZ3AssetUrls as a } from "./z3-assets.js";
 //#region src/modeler/solvers/z3/loader.ts
 var o = null, s = null, c = null, l = null, u = /* @__PURE__ */ new WeakMap();