Merge branch 'addax'

Author: acadet

buildLauncher.py

@@ -17,11 +17,14 @@ def __collect(self, path):
 
 		for root, dirs, files in os.walk(path):
 			for fileName in files:
-				with open(os.path.join(root, fileName), 'r') as f:
-					for line in f:
-						outcome = re.findall(pattern, line)
-						for e in outcome:
-							collected.append(e)
+				ext = os.path.splitext(fileName)[1]
+				
+				if ext == '.ts':
+					with open(os.path.join(root, fileName), 'r') as f:
+						for line in f:
+							outcome = re.findall(pattern, line)
+							for e in outcome:
+								collected.append(e)
 
 		return collected
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Ludivine",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-contrib-clean": "~0.6.0",

src/Guid.ts

@@ -6,17 +6,17 @@
  */
 class Guid {
 	//region Fields
-	
+
 	//endregion Fields
-	
+
 	//region Constructors
-	
+
 	//endregion Constructors
-	
+
 	//region Methods
-	
+
 	//region Private Methods
-	
+
 	/**
 	 * Returns a random string using provided charset
 	 * @param  {number} length Desired length
@@ -41,9 +41,9 @@ class Guid {
 	}
 
 	//endregion Private Methods
-	
+
 	//region Public Methods
-	
+
 	/**
 	 * Produces a new guid
 	 * @return {string} [description]
@@ -66,6 +66,6 @@ class Guid {
 	}
 
 	//endregion Public Methods
-	
+
 	//endregion Methods
 }

src/collections/impl/ArrayList.ts

@@ -11,9 +11,9 @@ class ArrayList<T> implements IList<T> {
 	 * Inner content
 	 */
 	private _content : Array<T>;
-	
+
 	//endregion Fields
-	
+
 	//region Constructors
 
 	/**
@@ -27,15 +27,15 @@ class ArrayList<T> implements IList<T> {
 			source.forEach(x => this.add(x));
 		}
 	}
-	
+
 	//endregion Constructors
-	
+
 	//region Methods
-	
+
 	//region Private Methods
-	
+
 	//endregion Private Methods
-	
+
 	//region Public Methods
 
 	//region IList
@@ -173,7 +173,7 @@ class ArrayList<T> implements IList<T> {
 		a = new Array<T>();
 		this.forEach(e => a.push(e));
 		CollectionUtils.ArrayUtils.sort(a, getter);
-		
+
 		for (var i = 0; i < a.length; i++) {
 			outcome.add(a[i]);
 		}
@@ -194,7 +194,7 @@ class ArrayList<T> implements IList<T> {
 		a = new Array<T>();
 		this.forEach(e => a.push(e));
 		CollectionUtils.ArrayUtils.sort(a, getter, false);
-		
+
 		for (var i = 0; i < a.length; i++) {
 			outcome.add(a[i]);
 		}
@@ -218,6 +218,14 @@ class ArrayList<T> implements IList<T> {
 
 	//region ICollection
 
+	average(getter : Func<T, number>) : number {
+		return CollectionUtils.CollectionHelper.average(this, getter);
+	}
+
+	exists(selector : Func<T, boolean>) : boolean {
+		return this.find(selector) !== null;
+	}
+
 	find(selector : Func<T, boolean>) : T {
 		var size : number;
 
@@ -245,67 +253,36 @@ class ArrayList<T> implements IList<T> {
 		}
 	}
 
-	map(action : Func<T, T>) : ICollection<T> {
+	intersect(collection : ICollection<T>) : ICollection<T> {
 		var outcome : ArrayList<T>;
 
 		outcome = new ArrayList<T>();
-		this.forEach(e => outcome.add(action(e)));
-
-		return outcome;
-	}
-
-	max(getter : Func<T, number>) : T {
-		var max : number;
-		var current : T;
-
-		if (this.getLength() === 0) {
-			return null;
-		}
-
-		current = this.getAt(0);
-		max = getter(current);
-
 		this.forEach(
-			(e) => {
-				var value : number;
-
-				value = getter(e);
-
-				if (value > max) {
-					max = value;
-					current = e;
+			(x) => {
+				if (collection.exists(e => e === x)) {
+					outcome.add(x);
 				}
 			}
 		);
 
-		return current;
+		return outcome;
 	}
 
-	min(getter : Func<T, number>) : T {
-		var min : number;
-		var current : T;
-
-		if (this.getLength() === 0) {
-			return null;
-		}
-
-		current = this.getAt(0);
-		min = getter(current);
+	map(action : Func<T, T>) : ICollection<T> {
+		var outcome : ArrayList<T>;
 
-		this.forEach(
-			(e) => {
-				var value : number;
+		outcome = new ArrayList<T>();
+		this.forEach(e => outcome.add(action(e)));
 
-				value = getter(e);
+		return outcome;
+	}
 
-				if (value < min) {
-					min = value;
-					current = e;
-				}
-			}
-		);
+	max(getter : Func<T, number>) : T {
+		return CollectionUtils.CollectionHelper.max(this, getter);
+	}
 
-		return current;
+	min(getter : Func<T, number>) : T {
+		return CollectionUtils.CollectionHelper.min(this, getter);
 	}
 
 	select(selector : Func<T, boolean>) : ICollection<T> {
@@ -325,39 +302,54 @@ class ArrayList<T> implements IList<T> {
 	}
 
 	sum(getter : Func<T, number>) : number {
-		var acc : number;
-
-		acc = 0;
-		this.forEach(e => acc += getter(e));
-
-		return acc;
+		return CollectionUtils.CollectionHelper.sum(this, getter);
 	}
 
 	toArray() : Array<T> {
-		var outcome : Array<T>;
+		return CollectionUtils.CollectionHelper.toArray(this);
+	}
 
-		outcome = new Array<T>();
-		this.forEach(x => outcome.push(x));
+	toDictionary<K, V>(keyGetter : Func<T, K>, valueGetter : Func<T, V>) : IDictionary<K, V> {
+		return CollectionUtils.CollectionHelper.toDictionary(this, keyGetter, valueGetter);
+	}
 
-		return outcome;
+	toList() : IList<T> {
+		return CollectionUtils.CollectionHelper.toList(this);
 	}
 
-	toDictionary<K, V>(keyGetter : Func<T, K>, valueGetter : Func<T, V>) : IDictionary<K, V> {
-		var outcome : IDictionary<K, V>;
+	union(collection : ICollection<T>) : ICollection<T> {
+		var outcome : ArrayList<T>;
 
-		outcome = new Dictionary<K, V>();
-		this.forEach(x => outcome.add(keyGetter(x), valueGetter(x)));
+		outcome = new ArrayList<T>(this);
+		collection.forEach(
+			(x) => {
+				if (!this.exists(e => e === x)) {
+					outcome.add(x);
+				}
+			}
+		);
 
 		return outcome;
 	}
 
-	toList() : IList<T> {
-		return new ArrayList<T>(this);
+	uniq() : ICollection<T> {
+		var outcome : ArrayList<T>;
+
+		outcome = new ArrayList<T>();
+		this.forEach(
+			(x) => {
+				if (!outcome.exists(e => e === x)) {
+					outcome.add(x);
+				}
+			}
+		);
+
+		return outcome;
 	}
 
 	//endregion ICollection
-	
+
 	//endregion Public Methods
-	
+
 	//endregion Methods
 }