From 458e5ac10132e3cb297848d030501c4fd5d3ae30 Mon Sep 17 00:00:00 2001 From: Sacha Ligthert Date: Tue, 21 Jan 2025 21:37:07 +0100 Subject: [PATCH] Rework how potential solutions are presented. --- solver/processing.go | 3 +++ solver/solver.go | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/solver/processing.go b/solver/processing.go index 30de1c8..db393ba 100644 --- a/solver/processing.go +++ b/solver/processing.go @@ -16,6 +16,9 @@ func (solver *Solver) populate_blocks() { solver.find_blocks(&solver.row7, &solver.row7s) solver.find_blocks(&solver.row8, &solver.row8s) solver.find_blocks(&solver.row9, &solver.row9s) + + // This calculates and stores the total number of solutions to validate. + solver.iter = int64(len(solver.row1s)) * int64(len(solver.row2s)) * int64(len(solver.row3s)) * int64(len(solver.row4s)) * int64(len(solver.row5s)) * int64(len(solver.row6s)) * int64(len(solver.row7s)) * int64(len(solver.row8s)) * int64(len(solver.row9s)) } func (solver *Solver) find_blocks(row *string, rows *[]int) { diff --git a/solver/solver.go b/solver/solver.go index 2d29d1a..96b8eb1 100644 --- a/solver/solver.go +++ b/solver/solver.go @@ -22,8 +22,8 @@ func Run() { // Find rows that fit with the entered rows solver.populate_blocks() - solver.iter = int64(len(solver.row1s)) * int64(len(solver.row2s)) * int64(len(solver.row3s)) * int64(len(solver.row4s)) * int64(len(solver.row5s)) * int64(len(solver.row6s)) * int64(len(solver.row7s)) * int64(len(solver.row8s)) * int64(len(solver.row9s)) - fmt.Println("Number of iterations:", solver.iter) + // Print the total number of solutions to validate + fmt.Println("Number of solutions:", solver.iter) solver.check_combinations()