Skip to content

Commit

Permalink
fix dict type hinting in python
Browse files Browse the repository at this point in the history
  • Loading branch information
sunethwarna committed Aug 3, 2023
1 parent ca793fd commit 847c6ee
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def GetControlField(self) -> ContainerExpressionTypes:
KratosOA.PropertiesVariableExpressionIO.Read(field, self.controlled_physical_variable)
return field

def MapGradient(self, physical_gradient_variable_container_expression_map: dict[SupportedSensitivityFieldVariableTypes, ContainerExpressionTypes]) -> ContainerExpressionTypes:
def MapGradient(self, physical_gradient_variable_container_expression_map: 'dict[SupportedSensitivityFieldVariableTypes, ContainerExpressionTypes]') -> ContainerExpressionTypes:
keys = physical_gradient_variable_container_expression_map.keys()
if len(keys) != 1:
raise RuntimeError(f"Provided more than required gradient fields for control \"{self.GetName()}\". Following are the variables:\n\t" + "\n\t".join([k.Name() for k in keys]))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def CalculateValue(self) -> float:
self.value_array = (average_location / number_of_nodes - self.model_part_center)
return self.value_array[0] ** 2 + self.value_array[1] ** 2 + self.value_array[2] ** 2

def CalculateGradient(self, physical_variable_collective_expressions: dict[SupportedSensitivityFieldVariableTypes, KratosOA.CollectiveExpression]) -> None:
def CalculateGradient(self, physical_variable_collective_expressions: 'dict[SupportedSensitivityFieldVariableTypes, KratosOA.CollectiveExpression]') -> None:
# first merge all the model parts
merged_model_part_map = ModelPartUtilities.GetMergedMap(physical_variable_collective_expressions, False)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def CalculateValue(self) -> float:
self.primal_analysis_execution_policy_decorator.Execute()
return KratosOA.ResponseUtils.LinearStrainEnergyResponseUtils.CalculateValue(self.model_part)

def CalculateGradient(self, physical_variable_collective_expressions: dict[SupportedSensitivityFieldVariableTypes, KratosOA.CollectiveExpression]) -> None:
def CalculateGradient(self, physical_variable_collective_expressions: 'dict[SupportedSensitivityFieldVariableTypes, KratosOA.CollectiveExpression]') -> None:
# first merge all the model parts
merged_model_part_map = ModelPartUtilities.GetMergedMap(physical_variable_collective_expressions, False)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def GetAnalysisModelPart(self) -> None:
def CalculateValue(self) -> float:
return KratosOA.ResponseUtils.MassResponseUtils.CalculateValue(self.model_part)

def CalculateGradient(self, physical_variable_collective_expressions: dict[SupportedSensitivityFieldVariableTypes, KratosOA.CollectiveExpression]) -> None:
def CalculateGradient(self, physical_variable_collective_expressions: 'dict[SupportedSensitivityFieldVariableTypes, KratosOA.CollectiveExpression]') -> None:
# first merge all the model parts
merged_model_part_map = ModelPartUtilities.GetMergedMap(physical_variable_collective_expressions, False)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def __init__(self, response_name: str) -> None:
super().__init__(response_name)
def CalculateValue(self) -> float:
return 0.0
def CalculateGradient(self, physical_variable_collective_expressions: dict[SupportedSensitivityFieldVariableTypes, KratosOA.CollectiveExpression]) -> None:
def CalculateGradient(self, physical_variable_collective_expressions: 'dict[SupportedSensitivityFieldVariableTypes, KratosOA.CollectiveExpression]') -> None:
pass
def Check(self) -> None:
pass
Expand Down Expand Up @@ -48,7 +48,7 @@ def GetEmptyField(self) -> ContainerExpressionTypes:
return None
def GetPhysicalKratosVariables(self) -> 'list[SupportedSensitivityFieldVariableTypes]':
return []
def MapGradient(self, physical_gradient_variable_container_expression_map: dict[SupportedSensitivityFieldVariableTypes, ContainerExpressionTypes]) -> ContainerExpressionTypes:
def MapGradient(self, physical_gradient_variable_container_expression_map: 'dict[SupportedSensitivityFieldVariableTypes, ContainerExpressionTypes]') -> ContainerExpressionTypes:
return None
def Update(self, control_field: ContainerExpressionTypes) -> bool:
return True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def __init__(self, response_name: str, model_part: Kratos.ModelPart) -> None:
self.model_part = model_part
def CalculateValue(self) -> float:
return 0.0
def CalculateGradient(self, physical_variable_collective_expressions: dict[SupportedSensitivityFieldVariableTypes, KratosOA.CollectiveExpression]) -> None:
def CalculateGradient(self, physical_variable_collective_expressions: 'dict[SupportedSensitivityFieldVariableTypes, KratosOA.CollectiveExpression]') -> None:
pass
def Check(self) -> None:
pass
Expand Down Expand Up @@ -52,7 +52,7 @@ def GetEmptyField(self) -> ContainerExpressionTypes:
return None
def GetPhysicalKratosVariables(self) -> 'list[SupportedSensitivityFieldVariableTypes]':
return []
def MapGradient(self, physical_gradient_variable_container_expression_map: dict[SupportedSensitivityFieldVariableTypes, ContainerExpressionTypes]) -> ContainerExpressionTypes:
def MapGradient(self, physical_gradient_variable_container_expression_map: 'dict[SupportedSensitivityFieldVariableTypes, ContainerExpressionTypes]') -> ContainerExpressionTypes:
return None
def Update(self, control_field: ContainerExpressionTypes) -> bool:
return True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def GetEvaluatedModelPart(self) -> Kratos.ModelPart:
return None
def CalculateValue(self) -> float:
return 0.0
def CalculateGradient(self, _: dict[SupportedSensitivityFieldVariableTypes, KratosOA.CollectiveExpression]) -> None:
def CalculateGradient(self, _: 'dict[SupportedSensitivityFieldVariableTypes, KratosOA.CollectiveExpression]') -> None:
return None

@classmethod
Expand Down

0 comments on commit 847c6ee

Please sign in to comment.