Add radix merge logic to CTOptimizedTrie deletion

src/Containers-Trie-Tests/AbstractCTTrieTest.class.st

@@ -1,25 +1,26 @@
 Class {
-	#name : #AbstractCTTrieTest,
-	#superclass : #TestCase,
+	#name : 'AbstractCTTrieTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'trie'
 	],
-	#category : #'Containers-Trie-Tests'
+	#category : 'Containers-Trie-Tests',
+	#package : 'Containers-Trie-Tests'
 }
 
-{ #category : #utils }
+{ #category : 'utils' }
 AbstractCTTrieTest >> classUnderTest [
 
 	^ CTTrie
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 AbstractCTTrieTest >> newInstance [
 
 	^ self classUnderTest new
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 AbstractCTTrieTest >> setUp [
 	"example taken from  <http://en.wikipedia.org/wiki/Trie>"
 

src/Containers-Trie-Tests/CTOptimizedTrieTest.class.st

@@ -1,11 +1,193 @@
 Class {
-	#name : #CTOptimizedTrieTest,
-	#superclass : #CTTrieTest,
-	#category : #'Containers-Trie-Tests'
+	#name : 'CTOptimizedTrieTest',
+	#superclass : 'CTTrieTest',
+	#category : 'Containers-Trie-Tests',
+	#package : 'Containers-Trie-Tests'
 }
 
-{ #category : #utils }
+{ #category : 'utils' }
 CTOptimizedTrieTest >> classUnderTest [
 
 	^ CTOptimizedTrie
 ]
+
+{ #category : 'tests' }
+CTOptimizedTrieTest >> testCompressNodeDoesNotMergeWhenAncestorsTooSmall [
+    | rootNode nodeToCheck ancestors |
+    trie := CTOptimizedTrie new.
+
+    trie at: 'cat' put: 1.
+
+    rootNode := trie instVarNamed: 'root'.
+    nodeToCheck := rootNode children first. 
+
+    ancestors := OrderedCollection new.
+    ancestors add: nodeToCheck.
+
+    trie compressNode: nodeToCheck ancestors: ancestors.
+
+    self assert: rootNode keys size equals: 1.
+    self assert: rootNode keys first equals: 'cat'.
+    self assert: (trie at: 'cat') equals: 1.
+]
+
+{ #category : 'tests' }
+CTOptimizedTrieTest >> testCompressNodeDoesNotMergeWhenHasValue [
+    | rootNode nodeToCheck ancestors |
+    trie := CTOptimizedTrie new.
+
+    trie at: 'cat' put: 1.
+    trie at: 'ca' put: 2.
+
+    rootNode := trie instVarNamed: 'root'.
+    nodeToCheck := rootNode children first. 
+
+    ancestors := OrderedCollection new.
+    ancestors add: rootNode.
+    ancestors add: nodeToCheck.
+
+    trie compressNode: nodeToCheck ancestors: ancestors.
+
+    self assert: rootNode keys size equals: 1.
+    self assert: rootNode keys first equals: 'ca'.
+    self assert: (trie at: 'ca') equals: 2.
+]
+
+{ #category : 'tests' }
+CTOptimizedTrieTest >> testCompressNodeDoesNotMergeWithMultipleChildren [
+    | rootNode nodeToCheck ancestors |
+    trie := CTOptimizedTrie new.
+
+    trie at: 'cat' put: 1.
+    trie at: 'car' put: 2.
+
+    rootNode := trie instVarNamed: 'root'.
+    nodeToCheck := rootNode children first. 
+
+    nodeToCheck instVarNamed: 'nodeValue' put: nil.
+
+    ancestors := OrderedCollection new.
+    ancestors add: rootNode.
+    ancestors add: nodeToCheck.
+
+    trie compressNode: nodeToCheck ancestors: ancestors.
+
+    self assert: rootNode keys size equals: 1.
+    self assert: rootNode keys first equals: 'ca'.
+    self assert: nodeToCheck keys size equals: 2.
+    self assert: (nodeToCheck keys includesAll: #('t' 'r')).
+    self assert: (trie at: 'cat') equals: 1.
+    self assert: (trie at: 'car') equals: 2.
+]
+
+{ #category : 'tests' }
+CTOptimizedTrieTest >> testCompressNodeMergesDeepSingleChild [
+    | rootNode parentNode nodeToCheck ancestors |
+    trie := CTOptimizedTrie new.
+
+    trie at: 'a' put: 1.
+    trie at: 'ab' put: 2.
+    trie at: 'abc' put: 3.
+
+    rootNode := trie instVarNamed: 'root'.
+    parentNode := rootNode children first. 
+    nodeToCheck := parentNode children first. 
+
+    nodeToCheck instVarNamed: 'nodeValue' put: nil.
+
+    ancestors := OrderedCollection new.
+    ancestors add: rootNode.
+    ancestors add: parentNode.
+    ancestors add: nodeToCheck.
+
+    trie compressNode: nodeToCheck ancestors: ancestors.
+
+    self assert: parentNode keys size equals: 1.
+    self assert: parentNode keys first equals: 'bc'.
+
+    self assert: (trie at: 'abc') equals: 3.
+    self assert: (trie at: 'a') equals: 1.
+]
+
+{ #category : 'tests' }
+CTOptimizedTrieTest >> testCompressNodeMergesSingleChildWithoutValue [
+    | rootNode nodeToCheck ancestors |
+    trie := CTOptimizedTrie new.
+
+    trie at: 'cat' put: 1.
+    trie at: 'ca' put: 2.
+
+    rootNode := trie instVarNamed: 'root'.
+    nodeToCheck := rootNode children first. 
+
+    nodeToCheck instVarNamed: 'nodeValue' put: nil.
+
+    ancestors := OrderedCollection new.
+    ancestors add: rootNode.
+    ancestors add: nodeToCheck.
+
+    trie compressNode: nodeToCheck ancestors: ancestors.
+
+    self assert: rootNode keys size equals: 1.
+    self assert: rootNode keys first equals: 'cat'.
+    self assert: (trie at: 'cat') equals: 1.
+]
+
+{ #category : 'tests' }
+CTOptimizedTrieTest >> testOptimizedTrieCompressesOnDeletion [
+    | trie rootNode |
+    trie := CTOptimizedTrie new.
+    trie at: 'car' put: 1.
+    trie at: 'cat' put: 2.
+
+    trie removeKey: 'cat'.
+
+    self assert: (trie at: 'car') equals: 1.
+
+    rootNode := trie instVarNamed: 'root'.
+
+    self assert: rootNode children first children isEmpty.
+]
+
+{ #category : 'tests' }
+CTOptimizedTrieTest >> testOptimizedTrieDoesNotMergeWhenParentIsWord [
+	| trie rootNode parentNode |
+	trie := CTOptimizedTrie new.
+
+	trie at: 'ca' put: 1.
+	trie at: 'cat' put: 2.
+	trie at: 'car' put: 3.
+
+	trie removeKey: 'cat'.
+
+	self assert: (trie at: 'ca') equals: 1.
+	self assert: (trie at: 'car') equals: 3.
+
+	rootNode := trie instVarNamed: 'root'.
+	parentNode := rootNode children first. 
+
+	self assert: parentNode isWord.
+	self assert: parentNode nodeValue equals: 1.
+	self assert: parentNode keys size equals: 1.
+]
+
+{ #category : 'tests' }
+CTOptimizedTrieTest >> testOptimizedTrieDoesNotMergeWithMultipleChildren [
+	| trie rootNode parentNode |
+	trie := CTOptimizedTrie new.
+
+	trie at: 'cat' put: 1.
+	trie at: 'car' put: 2.
+	trie at: 'cab' put: 3.
+
+	trie removeKey: 'cat'.
+
+	self assert: (trie at: 'car') equals: 2.
+	self assert: (trie at: 'cab') equals: 3.
+
+	rootNode := trie instVarNamed: 'root'.
+	parentNode := rootNode children first.
+
+	self assert: parentNode isWord not.
+	self assert: parentNode keys size equals: 2.
+]

src/Containers-Trie-Tests/CTSuffixTreeTest.class.st

@@ -1,20 +1,21 @@
 Class {
-	#name : #CTSuffixTreeTest,
-	#superclass : #TestCase,
+	#name : 'CTSuffixTreeTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'suffixTree'
 	],
-	#category : #'Containers-Trie-Tests'
+	#category : 'Containers-Trie-Tests',
+	#package : 'Containers-Trie-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 CTSuffixTreeTest >> setUp [
 
 	super setUp.
 	suffixTree := CTSuffixTree new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CTSuffixTreeTest >> testAddingAStringAddsAllSubstring [
 
 	suffixTree atSuffixesOf: 'banana' put: 1.
@@ -24,7 +25,7 @@ CTSuffixTreeTest >> testAddingAStringAddsAllSubstring [
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CTSuffixTreeTest >> testRemovingAStringRemovesAllSuffixes [
 
 	suffixTree atSuffixesOf: 'banana' put: 1.

src/Containers-Trie-Tests/CTTrieNodeTest.class.st

@@ -1,10 +1,11 @@
 Class {
-	#name : #CTTrieNodeTest,
-	#superclass : #AbstractCTTrieTest,
-	#category : #'Containers-Trie-Tests'
+	#name : 'CTTrieNodeTest',
+	#superclass : 'AbstractCTTrieTest',
+	#category : 'Containers-Trie-Tests',
+	#package : 'Containers-Trie-Tests'
 }
 
-{ #category : #'tests - nodes' }
+{ #category : 'tests - nodes' }
 CTTrieNodeTest >> testIsLeaf [
 	| aTrie aWord aLongerWord aNode |
 	aTrie := self newInstance.
@@ -26,7 +27,7 @@ CTTrieNodeTest >> testIsLeaf [
 	self assert: aLongerWord isLeaf
 ]
 
-{ #category : #'tests - nodes' }
+{ #category : 'tests - nodes' }
 CTTrieNodeTest >> testIsLeafWikipediaExample [
 
 	self assert: (trie find: 'to') isLeaf.
@@ -41,7 +42,7 @@ CTTrieNodeTest >> testIsLeafWikipediaExample [
 	self assert: (trie isCompressed)
 ]
 
-{ #category : #'tests - nodes' }
+{ #category : 'tests - nodes' }
 CTTrieNodeTest >> testIsNode [
 	| aTrie aWord aLongerWord aNode |
 	aTrie := self newInstance.
@@ -74,7 +75,7 @@ CTTrieNodeTest >> testIsNode [
 	self deny: trie rootNode isNode
 ]
 
-{ #category : #'tests - nodes' }
+{ #category : 'tests - nodes' }
 CTTrieNodeTest >> testIsNotCompressed [
 
 	| aTrie |
@@ -90,7 +91,7 @@ CTTrieNodeTest >> testIsNotCompressed [
 	self deny: aTrie isCompressed
 ]
 
-{ #category : #'tests - nodes' }
+{ #category : 'tests - nodes' }
 CTTrieNodeTest >> testIsRoot [
 	| aTrie aWord aLongerWord aNode |
 	aTrie := self newInstance.
@@ -123,7 +124,7 @@ CTTrieNodeTest >> testIsRoot [
 	self assert: trie rootNode isRoot
 ]
 
-{ #category : #'tests - nodes' }
+{ #category : 'tests - nodes' }
 CTTrieNodeTest >> testIsWord [
 	| aTrie aWord aLongerWord aNode |
 	aTrie := self newInstance.
@@ -145,7 +146,7 @@ CTTrieNodeTest >> testIsWord [
 	self assert: aLongerWord isWord
 ]
 
-{ #category : #'tests - nodes' }
+{ #category : 'tests - nodes' }
 CTTrieNodeTest >> testIsWordWikipediaExample [
 
 	self assert: (trie find: 'to') isWord.