teaching/muMLE
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace everywhere: 'is [not] None' -> '(==|!=) None'

Browse source
This commit is contained in:
Joeri Exelmans 2024-09-04 09:50:30 +02:00
parent 3ae35a87d0
commit ec1a9dbfca
28 changed files with 690 additions and 668 deletions
Download patch file Download diff file Expand all files Collapse all files

22
services/bottom/V0.py
View file

@ -21,7 +21,7 @@ class Bottom:
Returns:
UUID of the node.
"""
if value is None:
if value == None:
return self.state.create_node()
else:
return self.state.create_nodevalue(value)
@ -38,7 +38,7 @@ class Bottom:
Returns:
UUID of the edge.
"""
if label is None:
if label == None:
return self.state.create_edge(source, target)
else:
return self.state.create_dict(source, label, target)
@ -66,7 +66,7 @@ class Bottom:
UUID of source element of the edge
"""
result = self.state.read_edge(edge)
return result[0] if result is not None else result
return result[0] if result != None else result
def read_edge_target(self, edge: UUID) -> UUID:
"""
@ -79,7 +79,7 @@ class Bottom:
UUID of target element of the edge
"""
result = self.state.read_edge(edge)
return result[1] if result is not None else result
return result[1] if result != None else result
def read_incoming_edges(self, target: UUID, label=None) -> List[UUID]:
"""
@ -102,9 +102,9 @@ class Bottom:
return None
edges = self.state.read_incoming(target)
if edges is None:
if edges == None:
return []
if label is not None:
if label != None:
edges = [e for e in edges if read_label(e) == label]
return edges
@ -129,9 +129,9 @@ class Bottom:
return None
edges = self.state.read_outgoing(source)
if edges is None:
if edges == None:
return []
if label is not None:
if label != None:
edges = [e for e in edges if read_label(e) == label]
return edges
@ -148,7 +148,7 @@ class Bottom:
List of UUIDs of elements connected via incoming edges
"""
edges = self.read_incoming_edges(target, label)
if edges is None or len(edges) == 0:
if edges == None or len(edges) == 0:
return []
else:
return [self.read_edge_source(e) for e in edges]
@ -166,7 +166,7 @@ class Bottom:
List of UUIDs of elements connected via outgoing edges
"""
edges = self.read_outgoing_edges(source, label)
if edges is None or len(edges) == 0:
if edges == None or len(edges) == 0:
return []
else:
return [self.read_edge_target(e) for e in edges]
@ -196,7 +196,7 @@ class Bottom:
Nothing
"""
src, tgt = self.state.read_edge(element)
if src is None and tgt is None:
if src == None and tgt == None:
# node
self.state.delete_node(element)
else:

2
services/bottom/V1.py
View file

@ -25,7 +25,7 @@ class Bottom:
Returns:
Nothing
"""
if value is None:
if value == None:
n = self.bottom.create_node()
else:
n = self.bottom.create_node(value)

6
services/point/cartesian.py
View file

@ -28,7 +28,7 @@ class PointCartesian:
Returns:
Nothing.
"""
if self.point is None:
if self.point == None:
self.point = (x, y)
else:
raise RuntimeError("A PointCartesian model can contain at most 1 point.")
@ -40,7 +40,7 @@ class PointCartesian:
Returns:
Textual representation of the point data.
"""
if self.point is None:
if self.point == None:
raise RuntimeError("No point found in model.")
else:
return f"(X = {self.point[0]}, Y = {self.point[1]})"
@ -65,7 +65,7 @@ class PointCartesian:
Returns:
Nothing.
"""
if self.point is not None:
if self.point != None:
self.point = (self.point[0] + delta_x, self.point[1] + delta_y)
else:
raise RuntimeError("No point found in model.")

6
services/point/polar.py
View file

@ -30,7 +30,7 @@ class PointPolar:
Returns:
Nothing.
"""
if self.point is None:
if self.point == None:
self.point = (r, theta)
else:
raise RuntimeError("A PointPolar model can contain at most 1 point.")
@ -42,7 +42,7 @@ class PointPolar:
Returns:
Textual representation of the point data.
"""
if self.point is None:
if self.point == None:
raise RuntimeError("No point found in model.")
else:
return f"(r = {self.point[0]}, \u03B8 = {self.point[1]})"
@ -67,7 +67,7 @@ class PointPolar:
Returns:
Nothing.
"""
if self.point is not None:
if self.point != None:
self.point = (self.point[0] + delta_r, self.point[1] + delta_theta)
else:
raise RuntimeError("No point found in model.")

14
services/scd.py
View file

@ -55,7 +55,7 @@ class SCD:
self.bottom.create_edge(self.model, class_node, name) # attach to model
scd_node, = self.bottom.read_outgoing_elements(self.scd_model, "Class") # retrieve type
self.bottom.create_edge(class_node, scd_node, "Morphism") # create morphism link
if abstract is not None:
if abstract != None:
# operations similar to set_cardinality function defined above
abstract_model = self.bottom.create_node()
Boolean(abstract_model, self.bottom.state).create(abstract)
@ -67,9 +67,9 @@ class SCD:
scd_link, = self.bottom.read_outgoing_elements(self.scd_model, "Class_abstract")
self.bottom.create_edge(abstract_node, scd_node, "Morphism")
self.bottom.create_edge(abstract_link, scd_link, "Morphism")
if min_c is not None:
if min_c != None:
set_cardinality("lower", min_c)
if max_c is not None:
if max_c != None:
set_cardinality("upper", max_c)
def create_association(self, name: str, source: str, target: str,
@ -118,13 +118,13 @@ class SCD:
self.bottom.create_edge(self.model, assoc_edge, name) # attach to model
scd_node, = self.bottom.read_outgoing_elements(self.scd_model, "Association") # retrieve type
self.bottom.create_edge(assoc_edge, scd_node, "Morphism") # create morphism link
if src_min_c is not None:
if src_min_c != None:
set_cardinality("source_lower", src_min_c)
if src_max_c is not None:
if src_max_c != None:
set_cardinality("source_upper", src_max_c)
if tgt_min_c is not None:
if tgt_min_c != None:
set_cardinality("target_lower", tgt_min_c)
if tgt_max_c is not None:
if tgt_max_c != None:
set_cardinality("target_upper", tgt_max_c)
def create_global_constraint(self, name: str):