pitchcar 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cfb4cca3c15ed76e0bdd730371422c9baaea933
-  data.tar.gz: c6ff868a47679b6379bce4e8bed8f81fb7e81513
+  metadata.gz: 6e5d25f33141f96aecd5559af9d9e4ed55fe443e
+  data.tar.gz: 65ada2bad29c4c1caa7ec5fb09216c1abc6e2fdf
 SHA512:
-  metadata.gz: a4f2393bba6fe0625f6396e5a95e68221f6e03b91db1e2083365d5e671b42fb4dd60d30e1a6e859d5c4e2b440924c53381df9db6e4d33b84613e5b64b08c6248
-  data.tar.gz: cf1528903b11d01fb39d976e7bb112357afc32439bfa661d4d221b5717f2fc23dcee208e663e9dfcc2bcc8e6d5c8672d950230626535fa66d6896d9ce99bc974
+  metadata.gz: 86b6cfa6f33c97bec657a9d73ef6d4c419a0acea6bb6adbdcd8953859f64425251c786edd9b2b95067aaf60584656c8502009cb46261b13278b9980c4a415e67
+  data.tar.gz: 6630c665a33b9c7e9c0e6b5b1978254f1eb8667157e40fe4f24249accc67b7afc4df8b12af8d360e22de2a4713e366c227526f44c3163fb3a7a21d9250a094fc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pitchcar (0.6.3)
+    pitchcar (0.7.0)
       bazaar
       rmagick
 

data/lib/pieces/left.rb

@@ -0,0 +1,47 @@
+module Pitchcar
+  module Pieces
+    class Left < Piece
+      IMAGE = Magick::Image.read(File.expand_path('../images/curve_tile.png', __FILE__))[0]
+
+      def next_direction
+        if north?
+          DIRECTIONS[:WEST]
+        elsif east?
+          DIRECTIONS[:NORTH]
+        elsif west?
+          DIRECTIONS[:SOUTH]
+        elsif south?
+          DIRECTIONS[:EAST]
+        end
+      end
+
+      def next_coordinate
+        if north?
+          { x: x - 1, y: y }
+        elsif east?
+          { x: x, y: y + 1 }
+        elsif west?
+          { x: x, y: y - 1 }
+        elsif south?
+          { x: x + 1, y: y }
+        end
+      end
+
+      def image
+        if north?
+          IMAGE.rotate(180)
+        elsif east?
+          IMAGE.rotate(270)
+        elsif west?
+          IMAGE.rotate(90)
+        elsif south?
+          IMAGE
+        end
+      end
+
+      def to_s
+        'L'
+      end
+    end
+  end
+end

data/lib/pieces/piece.rb

@@ -0,0 +1,62 @@
+require 'json'
+require 'rmagick'
+
+module Pitchcar
+  module Pieces
+    class Piece
+      DIRECTIONS = { NORTH: 0, EAST: 1, WEST: 2, SOUTH: 3 }
+      attr_accessor :direction, :x, :y, :type
+
+      def initialize(properties)
+        self.x = properties[:x]
+        self.y = properties[:y]
+        self.direction = properties[:direction]
+      end
+
+      def self.first_from_string(piece_string)
+        Pieces::Piece.type_from_string(piece_string).new(x: 0, y: 0, direction: DIRECTIONS[:SOUTH])
+      end
+
+      def self.type_from_string(string)
+        case string
+        when 'S'
+          Straight
+        when 'L'
+          Left
+        when 'R'
+          Right
+        end
+      end
+
+      def to_h
+        { x: x, y: y, type: name, direction_name: DIRECTIONS.key(direction).downcase, direction: direction }
+      end
+
+      def name
+        self.class.name.split('::').last
+      end
+
+      def coordinate
+        { x: x, y: y }
+      end
+
+      private
+
+      def north?
+        direction == DIRECTIONS[:NORTH]
+      end
+
+      def south?
+        direction == DIRECTIONS[:SOUTH]
+      end
+
+      def west?
+        direction == DIRECTIONS[:WEST]
+      end
+
+      def east?
+        direction == DIRECTIONS[:EAST]
+      end
+    end
+  end
+end

data/lib/pieces/right.rb

