@@ -329,9 +329,8 @@ <h1>Source code for skopt.utils</h1><div class="highlight"><pre>
329
329
330
330
331
331
< div class ="viewcode-block " id ="expected_minimum "> < a class ="viewcode-back " href ="../../modules/generated/skopt.utils.expected_minimum.html#skopt.expected_minimum "> [docs]</ a > < span class ="k "> def</ span > < span class ="nf "> expected_minimum</ span > < span class ="p "> (</ span > < span class ="n "> res</ span > < span class ="p "> ,</ span > < span class ="n "> n_random_starts</ span > < span class ="o "> =</ span > < span class ="mi "> 20</ span > < span class ="p "> ,</ span > < span class ="n "> random_state</ span > < span class ="o "> =</ span > < span class ="kc "> None</ span > < span class ="p "> ):</ span >
332
- < span class ="sd "> """</ span >
333
- < span class ="sd "> Compute the minimum over the predictions of the last surrogate model.</ span >
334
- < span class ="sd "> Uses `expected_minimum_random_sampling` with `n_random_starts`=100000,</ span >
332
+ < span class ="sd "> """Compute the minimum over the predictions of the last surrogate model.</ span >
333
+ < span class ="sd "> Uses `expected_minimum_random_sampling` with `n_random_starts` = 100000,</ span >
335
334
< span class ="sd "> when the space contains any categorical values.</ span >
336
335
337
336
< span class ="sd "> .. note::</ span >
@@ -460,17 +459,15 @@ <h1>Source code for skopt.utils</h1><div class="highlight"><pre>
460
459
461
460
462
461
< div class ="viewcode-block " id ="cook_estimator "> < a class ="viewcode-back " href ="../../modules/generated/skopt.utils.cook_estimator.html#skopt.cook_estimator "> [docs]</ a > < span class ="k "> def</ span > < span class ="nf "> cook_estimator</ span > < span class ="p "> (</ span > < span class ="n "> base_estimator</ span > < span class ="p "> ,</ span > < span class ="n "> space</ span > < span class ="o "> =</ span > < span class ="kc "> None</ span > < span class ="p "> ,</ span > < span class ="o "> **</ span > < span class ="n "> kwargs</ span > < span class ="p "> ):</ span >
463
- < span class ="sd "> """</ span >
464
- < span class ="sd "> Cook a default estimator.</ span >
462
+ < span class ="sd "> """Cook a default estimator.</ span >
465
463
466
464
< span class ="sd "> For the special base_estimator called "DUMMY" the return value is None.</ span >
467
465
< span class ="sd "> This corresponds to sampling points at random, hence there is no need</ span >
468
466
< span class ="sd "> for an estimator.</ span >
469
467
470
468
< span class ="sd "> Parameters</ span >
471
469
< span class ="sd "> ----------</ span >
472
- < span class ="sd "> base_estimator : "GP", "RF", "ET", "GBRT", "DUMMY"</ span >
473
- < span class ="sd "> or sklearn regressor</ span >
470
+ < span class ="sd "> base_estimator : "GP", "RF", "ET", "GBRT", "DUMMY" or sklearn regressor</ span >
474
471
< span class ="sd "> Should inherit from `sklearn.base.RegressorMixin`.</ span >
475
472
< span class ="sd "> In addition the `predict` method should have an optional `return_std`</ span >
476
473
< span class ="sd "> argument, which returns `std(Y | x)`` along with `E[Y | x]`.</ span >
@@ -535,15 +532,14 @@ <h1>Source code for skopt.utils</h1><div class="highlight"><pre>
535
532
536
533
537
534
< div class ="viewcode-block " id ="cook_initial_point_generator "> < a class ="viewcode-back " href ="../../modules/generated/skopt.utils.cook_initial_point_generator.html#skopt.cook_initial_point_generator "> [docs]</ a > < span class ="k "> def</ span > < span class ="nf "> cook_initial_point_generator</ span > < span class ="p "> (</ span > < span class ="n "> generator</ span > < span class ="p "> ,</ span > < span class ="o "> **</ span > < span class ="n "> kwargs</ span > < span class ="p "> ):</ span >
538
- < span class ="sd "> """</ span >
539
- < span class ="sd "> Cook a default initial point generator.</ span >
535
+ < span class ="sd "> """Cook a default initial point generator.</ span >
540
536
541
537
< span class ="sd "> For the special generator called "random" the return value is None.</ span >
542
538
543
539
< span class ="sd "> Parameters</ span >
544
540
< span class ="sd "> ----------</ span >
545
- < span class ="sd "> generator : "lhs", "sobol", "halton", "hammersly", "grid", "random"</ span >
546
- < span class ="sd "> or InitialPointGenerator instance"</ span >
541
+ < span class ="sd "> generator : "lhs", "sobol", "halton", "hammersly", "grid", "random" \ </ span >
542
+ < span class ="sd "> or InitialPointGenerator instance"</ span >
547
543
< span class ="sd "> Should inherit from `skopt.sampler.InitialPointGenerator`.</ span >
548
544
549
545
< span class ="sd "> kwargs : dict</ span >
@@ -721,37 +717,30 @@ <h1>Source code for skopt.utils</h1><div class="highlight"><pre>
721
717
< span class ="sd "> """</ span >
722
718
< span class ="n "> space</ span > < span class ="o "> =</ span > < span class ="n "> Space</ span > < span class ="p "> (</ span > < span class ="n "> dimensions</ span > < span class ="p "> )</ span >
723
719
< span class ="n "> transformed_dimensions</ span > < span class ="o "> =</ span > < span class ="p "> []</ span >
724
- < span class ="k "> if</ span > < span class ="n "> space</ span > < span class ="o "> .</ span > < span class ="n "> is_categorical</ span > < span class ="p "> :</ span >
725
- < span class ="c1 "> # recreate the space and explicitly set transform to "string"</ span >
726
- < span class ="c1 "> # this is a special case for GP based regressors</ span >
727
- < span class ="k "> for</ span > < span class ="n "> dimension</ span > < span class ="ow "> in</ span > < span class ="n "> space</ span > < span class ="p "> :</ span >
720
+ < span class ="k "> for</ span > < span class ="n "> dimension</ span > < span class ="ow "> in</ span > < span class ="n "> space</ span > < span class ="o "> .</ span > < span class ="n "> dimensions</ span > < span class ="p "> :</ span >
721
+ < span class ="k "> if</ span > < span class ="nb "> isinstance</ span > < span class ="p "> (</ span > < span class ="n "> dimension</ span > < span class ="p "> ,</ span > < span class ="n "> Categorical</ span > < span class ="p "> ):</ span >
728
722
< span class ="n "> transformed_dimensions</ span > < span class ="o "> .</ span > < span class ="n "> append</ span > < span class ="p "> (</ span > < span class ="n "> Categorical</ span > < span class ="p "> (</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> categories</ span > < span class ="p "> ,</ span >
729
723
< span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> prior</ span > < span class ="p "> ,</ span >
730
724
< span class ="n "> name</ span > < span class ="o "> =</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> name</ span > < span class ="p "> ,</ span >
731
- < span class ="n "> transform</ span > < span class ="o "> =</ span > < span class ="s2 "> "string"</ span > < span class ="p "> ))</ span >
732
-
733
- < span class ="k "> else</ span > < span class ="p "> :</ span >
734
- < span class ="k "> for</ span > < span class ="n "> dimension</ span > < span class ="ow "> in</ span > < span class ="n "> space</ span > < span class ="o "> .</ span > < span class ="n "> dimensions</ span > < span class ="p "> :</ span >
735
- < span class ="k "> if</ span > < span class ="nb "> isinstance</ span > < span class ="p "> (</ span > < span class ="n "> dimension</ span > < span class ="p "> ,</ span > < span class ="n "> Categorical</ span > < span class ="p "> ):</ span >
736
- < span class ="n "> transformed_dimensions</ span > < span class ="o "> .</ span > < span class ="n "> append</ span > < span class ="p "> (</ span > < span class ="n "> dimension</ span > < span class ="p "> )</ span >
737
- < span class ="c1 "> # To make sure that GP operates in the [0, 1] space</ span >
738
- < span class ="k "> elif</ span > < span class ="nb "> isinstance</ span > < span class ="p "> (</ span > < span class ="n "> dimension</ span > < span class ="p "> ,</ span > < span class ="n "> Real</ span > < span class ="p "> ):</ span >
739
- < span class ="n "> transformed_dimensions</ span > < span class ="o "> .</ span > < span class ="n "> append</ span > < span class ="p "> (</ span >
740
- < span class ="n "> Real</ span > < span class ="p "> (</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> low</ span > < span class ="p "> ,</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> high</ span > < span class ="p "> ,</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> prior</ span > < span class ="p "> ,</ span >
741
- < span class ="n "> name</ span > < span class ="o "> =</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> name</ span > < span class ="p "> ,</ span >
742
- < span class ="n "> transform</ span > < span class ="o "> =</ span > < span class ="s2 "> "normalize"</ span > < span class ="p "> ,</ span >
743
- < span class ="n "> dtype</ span > < span class ="o "> =</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> dtype</ span > < span class ="p "> )</ span >
744
- < span class ="p "> )</ span >
745
- < span class ="k "> elif</ span > < span class ="nb "> isinstance</ span > < span class ="p "> (</ span > < span class ="n "> dimension</ span > < span class ="p "> ,</ span > < span class ="n "> Integer</ span > < span class ="p "> ):</ span >
746
- < span class ="n "> transformed_dimensions</ span > < span class ="o "> .</ span > < span class ="n "> append</ span > < span class ="p "> (</ span >
747
- < span class ="n "> Integer</ span > < span class ="p "> (</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> low</ span > < span class ="p "> ,</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> high</ span > < span class ="p "> ,</ span >
748
- < span class ="n "> name</ span > < span class ="o "> =</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> name</ span > < span class ="p "> ,</ span >
749
- < span class ="n "> transform</ span > < span class ="o "> =</ span > < span class ="s2 "> "normalize"</ span > < span class ="p "> ,</ span >
750
- < span class ="n "> dtype</ span > < span class ="o "> =</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> dtype</ span > < span class ="p "> )</ span >
751
- < span class ="p "> )</ span >
752
- < span class ="k "> else</ span > < span class ="p "> :</ span >
753
- < span class ="k "> raise</ span > < span class ="ne "> RuntimeError</ span > < span class ="p "> (</ span > < span class ="s2 "> "Unknown dimension type "</ span >
754
- < span class ="s2 "> "(</ span > < span class ="si "> %s</ span > < span class ="s2 "> )"</ span > < span class ="o "> %</ span > < span class ="nb "> type</ span > < span class ="p "> (</ span > < span class ="n "> dimension</ span > < span class ="p "> ))</ span >
725
+ < span class ="n "> transform</ span > < span class ="o "> =</ span > < span class ="s2 "> "normalize"</ span > < span class ="p "> ))</ span >
726
+ < span class ="c1 "> # To make sure that GP operates in the [0, 1] space</ span >
727
+ < span class ="k "> elif</ span > < span class ="nb "> isinstance</ span > < span class ="p "> (</ span > < span class ="n "> dimension</ span > < span class ="p "> ,</ span > < span class ="n "> Real</ span > < span class ="p "> ):</ span >
728
+ < span class ="n "> transformed_dimensions</ span > < span class ="o "> .</ span > < span class ="n "> append</ span > < span class ="p "> (</ span >
729
+ < span class ="n "> Real</ span > < span class ="p "> (</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> low</ span > < span class ="p "> ,</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> high</ span > < span class ="p "> ,</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> prior</ span > < span class ="p "> ,</ span >
730
+ < span class ="n "> name</ span > < span class ="o "> =</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> name</ span > < span class ="p "> ,</ span >
731
+ < span class ="n "> transform</ span > < span class ="o "> =</ span > < span class ="s2 "> "normalize"</ span > < span class ="p "> ,</ span >
732
+ < span class ="n "> dtype</ span > < span class ="o "> =</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> dtype</ span > < span class ="p "> )</ span >
733
+ < span class ="p "> )</ span >
734
+ < span class ="k "> elif</ span > < span class ="nb "> isinstance</ span > < span class ="p "> (</ span > < span class ="n "> dimension</ span > < span class ="p "> ,</ span > < span class ="n "> Integer</ span > < span class ="p "> ):</ span >
735
+ < span class ="n "> transformed_dimensions</ span > < span class ="o "> .</ span > < span class ="n "> append</ span > < span class ="p "> (</ span >
736
+ < span class ="n "> Integer</ span > < span class ="p "> (</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> low</ span > < span class ="p "> ,</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> high</ span > < span class ="p "> ,</ span >
737
+ < span class ="n "> name</ span > < span class ="o "> =</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> name</ span > < span class ="p "> ,</ span >
738
+ < span class ="n "> transform</ span > < span class ="o "> =</ span > < span class ="s2 "> "normalize"</ span > < span class ="p "> ,</ span >
739
+ < span class ="n "> dtype</ span > < span class ="o "> =</ span > < span class ="n "> dimension</ span > < span class ="o "> .</ span > < span class ="n "> dtype</ span > < span class ="p "> )</ span >
740
+ < span class ="p "> )</ span >
741
+ < span class ="k "> else</ span > < span class ="p "> :</ span >
742
+ < span class ="k "> raise</ span > < span class ="ne "> RuntimeError</ span > < span class ="p "> (</ span > < span class ="s2 "> "Unknown dimension type "</ span >
743
+ < span class ="s2 "> "(</ span > < span class ="si "> %s</ span > < span class ="s2 "> )"</ span > < span class ="o "> %</ span > < span class ="nb "> type</ span > < span class ="p "> (</ span > < span class ="n "> dimension</ span > < span class ="p "> ))</ span >
755
744
756
745
< span class ="k "> return</ span > < span class ="n "> Space</ span > < span class ="p "> (</ span > < span class ="n "> transformed_dimensions</ span > < span class ="p "> )</ span >
757
746
0 commit comments