From a93a06124f8fd730dbc3213abcc953d111d244aa Mon Sep 17 00:00:00 2001 From: Timofey Solomko Date: Thu, 8 Dec 2016 08:26:14 +0300 Subject: [PATCH] Removed HuffmanLength. --- SWCompression.xcodeproj/project.pbxproj | 10 ----- Sources/HuffmanLength.swift | 59 ------------------------- 2 files changed, 69 deletions(-) delete mode 100644 Sources/HuffmanLength.swift diff --git a/SWCompression.xcodeproj/project.pbxproj b/SWCompression.xcodeproj/project.pbxproj index 65ca7ebf..d47d49b1 100644 --- a/SWCompression.xcodeproj/project.pbxproj +++ b/SWCompression.xcodeproj/project.pbxproj @@ -14,9 +14,6 @@ 063DF10D1DE1F07800F38082 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063DF1061DE1F07800F38082 /* Extensions.swift */; }; 063DF10E1DE1F07800F38082 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063DF1061DE1F07800F38082 /* Extensions.swift */; }; 063DF10F1DE1F07800F38082 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063DF1061DE1F07800F38082 /* Extensions.swift */; }; - 063DF1101DE1F07800F38082 /* HuffmanLength.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063DF1071DE1F07800F38082 /* HuffmanLength.swift */; }; - 063DF1111DE1F07800F38082 /* HuffmanLength.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063DF1071DE1F07800F38082 /* HuffmanLength.swift */; }; - 063DF1121DE1F07800F38082 /* HuffmanLength.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063DF1071DE1F07800F38082 /* HuffmanLength.swift */; }; 063DF1131DE1F07800F38082 /* HuffmanTree.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063DF1081DE1F07800F38082 /* HuffmanTree.swift */; }; 063DF1141DE1F07800F38082 /* HuffmanTree.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063DF1081DE1F07800F38082 /* HuffmanTree.swift */; }; 063DF1151DE1F07800F38082 /* HuffmanTree.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063DF1081DE1F07800F38082 /* HuffmanTree.swift */; }; @@ -25,7 +22,6 @@ 063DF1181DE1F07800F38082 /* Protocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063DF1091DE1F07800F38082 /* Protocols.swift */; }; 063DF1191DE1F2E200F38082 /* DataWithPointer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063DF1051DE1F07800F38082 /* DataWithPointer.swift */; }; 063DF11A1DE1F2E200F38082 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063DF1061DE1F07800F38082 /* Extensions.swift */; }; - 063DF11B1DE1F2E200F38082 /* HuffmanLength.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063DF1071DE1F07800F38082 /* HuffmanLength.swift */; }; 063DF11C1DE1F2E200F38082 /* HuffmanTree.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063DF1081DE1F07800F38082 /* HuffmanTree.swift */; }; 063DF11D1DE1F2E200F38082 /* Protocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063DF1091DE1F07800F38082 /* Protocols.swift */; }; 065569681DC65C2A00A47E66 /* GzipArchive.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063364E21DC52979007E313F /* GzipArchive.swift */; }; @@ -100,7 +96,6 @@ 063364E21DC52979007E313F /* GzipArchive.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GzipArchive.swift; sourceTree = ""; }; 063DF1051DE1F07800F38082 /* DataWithPointer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DataWithPointer.swift; path = Sources/DataWithPointer.swift; sourceTree = SOURCE_ROOT; }; 063DF1061DE1F07800F38082 /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = Sources/Extensions.swift; sourceTree = SOURCE_ROOT; }; - 063DF1071DE1F07800F38082 /* HuffmanLength.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HuffmanLength.swift; path = Sources/HuffmanLength.swift; sourceTree = SOURCE_ROOT; }; 063DF1081DE1F07800F38082 /* HuffmanTree.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HuffmanTree.swift; path = Sources/HuffmanTree.swift; sourceTree = SOURCE_ROOT; }; 063DF1091DE1F07800F38082 /* Protocols.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Protocols.swift; path = Sources/Protocols.swift; sourceTree = SOURCE_ROOT; }; 064492581DC606D400F10981 /* ZlibArchive.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZlibArchive.swift; sourceTree = ""; }; @@ -196,7 +191,6 @@ children = ( 063DF1051DE1F07800F38082 /* DataWithPointer.swift */, 063DF1061DE1F07800F38082 /* Extensions.swift */, - 063DF1071DE1F07800F38082 /* HuffmanLength.swift */, 063DF1081DE1F07800F38082 /* HuffmanTree.swift */, 063DF1091DE1F07800F38082 /* Protocols.swift */, ); @@ -596,7 +590,6 @@ 063DF1171DE1F07800F38082 /* Protocols.swift in Sources */, 0655696A1DC65C2A00A47E66 /* Deflate.swift in Sources */, 06FED40D1DD7717E0013DFB2 /* BZip2.swift in Sources */, - 063DF1111DE1F07800F38082 /* HuffmanLength.swift in Sources */, 065569681DC65C2A00A47E66 /* GzipArchive.swift in Sources */, 063DF10B1DE1F07800F38082 /* DataWithPointer.swift in Sources */, ); @@ -608,7 +601,6 @@ files = ( 063DF1191DE1F2E200F38082 /* DataWithPointer.swift in Sources */, 063DF11A1DE1F2E200F38082 /* Extensions.swift in Sources */, - 063DF11B1DE1F2E200F38082 /* HuffmanLength.swift in Sources */, 063DF11C1DE1F2E200F38082 /* HuffmanTree.swift in Sources */, 063DF11D1DE1F2E200F38082 /* Protocols.swift in Sources */, 065569701DC65C2B00A47E66 /* ZlibArchive.swift in Sources */, @@ -628,7 +620,6 @@ 063DF1181DE1F07800F38082 /* Protocols.swift in Sources */, 065569781DC65C2B00A47E66 /* Deflate.swift in Sources */, 06FED40F1DD7717E0013DFB2 /* BZip2.swift in Sources */, - 063DF1121DE1F07800F38082 /* HuffmanLength.swift in Sources */, 065569761DC65C2B00A47E66 /* GzipArchive.swift in Sources */, 063DF10C1DE1F07800F38082 /* DataWithPointer.swift in Sources */, ); @@ -644,7 +635,6 @@ 063DF1161DE1F07800F38082 /* Protocols.swift in Sources */, 06A3933A1DE0709300182E12 /* ZlibArchive.swift in Sources */, 06A3933B1DE0709300182E12 /* Deflate.swift in Sources */, - 063DF1101DE1F07800F38082 /* HuffmanLength.swift in Sources */, 06A3933C1DE0709300182E12 /* BZip2.swift in Sources */, 063DF10A1DE1F07800F38082 /* DataWithPointer.swift in Sources */, ); diff --git a/Sources/HuffmanLength.swift b/Sources/HuffmanLength.swift deleted file mode 100644 index 13f578cb..00000000 --- a/Sources/HuffmanLength.swift +++ /dev/null @@ -1,59 +0,0 @@ -// -// HuffmanLength.swift -// SWCompression -// -// Created by Timofey Solomko on 26.10.16. -// Copyright © 2016 Timofey Solomko. All rights reserved. -// - -import Foundation - -struct HuffmanLength: Comparable, CustomStringConvertible { - let code: Int - let bits: Int - - var description: String { - return "(code: \(code), bits: \(bits)" - } - - static func < (left: HuffmanLength, right: HuffmanLength) -> Bool { - if left.bits == right.bits { - return left.code < right.code - } else { - return left.bits < right.bits - } - } - - static func <= (left: HuffmanLength, right: HuffmanLength) -> Bool { - if left.bits == right.bits { - return left.code <= right.code - } else { - return left.bits <= right.bits - } - } - - static func > (left: HuffmanLength, right: HuffmanLength) -> Bool { - if left.bits == right.bits { - return left.code > right.code - } else { - return left.bits > right.bits - } - } - - static func >= (left: HuffmanLength, right: HuffmanLength) -> Bool { - if left.bits == right.bits { - return left.code >= right.code - } else { - return left.bits >= right.bits - } - } - - static func == (left: HuffmanLength, right: HuffmanLength) -> Bool { - if left.bits == right.bits { - return left.code == right.code - } else { - return left.bits == right.bits - } - } - -}