sudoku_builder 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51dabd8ea0238ed578d3c3a67e1e15b3fdbe1dc2
-  data.tar.gz: 955fbb1af033d8b111829802eb0ccfc2fb6fc7b2
+  metadata.gz: c631c3c2ce23002dc161396f1c2774911fb88f56
+  data.tar.gz: 361a3e813a48ab370543216c29b717e0ea3c8aab
 SHA512:
-  metadata.gz: f818785a7502d21892c6b9d17e1ba017210fbd6d1d155216637fa7484608ce111d33db8dcddee01beb47ba2cda69662dd88f0dfdf00484622d54f52f8d4f8279
-  data.tar.gz: 6ab1c9693c53690c63b2008b280bb1915cafb0253f826e2d48fdd8b01b0be0d35a24fb05a7b4185f53ae10f872632008713173f03964b8e75903b2f3427a8e39
+  metadata.gz: 318dc0b0b6f15d2f22d8764e9272ef7976c7d736b462246bf2209a26ddf2c06553bcf6c5cc90e1cffa4a7208da67cdcd6fc27d24000af3e2f0d0373d270aa1c0
+  data.tar.gz: 8a869b16081a7df9efe823dc84c5062e7def462712377c31326be085365a3e67963971f024a4d69687cb5c4fd5959d3d9adddd2787b7a839bc4c9626c173b2ce

data/README.md

@@ -1,35 +1,77 @@
 # SudokuBuilder
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/sudoku_builder`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
-## Installation
-
-Add this line to your application's Gemfile:
-
 ```ruby
