feat(web): add solution space info
This commit is contained in:
+2
-2
@@ -58,8 +58,8 @@ impl Solver {
|
|||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn solution_space(&self) -> u64 {
|
pub fn solution_space(&self) -> u32 {
|
||||||
self.0.stats().0
|
self.0.stats().0 as u32
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn solution_space_uncertainty(&self) -> f64 {
|
pub fn solution_space_uncertainty(&self) -> f64 {
|
||||||
|
|||||||
+20
-3
@@ -1,7 +1,8 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Color } from "wordle-solver";
|
import { Color } from "wordle-solver";
|
||||||
import WordleLine from "./components/WordleLine.svelte";
|
import WordleLine from "./components/WordleLine.svelte";
|
||||||
import { solver_guess } from "./solver/solver.ts";
|
import { solver_guess, solver_solution_space } from "./solver/solver.ts";
|
||||||
|
import type { GuessResult, SolutionSpaceResult } from "./solver/types.ts";
|
||||||
|
|
||||||
let guesses = $state([
|
let guesses = $state([
|
||||||
{
|
{
|
||||||
@@ -16,7 +17,14 @@
|
|||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
let infos_gained: (Promise<number> | null)[] = $state([null]);
|
let infos_gained: (Promise<GuessResult> | null)[] = $state([null]);
|
||||||
|
|
||||||
|
let solution_space: Promise<SolutionSpaceResult> = $state(
|
||||||
|
solver_solution_space(),
|
||||||
|
);
|
||||||
|
self.setTimeout(() => {
|
||||||
|
solution_space = solver_solution_space();
|
||||||
|
}, 300);
|
||||||
|
|
||||||
let cursor = $state(0);
|
let cursor = $state(0);
|
||||||
|
|
||||||
@@ -33,6 +41,7 @@
|
|||||||
guess.colors,
|
guess.colors,
|
||||||
);
|
);
|
||||||
infos_gained.push(null);
|
infos_gained.push(null);
|
||||||
|
solution_space = solver_solution_space();
|
||||||
|
|
||||||
cursor = 0;
|
cursor = 0;
|
||||||
|
|
||||||
@@ -58,7 +67,15 @@
|
|||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
<h1 class="mb-6 text-3xl font-bold">Wordle Solver</h1>
|
<h1 class="mb-6 text-3xl font-bold">Wordle Solver</h1>
|
||||||
|
|
||||||
<p class="mt-4 text-sm text-zinc-500">SolutionSpace</p>
|
<p class="mt-4 text-sm text-zinc-500">
|
||||||
|
{#await solution_space then s}
|
||||||
|
Solution-space: {s.size}, Uncertainty: {s.uncertainty.toFixed(
|
||||||
|
2,
|
||||||
|
)}bits
|
||||||
|
{:catch e}
|
||||||
|
{e}
|
||||||
|
{/await}
|
||||||
|
</p>
|
||||||
|
|
||||||
<div class="mt-4 flex flex-col gap-2">
|
<div class="mt-4 flex flex-col gap-2">
|
||||||
{#each guesses as g, i (g)}
|
{#each guesses as g, i (g)}
|
||||||
|
|||||||
@@ -74,7 +74,7 @@
|
|||||||
</div>
|
</div>
|
||||||
{/each}
|
{/each}
|
||||||
<span
|
<span
|
||||||
class="w-12 text-sm text-zinc-500 self-center flex items-center justify-center"
|
class="w-16 text-sm text-zinc-500 self-center flex items-center justify-center"
|
||||||
>
|
>
|
||||||
{#if info_gained === null}
|
{#if info_gained === null}
|
||||||
↵
|
↵
|
||||||
@@ -84,7 +84,7 @@
|
|||||||
class="size-3 animate-spin rounded-full border-2 border-gray-300 border-t-gray-700"
|
class="size-3 animate-spin rounded-full border-2 border-gray-300 border-t-gray-700"
|
||||||
></div>
|
></div>
|
||||||
{:then i}
|
{:then i}
|
||||||
{i.toFixed(2)}
|
{i.info_gained.toFixed(2)} bits
|
||||||
{:catch e}
|
{:catch e}
|
||||||
<span
|
<span
|
||||||
title={e}
|
title={e}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import type { Color } from "wordle-solver";
|
import type { Color } from "wordle-solver";
|
||||||
import SolverWorker from "./worker?worker";
|
import SolverWorker from "./worker?worker";
|
||||||
import type { SolverRequest, SolverResponse } from "./types";
|
import type { GuessResult, SolutionSpaceResult, SolverRequest, SolverResponse } from "./types";
|
||||||
|
|
||||||
let solver_worker = new SolverWorker();
|
let solver_worker = new SolverWorker();
|
||||||
|
|
||||||
@@ -11,7 +11,7 @@ const pending = new Map<number, {
|
|||||||
reject: (error: unknown) => void;
|
reject: (error: unknown) => void;
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
export function solver_guess(word: string[], colors: Color[]): Promise<number> {
|
export function solver_guess(word: string[], colors: Color[]): Promise<GuessResult> {
|
||||||
const id = msg_id++;
|
const id = msg_id++;
|
||||||
|
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
@@ -27,6 +27,22 @@ export function solver_guess(word: string[], colors: Color[]): Promise<number> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function solver_solution_space(): Promise<SolutionSpaceResult> {
|
||||||
|
const id = msg_id++;
|
||||||
|
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
pending.set(id, { resolve, reject });
|
||||||
|
|
||||||
|
const r: SolverRequest = {
|
||||||
|
type: "solution_space",
|
||||||
|
id: id,
|
||||||
|
input: null,
|
||||||
|
};
|
||||||
|
|
||||||
|
solver_worker.postMessage(JSON.parse(JSON.stringify(r)));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
solver_worker.onmessage = (event: MessageEvent<SolverResponse>) => {
|
solver_worker.onmessage = (event: MessageEvent<SolverResponse>) => {
|
||||||
let res = event.data;
|
let res = event.data;
|
||||||
@@ -39,10 +55,10 @@ solver_worker.onmessage = (event: MessageEvent<SolverResponse>) => {
|
|||||||
pending.delete(res.id);
|
pending.delete(res.id);
|
||||||
|
|
||||||
if (res.error) {
|
if (res.error) {
|
||||||
pendingRequest.reject(res.result);
|
pendingRequest.reject(res.error);
|
||||||
} else if (res.type == "guess") {
|
} else if (res.result) {
|
||||||
pendingRequest.resolve(res.result.info_gained);
|
pendingRequest.resolve(res.result);
|
||||||
} else if (event.type == "evaluate_words") {
|
} else {
|
||||||
pendingRequest.resolve(res.result.stats);
|
pendingRequest.reject("No result");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
+19
-4
@@ -10,20 +10,31 @@ export type SolverRequest =
|
|||||||
type: "evaluate_words",
|
type: "evaluate_words",
|
||||||
id: number,
|
id: number,
|
||||||
input: EvaluateWords
|
input: EvaluateWords
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
type: "solution_space",
|
||||||
|
id: number,
|
||||||
|
input: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
export type SolverResponse =
|
export type SolverResponse =
|
||||||
| {
|
| {
|
||||||
type: "guess",
|
type: "guess",
|
||||||
id: number,
|
id: number,
|
||||||
error: boolean,
|
error: string | null,
|
||||||
result: GuessResult | string
|
result: GuessResult | null
|
||||||
}
|
}
|
||||||
| {
|
| {
|
||||||
type: "evaluate_words",
|
type: "evaluate_words",
|
||||||
id: number,
|
id: number,
|
||||||
error: boolean,
|
error: string | null,
|
||||||
result: EvaluateWordsResult | string
|
result: EvaluateWordsResult | null
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
type: "solution_space",
|
||||||
|
id: number,
|
||||||
|
error: string | null,
|
||||||
|
result: SolutionSpaceResult | null
|
||||||
};
|
};
|
||||||
|
|
||||||
export type Guess = {
|
export type Guess = {
|
||||||
@@ -42,3 +53,7 @@ export type WordStats = {
|
|||||||
export type EvaluateWordsResult = {
|
export type EvaluateWordsResult = {
|
||||||
stats: WordStats[]
|
stats: WordStats[]
|
||||||
};
|
};
|
||||||
|
export type SolutionSpaceResult = {
|
||||||
|
size: number,
|
||||||
|
uncertainty: number
|
||||||
|
};
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { Solver } from "wordle-solver";
|
import { Solver } from "wordle-solver";
|
||||||
import type { SolverRequest, SolverResponse } from "./types";
|
import type { SolverRequest, SolverResponse } from "./types";
|
||||||
|
|
||||||
|
|
||||||
let solver = Solver.new();
|
let solver = Solver.new();
|
||||||
|
|
||||||
self.onmessage = (event: MessageEvent<SolverRequest>) => {
|
self.onmessage = (event: MessageEvent<SolverRequest>) => {
|
||||||
@@ -16,7 +15,7 @@ self.onmessage = (event: MessageEvent<SolverRequest>) => {
|
|||||||
const response: SolverResponse = {
|
const response: SolverResponse = {
|
||||||
type: "guess",
|
type: "guess",
|
||||||
id: request.id,
|
id: request.id,
|
||||||
error: false,
|
error: null,
|
||||||
result: { info_gained: infos[infos.length - 1] }
|
result: { info_gained: infos[infos.length - 1] }
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -27,8 +26,8 @@ self.onmessage = (event: MessageEvent<SolverRequest>) => {
|
|||||||
const response: SolverResponse = {
|
const response: SolverResponse = {
|
||||||
type: "guess",
|
type: "guess",
|
||||||
id: request.id,
|
id: request.id,
|
||||||
error: true,
|
error: e,
|
||||||
result: e,
|
result: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
self.setTimeout(() => {
|
self.setTimeout(() => {
|
||||||
@@ -43,12 +42,27 @@ self.onmessage = (event: MessageEvent<SolverRequest>) => {
|
|||||||
const response: SolverResponse = {
|
const response: SolverResponse = {
|
||||||
type: "evaluate_words",
|
type: "evaluate_words",
|
||||||
id: request.id,
|
id: request.id,
|
||||||
error: true,
|
error: "not implemented",
|
||||||
result: "Not implemented"
|
result: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
self.postMessage(JSON.parse(JSON.stringify(response)));
|
self.postMessage(JSON.parse(JSON.stringify(response)));
|
||||||
break;
|
break;
|
||||||
};
|
};
|
||||||
|
case "solution_space": {
|
||||||
|
const response: SolverResponse = {
|
||||||
|
type: "solution_space",
|
||||||
|
id: request.id,
|
||||||
|
error: null,
|
||||||
|
result: {
|
||||||
|
size: solver.solution_space(),
|
||||||
|
uncertainty: solver.solution_space_uncertainty()
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
self.postMessage(JSON.parse(JSON.stringify(response)));
|
||||||
|
break;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user