From ea8f74e448ed25b54368cd70c8cffd441741d772 Mon Sep 17 00:00:00 2001 From: Eugene Lazutkin Date: Sat, 7 Dec 2013 00:57:07 -0600 Subject: [PATCH] Refactored utils. --- lib/addArea.js | 9 +++++++++ lib/utils.js | 11 ----------- lib/windowOpt.js | 6 +++--- 3 files changed, 12 insertions(+), 14 deletions(-) create mode 100644 lib/addArea.js delete mode 100644 lib/utils.js diff --git a/lib/addArea.js b/lib/addArea.js new file mode 100644 index 0000000..5fa07b3 --- /dev/null +++ b/lib/addArea.js @@ -0,0 +1,9 @@ +"use strict"; + + +module.exports = function(rectangles){ + rectangles.forEach(function(rect){ + rect.area = rect.w * rect.h; + }); + return rectangles; +}; diff --git a/lib/utils.js b/lib/utils.js deleted file mode 100644 index bb03445..0000000 --- a/lib/utils.js +++ /dev/null @@ -1,11 +0,0 @@ -"use strict"; - - -module.exports = { - addArea: function(rectangles){ - rectangles.forEach(function(rect){ - rect.area = rect.w * rect.h; - }); - return rectangles; - } -}; \ No newline at end of file diff --git a/lib/windowOpt.js b/lib/windowOpt.js index 5d12ea3..5c1d3c0 100644 --- a/lib/windowOpt.js +++ b/lib/windowOpt.js @@ -4,13 +4,13 @@ var Envelope = require("./Envelope"); var RectState = require("./RectState"); var lookAhead = require("./lookAhead"); -var sort = require("./sort"); -var utils = require("./utils"); +var sort = require("./sort") ; +var addArea = require("./addArea"); function windowOpt(rectangles, produceScore, depth, finalDepth){ if(isNaN(rectangles[0].area)){ - utils.addArea(rectangles); + addArea(rectangles); } sort.byAreaDescending(rectangles);