-gem 'sudoku_builder'
+$ gem install sudoku_builder
+$ irb
+
+> puzzle = SudokuBuilder.create
+> puzzle.pretty_print
+ +-----------------------------+
+ | 7  9  2 | 5  1  4 | 8  6  3 |
+ | 3  4  1 | 7  8  6 | 2  5  9 |
+ | 5  6  8 | 3  9  2 | 7  1  4 |
+ +-----------------------------+
+ | 4  5  7 | 6  3  8 | 9  2  1 |
+ | 6  1  9 | 2  5  7 | 4  3  8 |
+ | 2  8  3 | 1  4  9 | 6  7  5 |
+ +-----------------------------+
+ | 9  7  5 | 4  2  1 | 3  8  6 |
+ | 8  3  6 | 9  7  5 | 1  4  2 |
+ | 1  2  4 | 8  6  3 | 5  9  7 |
+ +-----------------------------+
+
+> puzzle.hard.pretty_print
+ +-----------------------------+
+ | _  2  6 | _  _  _ | _  8  _ |
+ | _  _  _ | _  2  _ | 1  3  7 |
+ | _  _  _ | 9  _  _ | 4  _  _ |
+ +-----------------------------+
+ | 1  5  _ | _  _  7 | _  _  _ |
+ | 9  4  2 | _  _  _ | _  _  _ |
+ | 6  _  _ | 1  4  _ | _  _  2 |
+ +-----------------------------+
+ | _  _  _ | 4  7  2 | 6  1  9 |
+ | _  6  4 | _  _  _ | _  5  3 |
+ | 2  _  _ | _  _  6 | 7  _  8 |
+ +-----------------------------+
+
+> puzzle = SudokuBuilder.create
+> puzzle.easy.pretty_print
+ +-----------------------------+
+ | 8  6  _ | 9  2  5 | _  _  4 |
+ | _  1  _ | _  _  _ | 5  2  7 |
+ | 2  4  5 | 7  _  3 | 9  8  _ |
+ +-----------------------------+
+ | 6  _  4 | _  _  1 | 7  5  9 |
+ | _  _  1 | 3  7  _ | _  6  8 |
+ | _  7  8 | 5  6  _ | 2  1  3 |
+ +-----------------------------+
+ | _  8  3 | 4  _  2 | 6  9  1 |
+ | _  _  _ | _  3  7 | 8  _  _ |
+ | 4  5  6 | 1  _  _ | 3  7  2 |
+ +-----------------------------+
+
+> to_solve = SudokuBuilder.create.hard.to_a
+> solved   = SudokuBuilder.solve(to_solve).pretty_print
+ +-----------------------------+
+ | 3  2  1 | 9  8  4 | 6  5  7 |
+ | 7  8  4 | 6  3  5 | 1  2  9 |
+ | 9  5  6 | 7  1  2 | 8  4  3 |
+ +-----------------------------+
+ | 8  1  7 | 4  6  9 | 5  3  2 |
+ | 6  3  2 | 1  5  7 | 9  8  4 |
+ | 4  9  5 | 8  2  3 | 7  6  1 |
+ +-----------------------------+
+ | 5  7  9 | 2  4  8 | 3  1  6 |
+ | 2  6  3 | 5  7  1 | 4  9  8 |
+ | 1  4  8 | 3  9  6 | 2  7  5 |
+ +-----------------------------+
+
+> puzzle = SudokuBuilder.create
+> print puzzle.to_flat_a
+# an array from 0..80 with each value of the sudoku
+[1, 7, 8, 6, 5, 3, 4, 2, 9, 4, 5, 6, 1, 2, 9, 3, 8, 7, 9, 3, 2, 8, 7, 4, 6, 5, 1, 2, 6, 5, 4, 9, 8, 7, 1, 3, 3, 1, 7, 5, 6, 2, 9, 4, 8, 8, 4, 9, 3, 1, 7, 2, 6, 5, 5, 9, 1, 7, 4, 6, 8, 3, 2, 6, 2, 3, 9, 8, 1, 5, 7, 4, 7, 8, 4, 2, 3, 5, 1, 9, 6]
 ```
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install sudoku_builder
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/sudoku_builder/fork )

data/lib/sudoku_builder/builder.rb

@@ -5,12 +5,7 @@ class SudokuBuilder
     loop do
       return @sud if @loc == [9,0,0]
 
-      poss = []
-      (1..9).each do |i|
-        if check?(i)
-          poss << i
-        end
-      end
+      poss = get_possibilities
 
       if !poss.empty?
         write(poss.sample)
@@ -24,11 +19,11 @@ class SudokuBuilder
   end
 
   def poke(num)
-    sud = to_flat_a
     num.times do
-      sud[rand(0..80)] = nil
+      @loc = [rand(0..8),rand(0..2),rand(0..2)]
+      only_write(nil)
     end
-    sud
+    return self
   end
 
   def hard

data/lib/sudoku_builder/presenter.rb

@@ -1,13 +1,5 @@
 class SudokuBuilder
 
-  def pretty
-    @sud.each_with_index do |row|
-      print row.join(' ')
-      puts ' '
-    end
-    puts ' '
-  end
-
   def to_a
     @sud
   end
@@ -16,4 +8,37 @@ class SudokuBuilder
     @sud.flatten
   end
 
+  def to_rows
+    rows = []
+    @sud.each do |row|
+      rows << row.flatten
+    end
+    return rows
+  end
+
+  def pretty_print
+    b = []
+    to_flat_a.each do |i|
+      if i
+        b << i
+      else
+        b << '_'
+      end
+    end
+
+    puts "+-----------------------------+"
+    puts "| #{b[0]}  #{b[1]}  #{b[2]} | #{b[3]}  #{b[4]}  #{b[5]} | #{b[6]}  #{b[7]}  #{b[8]} |"
+    puts "| #{b[9]}  #{b[10]}  #{b[11]} | #{b[12]}  #{b[13]}  #{b[14]} | #{b[15]}  #{b[16]}  #{b[17]} |"
+    puts "| #{b[18]}  #{b[19]}  #{b[20]} | #{b[21]}  #{b[22]}  #{b[23]} | #{b[24]}  #{b[25]}  #{b[26]} |"
+    puts "+-----------------------------+"
+    puts "| #{b[27]}  #{b[28]}  #{b[29]} | #{b[30]}  #{b[31]}  #{b[32]} | #{b[33]}  #{b[34]}  #{b[35]} |"
+    puts "| #{b[36]}  #{b[37]}  #{b[38]} | #{b[39]}  #{b[40]}  #{b[41]} | #{b[42]}  #{b[43]}  #{b[44]} |"
+    puts "| #{b[45]}  #{b[46]}  #{b[47]} | #{b[48]}  #{b[49]}  #{b[50]} | #{b[51]}  #{b[52]}  #{b[53]} |"
+    puts "+-----------------------------+"
+    puts "| #{b[54]}  #{b[55]}  #{b[56]} | #{b[57]}  #{b[58]}  #{b[59]} | #{b[60]}  #{b[61]}  #{b[62]} |"
+    puts "| #{b[63]}  #{b[64]}  #{b[65]} | #{b[66]}  #{b[67]}  #{b[68]} | #{b[69]}  #{b[70]}  #{b[71]} |"
+    puts "| #{b[72]}  #{b[73]}  #{b[74]} | #{b[75]}  #{b[76]}  #{b[77]} | #{b[78]}  #{b[79]}  #{b[80]} |"
+    puts "+-----------------------------+"
+  end
+
 end

data/lib/sudoku_builder/solver.rb

@@ -16,13 +16,7 @@ class SudokuBuilder
 
       else
 
-        poss = []
-        (1..9).each do |i|
-          if check?(i)
-            poss << i
-          end
-        end
-
+        poss = get_possibilities
         if !poss.empty?
           write(poss.sample)
           increment ; up = true
@@ -37,4 +31,26 @@ class SudokuBuilder
 
   end
 
+  def parse_for_solve(puzzle)
+    if puzzle.class == SudokuBuilder
+      flattened = puzzle.to_a.flatten
+    else
+      flattened = puzzle.flatten
+    end
+
+    if flattened.count == 81
+
+      @loc = [0,0,0] ; @sud = blank
+      flattened.each do |val|
+      if val and val <= 9 and val >= 1
+        write(val)
+      end
+        increment
+      end
+
+    else
+      raise PuzzleFormatError, 'Must have exactly 81 spots in the array.'
+    end
+  end
+
 end

data/lib/sudoku_builder/tools.rb

@@ -59,9 +59,8 @@ class SudokuBuilder
 
   def valid?
     @loc = [0,0,0]
-    validity = []
     loop do
-      if check?(value)
+      unless check?(value)
         return false
       end
       increment
@@ -71,26 +70,16 @@ class SudokuBuilder
   end
 
   def check?(val)
-    !(grid.include?(val) || column.include?(val) ||
-          row.include?(val) || used.include?(val) )
-  end
-
-  def parse_for_solve(puzzle)
-    flattened = puzzle.flatten
-
-    if flattened.count == 81
-
-      @loc = [0,0,0] ; @sud = blank
-      flattened.each do |val|
-      if val and val <= 9 and val >= 1
-        write(val)
-      end
-        increment
-      end
-
+    if val and !(val < 1 or val >  9)
+      val = [val] unless val.class == Array
+      !((grid - val).include?(val) || (column - val).include?(val) || (row - val).include?(val))
     else
-      raise PuzzleFormatError, 'Must have exactly 81 spots in the array.'
+      false
     end
   end
 
+  def get_possibilities
+    [1,2,3,4,5,6,7,8,9] - used - (grid + column + row).uniq
+  end
+
 end

data/lib/sudoku_builder/values.rb

@@ -9,6 +9,10 @@ class SudokuBuilder
     @used[@loc[0]][@loc[1]][@loc[2]] << val unless used.include?(val)
   end
 
+  def only_write(val)
+    @sud[@loc[0]][@loc[1]][@loc[2]] = val
+  end
+
   def value
     @sud[@loc[0]][@loc[1]][@loc[2]]
   end

data/lib/sudoku_builder/version.rb

@@ -1,3 +1,3 @@
 class SudokuBuilder
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sudoku_builder
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Colin Walker
@@ -62,6 +62,7 @@ files:
 - lib/sudoku_builder/values.rb
 - lib/sudoku_builder/version.rb
 - sudoku_builder-1.1.0.gem
+- sudoku_builder-1.2.0.gem
 - sudoku_builder.gemspec
 homepage: https://github.com/ColDog/sudoku-gem
 licenses: []