From aec7b50382465dfdff6639a2f5574a013a693811 Mon Sep 17 00:00:00 2001 From: naweedkhan Date: Thu, 30 Nov 2023 16:11:58 +0200 Subject: [PATCH] MAINT: class rename Signed-off-by: naweedkhan --- lnn/symbolic/logic/__init__.py | 14 +++++++------- lnn/symbolic/logic/n_ary_neuron.py | 4 ++-- lnn/symbolic/logic/n_ary_operator.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lnn/symbolic/logic/__init__.py b/lnn/symbolic/logic/__init__.py index 97a983d..f494dfb 100644 --- a/lnn/symbolic/logic/__init__.py +++ b/lnn/symbolic/logic/__init__.py @@ -3,8 +3,8 @@ from .connective_neuron import _ConnectiveNeuron from .formula import Formula from .leaf_formula import _LeafFormula, Predicate, Predicates, Proposition, Propositions -from .n_ary_neuron import And, Or, XOr -from .n_ary_operator import Congruent +from .n_ary_neuron import And, Or, Xor +from .n_ary_operator import Equal from .neural_activation import NeuralActivation from .unary_operator import _Quantifier, Exists, Forall, Not from .variable import Variable, Variables @@ -22,7 +22,7 @@ "_Quantifier": _Quantifier, "_LeafFormula": _LeafFormula, "And": And, - "Congruent": Congruent, + "Equal": Equal, "Iff": Iff, "Exists": Exists, "Forall": Forall, @@ -31,7 +31,7 @@ "Or": Or, "Predicate": Predicate, "Proposition": Proposition, - "XOr": XOr, + "Xor": Xor, } _connective_neuron.subclasses = { @@ -39,7 +39,7 @@ "Iff": Iff, "Implies": Implies, "Or": Or, - "XOr": XOr, + "Xor": Xor, } __all__ = [ @@ -47,7 +47,7 @@ "_ConnectiveNeuron", "_Quantifier", "And", - "Congruent", + "Equal", "Iff", "Exists", "Forall", @@ -62,5 +62,5 @@ "Predicates", "Variable", "Variables", - "XOr", + "Xor", ] diff --git a/lnn/symbolic/logic/n_ary_neuron.py b/lnn/symbolic/logic/n_ary_neuron.py index 431d213..b3ff91c 100644 --- a/lnn/symbolic/logic/n_ary_neuron.py +++ b/lnn/symbolic/logic/n_ary_neuron.py @@ -127,14 +127,14 @@ class Xor(_NAryNeuron): ```python # Propositional A, B, C = Propositions('A', 'B', 'C') - XOr(A, B, C) + Xor(A, B, C) ``` ```python # First-order logic x, y = Variables('x', 'y') A, C = Predicates('A', 'C') B = Predicate('B', arity=2) - XOr(A(x), B(x, y), C(y))) + Xor(A(x), B(x, y), C(y))) ``` """ diff --git a/lnn/symbolic/logic/n_ary_operator.py b/lnn/symbolic/logic/n_ary_operator.py index b371807..10e200f 100644 --- a/lnn/symbolic/logic/n_ary_operator.py +++ b/lnn/symbolic/logic/n_ary_operator.py @@ -28,7 +28,7 @@ def __init__(self, *formula, **kwds): super().__init__(*formula, arity=len(formula), **kwds) -class Congruent(_NAryOperator): +class Equal(_NAryOperator): r"""Symbolic Congruency This is used to define nodes that are symbolically equivalent to one another