Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions genetic-rs-common/src/builtin/eliminator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,56 @@ where
}
}

impl<G, A, B> Default for LayeredObserver<G, A, B>
where
A: Default + FitnessObserver<G>,
B: Default + FitnessObserver<G>,
{
fn default() -> Self {
Self(A::default(), B::default(), std::marker::PhantomData)
}
}

impl<G, A, B> Clone for LayeredObserver<G, A, B>
where
A: Clone + FitnessObserver<G>,
B: Clone + FitnessObserver<G>,
{
fn clone(&self) -> Self {
Self(self.0.clone(), self.1.clone(), std::marker::PhantomData)
}
}

impl<G, A, B> std::fmt::Debug for LayeredObserver<G, A, B>
where
A: std::fmt::Debug + FitnessObserver<G>,
B: std::fmt::Debug + FitnessObserver<G>,
{
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_tuple("LayeredObserver")
.field(&self.0)
.field(&self.1)
.finish()
}
}

impl<G, A, B> PartialEq for LayeredObserver<G, A, B>
where
A: PartialEq + FitnessObserver<G>,
B: PartialEq + FitnessObserver<G>,
{
fn eq(&self, other: &Self) -> bool {
self.0 == other.0 && self.1 == other.1
}
}

impl<G, A, B> Eq for LayeredObserver<G, A, B>
where
A: Eq + FitnessObserver<G>,
B: Eq + FitnessObserver<G>,
{
}

#[cfg(not(feature = "rayon"))]
#[doc(hidden)]
pub trait FeatureBoundedFitnessObserver<G: FeatureBoundedGenome>: FitnessObserver<G> {}
Expand Down
56 changes: 56 additions & 0 deletions genetic-rs/tests/eliminator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ impl<'a, G> FitnessObserver<G> for CountingObserver<'a> {
}
}

#[derive(Debug, Default, Clone, PartialEq, Eq)]
struct TrackingObserver(usize);

impl<G> FitnessObserver<G> for TrackingObserver {
fn observe(&mut self, _fitnesses: &[(G, f32)]) {
self.0 += 1;
}
}

#[test]
fn layered_observer_calls_both() {
let count_a = Cell::new(0usize);
Expand Down Expand Up @@ -43,3 +52,50 @@ fn layered_observer_triple_layer() {
assert_eq!(count_b.get(), 1);
assert_eq!(count_c.get(), 1);
}

#[test]
fn layered_observer_default() {
let layered: LayeredObserver<(), TrackingObserver, TrackingObserver> =
LayeredObserver::default();
assert_eq!(layered.0, TrackingObserver(0));
assert_eq!(layered.1, TrackingObserver(0));
}

#[test]
fn layered_observer_clone() {
let original = TrackingObserver::default().layer(TrackingObserver::default());
let mut cloned: LayeredObserver<(), _, _> = original.clone();

let fitnesses: Vec<((), f32)> = vec![((), 1.0)];
cloned.observe(&fitnesses);

assert_eq!(cloned.0, TrackingObserver(1));
assert_eq!(cloned.1, TrackingObserver(1));
assert_eq!(original.0, TrackingObserver(0));
assert_eq!(original.1, TrackingObserver(0));
}

#[test]
fn layered_observer_debug() {
let layered: LayeredObserver<(), TrackingObserver, TrackingObserver> =
TrackingObserver::default().layer(TrackingObserver::default());
let debug_str = format!("{:?}", layered);
assert!(debug_str.contains("LayeredObserver"));
assert!(debug_str.contains("TrackingObserver"));
}

#[test]
fn layered_observer_partial_eq() {
let a: LayeredObserver<(), _, _> =
TrackingObserver::default().layer(TrackingObserver::default());
let b: LayeredObserver<(), _, _> =
TrackingObserver::default().layer(TrackingObserver::default());
assert_eq!(a, b);
}

#[test]
fn layered_observer_partial_eq_not_equal() {
let a: LayeredObserver<(), _, _> = TrackingObserver(1).layer(TrackingObserver(0));
let b: LayeredObserver<(), _, _> = TrackingObserver(0).layer(TrackingObserver(0));
assert_ne!(a, b);
}