Merge pull request #1 from RobinKa/robin/egglog-0.6.0

Upgrade to egglog 0.7.0

egga/geometric_algebra.py

@@ -6,8 +6,8 @@
 from typing import Dict, Optional, Tuple, Type
 
 from egglog import (
-    BaseExpr,
     EGraph,
+    Expr,
     String,
     StringLike,
     egraph,
@@ -77,7 +77,7 @@ def __init__(
         egraph = EGraph()
 
         @egraph.class_
-        class MathExpr(BaseExpr):
+        class MathExpr(Expr):
             @egraph.method(cost=costs.get("equal"))
             def equal(self, other: MathExpr) -> MathExpr:
                 ...
@@ -676,10 +676,10 @@ def register_equality():
                 birewrite(x_1.equal(x_2)).to(x_2.equal(x_1)),
                 birewrite(x_1.not_equal(x_2)).to(x_2.not_equal(x_1)),
                 # Eq / Ne
-                rewrite(x_1.equal(x_1)).to(boolean(True)),
-                rewrite(x_1.not_equal(x_1)).to(boolean(False)),
-                rewrite(x_1.equal(x_2)).to(boolean(False), x_1 != x_2),
-                rewrite(x_1.not_equal(x_2)).to(boolean(True), x_1 != x_2),
+                rewrite(x_1.equal(x_1)).to(boolean(1)),
+                rewrite(x_1.not_equal(x_1)).to(boolean(0)),
+                rewrite(x_1.equal(x_2)).to(boolean(0), x_1 != x_2),
+                rewrite(x_1.not_equal(x_2)).to(boolean(1), x_1 != x_2),
             )
 
         def register_trigonometry():

egga/utils.py

@@ -20,13 +20,13 @@ def run_ruleset(ga: GeometricAlgebra, options: RunRulesetOptions = RunRulesetOpt
     else:
         ruleset = options.ruleset
 
-    return ga.egraph.run(
-        run(
-            ruleset,
-            options.limit,
-            *([options.until] if options.until is not None else []),
-        ).saturate()
-    )
+    for _ in range(options.limit):
+        ga.egraph.run(
+            run(
+                ruleset,
+                *([options.until] if options.until is not None else []),
+            ).saturate()
+        )
 
 
 @dataclass

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "egga"
-version = "0.1.7"
+version = "0.1.8"
 description = "Symbolic Geometric Algebra with E-Graphs "
 authors = ["Robin Kahlow <tora@warlock.ai>"]
 readme = "README.md"
@@ -45,7 +45,7 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-egglog = "^0.5.1"
+egglog = "^0.7.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.0"

tests/test_rules.py

@@ -40,10 +40,10 @@
     (e_1 * ~(e_12 + e_23 + e_31), -e_2 - e_123 + e_3),
     (e_23 ** E.scalar_literal(1.0), e_23),
     (e_23 * e_23, E.scalar_literal(-1.0)),
-    (e_1.equal(E.scalar_literal(1.0) * e_1), E.boolean(True)),
-    (e_1.not_equal(E.scalar_literal(1.0) * e_1), E.boolean(False)),
-    (e_1.equal(-E.scalar_literal(1.0) * e_1), E.boolean(False)),
-    (e_1.not_equal(-E.scalar_literal(1.0) * e_1), E.boolean(True)),
+    (e_1.equal(E.scalar_literal(1.0) * e_1), E.boolean(1)),
+    (e_1.not_equal(E.scalar_literal(1.0) * e_1), E.boolean(0)),
+    (e_1.equal(-E.scalar_literal(1.0) * e_1), E.boolean(0)),
+    (e_1.not_equal(-E.scalar_literal(1.0) * e_1), E.boolean(1)),
     (E.inverse(e_1), e_1),
     (E.inverse(e_12), -e_12),
     (E.scalar_literal(1.0) / e_12, -e_12),
@@ -359,7 +359,7 @@ def test_equalities(equation):
     ga.egraph.pop()
 
     if caught is not None:
-        raise caught
+        raise caught from caught
 
 
 @pytest.mark.skip
@@ -393,4 +393,4 @@ def test_contradiction(equations):
     ga.egraph.pop()
 
     if caught is not None:
-        raise caught
+        raise caught from caught