@@ -0,0 +1,47 @@
+module Pitchcar
+  module Pieces
+    class Right < Piece
+      IMAGE = Magick::Image.read(File.expand_path('../images/curve_tile.png', __FILE__))[0]
+
+      def next_direction
+        if north?
+          DIRECTIONS[:EAST]
+        elsif east?
+          DIRECTIONS[:SOUTH]
+        elsif west?
+          DIRECTIONS[:NORTH]
+        elsif south?
+          DIRECTIONS[:WEST]
+        end
+      end
+
+      def next_coordinate
+        if north?
+          { x: x + 1, y: y }
+        elsif east?
+          { x: x, y: y - 1 }
+        elsif west?
+          { x: x, y: y + 1 }
+        elsif south?
+          { x: x - 1, y: y }
+        end
+      end
+
+      def image
+        if north?
+          IMAGE.rotate(90)
+        elsif east?
+          IMAGE.rotate(180)
+        elsif west?
+          IMAGE
+        elsif south?
+          IMAGE.rotate(270)
+        end
+      end
+
+      def to_s
+        'R'
+      end
+    end
+  end
+end

data/lib/pieces/start.rb

@@ -0,0 +1,23 @@
+module Pitchcar
+  module Pieces
+    class Start < Straight
+      IMAGE = Magick::Image.read(File.expand_path('../images/start_tile.png', __FILE__))[0]
+
+      def image
+        if north?
+          IMAGE.rotate(270)
+        elsif east?
+          IMAGE
+        elsif west?
+          IMAGE.rotate(180)
+        elsif south?
+          IMAGE.rotate(90)
+        end
+      end
+
+      def to_s
+        'St'
+      end
+    end
+  end
+end

data/lib/pieces/straight.rb

@@ -0,0 +1,31 @@
+module Pitchcar
+  module Pieces
+    class Straight < Piece
+      IMAGE = Magick::Image.read(File.expand_path('../images/straight_tile.png', __FILE__))[0]
+      def next_direction
+        direction
+      end
+
+      def next_coordinate
+        if north?
+          { x: x, y: y + 1 }
+        elsif east?
+          { x: x + 1, y: y }
+        elsif west?
+          { x: x - 1, y: y }
+        elsif south?
+          { x: x, y: y - 1 }
+        end
+      end
+
+      def image
+        return IMAGE.rotate(90) if north? || south?
+        IMAGE
+      end
+
+      def to_s
+        'S'
+      end
+    end
+  end
+end

data/lib/pieces/straight_left_wall.rb

@@ -0,0 +1,21 @@
+module Pitchcar
+  module Pieces
+    class StraightLeftWall < Straight
+      def image
+        if north?
+          IMAGE.rotate(90)
+        elsif east?
+          IMAGE.rotate(180)
+        elsif west?
+          IMAGE
+        elsif south?
+          IMAGE.rotate(270)
+        end
+      end
+
+      def to_s
+        'Slw'
+      end
+    end
+  end
+end

data/lib/pieces/straight_right_wall.rb

@@ -0,0 +1,21 @@
+module Pitchcar
+  module Pieces
+    class StraightRightWall < Straight
+      def image
+        if south?
+          IMAGE.rotate(90)
+        elsif west?
+          IMAGE.rotate(180)
+        elsif east?
+          IMAGE
+        elsif north?
+          IMAGE.rotate(270)
+        end
+      end
+
+      def to_s
+        'Srw'
+      end
+    end
+  end
+end

data/lib/pitchcar.rb

@@ -1,12 +1,20 @@
-require_relative 'piece'
+require_relative 'pieces/piece'
+require_relative 'pieces/straight'
+require_relative 'pieces/start'
+require_relative 'pieces/straight_right_wall'
+require_relative 'pieces/straight_left_wall'
+require_relative 'pieces/left'
+require_relative 'pieces/right'
 require_relative 'track'
 
+Thread.abort_on_exception = true
+
 module Pitchcar
   class Pitchcar
 
     class << self
       def find_all_tracks(straight, left_right)
-        tracks = find_tracks(straight - 1, left_right, 'S', [])
+        tracks = find_tracks(straight, left_right, '', [])
         tracks.map(&:with_wall_combinations).flatten
       end
 
@@ -39,10 +47,12 @@ module Pitchcar
 
       def find_tracks(straight, left_right, track_pieces, tracks)
         print "Found #{tracks.size} tracks\r"
-        track = Track.build_from(track_pieces)
-        return false if track.overlaps?
+        unless track_pieces.empty?
+          track = Track.build_from(track_pieces)
+          return false if track.overlaps?
+          return tracks << track if straight == 0 && left_right == 0 && track.valid?(tracks)
+        end
 
