Skip to content

Add radix merge logic to CTOptimizedTrie deletion #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jordanmontt merged 5 commits into from
Mar 10, 2026
Merged

Add radix merge logic to CTOptimizedTrie deletion #12

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d729615
Test: Add failing test for issue (#11)
HossamSaberr Feb 24, 2026
f221001
Merge 1fce6ed62ceefba16a1280e10574035cad9bb566
HossamSaberr Feb 24, 2026
e707774
Fix: Implement Radix merge logic on deletion (#11)
HossamSaberr Feb 24, 2026
05bdf26
Add tests for CTOptimizedTrie compression
HossamSaberr Mar 1, 2026
58b08c6
Add direct tests for compressNode:ancestors:
HossamSaberr Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/Containers-Trie-Tests/AbstractCTTrieTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>"

Expand Down
26 changes: 22 additions & 4 deletions src/Containers-Trie-Tests/CTOptimizedTrieTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,29 @@
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 >> testOptimizedTrieCompressesOnDeletion [
| trie rootNode |
trie := CTOptimizedTrie new.
trie at: 'car' put: 1.
trie at: 'cat' put: 2.

trie removeKey: 'cat'.

self assert: (trie at: 'car' ifAbsent: [ nil ]) equals: 1.

@jordanmontt jordanmontt Mar 1, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should not use ifabsent in this case

self assert: (trie at: 'car') equals: 1.

self assert: (trie at: 'cat' ifAbsent: [ nil ]) isNil.

rootNode := trie instVarNamed: 'root'.

self assert: rootNode children first children isEmpty.
]
13 changes: 7 additions & 6 deletions src/Containers-Trie-Tests/CTSuffixTreeTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -24,7 +25,7 @@ CTSuffixTreeTest >> testAddingAStringAddsAllSubstring [

]

{ #category : #tests }
{ #category : 'tests' }
CTSuffixTreeTest >> testRemovingAStringRemovesAllSuffixes [

suffixTree atSuffixesOf: 'banana' put: 1.
Expand Down
21 changes: 11 additions & 10 deletions src/Containers-Trie-Tests/CTTrieNodeTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -26,7 +27,7 @@ CTTrieNodeTest >> testIsLeaf [
self assert: aLongerWord isLeaf
]

{ #category : #'tests - nodes' }
{ #category : 'tests - nodes' }
CTTrieNodeTest >> testIsLeafWikipediaExample [

self assert: (trie find: 'to') isLeaf.
Expand All @@ -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.
Expand Down Expand Up @@ -74,7 +75,7 @@ CTTrieNodeTest >> testIsNode [
self deny: trie rootNode isNode
]

{ #category : #'tests - nodes' }
{ #category : 'tests - nodes' }
CTTrieNodeTest >> testIsNotCompressed [

| aTrie |
Expand All @@ -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.
Expand Down Expand Up @@ -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.
Expand All @@ -145,7 +146,7 @@ CTTrieNodeTest >> testIsWord [
self assert: aLongerWord isWord
]

{ #category : #'tests - nodes' }
{ #category : 'tests - nodes' }
CTTrieNodeTest >> testIsWordWikipediaExample [

self assert: (trie find: 'to') isWord.
Expand Down
Loading
Loading