General file cleanup..

waynewbishop · waynewbishop · commit 6da482c1d2af · 2018-10-05T14:12:41.000-07:00
diff --git a/Source/Extensions/Array.swift b/Source/Extensions/Array.swift
@@ -11,6 +11,39 @@ import Foundation
 
 extension Array where Element: Comparable {
 
+        
+        //determines the longest sequence of specified values
+    func longestSequence(of key: Element) -> Int {
+            
+            //initial values
+            var current: Element
+            var counter: Int = 0
+            var longest: Int = 0
+            
+            //iterate through list - O(n)
+            for s in self {
+                
+                //current iteration
+                current = s
+                
+                if current == key {
+                    counter += 1
+                }
+                else {
+                    counter = 0
+                }
+                
+                //preserve the longest sequence
+                if counter >= longest {
+                    longest = counter
+                }
+            }
+            
+            //return count results
+            return longest
+            
+        }
+    
     
     //MARK: Index Operation
     
diff --git a/Source/Extensions/Chain.swift b/Source/Extensions/Chain.swift
@@ -17,10 +17,14 @@ extension Blockchain {
         
         let newblock = Block()
         
+        /*
+        not required as all these properties are optional..
         newblock.key = nil
         newblock.miner = nil
         newblock.previous = nil
         newblock.transactions = nil
+        */
+        
         newblock.description = "Genesis Block"
         
         return newblock
@@ -39,54 +43,16 @@ extension Blockchain {
     }
 
     
-    //TODO: estblish new block based on provided input and the level of difficulty.
-    func hashValue(_ element: Block) -> Hash? {
-        
-        var rawvalue = Int()
-        var leadvalue = Int()
-
-        
-        //check tranactions
-        guard let items = element.transactions else {
-            return nil
-        }
-        
+    func puzzle(newBlock: Block) -> Hash? {
+    
+     return nil
         
-        //sum hash values
-        for exchange in items {
-           rawvalue = exchange.amount.hashValue
-           rawvalue += exchange.from.hashValue
-           rawvalue += exchange.to.hashValue
-           rawvalue += exchange.lastModified.hashValue
-        }
-
+        //takes the value, converts it to a string array, send the 4 leading characters "array slice" to the closure, have it
+        //calculate the result. The closure results determines of the puzzle should repeat. 
         
-        //sum previous hash
-        if let previous = element.previous {
-            rawvalue += previous.hashValue
-        }
-
-       
-        while leadvalue >= difficulty {
-            
-            print("mining new block..")
-            let testvalue = rawvalue + String(describing: Date()).hashValue
-            
-            let rawlist: Array<Int> = String(testvalue).characters.flatMap{Int(String($0))}
-            
-            for m in 0..<rawlist.startIndex + 3 {
-                leadvalue += rawlist[m]
-            }
-            
-            //perform final bit shift and test leading values
-            if (leadvalue >> 2) >= difficulty {
-                return String(testvalue)
-            }
-            
-        }
+        //the new hash is just a combination of the previous hash combined with the hash of the
+        //previous transactions along with the date..
         
-        return nil
-    
     }
 
     
diff --git a/Source/Extensions/Int.swift b/Source/Extensions/Int.swift
@@ -25,7 +25,7 @@ extension Int: Keyable {
         }
     }
     
-    
+        
     
     //build fibonacci sequence to a specified position - default
     func fibNormal() -> Array<Int>? {
@@ -133,7 +133,7 @@ extension Int: Keyable {
     */
 
     //calculate results
-    mutating func fibMemoized() -> Int {
+     func fibMemoized() -> Int {
  
         
         //builds array sequence
diff --git a/Source/Extensions/String.swift b/Source/Extensions/String.swift
@@ -22,6 +22,8 @@ extension String: Keyable {
     var length: Int {
        return self.count
     }
+    
+    
 
     
     //determine if all characters are unique
diff --git a/Source/Factories/Blockchain.swift b/Source/Factories/Blockchain.swift
@@ -61,7 +61,7 @@ public class Blockchain: Graph {
                 
                 let queue = network.queue
                 let threshold = network.threshold
-                let chain = network.chain
+                //let chain = network.chain
  
 
                 for exchange in peer.intentions {
@@ -99,7 +99,7 @@ public class Blockchain: Graph {
         
         private func newBlock(for network: Blockchain) -> Bool {
             
-            //esablish queue
+            //establish queue
             let queue = network.queue
             let newblock = Block()
             var transactions = Array<Exchange>()
@@ -124,7 +124,7 @@ public class Blockchain: Graph {
             newblock.miner = self
             newblock.previous = network.currentBlock().key
             newblock.transactions = transactions
-            newblock.key = network.hashValue(newblock)
+            //newblock.key = network.hashValue(newblock)
             
             /*
             note: This is also where the hash algorithm for each block obtained. For clarity, make the
diff --git a/Source/Factories/LinkedList.swift b/Source/Factories/LinkedList.swift
@@ -293,7 +293,6 @@ class LinkedList<T> {
     
   }
     
-  
     
     
     //MARK: Closure operations
diff --git a/SwiftStructures.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SwiftStructures.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/SwiftStructures.xcodeproj/project.xcworkspace/xcuserdata/waynebishop.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftStructures.xcodeproj/project.xcworkspace/xcuserdata/waynebishop.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/SwiftStructures.xcodeproj/xcuserdata/waynebishop.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiftStructures.xcodeproj/xcuserdata/waynebishop.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,165 +2,4 @@
 <Bucket
    type = "1"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "SwiftTests/HashTest.swift"
-            timestampString = "543522989.152511"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "79"
-            endingLineNumber = "79"
-            landmarkName = "testMissingList()"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  shouldBeEnabled = "No"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "SwiftTests.HashTest.testMissingList() -&gt; ()"
-                  moduleName = "SwiftTests"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/waynebishop/Dropbox/iPhone%20Development/SwiftStructures/SwiftTests/HashTest.swift"
-                  timestampString = "533859967.12933"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "79"
-                  endingLineNumber = "79"
-                  offsetFromSymbolStart = "131">
-               </Location>
-               <Location
-                  shouldBeEnabled = "No"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "implicit closure #1 : @autoclosure () throws -&gt; Swift.Bool in SwiftTests.HashTest.testMissingList() -&gt; ()"
-                  moduleName = "SwiftTests"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/waynebishop/Dropbox/iPhone%20Development/SwiftStructures/SwiftTests/HashTest.swift"
-                  timestampString = "533859967.132433"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "79"
-                  endingLineNumber = "79"
-                  offsetFromSymbolStart = "14">
-               </Location>
-               <Location
-                  shouldBeEnabled = "No"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "implicit closure #2 : @autoclosure () -&gt; Swift.String in SwiftTests.HashTest.testMissingList() -&gt; ()"
-                  moduleName = "SwiftTests"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/waynebishop/Dropbox/iPhone%20Development/SwiftStructures/SwiftTests/HashTest.swift"
-                  timestampString = "533859967.135077"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "79"
-                  endingLineNumber = "79"
-                  offsetFromSymbolStart = "4">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Source/Factories/BSTree.swift"
-            timestampString = "533860009.986163"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "43"
-            endingLineNumber = "43"
-            landmarkName = "append(element:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Source/Factories/BSTree.swift"
-            timestampString = "533860009.986865"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "139"
-            endingLineNumber = "139"
-            landmarkName = "push(element:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Source/Extensions/Int.swift"
-            timestampString = "535328261.598035"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "25"
-            endingLineNumber = "25"
-            landmarkName = "times(closure:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "SwiftTests/FibTest.swift"
-            timestampString = "540942274.158419"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "50"
-            endingLineNumber = "50"
-            landmarkName = "testFibRecursive()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "SwiftTests/SortingTest.swift"
-            timestampString = "543524921.796223"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "44"
-            endingLineNumber = "44"
-            landmarkName = "testUniqueEssayExample()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "SwiftTests/BlockTest.swift"
-            timestampString = "543816078.602953"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "54"
-            endingLineNumber = "54"
-            landmarkName = "testMiningBlock()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>
diff --git a/SwiftTests/FibTest.swift b/SwiftTests/FibTest.swift
@@ -97,7 +97,7 @@ class FibTest: XCTestCase {
 
     func testFibMemoized() {
         
-        var positions: Int = 4
+        let positions: Int = 4
         let result = positions.fibMemoized()
         
         //test trivial condition
diff --git a/SwiftTests/SortingTest.swift b/SwiftTests/SortingTest.swift
@@ -38,9 +38,12 @@ class SortingTest: XCTestCase, Sortable {
         super.setUp()
     }
     
-    func testUniqueEssayExample(){
+    func testLongestSequence() {
         
-        let results = "Uncopyrightable".isStringUnique()
+        let list = [0,1,0,1,1,1,0,1,1,1,1,1]
+        let results = list.longestSequence(of: 1)
+        
+        print("the longest sequence is \(results)")        
     }
 
     
@@ -97,7 +100,6 @@ class SortingTest: XCTestCase, Sortable {
         XCTAssertTrue(isSorted(triviaTextList.insertionSort()))
         XCTAssertTrue(isSorted(emptyTextList.insertionSort()))
         XCTAssert(isSorted(dateList.insertionSort()))
-        
     }
     
     

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ extension Int: Keyable {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`-`
	`28`	`+`
`29`	`29`
`30`	`30`	`//build fibonacci sequence to a specified position - default`
`31`	`31`	`func fibNormal() -> Array<Int>? {`
`@@ -133,7 +133,7 @@ extension Int: Keyable {`
`133`	`133`	`*/`
`134`	`134`
`135`	`135`	`//calculate results`
`136`		`- mutating func fibMemoized() -> Int {`
	`136`	`+ func fibMemoized() -> Int {`
`137`	`137`
`138`	`138`
`139`	`139`	`//builds array sequence`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ extension String: Keyable {`
`22`	`22`	`var length: Int {`
`23`	`23`	`return self.count`
`24`	`24`	`}`
	`25`	`+`
	`26`	`+`
`25`	`27`
`26`	`28`
`27`	`29`	`//determine if all characters are unique`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,6 @@ class LinkedList<T> {`
`293`	`293`
`294`	`294`	`}`
`295`	`295`
`296`		`-`
`297`	`296`
`298`	`297`
`299`	`298`	`//MARK: Closure operations`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,12 @@ class SortingTest: XCTestCase, Sortable {`
`38`	`38`	`super.setUp()`
`39`	`39`	`}`
`40`	`40`
`41`		`- func testUniqueEssayExample(){`
	`41`	`+ func testLongestSequence() {`
`42`	`42`
`43`		`- let results = "Uncopyrightable".isStringUnique()`
	`43`	`+ let list = [0,1,0,1,1,1,0,1,1,1,1,1]`
	`44`	`+ let results = list.longestSequence(of: 1)`
	`45`	`+`
	`46`	`+ print("the longest sequence is \(results)")`
`44`	`47`	`}`
`45`	`48`
`46`	`49`
`@@ -97,7 +100,6 @@ class SortingTest: XCTestCase, Sortable {`
`97`	`100`	`XCTAssertTrue(isSorted(triviaTextList.insertionSort()))`
`98`	`101`	`XCTAssertTrue(isSorted(emptyTextList.insertionSort()))`
`99`	`102`	`XCTAssert(isSorted(dateList.insertionSort()))`
`100`		`-`
`101`	`103`	`}`
`102`	`104`
`103`	`105`