@ohtaman/washi 0.6.0 → 0.7.0

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

@@ -479,37 +479,107 @@ var m = class e {
 function g(e, t) {
 	let n = /* @__PURE__ */ new Map(), r = 0;
 	function i(e) {
+		return e instanceof d || e.kind === "constraint" || "sense" in e && (e.sense === "<=" || e.sense === ">=" || e.sense === "==") && "lhs" in e && "rhs" in e && typeof e.rhs == "number" && typeof e.lhs == "object" && e.lhs !== null && "terms" in e.lhs && e.lhs.terms instanceof Map;
+	}
+	function a(e) {
+		return e instanceof m || "quadTerms" in e && e.quadTerms instanceof Map && "linearTerms" in e && e.linearTerms instanceof Map && typeof e.constant == "number";
+	}
+	function o(e) {
+		return e instanceof h || "terms" in e && e.terms instanceof Map && typeof e.constant == "number";
+	}
+	function s(e) {
+		return e instanceof F || !i(e) && typeof e.id == "number" && typeof e.name == "string" && typeof e.lb == "number" && typeof e.ub == "number" && typeof e.type == "string" && typeof e.mul == "function";
+	}
+	function c(e) {
+		return i(e) || a(e) || o(e) || s(e);
+	}
+	function l(e) {
+		if (typeof e != "object" || !e || Array.isArray(e) || c(e)) return !1;
+		let t = Object.getPrototypeOf(e);
+		return t === Object.prototype || t === null;
+	}
+	function u(e) {
 		if (e != null) {
-			if (typeof e == "number") r += e;
-			else if (e instanceof d || 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 m || typeof e == "object" && "quadTerms" in e && e.quadTerms instanceof Map) {
+			if (typeof e == "number") {
+				if (!Number.isFinite(e)) throw Error(`Invalid non-finite number "${e}" in sum().`);
+				let t = r + e;
+				if (!Number.isFinite(t)) throw Error("Constant accumulation overflows finite floating-point range in sum().");
+				r = t;
+			} else if (typeof e == "object" && i(e)) throw Error("Cannot sum a constraint comparison (<=, >=, ==) in sum(): expected a number, Var, or LinExpr.");
+			else if (typeof e == "object" && a(e)) {
 				let t = e;
 				if (t.quadTerms.size > 0) throw Error("Quadratic expressions are not supported in sum(): sum() produces a linear expression (LinExpr).");
+				if (!Number.isFinite(t.constant)) throw Error(`Invalid non-finite constant "${t.constant}" in sum().`);
 				for (let [e, r] of t.linearTerms) {
-					let t = n.get(e) ?? 0;
-					n.set(e, t + r);
+					if (!Number.isFinite(r)) throw Error(`Invalid non-finite coefficient "${r}" in sum().`);
+					let t = (n.get(e) ?? 0) + r;
+					if (!Number.isFinite(t)) throw Error("Coefficient accumulation overflows finite floating-point range in sum().");
+					n.set(e, t);
 				}
-				r += t.constant;
-			} else if (typeof e == "object" && "terms" in e) {
+				let i = r + t.constant;
+				if (!Number.isFinite(i)) throw Error("Constant accumulation overflows finite floating-point range in sum().");
+				r = i;
+			} else if (typeof e == "object" && o(e)) {
 				let t = e;
+				if (!Number.isFinite(t.constant)) throw Error(`Invalid non-finite constant "${t.constant}" in sum().`);
 				for (let [e, r] of t.terms) {
-					let t = n.get(e) ?? 0;
-					n.set(e, t + r);
+					if (!Number.isFinite(r)) throw Error(`Invalid non-finite coefficient "${r}" in sum().`);
+					let t = (n.get(e) ?? 0) + r;
+					if (!Number.isFinite(t)) throw Error("Coefficient accumulation overflows finite floating-point range in sum().");
+					n.set(e, t);
 				}
-				r += t.constant;
-			} 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);
+				let i = r + t.constant;
+				if (!Number.isFinite(i)) throw Error("Constant accumulation overflows finite floating-point range in sum().");
+				r = i;
+			} else if (typeof e == "object" && s(e)) {
+				let t = e, r = (n.get(t) ?? 0) + 1;
+				if (!Number.isFinite(r)) throw Error("Coefficient accumulation overflows finite floating-point range in sum().");
+				n.set(t, r);
 			} else throw Error("Unsupported item in sum(): expected a number, Var, or LinExpr.");
 		}
 	}
+	function f(e, t = 0) {
+		if (e != null) {
+			if (typeof e == "number") {
+				u(e);
+				return;
+			}
+			if (typeof e == "object") {
+				if (c(e)) {
+					u(e);
+					return;
+				}
+				if (!(e instanceof String) && !(e instanceof Map) && Symbol.iterator in e && typeof e[Symbol.iterator] == "function") {
+					if (t >= 2) throw Error("Nested containers deeper than 2D are not supported in sum().");
+					for (let n of e) f(n, t + 1);
+					return;
+				}
+				if (l(e)) {
+					if (t >= 2) throw Error("Nested containers deeper than 2D are not supported in sum().");
+					if (Object.getOwnPropertySymbols(e).length > 0) throw Error("Symbol keys are not supported in sum().");
+					for (let n of Object.keys(e)) f(e[n], t + 1);
+					return;
+				}
+			}
+			u(e);
+		}
+	}
 	if (typeof e == "number") {
-		let n = e, r = t;
-		for (let e = 0; e < n; e++) i(r(e, e));
-	} else {
+		if (typeof t != "function") throw Error("sum(count, mapFn) requires a mapping function as the second argument.");
+		if (!Number.isInteger(e) || e < 0) throw Error("sum(count, mapFn) requires a non-negative integer count.");
+		let n = e;
+		for (let e = 0; e < n; e++) f(t(e, e), 0);
+	} else if (typeof e == "object" && e && !(e instanceof String) && (!(e instanceof Map) || typeof t == "function") && Symbol.iterator in e && typeof e[Symbol.iterator] == "function") {
 		let n = 0;
-		for (let r of e) i(t ? t(r, n++) : r);
-	}
+		for (let r of e) t ? f(t(r, n++), 0) : f(r, 1);
+	} else if (l(e)) {
+		if (Object.getOwnPropertySymbols(e).length > 0) throw Error("Symbol keys are not supported in sum().");
+		let n = 0;
+		for (let r of Object.keys(e)) {
+			let i = e[r];
+			t ? f(t(i, n++), 0) : f(i, 1);
+		}
+	} else throw Error("Unsupported item in sum(): expected an Iterable, Record, or (count, mapFn).");
 	for (let [e, t] of n) t === 0 && n.delete(e);
 	return new h(n, r);
 }

package/dist/lib/solvers/glpk.js

@@ -1,4 +1,4 @@
-import { a as e, r as t, s as n } from "../registry-C20sxTwm.js";
+import { a as e, r as t, s as n } from "../registry-D7TZ3Wh_.js";
 //#region src/modeler/solvers/glpk/loader.ts
 var r = null, i = null;
 async function a() {
@@ -211,8 +211,8 @@ var l = class t {
 					B = !1;
 					break;
 				}
-				let n = f.get(e);
-				c(z, n ? n.name : e, Math.abs(t) < 1e-9 ? 0 : t);
+				let n = f.get(e), r = n ? n.name : e, i = Math.abs(t) < 1e-9 ? 0 : t;
+				!l.relax && n && (n.type === "Integer" || n.type === "Binary") && Math.abs(i - Math.round(i)) <= 1e-5 && (i = Math.round(i) + 0), c(z, r, i);
 			}
 			if (B) for (let e of t.variables) {
 				let t = p.get(e) || e.name;

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-C20sxTwm.js";
+import { D as e, O as t, T as n, r, s as i } from "../registry-D7TZ3Wh_.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();