subparry_labyrinth_solver 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0bf1b3d99443815ae5ff546b0abbd55512351f75ddb9d7de6299a2166c6f796
-  data.tar.gz: 4c7f159471b6f6e9c24178cd8d165f60e8a593f6f89160e92720e6c826e9a747
+  metadata.gz: e6b29e16241f2cc49228dade89632f4abae2e88aaa65817f75efeffddbef424b
+  data.tar.gz: 6660e17d4047fe5aae28e899cff81ad7dc512247271641006ed1e8edf938dba8
 SHA512:
-  metadata.gz: 2efa961d309f5b2c729adb7f8c2c4b8a576195566fd27605401e2c9882bdedfdcf15a7562b47bf0a65e96ef5ffc0788ed358c29353abab9169440f33787278dd
-  data.tar.gz: 566eb78c672a2bec211480ac09651dbdf458f7674983dbae0b4079691d553410ca71dfa9f4f7753a91a9cae1d59e13b5e55b7a18bdc37ab707690ad56a0d232f
+  metadata.gz: c657486a382ba18ddbf507bbce29a8a76ab6ca22e00795876b2014238d44fab0f746b345dad1f633e86ee1fc6bce29a7cf78fbe2d89c4c57f8469f8447fab751
+  data.tar.gz: 6dd3f0a61db28f164baed8b3bdd79eb91b09f8e9197c1ec3bec34f484c73df523e60b2ab9b9897cdb6b89b2328c9b6a252c176b9d96c2715f9a4413fd46a4e6b

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.1.0 2021-01-22
+
+- Added support for labyrinths with circular paths
+- Added support for "empty" labyrinths (only outer walls and cheese)
+
 ## 1.0.4 2021-01-22
 
 - First fully functional release

data/README.md

@@ -10,9 +10,7 @@ Fun little project about labyrinth solving inspired in mice that find cheese in
 
 It exposes some classes to create a labyrinth and then find the path to the cheese.
 
-Be advised: **It does not support labyrinths with circular paths and if you try to solve one of these, it will result in an infinite loop**.
-
-That being said, I plan to support that kind of labyrinths soon.
+Note that although the paths found are mostly efficient, the algorithm does not focus on finding **the best** path to the cheese.
 
 ## Usage
 
@@ -40,7 +38,7 @@ data = [
   ]
 ]
 
-# This data represents this maze:
+# The above data represents this maze:
 #      ___ ___
 #     |   | 🧀|
 #     |   |   |
@@ -72,6 +70,6 @@ solver.position # => <struct x: 1, y: 0>
 
 ## Pending
 
-- Support labyrinths with circular paths
 - Create a labyrinth maker class
 - Visual representation of labyrinths
+- Document Node and Labyrinth classes

data/lib/subparry_labyrinth_solver.rb

@@ -3,6 +3,8 @@ require 'subparry_labyrinth_solver/labyrinth'
 require 'subparry_labyrinth_solver/solver'
 module LabyrinthSolver
   class MissingPathsError < ArgumentError; end
+
   class InvalidMoveError < RuntimeError; end
+
   class MissingCheeseError < ArgumentError; end
-end
+end

data/lib/subparry_labyrinth_solver/solver.rb

@@ -23,6 +23,8 @@ module LabyrinthSolver
       next_dir = OPPOSITE_DIRECTIONS.find { |dir, opp| @labyrinth.open?(dir) && opp != @path.last }
       return dead_end unless next_dir
 
+      return dead_end if circled?
+
       go(next_dir.first)
       @path.push(next_dir.first)
     end
@@ -32,11 +34,36 @@ module LabyrinthSolver
     end
 
     private
-    
+
     def dead_end
       to_close = path.pop
       go(OPPOSITE_DIRECTIONS[to_close])
       close(to_close)
     end
+
+    def circled?
+      return false if path.size < 4
+
+      idx = path.size - 1
+      control_point = Point.new(position.x, position.y)
+
+      loop do
+        case path[idx]
+        when :up
+          control_point.y += 1
+        when :down
+          control_point.y -= 1
+        when :left
+          control_point.x += 1
+        when :right
+          control_point.x -= 1
+        end
+        return true if control_point == position
+
+        return false if idx.zero?
+
+        idx -= 1
+      end
+    end
   end
-end
+end

data/lib/subparry_labyrinth_solver/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LabyrinthSolver
-  VERSION = '1.0.4'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subparry_labyrinth_solver
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Adrian Parry