Skip to content

Commit

Permalink
Switchting from HPOlibConfigspace to ConfigSpace
Browse files Browse the repository at this point in the history
Refactor all the things !
  • Loading branch information
stokasto committed Feb 11, 2016
1 parent 8ae3c67 commit 8514e7a
Show file tree
Hide file tree
Showing 66 changed files with 160 additions and 159 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import sklearn.utils

from pyMetaLearn.metalearning.meta_base import MetaBase, Run
from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.configuration_space import ConfigurationSpace

logging.basicConfig()

Expand Down
2 changes: 1 addition & 1 deletion autosklearn/metalearning/metalearning/meta_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from ..input import aslib_simple
from ..metafeatures.metafeature import DatasetMetafeatures
from HPOlibConfigSpace.configuration_space import Configuration
from ConfigSpace.configuration_space import Configuration



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def __init__(self, dataset_name, configuration_space,
dataset_name : str
Name of the dataset
configuration_space : HPOlibConfigSpace.configuration_space.ConfigurationSpace
configuration_space : ConfigSpace.configuration_space.ConfigurationSpace
datasets_file : str
Path to an aslib directory
Expand Down
4 changes: 2 additions & 2 deletions autosklearn/pipeline/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def get_hyperparameter_search_space(cls, include=None, exclude=None,
assembles a list of available estimators and preprocessor components,
_get_hyperparameter_search_space can be called to do the work of
creating the actual
HPOlibConfigSpace.configuration_space.ConfigurationSpace object.
ConfigSpace.configuration_space.ConfigurationSpace object.
Parameters
----------
Expand All @@ -230,7 +230,7 @@ def get_hyperparameter_search_space(cls, include=None, exclude=None,
Returns
-------
cs : HPOlibConfigSpace.configuration_space.Configuration
cs : ConfigSpace.configuration_space.Configuration
The configuration space describing the AutoSklearnClassifier.
"""
Expand Down
8 changes: 4 additions & 4 deletions autosklearn/pipeline/classification.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

from sklearn.base import ClassifierMixin

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.forbidden import ForbiddenEqualsClause, ForbiddenAndConjunction
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.forbidden import ForbiddenEqualsClause, ForbiddenAndConjunction

from autosklearn.pipeline.components import classification as \
classification_components
Expand All @@ -30,11 +30,11 @@ class SimpleClassificationPipeline(ClassifierMixin, BasePipeline):
possible parameters in the __init__ function because we only know the
available classifiers at runtime. For this reason the user must
specifiy the parameters by passing an instance of
HPOlibConfigSpace.configuration_space.Configuration.
ConfigSpace.configuration_space.Configuration.
Parameters
----------
configuration : HPOlibConfigSpace.configuration_space.Configuration
configuration : ConfigSpace.configuration_space.Configuration
The configuration to evaluate.
random_state : int, RandomState instance or None, optional (default=None)
Expand Down
6 changes: 3 additions & 3 deletions autosklearn/pipeline/components/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def get_hyperparameter_search_space(dataset_properties=None):
Returns
-------
HPOlibConfigspace.configuration_space.ConfigurationSpace
Configspace.configuration_space.ConfigurationSpace
The configuration space of this classification algorithm.
"""
raise NotImplementedError()
Expand Down Expand Up @@ -212,7 +212,7 @@ def get_hyperparameter_search_space(dataset_properties=None):
Returns
-------
HPOlibConfigspace.configuration_space.ConfigurationSpace
Configspace.configuration_space.ConfigurationSpace
The configuration space of this preprocessing algorithm.
"""
raise NotImplementedError()
Expand Down Expand Up @@ -311,7 +311,7 @@ def get_hyperparameter_search_space(dataset_properties=None):
Returns
-------
HPOlibConfigspace.configuration_space.ConfigurationSpace
Configspace.configuration_space.ConfigurationSpace
The configuration space of this regression algorithm.
"""
raise NotImplementedError()
Expand Down
4 changes: 2 additions & 2 deletions autosklearn/pipeline/components/classification/adaboost.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from autosklearn.pipeline.implementations.MultilabelClassifier import \
MultilabelClassifier

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
UniformIntegerHyperparameter, CategoricalHyperparameter

from autosklearn.pipeline.components.base import AutoSklearnClassificationAlgorithm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
CategoricalHyperparameter

from autosklearn.pipeline.components.base import AutoSklearnClassificationAlgorithm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
UniformIntegerHyperparameter, CategoricalHyperparameter, \
UnParametrizedHyperparameter, Constant

Expand Down
4 changes: 2 additions & 2 deletions autosklearn/pipeline/components/classification/extra_trees.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
UniformIntegerHyperparameter, CategoricalHyperparameter, \
UnParametrizedHyperparameter, Constant

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.configuration_space import ConfigurationSpace

from autosklearn.pipeline.components.base import AutoSklearnClassificationAlgorithm
from autosklearn.pipeline.constants import *
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
UniformIntegerHyperparameter, UnParametrizedHyperparameter, Constant, \
CategoricalHyperparameter

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import CategoricalHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import CategoricalHyperparameter, \
Constant, UniformIntegerHyperparameter

from autosklearn.pipeline.components.base import AutoSklearnClassificationAlgorithm
Expand Down
6 changes: 3 additions & 3 deletions autosklearn/pipeline/components/classification/lda.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
UniformIntegerHyperparameter, CategoricalHyperparameter
from HPOlibConfigSpace.conditions import EqualsCondition
from ConfigSpace.conditions import EqualsCondition

from autosklearn.pipeline.components.base import \
AutoSklearnClassificationAlgorithm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
CategoricalHyperparameter, Constant
from HPOlibConfigSpace.forbidden import ForbiddenEqualsClause, \
from ConfigSpace.forbidden import ForbiddenEqualsClause, \
ForbiddenAndConjunction

from autosklearn.pipeline.components.base import AutoSklearnClassificationAlgorithm
Expand Down
6 changes: 3 additions & 3 deletions autosklearn/pipeline/components/classification/libsvm_svc.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.conditions import EqualsCondition, InCondition
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.conditions import EqualsCondition, InCondition
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
UniformIntegerHyperparameter, CategoricalHyperparameter, \
UnParametrizedHyperparameter

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
CategoricalHyperparameter

from autosklearn.pipeline.components.base import AutoSklearnClassificationAlgorithm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
CategoricalHyperparameter, UnParametrizedHyperparameter, \
UniformIntegerHyperparameter

Expand Down
4 changes: 2 additions & 2 deletions autosklearn/pipeline/components/classification/proj_logit.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
UniformIntegerHyperparameter, CategoricalHyperparameter, \
UnParametrizedHyperparameter, Constant

Expand Down
4 changes: 2 additions & 2 deletions autosklearn/pipeline/components/classification/qda.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter

from autosklearn.pipeline.components.base import \
AutoSklearnClassificationAlgorithm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
UniformIntegerHyperparameter, CategoricalHyperparameter, \
UnParametrizedHyperparameter, Constant

Expand Down
6 changes: 3 additions & 3 deletions autosklearn/pipeline/components/classification/sgd.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
CategoricalHyperparameter, UnParametrizedHyperparameter, \
UniformIntegerHyperparameter
from HPOlibConfigSpace.conditions import EqualsCondition
from ConfigSpace.conditions import EqualsCondition

from autosklearn.pipeline.components.base import AutoSklearnClassificationAlgorithm
from autosklearn.pipeline.constants import *
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import CategoricalHyperparameter
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import CategoricalHyperparameter

from autosklearn.pipeline.components.base import \
AutoSklearnPreprocessingAlgorithm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import CategoricalHyperparameter
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import CategoricalHyperparameter

from autosklearn.pipeline.components.base import AutoSklearnPreprocessingAlgorithm
from autosklearn.pipeline.constants import *
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import autosklearn.pipeline.implementations.OneHotEncoder

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import CategoricalHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import CategoricalHyperparameter, \
UniformFloatHyperparameter
from HPOlibConfigSpace.conditions import EqualsCondition
from ConfigSpace.conditions import EqualsCondition

from autosklearn.pipeline.components.base import AutoSklearnPreprocessingAlgorithm
from autosklearn.pipeline.constants import *
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from collections import OrderedDict
import copy

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import CategoricalHyperparameter
from HPOlibConfigSpace.conditions import EqualsCondition, AbstractConjunction
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import CategoricalHyperparameter
from ConfigSpace.conditions import EqualsCondition, AbstractConjunction

from autosklearn.pipeline.constants import *

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.configuration_space import ConfigurationSpace

from autosklearn.pipeline.components.base import \
AutoSklearnPreprocessingAlgorithm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
UniformIntegerHyperparameter, CategoricalHyperparameter, \
UnParametrizedHyperparameter, Constant

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
UniformIntegerHyperparameter, CategoricalHyperparameter, \
UnParametrizedHyperparameter, Constant

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import warnings

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import CategoricalHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import CategoricalHyperparameter, \
UniformIntegerHyperparameter
from HPOlibConfigSpace.conditions import EqualsCondition
from ConfigSpace.conditions import EqualsCondition

from autosklearn.pipeline.components.base import \
AutoSklearnPreprocessingAlgorithm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import CategoricalHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import CategoricalHyperparameter, \
UniformIntegerHyperparameter
from HPOlibConfigSpace.forbidden import ForbiddenInClause, \
from ConfigSpace.forbidden import ForbiddenInClause, \
ForbiddenAndConjunction, ForbiddenEqualsClause

from autosklearn.pipeline.components.base import \
Expand Down
4 changes: 2 additions & 2 deletions autosklearn/pipeline/components/feature_preprocessing/gem.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformIntegerHyperparameter, UniformFloatHyperparameter
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformIntegerHyperparameter, UniformFloatHyperparameter

from autosklearn.pipeline.components.base import AutoSklearnPreprocessingAlgorithm
from autosklearn.pipeline.implementations.gem import GEM as GEMImpl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import numpy as np

from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import CategoricalHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import CategoricalHyperparameter, \
UniformIntegerHyperparameter, UniformFloatHyperparameter
from HPOlibConfigSpace.conditions import EqualsCondition, InCondition
from ConfigSpace.conditions import EqualsCondition, InCondition

from autosklearn.pipeline.components.base import \
AutoSklearnPreprocessingAlgorithm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
UniformIntegerHyperparameter

from autosklearn.pipeline.components.base import AutoSklearnPreprocessingAlgorithm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from HPOlibConfigSpace.configuration_space import ConfigurationSpace
from HPOlibConfigSpace.hyperparameters import UniformFloatHyperparameter, \
from ConfigSpace.configuration_space import ConfigurationSpace
from ConfigSpace.hyperparameters import UniformFloatHyperparameter, \
CategoricalHyperparameter, Constant, UnParametrizedHyperparameter
from HPOlibConfigSpace.forbidden import ForbiddenEqualsClause, \
from ConfigSpace.forbidden import ForbiddenEqualsClause, \
ForbiddenAndConjunction

from autosklearn.pipeline.components.base import \
Expand Down
Loading

0 comments on commit 8514e7a

Please sign in to comment.