track total solutions

Author: feschber

solitaire-game/src/lib.rs

@@ -1,6 +1,6 @@
 use bevy::{camera::ScalingMode, prelude::*};
 use bevy_vector_shapes::{prelude::ShapePainter, shapes::DiscPainter};
-use solitaire_solver::Board;
+use solitaire_solver::{Board, Solution};
 
 use crate::{
     animation::PegAnimation,
@@ -71,6 +71,20 @@ fn update_solution(move_event: On<MoveEvent>, mut solution: ResMut<CurrentSoluti
     solution.1.push(*move_event);
 }
 
+fn trigger_solution(
+    _: On<MoveEvent>,
+    board: Res<CurrentBoard>,
+    solution: Res<CurrentSolution>,
+    mut commands: Commands,
+) {
+    if board.0.is_solved() {
+        commands.trigger(SolutionEvent(solution.0.clone()));
+    }
+}
+
+#[derive(Event)]
+pub struct SolutionEvent(solitaire_solver::Solution);
+
 #[derive(Default, Resource)]
 struct CurrentSolution(solitaire_solver::Solution, Vec<MoveEvent>);
 
@@ -103,6 +117,7 @@ impl Plugin for PegSolitaire {
         app.add_plugins(Buttons);
 
         app.add_observer(update_solution);
+        app.add_observer(trigger_solution);
         app.add_systems(Startup, (camera_setup, scale_viewport).chain());
         app.add_systems(PostUpdate, highlight_selected);
         app.add_systems(PreUpdate, calc_view_port);

solitaire-game/src/stats.rs

@@ -1,7 +1,7 @@
 use bevy::{prelude::*, sprite::Anchor, text::TextBounds, window::RequestRedraw};
 
 use crate::{
-    BoardPosition, CurrentBoard,
+    BoardPosition, CurrentBoard, SolutionEvent,
     solver::{FeasibleConstellations, RandomMoveChances},
     total_progress::TotalProgress,
 };
@@ -22,6 +22,7 @@ impl Plugin for StatsPlugin {
         app.add_observer(update_next_move_chance);
         app.add_observer(update_overall_success);
         app.add_observer(update_total_progress);
+        app.add_observer(update_solution_count);
     }
 }
 
@@ -34,6 +35,9 @@ struct NextMoveChanceText;
 #[derive(Component)]
 struct TotalProgressText;
 
+#[derive(Component)]
+struct SolutionText;
+
 #[derive(Component)]
 struct OverallSuccessRatio;
 
@@ -64,6 +68,8 @@ fn add_text(mut commands: Commands, asset_server: Res<AssetServer>) {
         Vec3::from((BoardPosition { x: 1, y: 4 }.to_world_space(), 1.)) + Vec3::new(0.5, -0.5, 0.0);
     let title_pos_2 =
         Vec3::from((BoardPosition { x: 4, y: 1 }.to_world_space(), 1.)) + Vec3::new(0.5, -0.5, 0.0);
+    let title_pos_3 =
+        Vec3::from((BoardPosition { x: 1, y: 1 }.to_world_space(), 1.)) + Vec3::new(0.5, -0.5, 0.0);
     let text_pos = title_pos - 1.0 * Vec3::Y;
     commands
         .spawn((
@@ -113,6 +119,20 @@ fn add_text(mut commands: Commands, asset_server: Res<AssetServer>) {
             small_font.clone(),
         ))
         .with_child((TextSpan("".into()), small_font.clone()));
+    commands
+        .spawn((
+            Text2d::new("you have found "),
+            Transform::from_scale(Vec3::new(0.004, 0.004, 0.004)).with_translation(title_pos_3),
+            small_font.clone(),
+            TextLayout::new(Justify::Center, LineBreak::WordBoundary),
+            TextBounds::from(Vec2::new(600.0, 300.0)),
+            Anchor::BOTTOM_RIGHT,
+            SolutionText,
+        ))
+        .with_child((TextSpan(" ? ".into()), large_font.clone()))
+        .with_child((TextSpan(" solutions, ".into()), small_font.clone()))
+        .with_child((TextSpan(" ? ".into()), large_font.clone()))
+        .with_child((TextSpan(" of which are unique!".into()), small_font.clone()));
 }
 
 fn update_overall_success(
@@ -193,3 +213,19 @@ fn update_total_progress(
     }
     request_redraw.write(RequestRedraw);
 }
+
+fn update_solution_count(
+    _: On<UpdateStats>,
+    total_progress: Res<TotalProgress>,
+    solution_text: Query<Entity, With<SolutionText>>,
+    mut writer: TextUiWriter,
+    mut request_redraw: MessageWriter<RequestRedraw>,
+) {
+    let num_solutions = total_progress.num_solutions;
+    let num_unique_solutions = total_progress.unique_solutions.len();
+    for text in solution_text {
+        *writer.text(text, 1) = format!("{num_solutions}");
+        *writer.text(text, 3) = format!("{num_unique_solutions}");
+    }
+    request_redraw.write(RequestRedraw);
+}

solitaire-game/src/total_progress.rs

@@ -1,3 +1,5 @@
+use std::collections::HashSet;
+
 use bevy::{
     app::Plugin,
     ecs::{
@@ -6,9 +8,9 @@ use bevy::{
         system::{Res, ResMut},
     },
 };
-use solitaire_solver::{Board, HashSet, Solution};
+use solitaire_solver::{Board, Solution};
 
-use crate::{CurrentBoard, MoveEvent};
+use crate::{CurrentBoard, MoveEvent, SolutionEvent};
 
 /// This module keeps track of the total progress of the game.
 /// We store statistics about which constellations have previously been
@@ -20,14 +22,17 @@ pub struct TotalProgressPlugin;
 pub struct TotalProgress {
     /// all states that have ever been seen
     pub explored_states: HashSet<Board>,
-    /// all solutions that have ever been found
-    pub found_solutions: HashSet<Solution>,
+    /// all unique solutions that have been explored
+    pub unique_solutions: HashSet<Solution>,
+    /// number of times the boared has been solved
+    pub num_solutions: u64,
 }
 
 impl Plugin for TotalProgressPlugin {
     fn build(&self, app: &mut bevy::app::App) {
         app.init_resource::<TotalProgress>();
         app.add_observer(update_total_progress);
+        app.add_observer(update_solutions);
     }
 }
 
@@ -38,3 +43,8 @@ fn update_total_progress(
 ) {
     total_progress.explored_states.insert(board.0);
 }
+
+fn update_solutions(solution: On<SolutionEvent>, mut total_progress: ResMut<TotalProgress>) {
+    total_progress.unique_solutions.insert(solution.0.clone());
+    total_progress.num_solutions += 1;
+}

solitaire-game/src/window.rs

@@ -9,7 +9,7 @@ pub struct MainWindow;
 
 impl Plugin for MainWindow {
     fn build(&self, app: &mut App) {
-        // app.insert_resource(WinitSettings::desktop_app());
+        app.insert_resource(WinitSettings::desktop_app());
 
         let default_plugins = DefaultPlugins
             .set(LogPlugin {
@@ -24,7 +24,7 @@ impl Plugin for MainWindow {
                     fit_canvas_to_parent: true,
                     prevent_default_event_handling: false,
                     desired_maximum_frame_latency: core::num::NonZero::new(1u32),
-                    present_mode: bevy::window::PresentMode::AutoNoVsync,
+                    present_mode: bevy::window::PresentMode::AutoVsync,
                     #[cfg(not(target_os = "android"))]
                     mode: WindowMode::Windowed,
                     #[cfg(target_os = "android")]

solitaire-solver/src/mov.rs

@@ -3,7 +3,7 @@ use std::fmt::{Display, Error, Formatter};
 
 use crate::{Dir, board};
 
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash)]
 pub struct Move {
     pub pos: (Idx, Idx),
     pub skip: (Idx, Idx),

solitaire-solver/src/solution.rs

@@ -2,7 +2,7 @@ use std::fmt::{Display, Formatter, Result};
 
 use crate::{Board, Move};
 
-#[derive(Clone, Default)]
+#[derive(Clone, Default, Debug, PartialEq, Eq, Hash)]
 pub struct Solution {
     steps: [Move; 31],
     count: usize,