Ficed bugs introduced by previous changes and added Scikit-Learn dpndncy

This commit is contained in:
Cian Hughes
2022-03-04 16:52:40 +00:00
parent caae863be5
commit 07a0842a68
7 changed files with 154 additions and 63 deletions

View File

@@ -3,6 +3,8 @@ class CalCurve():
def __init__(self):
self.name = "None"
self.formula = "y=x"
self.response = ""
self.units = ""
def __call__(self, x):
return x
@@ -16,6 +18,8 @@ class AlSi7Mg(CalCurve):
def __init__(self):
self.name = "AlSi7Mg"
self.formula = "N/A"
self.response = "Temperature"
self.units = "°C"
def __call__(self, x):
return x
@@ -26,16 +30,20 @@ class Al6061(CalCurve):
def __init__(self):
self.name = "Al6061"
self.formula = "T=(V+84.66)/1.45"
self.response = "Temperature"
self.units = "°C"
def __call__(self, x):
return (x + 84.661) / 1.4516
class _15_5PH(CalCurve):
class SS15_5PH(CalCurve):
def __init__(self):
self.name = "15-5PH Stainless Steel"
self.formula = "N/A"
self.response = "Temperature"
self.units = "°C"
def __call__(self, x):
return x
@@ -46,6 +54,8 @@ class H13(CalCurve):
def __init__(self):
self.name = "H13 Tool Steel"
self.formula = "N/A"
self.response = "Temperature"
self.units = "°C"
def __call__(self, x):
return x
@@ -56,6 +66,8 @@ class Inconel625(CalCurve):
def __init__(self):
self.name = "Inconel 625"
self.formula = "N/A"
self.response = "Temperature"
self.units = "°C"
def __call__(self, x):
return x
@@ -66,6 +78,8 @@ class Inconel718(CalCurve):
def __init__(self):
self.name = "Inconel 718"
self.formula = "N/A"
self.response = "Temperature"
self.units = "°C"
def __call__(self, x):
return x
@@ -76,6 +90,8 @@ class Custom(CalCurve):
def __init__(self):
self.name = "Custom"
self.formula = "y=mx+c"
self.response = "Response"
self.units = "U"
def __call__(self, x):
return x