Skip to content

Commit 65c1881

Browse files
committed
Reformatted function definitions on one line
1 parent bf06f89 commit 65c1881

File tree

5 files changed

+13
-38
lines changed

5 files changed

+13
-38
lines changed

src/logicalpy/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ class Proposition:
99
"""
1010

1111
def __init__(self, name: str):
12-
if name == "":
13-
raise ValueError("a proposition name cannot be ''")
12+
if name.strip() == "":
13+
raise ValueError("proposition name cannot be empty")
1414
self.name = name
1515

1616
def __str__(self) -> str:

src/logicalpy/hilbert.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424
"""
2525

2626

27-
def _make_regex_from_formula(
28-
formula: Formula,
29-
) -> str:
27+
def _make_regex_from_formula(formula: Formula) -> str:
3028
formula_props = formula.propositions()
3129
formula_str = str(formula)
3230
formula_str = formula_str.replace("(", r"\(").replace(")", r"\)")

src/logicalpy/normal_forms.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,7 @@ def _find_conjuncts(formula) -> list:
189189
return [Formula(formula)]
190190

191191

192-
def to_clausal_cnf(
193-
formula: Formula,
194-
) -> list[DisjunctiveClause]:
192+
def to_clausal_cnf(formula: Formula) -> list[DisjunctiveClause]:
195193
"""Converts a formula to conjunctive normal form (CNF) like `to_cnf`, but as a list of disjunctive clauses
196194
197195
Args:
@@ -215,9 +213,7 @@ def to_clausal_cnf(
215213
return list_of_clauses
216214

217215

218-
def to_clausal_dnf(
219-
formula: Formula,
220-
) -> list[ConjunctiveClause]:
216+
def to_clausal_dnf(formula: Formula) -> list[ConjunctiveClause]:
221217
"""Converts a formula to disjunctive normal form (DNF) like `to_dnf`, but as a list of conjunctive clauses
222218
223219
Args:

src/logicalpy/resolution.py

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,14 @@ def resolve(
7474
return DisjunctiveClause(*resulting_literals)
7575

7676

77-
def _is_tautology(
78-
clause: DisjunctiveClause,
79-
) -> bool:
77+
def _is_tautology(clause: DisjunctiveClause) -> bool:
8078
for literal_1, literal_2 in combinations(clause, 2):
8179
if are_complementary_literals(literal_1, literal_2):
8280
return True
8381
return False
8482

8583

86-
def _remove_redundancy(
87-
clause: DisjunctiveClause,
88-
) -> DisjunctiveClause:
84+
def _remove_redundancy(clause: DisjunctiveClause) -> DisjunctiveClause:
8985
all_literals = []
9086
for literal in clause:
9187
if literal not in all_literals:
@@ -103,11 +99,7 @@ class ResolutionProver:
10399
104100
"""
105101

106-
def __init__(
107-
self,
108-
premises: Iterable[Formula],
109-
conclusion: Formula,
110-
):
102+
def __init__(self, premises: Iterable[Formula], conclusion: Formula):
111103
"""The prover's constructor
112104
113105
Args:
@@ -150,9 +142,7 @@ def __init__(
150142
self._refutation_found = False
151143
self._terminated_without_refutation = False
152144

153-
def _apply_resolution(
154-
self,
155-
) -> Optional[tuple[DisjunctiveClause, int, int]]:
145+
def _apply_resolution(self) -> Optional[tuple[DisjunctiveClause, int, int]]:
156146
"""Resolves two clauses if possible and changes `all_clauses` in consideration. The clauses that were resolved are removed, and the resolvent is added.
157147
158148
Returns:

src/logicalpy/semantics.py

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,7 @@ def are_equivalent(formula_1: Formula, formula_2: Formula) -> bool:
242242
return True
243243

244244

245-
def are_jointly_satisfiable(
246-
*formulae: Formula,
247-
) -> bool:
245+
def are_jointly_satisfiable(*formulae: Formula) -> bool:
248246
"""Tests whether several formulae are jointly satisfiable
249247
250248
Args:
@@ -273,9 +271,7 @@ def are_jointly_satisfiable(
273271
return False
274272

275273

276-
def one_satisfying_valuation(
277-
formula: Formula,
278-
) -> Optional[dict[str, bool]]:
274+
def one_satisfying_valuation(formula: Formula) -> Optional[dict[str, bool]]:
279275
"""Returns one valuation that satisfies the formula given
280276
281277
Args:
@@ -299,9 +295,7 @@ def one_satisfying_valuation(
299295
return None
300296

301297

302-
def all_satisfying_valuations(
303-
formula: Formula,
304-
) -> list[dict[str, bool]]:
298+
def all_satisfying_valuations(formula: Formula) -> list[dict[str, bool]]:
305299
"""Returns all the valuations that satisfy the formula given
306300
307301
Args:
@@ -328,10 +322,7 @@ def all_satisfying_valuations(
328322
return satisfying_valuations
329323

330324

331-
def is_valid_argument(
332-
premises: Iterable[Formula],
333-
conclusion: Formula,
334-
) -> bool:
325+
def is_valid_argument(premises: Iterable[Formula], conclusion: Formula) -> bool:
335326
"""Tests whether an argument is (semantically) valid, i.e. whether the premises given entail the conclusion given
336327
337328
Args:

0 commit comments

Comments
 (0)