Skip to content

Commit 124aaa8

Browse files
committed
Codacy
1 parent eeaa0f5 commit 124aaa8

File tree

5 files changed

+26
-56
lines changed

5 files changed

+26
-56
lines changed

pina/condition/condition.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ def __new__(cls, *args, **kwargs):
7373
sorted_keys = sorted(kwargs.keys())
7474
if sorted_keys == sorted(InputTargetCondition.__slots__):
7575
return InputTargetCondition(**kwargs)
76-
elif sorted_keys == sorted(InputEquationCondition.__slots__):
76+
if sorted_keys == sorted(InputEquationCondition.__slots__):
7777
return InputEquationCondition(**kwargs)
78-
elif sorted_keys == sorted(DomainEquationCondition.__slots__):
78+
if sorted_keys == sorted(DomainEquationCondition.__slots__):
7979
return DomainEquationCondition(**kwargs)
80-
elif (
80+
if (
8181
sorted_keys == sorted(DataCondition.__slots__)
8282
or sorted_keys[0] == DataCondition.__slots__[0]
8383
):
8484
return DataCondition(**kwargs)
85-
else:
86-
raise ValueError(f"Invalid keyword arguments {kwargs.keys()}.")
85+
86+
raise ValueError(f"Invalid keyword arguments {kwargs.keys()}.")

pina/condition/data_condition.py

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import torch
2-
2+
from torch_geometric.data import Data
33
from . import ConditionInterface
44
from ..label_tensor import LabelTensor
55
from ..graph import Graph
66
from ..utils import check_consistency
7-
from torch_geometric.data import Data
87

98

109
class DataCondition(ConditionInterface):
@@ -66,26 +65,22 @@ def _get_subclass(input, conditional_variables):
6665
)
6766
if is_tensor_input:
6867
return TensorDataCondition
69-
elif is_graph_input:
68+
if is_graph_input:
7069
return GraphDataCondition
71-
else:
72-
raise ValueError(
73-
"Invalid input types. "
74-
"Please provide either torch.Tensor or Graph objects."
75-
)
70+
71+
raise ValueError(
72+
"Invalid input types. "
73+
"Please provide either torch.Tensor or Graph objects."
74+
)
7675

7776

7877
class TensorDataCondition(DataCondition):
7978
"""
8079
DataCondition for torch.Tensor input data
8180
"""
8281

83-
pass
84-
8582

8683
class GraphDataCondition(DataCondition):
8784
"""
8885
DataCondition for Graph/Data input data
8986
"""
90-
91-
pass

pina/condition/input_equation_condition.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
"""
44

55
import torch
6-
6+
from torch_geometric.data import Data
77
from .condition_interface import ConditionInterface
88
from ..label_tensor import LabelTensor
99
from ..graph import Graph
1010
from ..utils import check_consistency
1111
from ..equation.equation_interface import EquationInterface
12-
from torch_geometric.data import Data
1312

1413

1514
class InputEquationCondition(ConditionInterface):
@@ -60,26 +59,21 @@ def _get_subclass(input, equation):
6059
)
6160
if is_tensor_input:
6261
return InputTensorEquationCondition
63-
elif is_graph_input:
62+
if is_graph_input:
6463
return InputGraphEquationCondition
65-
else:
66-
raise ValueError(
67-
"Invalid input types. "
68-
"Please provide either torch.Tensor or Graph objects."
69-
)
64+
raise ValueError(
65+
"Invalid input types. "
66+
"Please provide either torch.Tensor or Graph objects."
67+
)
7068

7169

7270
class InputTensorEquationCondition(InputEquationCondition):
7371
"""
7472
InputEquationCondition subclass for torch.Tensor input data.
7573
"""
7674

77-
pass
78-
7975

8076
class InputGraphEquationCondition(InputEquationCondition):
8177
"""
8278
InputEquationCondition subclass for Graph input data.
8379
"""
84-
85-
pass

pina/condition/input_target_condition.py

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
"""
44

55
import torch
6-
6+
from torch_geometric.data import Data
77
from .condition_interface import ConditionInterface
88
from ..label_tensor import LabelTensor
99
from ..graph import Graph
10-
from torch_geometric.data import Data
1110

1211

1312
class InputTargetCondition(ConditionInterface):
@@ -66,56 +65,39 @@ def _get_subclass(input, target):
6665

6766
if is_tensor_input and is_tensor_target:
6867
return TensorInputTensorTargetCondition
69-
elif is_tensor_input and is_graph_target:
68+
if is_tensor_input and is_graph_target:
7069
return TensorInputGraphTargetCondition
71-
elif is_graph_input and is_tensor_target:
70+
if is_graph_input and is_tensor_target:
7271
return GraphInputTensorTargetCondition
73-
elif is_graph_input and is_graph_target:
72+
if is_graph_input and is_graph_target:
7473
return GraphInputGraphTargetCondition
75-
else:
76-
raise ValueError(
77-
"Invalid input and target types. "
78-
"Please provide either torch.Tensor or Graph objects."
79-
)
80-
81-
def __init__(self, input, target):
82-
"""
83-
TODO : add docstring
84-
"""
85-
super().__init__()
86-
self.input = input
87-
self.target = target
74+
raise ValueError(
75+
"Invalid input and target types. "
76+
"Please provide either torch.Tensor or Graph objects."
77+
)
8878

8979

9080
class TensorInputTensorTargetCondition(InputTargetCondition):
9181
"""
9282
InputTargetCondition subclass for torch.Tensor input and target data.
9383
"""
9484

95-
pass
96-
9785

9886
class TensorInputGraphTargetCondition(InputTargetCondition):
9987
"""
10088
InputTargetCondition subclass for torch.Tensor input and Graph/Data target
10189
data.
10290
"""
10391

104-
pass
105-
10692

10793
class GraphInputTensorTargetCondition(InputTargetCondition):
10894
"""
10995
InputTargetCondition subclass for Graph/Data input and torch.Tensor target
11096
data.
11197
"""
11298

113-
pass
114-
11599

116100
class GraphInputGraphTargetCondition(InputTargetCondition):
117101
"""
118102
InputTargetCondition subclass for Graph/Data input and target data.
119103
"""
120-
121-
pass

pina/problem/abstract_problem.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from ..utils import check_consistency
55
from ..domain import DomainInterface, CartesianDomain
66
from ..condition.domain_equation_condition import DomainEquationCondition
7-
from ..condition import InputEquationCondition
87
from copy import deepcopy
98
from .. import LabelTensor
109
from ..utils import merge_tensors

0 commit comments

Comments
 (0)