sudoku_builder 0.1.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cd22cf34be740677d7e4c7ba5f7997a2e41dc36
-  data.tar.gz: bf6f3b10480eabb2e75faf004bb7f87b830745db
+  metadata.gz: e2f78e53297fdec3ed32da905e2f8fc984436e7c
+  data.tar.gz: 7f308155099b5b3a3337bcffbdabf9fac49b243d
 SHA512:
-  metadata.gz: 806f32b0950b8e93781c3645bc674904deeb3974dfad7eb5be944f10d8eea92a2bfbf96ce55cf6d08a9ad3d856147f3acdd350382b02c9241446468f1ed990b9
-  data.tar.gz: 9bc41c7f3727ac016540af440d11dbba71eff35ee0621ecab6f2da877db5391ad77e48faacdffffef657b9c63ff76c32389f36ad11b9415e3f0d665e885f8f2d
+  metadata.gz: 068da8c8bb8943e81ed6e45ebcb959c8c07c0d7c39fe78396e4d994247f5b218c2afb145a10c483a01a96e3f4934fefa99b574c6456aa6b6b6591bafadbbc0a5
+  data.tar.gz: 9efc78638e5afd319a73c1baca0f699e58ae2e95443748e14cf44c7e52fd17af9820027754981677234150a306e7418ace9fde78005b7664d027754b3f97e616

data/.gitignore

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /.bundle/
 /.yardoc
 /Gemfile.lock
@@ -8,41 +7,3 @@
 /pkg/
 /spec/reports/
 /tmp/
-=======
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalisation:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
->>>>>>> 672b09b6331859edf9d3a2a39930340418f78e37
-

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in sudoku.gemspec
+# Specify your gem's dependencies in sudoku_builder.gemspec
 gemspec

data/README.md

@@ -1,14 +1,8 @@
-# Sudoku
-
-Welcome to `SudokuBuilder`. Build and fill out sudoku's with the same tool!
-
-### Quick Start
-`> require 'sudoku_builder'`
-
-Run the following in the console:
-`> SudokuBuilder.new.pretty_print`
+# 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
 
@@ -28,38 +22,17 @@ Or install it yourself as:
 
 ## Usage
 
-To create a new puzzle:
-
-`SudokuBuilder.new`
-
-This will return a `SudokuBuilder::Builder` object that looks like this:
-
-```ruby
-#<SudokuBuilder::Builder:0x007fdc729373e8 @sud={0=>[6], 1=>[8], 2=>[9], 3=>[5], 4=>[7], 5=>[2], 6=>[3], ...
-```
-
-On the builder object you can call a handful of different methods:
-
-- `valid?` checks if the sudoku is valid.
-- `to_hash` turns it into a regular hash.
-- `poke(number, poke_with)` pokes holes in the puzzle. (to create a solvable sudoku)
-- `medium`, `easy` and `hard` poke a set number of holes in the puzzle.
-- `pretty_print` makes it print out nice on the command line.
-
-To solve an existing puzzle, call:
+TODO: Write usage instructions here
 
-	`SudokuBuilder::Solver.new(my_puzzle).solve`
+## Development
 
-my_puzzle must be equal to a hash with keys from 0 to 80 and values equal to an integer for already given squares, and an array for empty squares. ie:
-
-```
-{0=>6, 1=>8, 2=>[], 3=>[], 4=>[], 5=>[], 6=>[3] ...
-```
+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/ColDog/sudoku/fork )
+1. Fork it ( https://github.com/[my-github-username]/sudoku_builder/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/sudoku_builder.rb

@@ -1,11 +1,30 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'sudoku_builder/sudoku'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'sudoku_builder/builder'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'sudoku_builder/solver' ))
-require File.expand_path(File.join(File.dirname(__FILE__), 'sudoku_builder/version'))
-
-module SudokuBuilder
-  extend self
-  def new
-    Solver.new.create
+require "sudoku_builder/version"
+require "sudoku_builder/builder"
+require "sudoku_builder/presenter"
+require "sudoku_builder/tools"
+require "sudoku_builder/values"
+require "sudoku_builder/errors"
+require "sudoku_builder/solver"
+
+class SudokuBuilder
+  attr_reader :tot, :res
+
+  def initialize
+    @sud  = blank
+    @used = blank
+    @loc = [0,0,0] ; @tot = 0 ; @res = 0
+  end
+
+  def self.create
+    sudoku = SudokuBuilder.new
+    sudoku.build
+    sudoku
+  end
+
+  def self.solve(puzzle)
+    sudoku = SudokuBuilder.new
+    sudoku.parse_for_solve(puzzle)
+    sudoku.solve
+    sudoku
   end
 end

