Skip to content

Commit 58d496d

Browse files
committed
Rename new_with_xtypes
1 parent eb7d11c commit 58d496d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ego/src/egor_solver.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ pub struct EgorSolver<SB: SurrogateBuilder> {
165165
impl SurrogateBuilder for MoeParams<f64, Xoshiro256Plus> {
166166
/// Constructor from domain space specified with types
167167
/// **panic** if xtypes contains other types than continuous type `Float`
168-
fn new_with_xtypes_rng(xtypes: &[XType]) -> Self {
168+
fn new_with_xtypes(xtypes: &[XType]) -> Self {
169169
if !no_discrete(xtypes) {
170170
panic!("MoeParams cannot be created with discrete types!");
171171
}
@@ -236,7 +236,7 @@ impl<SB: SurrogateBuilder> EgorSolver<SB> {
236236
..config
237237
},
238238
xlimits: xlimits.to_owned(),
239-
surrogate_builder: SB::new_with_xtypes_rng(&continuous_xlimits_to_xtypes(xlimits)),
239+
surrogate_builder: SB::new_with_xtypes(&continuous_xlimits_to_xtypes(xlimits)),
240240
rng,
241241
}
242242
}
@@ -260,7 +260,7 @@ impl<SB: SurrogateBuilder> EgorSolver<SB> {
260260
..config
261261
},
262262
xlimits: unfold_xtypes_as_continuous_limits(xtypes),
263-
surrogate_builder: SB::new_with_xtypes_rng(xtypes),
263+
surrogate_builder: SB::new_with_xtypes(xtypes),
264264
rng,
265265
}
266266
}
@@ -299,7 +299,7 @@ impl<SB: SurrogateBuilder> EgorSolver<SB> {
299299
/// Build `xtypes` from simple float bounds of `x` input components when x belongs to R^n.
300300
/// xlimits are bounds of the x components expressed a matrix (dim, 2) where dim is the dimension of x
301301
/// the ith row is the bounds interval [lower, upper] of the ith comonent of `x`.
302-
fn continuous_xlimits_to_xtypes(xlimits: &ArrayBase<impl Data<Elem = f64>, Ix2>) -> Vec<XType> {
302+
pub fn continuous_xlimits_to_xtypes(xlimits: &ArrayBase<impl Data<Elem = f64>, Ix2>) -> Vec<XType> {
303303
let mut xtypes: Vec<XType> = vec![];
304304
Zip::from(xlimits.rows()).for_each(|limits| xtypes.push(XType::Cont(limits[0], limits[1])));
305305
xtypes

0 commit comments

Comments
 (0)