refactor: move RandomMultiObjectiveSampler into sampler::random
This commit is contained in:
+1
-26
@@ -55,7 +55,7 @@ use crate::distribution::Distribution;
|
|||||||
use crate::param::ParamValue;
|
use crate::param::ParamValue;
|
||||||
use crate::parameter::{ParamId, Parameter};
|
use crate::parameter::{ParamId, Parameter};
|
||||||
use crate::pruner::NopPruner;
|
use crate::pruner::NopPruner;
|
||||||
use crate::sampler::random::RandomSampler;
|
use crate::sampler::random::RandomMultiObjectiveSampler;
|
||||||
use crate::sampler::{CompletedTrial, Sampler};
|
use crate::sampler::{CompletedTrial, Sampler};
|
||||||
use crate::trial::{AttrValue, Trial};
|
use crate::trial::{AttrValue, Trial};
|
||||||
use crate::types::{Direction, TrialState};
|
use crate::types::{Direction, TrialState};
|
||||||
@@ -154,31 +154,6 @@ pub trait MultiObjectiveSampler: Send + Sync {
|
|||||||
) -> ParamValue;
|
) -> ParamValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
// RandomMultiObjectiveSampler
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
/// Default MO sampler that delegates to [`RandomSampler`].
|
|
||||||
pub(crate) struct RandomMultiObjectiveSampler(RandomSampler);
|
|
||||||
|
|
||||||
impl RandomMultiObjectiveSampler {
|
|
||||||
pub(crate) fn new() -> Self {
|
|
||||||
Self(RandomSampler::new())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl MultiObjectiveSampler for RandomMultiObjectiveSampler {
|
|
||||||
fn sample(
|
|
||||||
&self,
|
|
||||||
distribution: &Distribution,
|
|
||||||
trial_id: u64,
|
|
||||||
_history: &[MultiObjectiveTrial],
|
|
||||||
_directions: &[Direction],
|
|
||||||
) -> ParamValue {
|
|
||||||
self.0.sample(distribution, trial_id, &[])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// MoSamplerBridge — bridges MultiObjectiveSampler to Sampler trait
|
// MoSamplerBridge — bridges MultiObjectiveSampler to Sampler trait
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -30,9 +30,11 @@
|
|||||||
use parking_lot::Mutex;
|
use parking_lot::Mutex;
|
||||||
|
|
||||||
use crate::distribution::Distribution;
|
use crate::distribution::Distribution;
|
||||||
|
use crate::multi_objective::{MultiObjectiveSampler, MultiObjectiveTrial};
|
||||||
use crate::param::ParamValue;
|
use crate::param::ParamValue;
|
||||||
use crate::rng_util;
|
use crate::rng_util;
|
||||||
use crate::sampler::{CompletedTrial, Sampler};
|
use crate::sampler::{CompletedTrial, Sampler};
|
||||||
|
use crate::types::Direction;
|
||||||
|
|
||||||
/// Uniform independent random sampler.
|
/// Uniform independent random sampler.
|
||||||
///
|
///
|
||||||
@@ -79,6 +81,27 @@ impl RandomSampler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Default multi-objective sampler that delegates to [`RandomSampler`].
|
||||||
|
pub(crate) struct RandomMultiObjectiveSampler(RandomSampler);
|
||||||
|
|
||||||
|
impl RandomMultiObjectiveSampler {
|
||||||
|
pub(crate) fn new() -> Self {
|
||||||
|
Self(RandomSampler::new())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl MultiObjectiveSampler for RandomMultiObjectiveSampler {
|
||||||
|
fn sample(
|
||||||
|
&self,
|
||||||
|
distribution: &Distribution,
|
||||||
|
trial_id: u64,
|
||||||
|
_history: &[MultiObjectiveTrial],
|
||||||
|
_directions: &[Direction],
|
||||||
|
) -> ParamValue {
|
||||||
|
self.0.sample(distribution, trial_id, &[])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl Default for RandomSampler {
|
impl Default for RandomSampler {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self::new()
|
Self::new()
|
||||||
|
|||||||
Reference in New Issue
Block a user