hanoi-jane 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6784220653ef2903d69fca3be4290dffb8b02c10
-  data.tar.gz: 9da04a7d95acdd741ec597ecb7dfa49cac7dd263
+  metadata.gz: 8d7f114e32d1a1e8f3a9f59cf07c86c0d68c9a17
+  data.tar.gz: b78e6dbd9b7deffc063e60049e22888183742a7f
 SHA512:
-  metadata.gz: 5ff0d22b64d36b613ed87957586fb24a1282443787b2ea632285f46382c02984b8e18c394a9fa8570bbc03548052528821cad8f076048f003e851c5ea0c8940e
-  data.tar.gz: b4732d47a93152b5939490fffebddace62fd89703374f6b238465914abc581b8a05613b95710247638ff60ba5ab1efad3f930c2542ddf4be25bd58f81a5a7902
+  metadata.gz: 695210a096216a3c91bdf43e8ff86cc3130cf8657bf5a6ef66c6f1da2ce17ca0bc26cb9f1420ba02c3e5d1c21ee03610afa9f9140a0919529ae64959b42111d4
+  data.tar.gz: bc72d1599263f725be624fb56c4d7ee6e488d44658f6627a2620a40b1e1eb062b14ce0048ababc968439abbd329c0c9e5a0c7b298a49db5a3c7cee693e703ee7

data/lib/hanoi/jane.rb

@@ -5,6 +5,7 @@ require 'hanoi/jane/version'
 
 require 'hanoi/jane/towers'
 require 'hanoi/jane/constrained_towers'
+require 'hanoi/jane/animation'
 
 require 'hanoi/jane/formatters/matrix'
 require 'hanoi/jane/formatters/console'

data/lib/hanoi/jane/animation.rb

@@ -0,0 +1,79 @@
+module Hanoi
+  module Jane
+    class Animation
+      include Enumerable
+
+      attr_reader :stacks
+
+      def initialize towers
+        @towers = towers
+        @height = towers.discs
+        @stacks = Animation.pad towers.old_stacks, @height
+        @disc = towers.disc
+        @source = towers.source
+        @destination = towers.sink
+        @fancy = towers.fancy
+
+        @lift = true
+        @drop = false
+        @done = false
+      end
+
+      def animate
+        @drop = true unless @lift
+        if @lift
+          stack = @stacks[@source]
+          @position = stack.index @disc
+          stack[@position] = nil
+
+          if @position + 1 >= @height
+            @lift = false
+          else
+            stack[@position + 1] = @disc
+          end
+
+          @stacks[@source] = stack
+        end
+
+        if @drop
+          stack = @stacks[@destination]
+          @position = -1 unless @position
+
+          stack[@position] = @disc
+          stack[(stack.index @disc) + 1] = nil
+
+          @position -= 1
+
+          @stacks[@destination] = stack.take @height
+
+          if stack[@position] || @position == 0
+            @drop = false
+            @done = true
+          end
+        end
+      end
+
+      def to_s
+        (Formatters::Console.new @height, @stacks, @fancy).to_s
+      end
+
+      def matrix
+        m = Formatters::Matrix.new @towers
+        m.stacks = @stacks
+
+        m
+      end
+
+      def each
+        until @done
+          animate
+          yield self
+        end
+      end
+
+      def Animation.pad stacks, height
+        stacks.map { |stack| stack + Array.new(height - stack.length) }
+      end
+    end
+  end
+end

data/lib/hanoi/jane/cli.rb

@@ -13,6 +13,7 @@ module Hanoi
       option :phat, type: :string, required: true
       option :constrained, type: :boolean
       option :interval, type: :numeric, default: 0.3
+      option :animated, type: :boolean, default: false
 
       def phat
         towers = Towers.new 5
@@ -20,7 +21,16 @@ module Hanoi
           towers = ConstrainedTowers.new 5
         end
 
+        towers.animated = options[:animated]
+
         towers.each do |state|
+          if state.animation
+            state.animation.each do |frame|
+              Hanoi::Jane.hit_phat frame, options[:phat]
+              sleep options[:interval] * 0.1
+            end
+          end
+
           Hanoi::Jane.hit_phat towers, options[:phat]
           sleep options[:interval]
         end
@@ -30,6 +40,9 @@ module Hanoi
       option :discs, type: :numeric, default: 3, minimum: 1
       option :constrained, type: :boolean
       option :fancy, type: :boolean, default: false
+      option :animated, type: :boolean, default: false
+      option :delay, type: :numeric, default: 0.2
+
       def console
         if options[:discs] < 1
           puts "Solving for %d discs makes no sense" % options[:discs]
@@ -43,14 +56,26 @@ module Hanoi
         end
 
         towers.fancy = options[:fancy]
+        towers.animated = options[:animated]
 
         towers.each do |state|
