a-star 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad3d1339c994132e1b167d581a31acb56233e9c3
-  data.tar.gz: d31e921b571d3d90bac5019423adcd92b5aa793e
+  metadata.gz: c0cfec0ca5ab1dcc9074403c04a15c8b882dbca2
+  data.tar.gz: 64180ed20f03c68ab30dae600b10182dc4cab98d
 SHA512:
-  metadata.gz: a7a3249ebf725239241cf614b4424d8f88c4db1ca839d9fea8fd8e23ae39fb5f1f7f8fbccb3abe0e64abc34bb1ad6974f9d0052423e1efe2dbc4bb3ab57cd919
-  data.tar.gz: a94ce957fcc1703d84c8721fced131a4bb568d9d95410fefbfe544917b1f3f44bf92bc68babe72ce1d5194ee095f43f7858a039bd280c88a0a1c1f2b269cd749
+  metadata.gz: 962f22ba62929fd10049410198e868949792610c01c0a5af0edda89b04991e2e8b5ed2c11ed48b411ee89c08b065fb4f1226d3ca9349de395d33ca3293d1ff14
+  data.tar.gz: 65a972cc63d057b5aa1e74474748aae1efb28c1db33c3f5a1431609a56a3a8924c63c130920d08639903374983dd2a343d8a96e132bbee403ddaaab21987e94b

data/lib/A_Star.rb

@@ -32,8 +32,8 @@ class FromTo
   end
 end
 
-def node x, y, index, cost, destCost, totalCost
-  return [x, y, index, cost, destCost, totalCost]
+def node x, y, index, cost, heuristic, totalCost
+  return [x, y, index, cost, heuristic, totalCost]
 end
 
 class AStar
@@ -47,7 +47,7 @@ class AStar
     @mazeLabel = mazeName.split( /()\s|\./)[0]
     @mazeFileType = "." + mazeName.split(/\s|\./)[1]
 
-    @firstNode = node start[0], start[1], -1, -1, -1, -1 # [x, y, index, startCost, destcost, heuristic]
+    @firstNode = node start[0], start[1], -1, -1, -1, -1 # [x, y, index, cost, heuristic, totalCost]
     @destNode  = node dest[0], dest[1],   -1, -1, -1, -1
 
     @height       = maze.dimension.height
@@ -61,7 +61,7 @@ class AStar
 
   def solve
 
-    while not @visited.empty? do
+    until @visited.empty? do
       minIndex = 0
       0.upto @visited.length - 1 do |i|
         if @visited[i][5] < @visited[minIndex][5]
@@ -75,14 +75,14 @@ class AStar
       if here[0] == @destNode[0] && here[1] == @destNode[1]
         path = [@destNode]
         puts "We're here! Final node at: (x: #{here[0]}, y: #{here[1]})"
-        while here[2] != -1 do
+        until here[2] == -1 do
           here = @unvisited[here[2]]
           path.unshift here
         end
-        puts "The entire path from #{@start} to #{@dest} is: \n#{path}"
+        puts "The entire path from node #{@start} to node #{@dest} are the nodes: \n#{path}"
 
         hue = 0
-        hueCoeff = 360.0 / path.length
+        hueCoeff = 360.0 / path.length # when * by path.length (the end of the arr) it would be 360, so one complete rainbow
 
         (1..path.length).each do |n|
           @solvedMaze[ path[n - 1][0], path[n - 1][1] ] = ChunkyPNG::Color.from_hsl(hue, 1, 0.6)
@@ -100,7 +100,7 @@ class AStar
         horizontalFriend = friendNodes[j][0]
         verticalFriend   = friendNodes[j][1]
 
-        if passable? horizontalFriend, verticalFriend || (horizontalFriend = @destNode[0] && verticalFriend == @destNode[1])
+        if passable? horizontalFriend, verticalFriend || (horizontalFriend == @destNode[0] && verticalFriend == @destNode[1])
           onUnvisited = false
           0.upto @unvisited.length - 1 do |k|
             unvisitedNode = @unvisited[k]
@@ -124,7 +124,7 @@ class AStar
             friendHeuristics << heuristic(friendNodes[k], @dest)
           end
           lowestHeuristic = friendHeuristics.min
-          if not onVisited && heuristic(friendNodes[j], @dest) == lowestHeuristic # If you're somwhere new and is fastest
+          unless onVisited && heuristic(friendNodes[j], @dest) != lowestHeuristic # If you're somwhere new and is fastest
             newNode = node horizontalFriend, verticalFriend, @unvisited.length - 1, -1, -1, -1
             newNode[3] = here[3] + cost(here, newNode)
             newNode[4] = heuristic newNode, @destNode
@@ -192,13 +192,14 @@ class AStar
 
   def draw
     puts "Solving..."
-    go = Time.new
 
-    path = solve # Here we go
+    go = Time.new # Start the time
+    path = solve # Here we go!
+    finish = Time.new # Take the finish time
+
     unless path.empty?
-      finish = Time.new
       puts "\n\nTime taken to solve: " + (finish - go).to_s + " seconds!"
-      minutes = ((finish - go) / 60).round
+      minutes = ((finish - go) / 60.0).round
       if minutes > 0
         if minutes > 1
           puts "Circa " + minutes.to_s + " Minutes."
@@ -210,11 +211,6 @@ class AStar
       puts "No solution found, solve function returned empty array for path!\nPlease make sure your maze is solvable!"
     end
 
-    #startColour = "#ff3c5e"
-    #destColour  = "#68ff9f"
-    #@solvedMaze[@start[0], @start[1]] = ChunkyPNG::Color.from_hex startColour
-    #@solvedMaze[@dest[0], @dest[1]] = ChunkyPNG::Color.from_hex destColour
-
     @solvedMaze.save(@mazeLabel + "-solved" + @mazeFileType)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: a-star
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Demonstrandum