Cleanup

Author: Hooman Mehr

Sources/RationalNumber.swift

@@ -316,16 +316,6 @@ extension Rational {
     }
 
 
-    
-    /// Convert from a Double.
-    ///
-    
-    public init(_ x: Double, tolerance: Percentage = 0.01%, preferredDenominators: [Int] = [] ) {
-
-        self.init(x, tolerance: x*tolerance, preferredDenominators: preferredDenominators)
-    }
-    
-    
     public static func +(lhs: Rational, rhs: Rational) -> Rational {
 
         let (lnum, rnum, denom) = numsWithCommonDenom(lhs, rhs)
@@ -396,39 +386,6 @@ internal func numsWithCommonDenom(_ left: Rational, _ right: Rational) -> (lnum:
 }
 
 
-extension String {
-    
-    func mapped(with lookupTable: [Character:Character]) -> String {
-        
-        return String(self.characters.map{ lookupTable[$0] ?? $0 })
-    }
-}
-
-
-
-/// Utility protocol to help write more readable code.
-///
-/// One alternative is overloading multiplication / division operators, but it would
-/// pollute operator space and lead to ambiguity.
-
-internal protocol Scalable {
-    
-    associatedtype ScaleFactor
-    
-    /// Returns a new item by scaling the current item.
-    
-    func scaled(by factor: ScaleFactor) -> Self
-}
-
-extension Int: Scalable {
-    
-    typealias ScaleFactor = Double
-    
-    func scaled(by factor: Double) -> Int {
-        
-        return Int((Double(self) * factor).rounded())
-    }
-}
 
 extension Rational: Scalable {
 
@@ -439,3 +396,4 @@ extension Rational: Scalable {
         return Rational(numerator.scaled(by: factor), over: denominator)
     }
 }
+

Sources/Utilities.swift

@@ -0,0 +1,60 @@
+//
+//  Utilities.swift
+//  SwiftMath
+//
+//
+//  Global functions (public in internal) defined by SwiftMath module.
+//  (c) 2016 Hooman Mehr. Licensed under Apache License v2.0 with Runtime Library Exception
+//
+
+
+
+/// Utility protocol to help write more readable code.
+///
+/// One alternative is overloading multiplication / division operators, but it would
+/// pollute operator space and lead to ambiguity.
+
+internal protocol Scalable {
+    
+    
+    /// The type of scale factor supporting by this scalable type.
+    
+    associatedtype ScaleFactor
+    
+    
+    /// Returns a new item by scaling the current item to the given factor.
+    ///
+    /// - Parameter factor: The given scaling factor.
+    
+    func scaled(by factor: ScaleFactor) -> Self
+}
+
+
+
+
+extension Int: Scalable {
+    
+    typealias ScaleFactor = Double
+    
+    func scaled(by factor: Double) -> Int {
+        
+        return Int((Double(self) * factor).rounded())
+    }
+}
+
+
+
+
+extension String {
+    
+    /// Returns a string with the given key characters replaced with corresponding value characters.
+    ///
+    /// - Parameter lookupTable: A dictionary that mapps character keys to character values. Each
+    ///   character key in the string is replaced with the corresponding character value from this 
+    ///   dictionary.
+    
+    func mapped(with lookupTable: [Character:Character]) -> String {
+        
+        return String(self.characters.map{ lookupTable[$0] ?? $0 })
+    }
+}

SwiftMath.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		861B50B41DA97DF100C6F0B1 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 861B50B31DA97DF100C6F0B1 /* Utilities.swift */; };
 		OBJ_25 /* Algorithms.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_9 /* Algorithms.swift */; };
 		OBJ_26 /* Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_10 /* Operators.swift */; };
 		OBJ_27 /* Percentage.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* Percentage.swift */; };
@@ -26,6 +27,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		861B50B31DA97DF100C6F0B1 /* Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Utilities.swift; sourceTree = "<group>"; };
 		OBJ_10 /* Operators.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Operators.swift; sourceTree = "<group>"; };
 		OBJ_11 /* Percentage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Percentage.swift; sourceTree = "<group>"; };
 		OBJ_12 /* RationalNumber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RationalNumber.swift; sourceTree = "<group>"; };
@@ -106,6 +108,7 @@
 				OBJ_10 /* Operators.swift */,
 				OBJ_11 /* Percentage.swift */,
 				OBJ_12 /* RationalNumber.swift */,
+				861B50B31DA97DF100C6F0B1 /* Utilities.swift */,
 			);
 			name = SwiftMath;
 			path = Sources;
@@ -181,6 +184,7 @@
 				OBJ_25 /* Algorithms.swift in Sources */,
 				OBJ_26 /* Operators.swift in Sources */,
 				OBJ_27 /* Percentage.swift in Sources */,
+				861B50B41DA97DF100C6F0B1 /* Utilities.swift in Sources */,
 				OBJ_28 /* RationalNumber.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;