8000 Add convenient get_typename method to DesignVariable by relf · Pull Request #452 · SMTorg/smt · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Add convenient get_typename method to DesignVariable #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2023
Merged

Add convenient get_typename method to DesignVariable #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions smt/utils/design_space.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ class DesignVariable:
upper: Union[float, int]
lower: Union[float, int]

def get_typename(self):
return self.__class__.__name__

def get_limits(self) -> Union[list, tuple]:
raise NotImplementedError

Expand Down Expand Up @@ -59,7 +62,7 @@ def __str__(self):
return f"Float ({self.lower}, {self.upper})"

def __repr__(self):
return f"{self.__class__.__name__}({self.lower}, {self.upper})"
return f"{self.get_typename()}({self.lower}, {self.upper})"


class IntegerVariable(DesignVariable):
Expand All @@ -80,7 +83,7 @@ def __str__(self):
return f"Int ({self.lower}, {self.upper})"

def __repr__(self):
return f"{self.__class__.__name__}({self.lower}, {self.upper})"
return f"{self.get_typename()}({self.lower}, {self.upper})"


class OrdinalVariable(DesignVariable):
Expand All @@ -107,7 +110,7 @@ def __str__(self):
return f"Ord {self.values}"

def __repr__(self):
return f"{self.__class__.__name__}({self.values})"
return f"{self.get_typename()}({self.values})"


class CategoricalVariable(DesignVariable):
Expand Down Expand Up @@ -138,7 +141,7 @@ def __str__(self):
return f"Cat {self.values}"

def __repr__(self):
return f"{self.__class__.__name__}({self.values})"
return f"{self.get_typename()}({self.values})"


class BaseDesignSpace:
Expand Down
4 changes: 4 additions & 0 deletions smt/utils/test/test_design_space.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def test_design_variables(self):
self.assertEqual(float_var.get_limits(), (0, 1))
self.assertTrue(str(float_var))
self.assertTrue(repr(float_var))
self.assertEqual("FloatVariable", float_var.get_typename())

with self.assertRaises(ValueError):
IntegerVariable(1, 0)
Expand All @@ -36,6 +37,7 @@ def test_design_variables(self):
self.assertEqual(int_var.get_limits(), (0, 1))
self.assertTrue(str(int_var))
self.assertTrue(repr(int_var))
self.assertEqual("IntegerVariable", int_var.get_typename())

with self.assertRaises(ValueError):
OrdinalVariable([])
Expand All @@ -49,6 +51,7 @@ def test_design_variables(self):
self.assertEqual(ord_var.upper, 2)
self.assertTrue(str(ord_var))
self.assertTrue(repr(ord_var))
self.assertEqual("OrdinalVariable", ord_var.get_typename())

with self.assertRaises(ValueError):
CategoricalVariable([])
Expand All @@ -62,6 +65,7 @@ def test_design_variables(self):
self.assertEqual(cat_var.upper, 2)
self.assertTrue(str(cat_var))
self.assertTrue(repr(cat_var))
self.assertEqual("CategoricalVariable", cat_var.get_typename())

def test_rounding(self):
ds = BaseDesignSpace(
Expand Down
0