pitchcar 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 702ba918ac8264afbcae75439e3523513b4d05d5
-  data.tar.gz: 1f8dbe2e3391e7256c5948413572ebf13af6f135
+  metadata.gz: 2c58c55c7dd606fb47608a84e45d5b2b2b3b02f4
+  data.tar.gz: b54fa3cc18b8e9dd78c6194e2f734268c3c3afbc
 SHA512:
-  metadata.gz: 430cc6d2ecf23b22d0fd0c0f5e410329d480768978b33995729b6461e5d71503c3f2f094f49fa3e221bb90b66c8174245f4771e2846009bfd8bcdc151e8fe136
-  data.tar.gz: 1f2777b165ea539d566e093cccd1ca67d6da8544537e916ce7872825c990281f8e9ebd6c055fe9d3e8fd6fc2fda62f8e0a6441250684eb6239a82b9433f4f393
+  metadata.gz: c38eb9cc4657a81ac872c1d44968ee2652acaf9c74dbd73133b0c7288594cfb2753e59de11898159a1325107de1bd4420d7f0121033790428d295df3a4d290fd
+  data.tar.gz: 4816b8fc9925dd92e1362e67aa9ecdc052b3638b7736f8cd511f55f0597a3a7ef1ae5876470bc0e2e986030acc55fe9e37a2bb95578a163c9a8547768df1645d

data/Readme.md

@@ -33,6 +33,13 @@ track = Pitchcar::Pitchcar.random_valid_track(6, 10)
 track.to_s # => 'Slw Slw L Slw R R Slw Slw R L R R L Slw R R'
 ```
 
+#### With size restrictions
+```ruby
+require 'pitchcar'
+# Either min or max can be omitted
+track = Pitchcar::Pitchcar.random_valid_track(6, 10, { min: { x: 1, y: 2 }, max: { x: 5, y: 5 } })
+```
+
 ### Find `n` random valid tracks
 ```ruby
 require 'pitchcar'
@@ -40,3 +47,10 @@ require 'pitchcar'
 track = Pitchcar::Pitchcar.random_valid_tracks(6, 10, 4)
 track.map(&:to_s) # => ["Slw Srw L R Srw L L Srw R L L Slw R Slw L L", "Slw L Slw L Slw R Srw L L R L Srw L R L Slw", "Slw R Slw Slw R Slw Srw L R R Srw R L R L R", "Slw Slw L Srw L R L Srw R L L Srw L R Slw L"]
 ```
+
+#### With size restrictions
+```ruby
+require 'pitchcar'
+# Either min or max can be omitted
+track = Pitchcar::Pitchcar.random_valid_tracks(6, 10, 4, { min: { x: 1, y: 2 }, max: { x: 5, y: 5 } })
+```

data/lib/pitchcar.rb

@@ -10,15 +10,15 @@ module Pitchcar
         tracks.map(&:with_wall_combinations).flatten
       end
 
-      def random_valid_track(straight, left_right)
+      def random_valid_track(straight, left_right, size_restrictions = {})
         track = nil
-        track = random_track(straight, left_right) until !track.nil? && track.valid?
+        track = random_track(straight, left_right, size_restrictions) until !track.nil? && track.valid?
         track.with_wall_combinations.sample
       end
 
-      def random_valid_tracks(straight, left_right, count = 2)
+      def random_valid_tracks(straight, left_right, count = 2, size_restrictions = {})
         tracks = []
-        count.times { tracks << random_valid_track(straight, left_right) }
+        count.times { tracks << random_valid_track(straight, left_right, size_restrictions) }
         tracks
       end
 
@@ -40,10 +40,10 @@ module Pitchcar
         tracks
       end
 
-      def random_track(straight, left_right)
+      def random_track(straight, left_right, size_restrictions = {})
         left = Random.rand(1..left_right)
         right = left_right - left
-        Track.build_from("S#{'S' * (straight - 1)}#{'L' * left}#{'R' * right}".split('').shuffle.join)
+        Track.build_from("S#{'S' * (straight - 1)}#{'L' * left}#{'R' * right}".split('').shuffle.join, size_restrictions)
       end
     end
   end

data/lib/track.rb

@@ -4,13 +4,15 @@ require_relative 'boyermoore'
 
 module Pitchcar
   class Track
-    attr_accessor :pieces
+    attr_accessor :pieces, :max_size, :min_size
 
-    def initialize(pieces)
+    def initialize(pieces, size_restrictions = {})
       self.pieces = pieces
+      self.max_size = size_restrictions.fetch(:max, x: Float::INFINITY, y: Float::INFINITY)
+      self.min_size = size_restrictions.fetch(:min, x: 1, y: 1)
     end
 
-    def self.build_from(track_pieces)
+    def self.build_from(track_pieces, size_restrictions = {})
       pieces = PieceList.new([Piece.starting_piece])
 
       track_pieces[1..-1].chars.each do |piece_str|
@@ -34,11 +36,11 @@ module Pitchcar
         pieces << piece
       end
 
-      Track.new(pieces)
+      Track.new(pieces, size_restrictions)
     end
 
     def valid?(tracks=[])
-      ends_correctly? && !overlaps? && !rotation_exists?(tracks)
+      ends_correctly? && !overlaps? && !rotation_exists?(tracks) && within_size_restrictions?
     end
 
     def to_s
@@ -54,7 +56,7 @@ module Pitchcar
       x_coords = pieces.map(&:x)
       y_coords = pieces.map(&:y)
       # We have to add one, because a piece takes up a discrete distance
-      [x_coords.max - x_coords.min + 1, y_coords.max - y_coords.min + 1]
+      { x: x_coords.max - x_coords.min + 1, y: y_coords.max - y_coords.min + 1 }
     end
 
     def overlaps?
@@ -89,6 +91,10 @@ module Pitchcar
     def ends_correctly?
       pieces.last.x == pieces.first.x && pieces.last.y == pieces.first.y + 1 && pieces.last.direction == Piece::DIRECTIONS[:SOUTH]
     end
+
+    def within_size_restrictions?
+      size[:x].between?(self.min_size[:x], self.max_size[:x]) && size[:y].between?(self.min_size[:y], self.max_size[:y])
+    end
   end
 
   class PieceList < Array

data/pitchcar.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name        = 'pitchcar'
-  s.version     = '0.2.0'
+  s.version     = '0.3.0'
   s.date        = '2017-02-23'
-  s.summary     = "Pitchcar Track Generator"
-  s.description = "Generates tracks for pitchcar"
-  s.authors     = ["Jonah Hirsch"]
+  s.summary     = 'Pitchcar Track Generator'
+  s.description = 'Generates tracks for pitchcar'
+  s.authors     = ['Jonah Hirsch']
   s.email       = 'jhirsch@rmn.com'
   s.homepage    = 'https://github.com/jonahwh/pitchcar_track_generator'
   s.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pitchcar
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jonah Hirsch