-        return tracks << track if straight == 0 && left_right == 0 && track.valid?(tracks)
         [track_pieces].product((['S'] * straight + ['L'] * left_right + ['R'] * left_right).uniq).each do |result|
           if result[1] == 'S'
             find_tracks(straight - 1, left_right, result.join, tracks)
@@ -56,7 +66,7 @@ module Pitchcar
       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, size_restrictions)
+        Track.build_from("#{'S' * straight}#{'L' * left}#{'R' * right}".split('').shuffle.join, size_restrictions)
       end
     end
   end

data/lib/track.rb

@@ -1,6 +1,7 @@
 require 'csv'
 require 'bazaar'
-require_relative 'piece'
+require 'digest'
+require_relative 'pieces/piece'
 require_relative 'track_image'
 require_relative 'boyermoore'
 
@@ -15,30 +16,11 @@ module Pitchcar
     end
 
     def self.build_from(track_pieces, size_restrictions = {})
-      pieces = PieceList.new([Piece.starting_piece])
-
-      track_pieces[1..-1].chars.each do |piece_str|
-        piece = Piece.new
-        piece.x = pieces.last.x
-        piece.y = pieces.last.y
-        piece.type = Piece.type_from_string(piece_str)
-
-        case pieces.last.direction
-        when Piece::DIRECTIONS[:NORTH]
-          piece.y = pieces.last.y + 1
-        when Piece::DIRECTIONS[:EAST]
-          piece.x = pieces.last.x + 1
-        when Piece::DIRECTIONS[:WEST]
-          piece.x = pieces.last.x - 1
-        when Piece::DIRECTIONS[:SOUTH]
-          piece.y = pieces.last.y - 1
-        end
-        piece.direction = piece.next_direction(pieces.last.direction)
-
-        pieces << piece
+      track = Track.new([Pieces::Piece.first_from_string(track_pieces.chars.first)], size_restrictions)
+      track_pieces.chars[1..-1].each do |piece_str|
+        track.pieces << Pieces::Piece.type_from_string(piece_str).new(track.pieces.last.next_coordinate.merge(direction: track.pieces.last.next_direction))
       end
-
-      Track.new(pieces, size_restrictions)
+      track
     end
 
     def valid?(tracks=[])
@@ -46,15 +28,15 @@ module Pitchcar
     end
 
     def to_s
-      pieces.map(&:to_s).join(' ')
+      assign_start_piece.pieces.map(&:to_s).join(' ')
     end
 
     def to_json
-      pieces.map(&:to_h).to_json
+      assign_start_piece.pieces.map(&:to_h).to_json
     end
 
     def to_png
-      TrackImage.new(self).render
+      TrackImage.new(assign_start_piece).render
       puts "Track image saved to #{Dir.pwd}/track.png"
     end
 
@@ -70,26 +52,18 @@ module Pitchcar
       @overlaps ||= string.include?('LLL') || string.include?('RRR') ||  pieces.group_by { |piece| [piece.x, piece.y] }.values.any? { |set| set.size > 1 }
     end
 
-    def with_wall_combinations(pieces = PieceList.new(self.pieces)[1..-1], combinations = [])
-      straight_index = pieces.find_index { |piece| piece.type == Piece::TYPES[:STRAIGHT] }
+    def with_wall_combinations(pieces = self.pieces, tracks = [])
+      straight_index = pieces.find_index { |piece| piece.instance_of? Pieces::Straight }
       if straight_index
-        combos = []
-        [Piece::TYPES[:STRAIGHT_LEFT_WALL], Piece::TYPES[:STRAIGHT_RIGHT_WALL]].each do |piece_type|
-          pieces_copy = PieceList.new(pieces)
-          pieces_copy[straight_index].type = piece_type
-          combos = with_wall_combinations(pieces_copy, combinations)
-        end
-        combos
+        pieces_copy = pieces.dup
+
+        [Pieces::StraightLeftWall, Pieces::StraightRightWall].map do |piece_type|
+          pieces_copy[straight_index] = piece_type.new(pieces[straight_index].to_h)
+          with_wall_combinations(pieces_copy, tracks)
+        end.last
       else
