Skip to content

Commit f709d1a

Browse files
committed
chore: update dependencies and fix formatting
1 parent 7d1ebef commit f709d1a

File tree

9 files changed

+33
-884
lines changed

9 files changed

+33
-884
lines changed

momba/engine/__main__.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
from __future__ import annotations
66

7-
import typing as t
8-
97
import pathlib
108

119
import click
@@ -15,9 +13,6 @@
1513
from . import objectives
1614

1715

18-
import json
19-
20-
2116
@click.group()
2217
def main() -> None:
2318
"""
@@ -39,7 +34,7 @@ def parse_constants(cmd_input: str) -> dict:
3934
And for all i Val_i in (Int, Bool)
4035
"""
4136
data = {}
42-
for l in cmd_input.split(","):
37+
for l in cmd_input.split(","): # noqa: E741
4338
idx = l.split("=")[0].strip()
4439
if l.split("=")[1].isnumeric():
4540
data[idx] = int(l.split("=")[1])
@@ -84,7 +79,7 @@ def translate(model_path: str, output_path: str, consts=None) -> None:
8479
translation = translator.translate_network(network, parameters=parameters)
8580
properties = network.ctx.properties
8681

87-
for i, (name, definition) in enumerate(properties.items()):
82+
for name, definition in properties.items():
8883
txt = name.lower().replace(" ", "_").strip()
8984
print(f"Saving property: {txt}")
9085

momba/engine/objectives.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33

44
import dataclasses as d
5-
import typing as t
65

76
from momba.model.operators import MinMax
87

98

10-
from .. import engine, model
9+
from .. import model
1110

1211

1312
@d.dataclass(frozen=True)
@@ -92,7 +91,6 @@ def extract_objective(prop: model.Expression) -> Objective:
9291
of expression with probabilities.
9392
"""
9493
subprop_l = prop.left
95-
subprop_r = prop.right
9694

9795
if isinstance(subprop_l.formula, model.properties.BinaryPathFormula):
9896
assert (

momba/jani/load_model.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -292,9 +292,11 @@ def _property(jani_property: t.Any) -> expressions.Expression:
292292
if jani_property["op"] in {"∀", "∃"}:
293293
_check_fields(jani_property, required={"op", "exp"})
294294
return properties.PathQuantifier(
295-
operators.Quantifier.FORALL
296-
if jani_property["op"] == "∀"
297-
else operators.Quantifier.EXISTS,
295+
(
296+
operators.Quantifier.FORALL
297+
if jani_property["op"] == "∀"
298+
else operators.Quantifier.EXISTS
299+
),
298300
_expression(jani_property["exp"]),
299301
)
300302
if jani_property["op"] in {"Emin", "Emax"}:
@@ -548,9 +550,11 @@ def _location(jani_location: t.Any) -> automata.Location:
548550
)
549551
transient_values.add(assignment)
550552
return automata.Location(
551-
name=None
552-
if jani_location.get("x-momba-anonymous", False)
553-
else jani_location["name"],
553+
name=(
554+
None
555+
if jani_location.get("x-momba-anonymous", False)
556+
else jani_location["name"]
557+
),
554558
progress_invariant=progress_invariant,
555559
transient_values=frozenset(transient_values),
556560
)
@@ -795,9 +799,9 @@ def load_model(source: JANIModel, *, ignore_properties: bool = False) -> model.N
795799
automaton = network.ctx.get_automaton_by_name(element["automaton"])
796800
input_enable = element.get("input-enable", None)
797801
instance = automaton.create_instance(
798-
input_enable=frozenset()
799-
if input_enable is None
800-
else frozenset(input_enable)
802+
input_enable=(
803+
frozenset() if input_enable is None else frozenset(input_enable)
804+
)
801805
)
802806
network.add_instance(instance)
803807
instances.append(instance)

momba/tools/modest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,9 @@ def check(
182182
named_properties.update(properties)
183183
if property_names is not None:
184184
for name in property_names:
185-
named_properties[
186-
name
187-
] = network.ctx.get_property_definition_by_name(name).expression
185+
named_properties[name] = (
186+
network.ctx.get_property_definition_by_name(name).expression
187+
)
188188
input_file.write_text(
189189
dump_model(network, properties=named_properties), encoding="utf-8"
190190
)

momba/tools/storm.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ def check(
108108
)
109109
if property_names is not None:
110110
for name in property_names:
111-
named_properties[
112-
name
113-
] = network.ctx.get_property_definition_by_name(name).expression
111+
named_properties[name] = (
112+
network.ctx.get_property_definition_by_name(name).expression
113+
)
114114
input_file.write_text(
115115
dump_model(network, properties=named_properties), encoding="utf-8"
116116
)

momba/tools/storm_docker.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ def check(
101101
named_properties.update(properties)
102102
if property_names is not None:
103103
for name in property_names:
104-
named_properties[
105-
name
106-
] = network.ctx.get_property_definition_by_name(name).expression
104+
named_properties[name] = (
105+
network.ctx.get_property_definition_by_name(name).expression
106+
)
107107
input_file.write_text(
108108
jani.dump_model(network, properties=named_properties), encoding="utf-8"
109109
)

0 commit comments

Comments
 (0)