data/lib/sudoku_builder/builder.rb

@@ -1,90 +1,46 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'sudoku'))
+class SudokuBuilder
 
-module SudokuBuilder
-  class Builder < Sudoku
-    def initialize(sudoku)
-      @sud = sudoku
-    end
+  def build
+    @loc = [0,0,0] ; @tot = 0 ; @res = 0
+    loop do
+      return @sud if @loc == [9,0,0]
 
-    def parse
-      @sud.each do |k,v|
-        if v.class == Array && v[0] == nil
-          @sud[k] = []
-        elsif v.class == Array && v[0] != nil
-          @sud[k] = v[0]
-        else
-          @sud[k] = v
+      poss = []
+      (1..9).each do |i|
+        if check?(i)
+          poss << i
         end
       end
-      @sud
-    end
-
-    def to_hash
-      @sud.each do |k,v|
-        @sud[k] = v[0] if v.class == Array
-      end
-      @sud
-    end
-
-    # pokes holes in a built sudoku to make it solvable.
-    # arranged by level of difficulty.
-    def poke(number, poke_with = [])
-      @sud.to_hash
-      poke = []
-      until poke.count == number            # number is related to difficulty.
-        poke << rand(0..80)                 # 0 - 80 refers to the index of the sudoku cells.
-        poke = poke.uniq
-      end
-      poke.each do |p|                      # pokes random holes.
-        @sud[p] = poke_with
-      end
-      Builder.new(@sud)
-    end
 
-    # checks if a sudoku is valid.
-    def valid?
-      valid = []
-      @sud.each do |k,v|
-        c = [] ; r = [] ; g = []
-        build_crg(k,c,r,g,@sud)
-        v.class == Array ? val = v[0] : val = v
-        if check?(val, c,r,g)              # runs the check method used before on every value.
-          valid << false
-        else
-          valid << true
-        end
+      if !poss.empty?
+        write(poss.sample)
+        increment
+      else
+        de_increment
       end
-      !valid.include?(false)
-    end
 
-    def medium(poke_with = [])
-      self.poke(45, poke_with)
+      @tot += 1
     end
+  end
 
-    def easy(poke_with = [])
-      self.poke(55, poke_with)
+  def poke(num)
+    sud = to_flat_a
+    num.times do
+      sud[rand(0..80)] = nil
     end
+    sud
+  end
 
-    def hard(poke_with = [])
-      self.poke(65, poke_with)
-    end
+  def hard
+    poke(65)
+  end
 
-    def pretty_print
-      b = self.to_hash
-      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
+  def medium
+    poke(50)
+  end
 
+  def easy
+    poke(35)
   end
-end
+
+end

data/lib/sudoku_builder/errors.rb

@@ -0,0 +1,9 @@
+class SudokuBuilder
+
+  class PuzzleFormatError < StandardError
+  end
+
+  class SolverError < StandardError
+  end
+
+end

data/lib/sudoku_builder/presenter.rb

@@ -0,0 +1,19 @@
+class SudokuBuilder
+
+  def pretty
+    @sud.each_with_index do |row|
+      print row.join(' ')
+      puts ' '
+    end
+    puts ' '
+  end
+
+  def to_a
+    @sud
+  end
+
+  def to_flat_a
+    @sud.flatten
+  end
+
+end

data/lib/sudoku_builder/solver.rb

@@ -1,108 +1,40 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'sudoku'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'builder'))
+class SudokuBuilder
 
-module SudokuBuilder
-  class Solver < Sudoku
+  def solve
+    @loc = [0,0,0] ; @tot = 0 ; @res = 0 ; up = true
 