+          if state.animation
+            state.animation.each do |frame|
+              system('clear')
+              s = options[:fancy] ? (Formatters::Console.fancify state.rebased) : state.rebased
+              puts s
+              puts
+              puts frame
+              sleep options[:delay] * 0.2
+            end
+          end
+
           system('clear')
           s = options[:fancy] ? (Formatters::Console.fancify state.rebased) : state.rebased
           puts s
           puts
           puts state.console
-          sleep 0.2
+          sleep options[:delay]
         end
 
         puts '%d moves to solve for %d discs' % [towers.total, options[:discs]]

data/lib/hanoi/jane/formatters/console.rb

@@ -18,10 +18,10 @@ module Hanoi
           horiz_divider: '🔻'
         }
 
-        def initialize towers
-          @discs = towers.discs
-          @stacks = towers.stacks.clone.map { |s| s.clone }
-          @@chars = towers.fancy ? FANCY_CHARS : CHARS
+        def initialize discs, stacks, fancy = false
+          @discs = discs
+          @stacks = stacks.clone.map { |s| s.clone }
+          @@chars = fancy ? FANCY_CHARS : CHARS
         end
 
         def to_s
@@ -43,7 +43,7 @@ module Hanoi
         end
 
         def Console.pad array, length
-          Array.new(length + 1 - array.length) + array.reverse
+          Array.new(length - array.length) + array.reverse
         end
 
         def Console.make_disc width, space

data/lib/hanoi/jane/formatters/matrix.rb

@@ -6,17 +6,28 @@ module Hanoi
           @stacks = towers.stacks
           @digits = towers.rebased
 
-          7.times do
-            self.push [0] * 45
+          populate
+        end
+
+        def stacks= stacks
+          @stacks = stacks
+          populate
+        end
+
+        def populate
+          7.times do |i|
+            self[i] = [0] * 45
           end
 
           offset = 0
           @stacks.each do |stack|
             total = 0
             stack.each do |disc|
-              shim = ((5 - (disc + 1)) / 2).round
-              (disc + 1).times do |i|
-                self[6 - total][i + offset + shim] = 1
+              if disc
+                shim = ((5 - (disc + 1)) / 2).round
+                (disc + 1).times do |i|
+                  self[6 - total][i + offset + shim] = 1
+                end
               end
               total += 1
             end

data/lib/hanoi/jane/towers.rb

@@ -3,8 +3,8 @@ module Hanoi
     class Towers
       include Enumerable
 
-      attr_reader :total, :stacks, :discs
-      attr_accessor :fancy
+      attr_reader :total, :stacks, :discs, :old_stacks, :disc, :source, :sink
+      attr_accessor :fancy, :animated, :animation
 
       def initialize discs
         @discs = discs
@@ -12,12 +12,20 @@ module Hanoi
         @base = 2
         @stacks = [(0...discs).to_a.reverse, [], []]
         @fancy = false
+        @animated = false
       end
 
       def move
+        @old_stacks = @stacks.clone.map { |s| s.clone }
+
         diff
-        find_disc
-        @stacks[find_stack].push @stacks[@source].pop
+        @source = find_disc
+        @sink = find_stack
+        @stacks[@sink].push @stacks[@source].pop
+
+        if @animated
+          @animation = Animation.new self
+        end
       end
 
       def solved
@@ -29,7 +37,7 @@ module Hanoi
       end
 
       def console
-        (Formatters::Console.new self).to_s
+        (Formatters::Console.new @discs, @stacks, @fancy).to_s
       end
 
       def inspect
@@ -37,7 +45,11 @@ module Hanoi
           stacks: @stacks,
           moves: @total,
           binary: rebased,
-          moved: @disc
+          moved: {
+            disc: @disc,
+            from: @source,
+            to: @sink
+          }
         }
       end
 
@@ -72,11 +84,11 @@ module Hanoi
 
       def find_disc
         @stacks.each_with_index do |stack, index|
-          @source = index if stack.index @disc
+          return index if stack.index @disc
         end
       end
 
-      def find_stack #disc, source, stacks
+      def find_stack
         # if the next stack is empty, move there
         if @stacks[(@source + 1) % 3] == []
           return (@source + 1) % 3

data/lib/hanoi/jane/version.rb

@@ -1,5 +1,5 @@
 module Hanoi
   module Jane
-    VERSION = '0.2.3'
+    VERSION = '0.2.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanoi-jane
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - pikesley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-06 00:00:00.000000000 Z
+date: 2018-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,6 +146,7 @@ files:
 - bin/setup
 - hanoi-jane.gemspec
 - lib/hanoi/jane.rb
+- lib/hanoi/jane/animation.rb
 - lib/hanoi/jane/cli.rb
 - lib/hanoi/jane/constrained_towers.rb
 - lib/hanoi/jane/formatters/console.rb