Refactored utils.

uhop · Dec 7, 2013 · ea8f74e · ea8f74e
1 parent 79fa68d
commit ea8f74e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/lib/addArea.js 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
diff --git 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);