move hooks to symmetric roll pass

Author: axtimhaus

pyroll/core/roll_pass/hookimpls/symmetric_roll_pass.py

@@ -0,0 +1,31 @@
+import numpy as np
+
+from ..symmetric_roll_pass import SymmetricRollPass
+
+
+@SymmetricRollPass.entry_point
+def entry_point(self: SymmetricRollPass):
+    height_change = self.in_profile.height - self.height
+    return np.sqrt(self.roll.min_radius * height_change - height_change ** 2 / 4)
+
+
+@SymmetricRollPass.entry_point
+def entry_point_square_oval(self: SymmetricRollPass):
+    if "square" in self.in_profile.classifiers and "oval" in self.classifiers:
+        depth = self.roll.groove.local_depth(self.in_profile.width / 2)
+        height_change = self.in_profile.height - self.gap - 2 * depth
+        radius = self.roll.max_radius - depth
+        return np.sqrt(radius * height_change - height_change ** 2 / 4)
+
+
+@SymmetricRollPass.velocity
+def velocity(self: SymmetricRollPass):
+    if self.roll.has_value("neutral_angle"):
+        return self.roll.working_velocity * np.cos(self.roll.neutral_angle)
+    else:
+        return self.roll.working_velocity
+
+
+@SymmetricRollPass.roll_force
+def roll_force(self: SymmetricRollPass):
+    return (self.in_profile.flow_stress + 2 * self.out_profile.flow_stress) / 3 * self.roll.contact_area

pyroll/core/roll_pass/hookimpls/three_roll_pass.py

@@ -87,30 +87,3 @@ def target_cross_section_area_from_target_width3(self: ThreeRollPass) -> float:
 def roll_power_3(self: ThreeRollPass) -> float:
     return 3 * self.roll.roll_power
 
-
-@ThreeRollPass.entry_point
-def entry_point(self: ThreeRollPass):
-    height_change = self.in_profile.height - self.height
-    return np.sqrt(self.roll.min_radius * height_change - height_change ** 2 / 4)
-
-
-@ThreeRollPass.entry_point
-def entry_point_square_oval(self: ThreeRollPass):
-    if "square" in self.in_profile.classifiers and "oval" in self.classifiers:
-        depth = self.roll.groove.local_depth(self.in_profile.width / 2)
-        height_change = self.in_profile.height - self.gap - 2 * depth
-        radius = self.roll.max_radius - depth
-        return np.sqrt(radius * height_change - height_change ** 2 / 4)
-
-
-@ThreeRollPass.velocity
-def velocity(self: ThreeRollPass):
-    if self.roll.has_value("neutral_angle"):
-        return self.roll.working_velocity * np.cos(self.roll.neutral_angle)
-    else:
-        return self.roll.working_velocity
-
-
-@ThreeRollPass.roll_force
-def roll_force(self: ThreeRollPass):
-    return (self.in_profile.flow_stress + 2 * self.out_profile.flow_stress) / 3 * self.roll.contact_area

pyroll/core/roll_pass/hookimpls/two_roll_pass.py

@@ -55,30 +55,3 @@ def target_cross_section_area_from_target_width(self: TwoRollPass):
 def roll_power(self: TwoRollPass):
     return 2 * self.roll.roll_power
 
-
-@TwoRollPass.entry_point
-def entry_point(self: TwoRollPass):
-    height_change = self.in_profile.height - self.height
-    return np.sqrt(self.roll.min_radius * height_change - height_change ** 2 / 4)
-
-
-@TwoRollPass.entry_point
-def entry_point_square_oval(self: TwoRollPass):
-    if "square" in self.in_profile.classifiers and "oval" in self.classifiers:
-        depth = self.roll.groove.local_depth(self.in_profile.width / 2)
-        height_change = self.in_profile.height - self.gap - 2 * depth
-        radius = self.roll.max_radius - depth
-        return np.sqrt(radius * height_change - height_change ** 2 / 4)
-
-
-@TwoRollPass.velocity
-def velocity(self: TwoRollPass):
-    if self.roll.has_value("neutral_angle"):
-        return self.roll.working_velocity * np.cos(self.roll.neutral_angle)
-    else:
-        return self.roll.working_velocity
-
-
-@TwoRollPass.roll_force
-def roll_force(self: TwoRollPass):
-    return (self.in_profile.flow_stress + 2 * self.out_profile.flow_stress) / 3 * self.roll.contact_area