Fixup tests

ConfigSpace/configuration.py

@@ -8,11 +8,13 @@
 from ConfigSpace import c_util
 from ConfigSpace.exceptions import HyperparameterNotFoundError, IllegalValueError
 from ConfigSpace.hyperparameters import FloatHyperparameter
-from ConfigSpace.hyperparameters.hyperparameter import NotSet
 
 if TYPE_CHECKING:
  from ConfigSpace.configuration_space import ConfigurationSpace
 
+NotSet = object() # Sentinal value for unset values
+
+
 class Configuration(Mapping[str, Any]):
  def __init__(
  self,

ConfigSpace/configuration_space.py

@@ -45,7 +45,7 @@
  ConditionComponent,
  EqualsCondition,
 )
-from ConfigSpace.configuration import Configuration
+from ConfigSpace.configuration import Configuration, NotSet
 from ConfigSpace.exceptions import (
  ActiveHyperparameterNotSetError,
  AmbiguousConditionError,
@@ -72,7 +72,6 @@
  UniformFloatHyperparameter,
  UniformIntegerHyperparameter,
 )
-from ConfigSpace.hyperparameters.hyperparameter import NotSet
 
 _ROOT: Final = "__HPOlib_configuration_space_root__"
 

ConfigSpace/hyperparameters/__init__.py

@@ -3,7 +3,7 @@
 from ConfigSpace.hyperparameters.categorical import CategoricalHyperparameter
 from ConfigSpace.hyperparameters.constant import Constant, UnParametrizedHyperparameter
 from ConfigSpace.hyperparameters.float_hyperparameter import FloatHyperparameter
-from ConfigSpace.hyperparameters.hyperparameter import Hyperparameter, NotSet
+from ConfigSpace.hyperparameters.hyperparameter import Hyperparameter
 from ConfigSpace.hyperparameters.integer_hyperparameter import IntegerHyperparameter
 from ConfigSpace.hyperparameters.normal_float import NormalFloatHyperparameter
 from ConfigSpace.hyperparameters.normal_integer import NormalIntegerHyperparameter
@@ -27,5 +27,4 @@
  "NormalIntegerHyperparameter",
  "BetaFloatHyperparameter",
  "BetaIntegerHyperparameter",
- "NotSet",
 ]

ConfigSpace/hyperparameters/hyperparameter.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 
-NotSet = object()
 
 class Comparison(Enum):
  """Enumeration of possible comparison results."""

ConfigSpace/hyperparameters/normal_float.py

@@ -125,7 +125,10 @@ def __repr__(self) -> str:
 
  if self.lower is None or self.upper is None:
  repr_str.write(
- f"{self.name}, Type: NormalFloat, Mu: {self.mu!r} Sigma: {self.sigma!r}, Default: {self.default_value!r}",
+ f"{self.name}, Type: NormalFloat,"
+ f" Mu: {self.mu!r}"
+ f" Sigma: {self.sigma!r},"
+ f" Default: {self.default_value!r}",
  )
  else:
  repr_str.write(

ConfigSpace/hyperparameters/ordinal.py

@@ -2,7 +2,6 @@
 
 import copy
 import io
-from collections import OrderedDict
 from typing import Any
 
 import numpy as np

ConfigSpace/hyperparameters/uniform_integer.py

@@ -59,7 +59,7 @@ def __init__(
  if q < 1:
  raise ValueError(
  "Setting quantization < 1 for Integer "
- f"Hyperparameter {name} has no effect."
+ f"Hyperparameter {name} has no effect.",
  )
 
  self.q = self.check_int(q, "q")
@@ -102,12 +102,14 @@ def __init__(
  def __repr__(self) -> str:
  repr_str = io.StringIO()
  repr_str.write(
- f"{self.name}, Type: UniformInteger, Range: [{self.lower!r}, {self.upper!r}], Default: {self.default_value!r}",
+ f"{self.name}, Type: UniformInteger,"
+ f" Range: [{self.lower!r}, {self.upper!r}],"
+ f" Default: {self.default_value!r}",
  )
  if self.log:
  repr_str.write(", on log-scale")
  if self.q is not None:
- repr_str.write(", Q: %s" % repr(self.q))
+ repr_str.write(f", Q: {self.q}")
  repr_str.seek(0)
  return repr_str.getvalue()
 
@@ -165,8 +167,8 @@ def check_default(self, default_value: int | float | None) -> int:
 
  if self.is_legal(default_value):
  return default_value
- else:
-  raise ValueError("Illegal default value %s" % str(default_value))
+
+ raise ValueError("Illegal default value %s" % str(default_value))
 
  def has_neighbors(self) -> bool:
  if self.log:
@@ -179,13 +181,13 @@ def has_neighbors(self) -> bool:
  # If there is only one active value, this is not enough
  return upper - lower >= 1
 
- def get_num_neighbors(self, value=None) -> int:
+ def get_num_neighbors(self, value: int | None = None) -> int:
  # If there is a value in the range, then that value is not a neighbor of itself
  # so we need to remove one
  if value is not None and self.lower <= value <= self.upper:
  return self.upper - self.lower - 1
- else:
-  return self.upper - self.lower
+
+ return self.upper - self.lower
 
  def get_neighbors(
  self,
@@ -252,8 +254,8 @@ def get_neighbors(
 
  if transform:
  return neighbors
- else:
-  return self._inverse_transform(np.asarray(neighbors)).tolist()
+
+ return self._inverse_transform(np.asarray(neighbors)).tolist()
 
  # A truncated normal between 0 and 1, centered on the value with a scale of std.
  # This will be sampled from and converted to the corresponding int value
@@ -297,8 +299,8 @@ def get_neighbors(
  neighbors = list(seen)
  if transform:
  return neighbors
- else:
-  return self._inverse_transform(np.array(neighbors)).tolist()
+
+ return self._inverse_transform(np.array(neighbors)).tolist()
 
  def _pdf(self, vector: np.ndarray) -> np.ndarray:
  """

ConfigSpace/util.py

@@ -172,8 +172,8 @@ def get_one_exchange_neighbourhood(
  array = configuration.get_array() # type: np.ndarray
  value = array[index] # type: float
 
- # Check for NaNs (inactive value)
- if value != value:
+ # Inactive value
+ if isinstance(value, float) and np.isnan(value):
  continue
 
  iteration = 0

pyproject.toml

@@ -178,6 +178,7 @@ select = [
 ignore = [
  "D100",
  "D101", # Missing docstring in public class
+ "D102", # Missing docstring in public method (Should be active but it's too much for right now)
  "D104", # Missing docstring in public package
  "D105", # Missing docstring in magic mthod
  "D203", # 1 blank line required before class docstring

test/test_configspace_from_dict.py

@@ -81,12 +81,6 @@
  ],
 )
 def test_individual_hyperparameters(value: Any, expected: Hyperparameter) -> None:
- """
- Expects
- -------
- * Creating a constant with the dictionary easy api will insert a Constant
- into it's hyperparameters.
- """
  cs = ConfigurationSpace({"hp": value})
  assert cs["hp"] == expected