Better file organization

Yonaba · Yonaba · commit 8073d7eac4c2 · 2014-02-22T22:59:49.000Z
diff --git a/A_Star_Search/Lua/Yonaba/astar.lua b/A_Star_Search/Lua/Yonaba/astar.lua
@@ -33,8 +33,8 @@
 -- See custom handlers for reference (*_hander.lua).
 
 -- Dependencies
-local class = require 'class'
-local bheap = require 'bheap'
+local class = require 'utils.class'
+local bheap = require 'utils.bheap'
 
 -- Clears data between consecutive path requests.
 local function resetForNextSearch(astar)
diff --git a/A_Star_Search/Lua/Yonaba/astar_test.lua b/A_Star_Search/Lua/Yonaba/astar_test.lua
@@ -26,7 +26,7 @@ end
 
 run('Testing linear graph', function()
   local comp = function(a, b) return a.value == b end
-  local ln_handler = require 'linear_handler'
+  local ln_handler = require 'handlers.linear_handler'
   local astar = Astar(ln_handler)
   ln_handler.init(-2,5)
   local start, goal = ln_handler.getNode(0), ln_handler.getNode(5)
@@ -38,7 +38,7 @@ end)
 
 run('Testing grid graph', function()
   local comp = function(a, b) return a.x == b[1] and a.y == b[2] end
-  local gm_handler = require 'gridmap_handler'
+  local gm_handler = require 'handlers.gridmap_handler'
   local astar = Astar(gm_handler)
   local map = {{0,0,0,0,0},{0,1,1,1,1},{0,0,0,0,0}}
   gm_handler.init(map)
@@ -53,7 +53,7 @@ end)
 
 run('Testing point graph', function()
   local comp = function(a, b) return a.x == b[1] and a.y == b[2] end
-  local pg_handler = require 'point_graph_handler'
+  local pg_handler = require 'handlers.point_graph_handler'
   local astar = Astar(pg_handler)
 
   pg_handler.addNode('a')
diff --git a/A_Star_Search/Lua/Yonaba/handlers/gridmap_handler.lua b/A_Star_Search/Lua/Yonaba/handlers/gridmap_handler.lua
@@ -5,8 +5,10 @@
 -- with a pair of (x, y) coordinates. It features straight (4-directions)
 -- and diagonal (8-directions) moves.
 
+local PATH = (...):gsub('handlers.gridmap_handler$','')
+local Node = require (PATH .. '.utils.node')
+
 -- Implements Node class (from node.lua)
-local Node = require 'node'
 function Node:initialize(x, y) self.x, self.y = x, y end
 function Node:toString() return ('Node: x = %d, y = %d'):format(self.x, self.y) end
 function Node:isEqualTo(n) return self.x == n.x and self.y == n.y end
diff --git a/A_Star_Search/Lua/Yonaba/handlers/linear_handler.lua b/A_Star_Search/Lua/Yonaba/handlers/linear_handler.lua
@@ -5,8 +5,10 @@
 -- Similar to a range (interval) with no bounds.
 -- i.e., the path from 5 to 0 would be 5, 4, 3, 2, 1, 0.
 
+local PATH = (...):gsub('handlers.linear_handler$','')
+local Node = require (PATH .. '.utils.node')
+
 -- Implements Node class (from node.lua)
-local Node = require 'node'
 function Node:initialize(value) self.value = value end
 function Node:toString() return ('Node: %d'):format(self.value) end
 function Node:isEqualTo(n) return self.value == n.value end
diff --git a/A_Star_Search/Lua/Yonaba/handlers/point_graph_handler.lua b/A_Star_Search/Lua/Yonaba/handlers/point_graph_handler.lua
@@ -6,8 +6,10 @@
 -- It assumes edges are symmetric, that is if an edge exists
 -- between a and b, weight(a -> b) ==  weight(b -> a)
 
+local PATH = (...):gsub('handlers.point_graph_handler$','')
+local Node = require (PATH .. '.utils.node')
+
 -- Implements Node class (from node.lua)
-local Node = require 'node'
 function Node:initialize(name) self.name = name end
 function Node:toString() return ('Node: %s'):format(self.name) end
 function Node:isEqualTo(n) return self.name == n.name end
diff --git a/A_Star_Search/Lua/Yonaba/utils/bheap.lua b/A_Star_Search/Lua/Yonaba/utils/bheap.lua
@@ -2,7 +2,8 @@
 -- See: http://www.policyalmanac.org/games/binaryHeaps.htm
 -- Adapted from: https://github.com/Yonaba/Binary-Heaps
 
-local class = require 'class'
+local PATH = (...):gsub('%.bheap$','')
+local class = require (PATH .. '.class')
 
 -- Looks for item in an array
 local function findIndex(array, item)
diff --git a/A_Star_Search/Lua/Yonaba/utils/class.lua b/A_Star_Search/Lua/Yonaba/utils/class.lua
diff --git a/A_Star_Search/Lua/Yonaba/utils/node.lua b/A_Star_Search/Lua/Yonaba/utils/node.lua
@@ -7,7 +7,8 @@
 -- See astar.lua comment header.
 -- See custom handlers for reference (*_hander.lua).
 
-local class = require 'class'
+local PATH = (...):gsub('%.node$','')
+local class = require (PATH .. '.class')
 
 local Node = class {f = 0, g = 0, h = 0}
 Node.__eq = function(a, b) return a:isEqualTo(b) end
