Merge pull request #10 from joshuahhh/master

Removed 'compare' functions and other unnecessary bits

lib/kiwi.js

@@ -58,7 +58,7 @@
     |
     | The full license is in the file COPYING.txt, distributed with this software.
     |----------------------------------------------------------------------------*/
-    function createMap(compare) {
+    function createMap() {
         return new IndexedMap();
     }
     var IndexedMap = /** @class */ (function () {
@@ -221,13 +221,6 @@
             this._id = VarId++;
             this._name = name;
         }
-        /**
-         * A static variable comparison function.
-         * @private
-         */
-        Variable.Compare = function (a, b) {
-            return a.id() - b.id();
-        };
         /**
          * Returns the unique id number of the variable.
          * @private
@@ -439,7 +432,7 @@
             return this._terms.size() == 0;
         };
         Expression.prototype.toString = function () {
-            var result = this._terms.array.map(function (pair, idx) {
+            var result = this._terms.array.map(function (pair) {
                 return (pair.second + "*" + pair.first.toString());
             }).join(" + ");
             if (!this.isConstant() && this._constant !== 0) {
@@ -457,7 +450,7 @@
     function parseArgs(args) {
         var constant = 0.0;
         var factory = function () { return 0.0; };
-        var terms = createMap(Variable.Compare);
+        var terms = createMap();
         for (var i = 0, n = args.length; i < n; ++i) {
             var item = args[i];
             if (typeof item === "number") {
@@ -521,11 +514,11 @@
         /**
          * Create a new symbolic strength.
          *
-         * @param {Number} a strong
-         * @param {Number} b medium
-         * @param {Number} c weak
-         * @param {Number} [w] weight
-         * @return {Number} strength
+         * @param a strong
+         * @param b medium
+         * @param c weak
+         * @param [w] weight
+         * @return strength
         */
         Strength.create = function (a, b, c, w) {
             if (w === void 0) { w = 1.0; }
@@ -598,13 +591,6 @@
                 this._expression = expression.minus(rhs);
             }
         }
-        /**
-         * A static constraint comparison function.
-         * @private
-         */
-        Constraint.Compare = function (a, b) {
-            return a.id() - b.id();
-        };
         /**
          * Returns the unique id number of the constraint.
          * @private
@@ -1351,28 +1337,28 @@
      * @private
      */
     function createCnMap() {
-        return createMap(Constraint.Compare);
+        return createMap();
     }
     /**
      * An internal function for creating a row map.
      * @private
      */
     function createRowMap() {
-        return createMap(Symbol.Compare);
+        return createMap();
     }
     /**
      * An internal function for creating a variable map.
      * @private
      */
     function createVarMap() {
-        return createMap(Variable.Compare);
+        return createMap();
     }
     /**
      * An internal function for creating an edit map.
      * @private
      */
     function createEditMap() {
-        return createMap(Variable.Compare);
+        return createMap();
     }
     /**
      * An enum defining the available symbol types.
@@ -1401,12 +1387,6 @@
             this._id = id;
             this._type = type;
         }
-        /**
-         * The static Symbol comparison function.
-         */
-        Symbol.Compare = function (a, b) {
-            return a.id() - b.id();
-        };
         /**
          * Returns the unique id number of the symbol.
          */
@@ -1436,7 +1416,7 @@
          */
         function Row(constant) {
             if (constant === void 0) { constant = 0.0; }
-            this._cellMap = createMap(Symbol.Compare);
+            this._cellMap = createMap();
             this._constant = constant;
         }
         /**

src/constraint.ts

@@ -56,14 +56,6 @@ class Constraint {
         }
     }
 
-    /**
-     * A static constraint comparison function.
-     * @private
-     */
-    public static Compare( a: Constraint, b: Constraint ): number {
-        return a.id() - b.id();
-    }
-
     /**
      * Returns the unique id number of the constraint.
      * @private
@@ -113,4 +105,4 @@ class Constraint {
  * The internal constraint id counter.
  * @private
  */
-let CnId = 0;
+let CnId = 0;

src/expression.ts

@@ -113,7 +113,7 @@ class Expression {
     }
 
     public toString(): string {
-        let result = this._terms.array.map(function(pair, idx) {
+        let result = this._terms.array.map(function(pair) {
             return (pair.second + "*" + pair.first.toString());
         }).join(" + ");
 
@@ -145,7 +145,7 @@ interface IParseResult {
 function parseArgs( args: IArguments ): IParseResult {
     let constant = 0.0;
     let factory = () => 0.0;
-    let terms = createMap<Variable, number>( Variable.Compare );
+    let terms = createMap<Variable, number>();
     for ( let i = 0, n = args.length; i < n; ++i ) {
         let item = args[ i ];
         if ( typeof item === "number" ) {

src/maptype.ts

@@ -9,7 +9,7 @@
 export interface IMap<T extends { id(): number }, U> extends IndexedMap<T, U> { }
 
 export
-function createMap<T extends { id(): number }, U>( compare: any ): IMap<T, U> {
+function createMap<T extends { id(): number }, U>(): IMap<T, U> {
     return new IndexedMap<T, U>();
 }
 

src/solver.ts

@@ -773,31 +773,31 @@ interface IRowCreation {
  * @private
  */
 function createCnMap(): IMap<Constraint, ITag> {
-    return createMap<Constraint, ITag>( Constraint.Compare );
+    return createMap<Constraint, ITag>();
 }
 
 /**
  * An internal function for creating a row map.
  * @private
  */
 function createRowMap(): IMap<Symbol, Row> {
-    return createMap<Symbol, Row>( Symbol.Compare );
+    return createMap<Symbol, Row>();
 }
 
 /**
  * An internal function for creating a variable map.
  * @private
  */
 function createVarMap(): IMap<Variable, Symbol> {
-    return createMap<Variable, Symbol>( Variable.Compare );
+    return createMap<Variable, Symbol>();
 }
 
 /**
  * An internal function for creating an edit map.
  * @private
  */
 function createEditMap(): IMap<Variable, IEditInfo> {
-    return createMap<Variable, IEditInfo>( Variable.Compare );
+    return createMap<Variable, IEditInfo>();
 }
 
 /**
@@ -817,13 +817,6 @@ enum SymbolType {
  * @private
  */
 class Symbol {
-    /**
-     * The static Symbol comparison function.
-     */
-    public static Compare( a: Symbol, b: Symbol ): number {
-        return a.id() - b.id();
-    }
-
     /**
      * Construct a new Symbol
      *
@@ -1037,6 +1030,6 @@ class Row {
         }
     }
 
-    private _cellMap = createMap<Symbol, number>( Symbol.Compare );
+    private _cellMap = createMap<Symbol, number>();
     private _constant: number;
 }

src/strength.ts

@@ -13,11 +13,11 @@
     /**
      * Create a new symbolic strength.
      *
-     * @param {Number} a strong
-     * @param {Number} b medium
-     * @param {Number} c weak
-     * @param {Number} [w] weight
-     * @return {Number} strength
+     * @param a strong
+     * @param b medium
+     * @param c weak
+     * @param [w] weight
+     * @return strength
     */
     static create( a: number, b: number, c: number, w: number = 1.0 ) {
         let result: number = 0.0;

src/variable.ts

@@ -20,14 +20,6 @@ class Variable {
         this._name = name;
     }
 
-    /**
-     * A static variable comparison function.
-     * @private
-     */
-    public static Compare( a: Variable, b: Variable ): number {
-        return a.id() - b.id();
-    }
-
     /**
      * Returns the unique id number of the variable.
      * @private