-        track = Track.new([self.pieces.first.dup] + pieces.dup)
-        track.pieces.first.type = Piece::TYPES[:STRAIGHT_RIGHT_WALL]
-        random_right_wall = track.pieces.each_index.select do |index|
-          track.pieces[index].type == Piece::TYPES[:STRAIGHT_RIGHT_WALL]
-        end.sample
-        track.pieces[random_right_wall].type = Piece::TYPES[:STRAIGHT_START]
-        combinations << track
+        tracks << Track.new(pieces.dup)
       end
-      return combinations
     end
 
     # Returns pieces list sorted from in a top-bottom left-right manner
@@ -115,6 +89,14 @@ module Pitchcar
       "#{results[:adjs].sample} #{results[:nouns].sample}"
     end
 
+    def assign_start_piece
+      start_index = pieces.each_index.select { |i| pieces[i].is_a? Pieces::StraightRightWall }.sample
+      # If there are no straight right pieces, pick any straight piece to be the start
+      start_index = pieces.each_index.select { |i| pieces[i].is_a? Pieces::Straight }.sample if start_index.nil?
+      self.pieces[start_index] = Pieces::Start.new(pieces[start_index].to_h) unless start_index.nil?
+      self
+    end
+
     private
 
     def rotation_exists?(tracks)
@@ -126,7 +108,8 @@ module Pitchcar
     end
 
     def ends_correctly?
-      pieces.last.x == pieces.first.x && pieces.last.y == pieces.first.y + 1 && pieces.last.direction == Piece::DIRECTIONS[:SOUTH]
+      return false if pieces.length < 2
+      pieces.last.next_coordinate == pieces.first.coordinate && pieces.last.next_direction == Pieces::Piece::DIRECTIONS[:SOUTH]
     end
 
     def within_size_restrictions?
@@ -137,17 +120,4 @@ module Pitchcar
       Digest::SHA256.hexdigest(to_s)
     end
   end
-
-  class PieceList < Array
-    def initialize(pieces)
-      pieces.each do |piece|
-        new_piece = Piece.new
-        new_piece.x = piece.x
-        new_piece.y = piece.y
-        new_piece.type = piece.type
-        new_piece.direction = piece.direction
-        self.<< new_piece
-      end
-    end
-  end
 end

data/pitchcar.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name        = 'pitchcar'
-  spec.version     = '0.6.3'
+  spec.version     = '0.7.0'
   spec.date        = '2017-02-23'
   spec.summary     = 'Pitchcar Track Generator'
   spec.description = 'Generates tracks for pitchcar'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pitchcar
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Jonah Hirsch
@@ -49,10 +49,16 @@ files:
 - LICENSE.md
 - Readme.md
 - lib/boyermoore.rb
-- lib/images/curve_tile.png
-- lib/images/start_tile.png
-- lib/images/straight_tile.png
-- lib/piece.rb
+- lib/pieces/images/curve_tile.png
+- lib/pieces/images/start_tile.png
+- lib/pieces/images/straight_tile.png
+- lib/pieces/left.rb
+- lib/pieces/piece.rb
+- lib/pieces/right.rb
+- lib/pieces/start.rb
+- lib/pieces/straight.rb
+- lib/pieces/straight_left_wall.rb
+- lib/pieces/straight_right_wall.rb
 - lib/pitchcar.rb
 - lib/track.rb
 - lib/track_image.rb
@@ -78,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Pitchcar Track Generator

data/lib/piece.rb

