Merge pull request automl#152 from automl/test_intensify

Test intensify
ml-squad · Jan 20, 2017 · 7c97bf4 · 7c97bf4
2 parents a47c111 + 62a1eb6
commit 7c97bf4
Show file tree

Hide file tree

Showing 8 changed files with 724 additions and 483 deletions.
diff --git a/smac/facade/roar_facade.py b/smac/facade/roar_facade.py
@@ -1,4 +1,5 @@
 import logging
+import typing
 
 import numpy as np
 
@@ -13,6 +14,7 @@
 from smac.smbo.acquisition import AbstractAcquisitionFunction
 from smac.epm.random_epm import RandomEPM
 from smac.facade.smac_facade import SMAC
+from smac.configspace import Configuration
 
 __author__ = "Marius Lindauer"
 __copyright__ = "Copyright 2016, ML4AAD"
@@ -27,6 +29,7 @@ def __init__(self,
                  runhistory: RunHistory=None,
                  intensifier: Intensifier=None,
                  initial_design: InitialDesign=None,
+                 initial_configurations: typing.List[Configuration]=None,
                  stats: Stats=None,
                  rng: np.random.RandomState=None):
         '''
@@ -46,6 +49,9 @@ def __init__(self,
             intensification object to issue a racing to decide the current incumbent
         initial_design: InitialDesign
             initial sampling design
+        initial_configurations: typing.List[Configuration]
+            list of initial configurations for initial design -- 
+            cannot be used together with initial_design
         stats: Stats
             optional stats object
         rng: np.random.RandomState
@@ -78,5 +84,6 @@ def __init__(self,
                          model=model,
                          runhistory2epm=runhistory2epm,
                          initial_design=initial_design,
+                         initial_configurations=initial_configurations,
                          stats=stats,
                          rng=rng)
diff --git a/smac/facade/smac_facade.py b/smac/facade/smac_facade.py
@@ -82,9 +82,9 @@ def __init__(self,
             RunHistory2EPM4LogCost if objective is runtime.
         initial_design: InitialDesign
             initial sampling design
-        initial_configuration: typing.List[Configuration]
+        initial_configurations: typing.List[Configuration]
             list of initial configurations for initial design -- 
-            cannot be used togehter with initial_design
+            cannot be used together with initial_design
         stats: Stats
             optional stats object
         rng: np.random.RandomState