-    def initialize(sudoku = nil)
-      @sud = sudoku
-      @used = {
-        0=> [], 1=> [], 2=> [], 3=> [], 4=> [], 5=> [], 6=> [], 7=> [], 8=> [],
-        9=> [], 10=>[], 11=>[], 12=>[], 13=>[], 14=>[], 15=>[], 16=>[], 17=>[],
-        18=>[], 19=>[], 20=>[], 21=>[], 22=>[], 23=>[], 24=>[], 25=>[], 26=>[],
-        27=>[], 28=>[], 29=>[], 30=>[], 31=>[], 32=>[], 33=>[], 34=>[], 35=>[],
-        36=>[], 37=>[], 38=>[], 39=>[], 40=>[], 41=>[], 42=>[], 43=>[], 44=>[],
-        45=>[], 46=>[], 47=>[], 48=>[], 49=>[], 50=>[], 51=>[], 52=>[], 53=>[],
-        54=>[], 55=>[], 56=>[], 57=>[], 58=>[], 59=>[], 60=>[], 61=>[], 62=>[],
-        63=>[], 64=>[], 65=>[], 66=>[], 67=>[], 68=>[], 69=>[], 70=>[], 71=>[],
-        72=>[], 73=>[], 74=>[], 75=>[], 76=>[], 77=>[], 78=>[], 79=>[], 80=>[]
-      }
-    end
+    loop do
+      return @sud if @loc == [9,0,0]
 
-    def solver_pristine
-      @sud
-    end
+      if value.class == Fixnum
 
-    def solve
-      t = 0 ; o = 0 ; key = 0               # main key and metric vars.
-      direction = true                      # indicates the direction in case of a backtrack on number.
-      sud   = solver_pristine
-      used  = pristine
-      if sud.nil?
-        'Sudoku entered is not valid/
-         does not exist.'
-      else
-        loop do
-          if sud[key].class == Array        # skips pre-filled numbers.
-            c = [] ; r = [] ; g = []        # build values for current grid, row, column.
-            build_crg(key,c,r,g,sud)        # updates the relevant variables for check.
-            sud[key] = []                   # makes a fresh possibilities array.
-            for i in 1..9
-              if check?(i, c,r,g) &&
-                  !used[key].include?(i)
-                sud[key] << i
-              end
-            end
-            if sud[key].count == 0          # backtrack if no possibilities.
-              key -= 1
-              direction = false             # setting backtrack to false sends the key down if the
-            else                            # next number down is a fixnum.
-              use = sud[key].sample         # pick a random possibility.
-              sud[key]   = [use]            # uses the possibility.
-              used[key] << use              # also puts it into the used array.
-              key += 1
-              direction = true
-            end
-          elsif sud[key].class == Fixnum
-            direction ? key += 1 : key -= 1 # backt or forward track based on current direction.
-          end
-          if key == 0 || t > 104 ||
-                  key == 1 && t > 3         # resets everything if we've reached a high amount
-            sud = solver_pristine
-            used = pristine
-            key = 0 ; t = 0
-            direction = true
-          end
-          break if key == 81                # break if we've reached the last value.
-          t += 1 ; o += 1                   # add the reporting variables.
-          break if o > 10000000             # there is the possibility to be given an unsolvable.
+        if up == true
+          increment
+        elsif up == false
+          de_increment
         end
-        Builder.new(@sud)
-      end
-    end
 
-    def create
-      sud = pristine
-      used = pristine
-      t = 0 ; o = 0 ; key = 0               # main key and metric variables
-      loop do
-        c = [] ; r = [] ; g = []            # build values for current grid, row, column.
-        build_crg(key,c,r,g,sud)            # updates the relevant variables for check.
-        sud[key] = []                       # makes a fresh possibilities array.
-        for i in 1..9
-          if check?(i,c,r,g) &&
-                !used[key].include?(i)
-            sud[key] << i
+      else
+
+        poss = []
+        (1..9).each do |i|
+          if check?(i)
+            poss << i
           end
         end
-        if sud[key].count == 0              # backtrack if no possibilities.
-          key -= 1
+
+        if !poss.empty?
+          write(poss.sample)
+          increment ; up = true
         else
-          use = sud[key].sample             # pick a random possibility.
-          sud[key]   = [use]                # uses the possibility.
-          used[key] << use                  # also puts it into the used array.
-          key += 1
-        end
-        if key == 0 || t > 104              # resets everything if we've reached a high count.
-          sud = pristine
-          used = pristine
-          key = 0 ; t = 0
+          de_increment ; up = false
         end
-        break if key == 81                  # break if we've reached the last value.
-        t += 1 ; o += 1                     # add the reporting variables
+
       end
-      Builder.new(sud)
+
+      @tot += 1
     end
 
   end
+
 end