@@ -1,126 +0,0 @@
-require 'json'
-require 'rmagick'
-
-module Pitchcar
-  class Piece
-    TYPES = { STRAIGHT: 0, LEFT: 1, RIGHT: 2, STRAIGHT_LEFT_WALL: 3, STRAIGHT_RIGHT_WALL: 4, STRAIGHT_START: 5 }
-    DIRECTIONS = { NORTH: 0, EAST: 1, WEST: 2, SOUTH: 3 }
-    STRAIGHT_IMAGE, CURVE_IMAGE, START_IMAGE = Magick::ImageList.new(File.expand_path('../images/straight_tile.png', __FILE__),
-                                                                     File.expand_path('../images/curve_tile.png', __FILE__),
-                                                                     File.expand_path('../images/start_tile.png', __FILE__)).to_a
-    attr_accessor :direction, :x, :y, :type
-
-    def self.starting_piece
-      piece = new
-      piece.x = 0
-      piece.y = 0
-      piece.type = TYPES[:STRAIGHT]
-      piece.direction = DIRECTIONS[:SOUTH]
-      piece
-    end
-
-    def self.type_from_string(string)
-      case string
-      when 'S'
-        TYPES[:STRAIGHT]
-      when 'L'
-        TYPES[:LEFT]
-      when 'R'
-        TYPES[:RIGHT]
-      end
-    end
-
-    def next_direction(from)
-      case type
-        when TYPES[:LEFT]
-        case from
-        when DIRECTIONS[:NORTH]
-          DIRECTIONS[:WEST]
-        when DIRECTIONS[:EAST]
-          DIRECTIONS[:NORTH]
-        when DIRECTIONS[:WEST]
-          DIRECTIONS[:SOUTH]
-        when DIRECTIONS[:SOUTH]
-          DIRECTIONS[:EAST]
-        end
-      when TYPES[:RIGHT]
-        case from
-        when DIRECTIONS[:NORTH]
-          DIRECTIONS[:EAST]
-        when DIRECTIONS[:EAST]
-          DIRECTIONS[:SOUTH]
-        when DIRECTIONS[:WEST]
-          DIRECTIONS[:NORTH]
-        when DIRECTIONS[:SOUTH]
-          DIRECTIONS[:WEST]
-        end
-      else
-        from
-      end
-    end
-
-    def to_s
-      TYPES.key(type).to_s.split('_').map { |word| word[0] }.join.downcase.capitalize
-    end
-
-    def to_h
-      { x: x, y: y, type: TYPES.key(type).downcase, direction: DIRECTIONS.key(direction).downcase }
-    end
-
-    # Slw N = Srw S
-    # Slw E = Srw W
-    # Slw W == Srw E
-    # Slw S = Srw N
-
-    def image
-      if (type == TYPES[:STRAIGHT_LEFT_WALL] && direction == DIRECTIONS[:NORTH]) || (type == TYPES[:STRAIGHT_RIGHT_WALL] && direction == DIRECTIONS[:SOUTH])
-        return STRAIGHT_IMAGE.rotate(90)
-      elsif (type == TYPES[:STRAIGHT_LEFT_WALL] && direction == DIRECTIONS[:EAST]) || (type == TYPES[:STRAIGHT_RIGHT_WALL] && direction == DIRECTIONS[:WEST])
-        return STRAIGHT_IMAGE.rotate(180)
-      elsif (type == TYPES[:STRAIGHT_LEFT_WALL] && direction == DIRECTIONS[:WEST]) || (type == TYPES[:STRAIGHT_RIGHT_WALL] && direction == DIRECTIONS[:EAST])
-        return STRAIGHT_IMAGE
-      elsif (type == TYPES[:STRAIGHT_LEFT_WALL] && direction == DIRECTIONS[:SOUTH]) || (type == TYPES[:STRAIGHT_RIGHT_WALL] && direction == DIRECTIONS[:NORTH])
-        return STRAIGHT_IMAGE.rotate(270)
-      end
-
-      case type
-      when TYPES[:STRAIGHT]
-        return STRAIGHT_IMAGE.rotate(90) if direction == DIRECTIONS[:NORTH] || direction == DIRECTIONS[:SOUTH]
-        STRAIGHT_IMAGE
-      when TYPES[:STRAIGHT_START]
-        case direction
-        when DIRECTIONS[:NORTH]
-          START_IMAGE.rotate(270)
-        when DIRECTIONS[:EAST]
-          START_IMAGE
-        when DIRECTIONS[:WEST]
-          START_IMAGE.rotate(180)
-        when DIRECTIONS[:SOUTH]
-          START_IMAGE.rotate(90)
-        end
-      when TYPES[:LEFT]
-        case direction
-        when DIRECTIONS[:NORTH]
-          CURVE_IMAGE.rotate(270)
-        when DIRECTIONS[:EAST]
-          CURVE_IMAGE
-        when DIRECTIONS[:WEST]
-          CURVE_IMAGE.rotate(180)
-        when DIRECTIONS[:SOUTH]
-          CURVE_IMAGE.rotate(90)
-        end
-      when TYPES[:RIGHT]
-        case direction
-        when DIRECTIONS[:NORTH]
-          CURVE_IMAGE
-        when DIRECTIONS[:EAST]
-          CURVE_IMAGE.rotate(90)
-        when DIRECTIONS[:WEST]
-          CURVE_IMAGE.rotate(270)
-        when DIRECTIONS[:SOUTH]
-          CURVE_IMAGE.rotate(180)
-        end
-      end
-    end
-  end
-end