From a2660e049d2d050a5c346a918f89a9100a274976 Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 06:42:51 +0000 Subject: [PATCH 01/55] Setting up GitHub Classroom Feedback From 90aca064fe83d716f6891b78f648972f8ba4efd5 Mon Sep 17 00:00:00 2001 From: sofyak0zyreva <144167895+sofyak0zyreva@users.noreply.github.com> Date: Sat, 23 Mar 2024 16:33:16 +0300 Subject: [PATCH 02/55] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d7b53d2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 Ksenia Kotelnikova, Sofya Kozyreva, Sofia Shvorob + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 7acaadf84d4e52a03c04d05043a986ca1f86f94a Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Sat, 23 Mar 2024 16:59:10 +0300 Subject: [PATCH 03/55] feat: create project with gradle --- .gitignore | 43 +++++ gradle.properties | 1 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 234 +++++++++++++++++++++++ gradlew.bat | 89 +++++++++ lib/build.gradle | 21 ++ settings.gradle | 6 + 8 files changed, 400 insertions(+) create mode 100644 .gitignore create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 lib/build.gradle create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..80f96c5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,43 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store +/lib/src/main/resources/ diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..7fc6f1f --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/lib/build.gradle b/lib/build.gradle new file mode 100644 index 0000000..e87a56d --- /dev/null +++ b/lib/build.gradle @@ -0,0 +1,21 @@ +plugins { + id 'org.jetbrains.kotlin.jvm' version '1.9.22' +} + +group = 'org.example' +version = '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} + +dependencies { + testImplementation 'org.jetbrains.kotlin:kotlin-test' +} + +test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(15) +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..b87aac9 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,6 @@ +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' +} +rootProject.name = 'trees-5' +include("lib") + From d3a9c1a061f9c80a94cdc008ab270ce254c4d4da Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Sat, 23 Mar 2024 17:18:17 +0300 Subject: [PATCH 04/55] feat: implement abstract node and abstract tree --- lib/src/main/kotlin/nodes/abstractNode.kt | 6 + lib/src/main/kotlin/trees/abstractTree.kt | 127 ++++++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 lib/src/main/kotlin/nodes/abstractNode.kt create mode 100644 lib/src/main/kotlin/trees/abstractTree.kt diff --git a/lib/src/main/kotlin/nodes/abstractNode.kt b/lib/src/main/kotlin/nodes/abstractNode.kt new file mode 100644 index 0000000..bfb848a --- /dev/null +++ b/lib/src/main/kotlin/nodes/abstractNode.kt @@ -0,0 +1,6 @@ +package nodes + +abstract class abstractNode, V, someNode: abstractNode>(var key:K, var value: V) { + var leftChild: someNode? = null + var rightChild: someNode? = null +} \ No newline at end of file diff --git a/lib/src/main/kotlin/trees/abstractTree.kt b/lib/src/main/kotlin/trees/abstractTree.kt new file mode 100644 index 0000000..832ac68 --- /dev/null +++ b/lib/src/main/kotlin/trees/abstractTree.kt @@ -0,0 +1,127 @@ +package trees + +import nodes.abstractNode + +abstract class abstractTree, V, someNode: abstractNode> { + protected var root: someNode? = null + + protected abstract fun createNewNode(key: K, value: V): someNode + + open fun insert(key: K, value: V) { + insertNode(key, value) + } + + protected fun insertNode(key: K, value: V): someNode? { + val nodeToInsert = createNewNode(key, value) + var curNode = root + if (curNode == null) { + root = nodeToInsert + return root + } + else { + while ((curNode != null) && (curNode != nodeToInsert)) { + when { + (curNode.key == nodeToInsert.key) -> { + curNode.value = nodeToInsert.value + println("existing key entered. data has been changed") + break + } + ((curNode.leftChild == null) && (nodeToInsert.key < curNode.key)) -> { + curNode.leftChild = nodeToInsert + curNode = curNode.leftChild + } + ((curNode.rightChild == null) && (nodeToInsert.key > curNode.key)) -> { + curNode.rightChild = nodeToInsert + curNode = curNode.rightChild + } + nodeToInsert.key < curNode.key -> { + curNode = curNode.leftChild + } + nodeToInsert.key > curNode.key -> { + curNode = curNode.rightChild + } + } + } + return curNode + } + } + + open fun delete(key: K) { + deleteNode(key) + } + + protected fun deleteNode(key: K): someNode? { + val nodeToDelete = findNodeByKey(key) + if ((nodeToDelete == null) || (root == null)) return null + val parentNode = findParent(nodeToDelete) + /* no children case */ + if (nodeToDelete.leftChild == null && nodeToDelete.rightChild == null) + moveParentNode(nodeToDelete, parentNode, null) + /* 1 child case */ + else if (nodeToDelete.leftChild == null || nodeToDelete.rightChild == null) { + if (nodeToDelete.leftChild == null) moveParentNode(nodeToDelete, parentNode, nodeToDelete.rightChild) + else moveParentNode(nodeToDelete, parentNode, nodeToDelete.leftChild) + } + /* 2 children case */ + else { + val replacementNode = findMinNodeInRight(nodeToDelete.rightChild) + ?: throw IllegalArgumentException ("Node with 2 children must have a right child") + moveParentNode(replacementNode, findParent(replacementNode), replacementNode.rightChild) + replacementNode.leftChild = nodeToDelete.leftChild + replacementNode.rightChild = nodeToDelete.rightChild + moveParentNode(nodeToDelete, parentNode, replacementNode) + } + return parentNode + } + + protected fun findParent(node: someNode): someNode? { + var curNode = root + while (curNode != null) { + if (curNode.key == node.key) return null + if (curNode.leftChild?.key == node.key || curNode.rightChild?.key == node.key) return curNode + curNode = when { + curNode.key < node.key -> curNode.rightChild + else -> curNode.leftChild + } + } + return null + } + + /* moves parent of a node to point to a different node instead */ + protected fun moveParentNode(node: someNode, parentNode: someNode?, replacementNode: someNode?) { + when (parentNode) { + null -> if (root == node) root = replacementNode + else -> { + if (parentNode.rightChild == node) parentNode.rightChild = replacementNode + else if (parentNode.leftChild == node) parentNode.leftChild = replacementNode + } + } + } + + private fun findMinNodeInRight(subtree: someNode?): someNode? { + var minNode = subtree + while (true) { + minNode = minNode?.leftChild ?: break + } + when { + (minNode != null) -> return minNode + else -> return null + } + } + + fun find(key: K): V? { + return findNodeByKey(key)?.value + } + + private fun findNodeByKey(key: K): someNode? { + var curNode: someNode? = root ?: return null + while (curNode != null) { + curNode = when { + (curNode.key == key) -> return curNode + (curNode.key > key) -> curNode.leftChild + else -> curNode.rightChild + } + } + return null + } +} \ No newline at end of file From 2b324f66cd428eca7f245a9150e2cdc0e6934a03 Mon Sep 17 00:00:00 2001 From: Sofya Kozyreva Date: Sat, 23 Mar 2024 20:43:26 +0300 Subject: [PATCH 05/55] feat: implement AVL node --- lib/src/main/kotlin/nodes/AVLNode.kt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 lib/src/main/kotlin/nodes/AVLNode.kt diff --git a/lib/src/main/kotlin/nodes/AVLNode.kt b/lib/src/main/kotlin/nodes/AVLNode.kt new file mode 100644 index 0000000..85bb630 --- /dev/null +++ b/lib/src/main/kotlin/nodes/AVLNode.kt @@ -0,0 +1,5 @@ +package nodes + +class AVLNode, V>(key: K, value: V): abstractNode>(key, value) { + var height = 1 +} \ No newline at end of file From c62e07fb3f95396138004ca39f281adac0e9eeff Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Sat, 23 Mar 2024 22:03:32 +0300 Subject: [PATCH 06/55] feat: implement balanced tree class with rotation methods --- lib/src/main/kotlin/trees/balancedTree.kt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 lib/src/main/kotlin/trees/balancedTree.kt diff --git a/lib/src/main/kotlin/trees/balancedTree.kt b/lib/src/main/kotlin/trees/balancedTree.kt new file mode 100644 index 0000000..8755c3e --- /dev/null +++ b/lib/src/main/kotlin/trees/balancedTree.kt @@ -0,0 +1,23 @@ +package trees + +import nodes.abstractNode + +abstract class balancedTree, V, someNode: abstractNode>: abstractTree() { + protected abstract fun balanceAfterInsert(curNode: someNode) + + protected abstract fun balanceAfterDelete(curNode: someNode) + + protected open fun rotateRight(node: someNode, parentNode: someNode?) { + val tempNode = node.leftChild ?: throw IllegalArgumentException("Node must have left child for right rotation") + node.leftChild = tempNode.rightChild + tempNode.rightChild = node + moveParentNode(node, parentNode, tempNode) + } + + protected open fun rotateLeft(node: someNode, parentNode: someNode?) { + val tempNode = node.rightChild ?: throw IllegalArgumentException("Node must have right child for left rotation") + node.rightChild = tempNode.leftChild + tempNode.leftChild = node + moveParentNode(node, parentNode,tempNode) + } +} \ No newline at end of file From 27060f40466cce5f2c931eae9b91b2a4b6ba66ad Mon Sep 17 00:00:00 2001 From: Sofya Kozyreva Date: Sat, 23 Mar 2024 22:39:01 +0300 Subject: [PATCH 07/55] feat: implement AVL tree and override methods(insert and delete); implement private methods for balancing --- lib/src/main/kotlin/trees/AVLTree.kt | 40 ++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 lib/src/main/kotlin/trees/AVLTree.kt diff --git a/lib/src/main/kotlin/trees/AVLTree.kt b/lib/src/main/kotlin/trees/AVLTree.kt new file mode 100644 index 0000000..2451f74 --- /dev/null +++ b/lib/src/main/kotlin/trees/AVLTree.kt @@ -0,0 +1,40 @@ +import nodes.AVLNode +import trees.balancedTree +import kotlin.math.max + +class AVLTree, V>: balancedTree>() { + override fun createNewNode(key: K, value: V) = AVLNode(key, value) + + override fun insert(key: K, value: V) { + val insertedNode = insertNode(key, value) + if (insertedNode != null) { + findParent(insertedNode)?.let { balanceAfterInsert(it) } + } + } + + override fun delete(key: K) { + val deletedNodeParent = deleteNode(key) + /* if nothing was added or tree is empty, there's no need to balance it */ + deletedNodeParent?.let { balanceAfterDelete(it) } + } + + private fun getHeight(node: AVLNode?): Int { + return node?.height ?: 0 + } + + private fun updateHeight(node: AVLNode) { + node.height = max(getHeight(node.rightChild), getHeight(node.leftChild)) + 1 + } + + private fun getBalanceFactor(node: AVLNode): Int { + return getHeight(node.rightChild) - getHeight(node.leftChild) + } + + override fun balanceAfterInsert(curNode: AVLNode) { + TODO("Not yet implemented") + } + + override fun balanceAfterDelete(curNode: AVLNode) { + TODO("Not yet implemented") + } +} \ No newline at end of file From 137c15ba009cce0abea47157426bdd823ba654a6 Mon Sep 17 00:00:00 2001 From: Sofya Kozyreva Date: Sat, 23 Mar 2024 23:52:04 +0300 Subject: [PATCH 08/55] feat(AVL): implement balancing methods for the tree --- lib/src/main/kotlin/trees/AVLTree.kt | 31 ++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/lib/src/main/kotlin/trees/AVLTree.kt b/lib/src/main/kotlin/trees/AVLTree.kt index 2451f74..b328053 100644 --- a/lib/src/main/kotlin/trees/AVLTree.kt +++ b/lib/src/main/kotlin/trees/AVLTree.kt @@ -30,11 +30,38 @@ class AVLTree, V>: balancedTree>() { return getHeight(node.rightChild) - getHeight(node.leftChild) } + /* balances a tree by performing left & right rotations + if absolute value of balance factor is more than 1 */ + private fun balance (curNode: AVLNode) { + when (getBalanceFactor(curNode)) { + -2 -> { + curNode.leftChild?.let { if (getBalanceFactor(it) == 1) rotateLeft(it, findParent(it)) } + rotateRight(curNode, findParent(curNode)) + } + 2 -> { + curNode.rightChild?.let { if (getBalanceFactor(it) == -1) rotateRight(it, findParent(it)) } + rotateLeft(curNode, findParent(curNode)) + } + else -> updateHeight(curNode) + } + findParent(curNode)?.let { balanceAfterInsert(it) } + } + override fun balanceAfterInsert(curNode: AVLNode) { - TODO("Not yet implemented") + balance(curNode) } override fun balanceAfterDelete(curNode: AVLNode) { - TODO("Not yet implemented") + balance(curNode) + } + + override fun rotateRight (node: AVLNode, parentNode: AVLNode?) { + super.rotateRight(node, parentNode) + updateHeight(node) + } + + override fun rotateLeft (node: AVLNode, parentNode: AVLNode?) { + super.rotateLeft(node, parentNode) + updateHeight(node) } } \ No newline at end of file From e7f81ecad7aed5b9709b5e7aa43fda2f78986517 Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Sun, 24 Mar 2024 21:30:11 +0300 Subject: [PATCH 09/55] feat(BST): implement binary search tree and its node --- lib/src/main/kotlin/nodes/BSNode.kt | 3 +++ lib/src/main/kotlin/trees/BSTree.kt | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 lib/src/main/kotlin/nodes/BSNode.kt create mode 100644 lib/src/main/kotlin/trees/BSTree.kt diff --git a/lib/src/main/kotlin/nodes/BSNode.kt b/lib/src/main/kotlin/nodes/BSNode.kt new file mode 100644 index 0000000..0a5b783 --- /dev/null +++ b/lib/src/main/kotlin/nodes/BSNode.kt @@ -0,0 +1,3 @@ +package nodes + +class BSNode, V>(key: K, value: V) : abstractNode>(key, value) \ No newline at end of file diff --git a/lib/src/main/kotlin/trees/BSTree.kt b/lib/src/main/kotlin/trees/BSTree.kt new file mode 100644 index 0000000..81c2ab5 --- /dev/null +++ b/lib/src/main/kotlin/trees/BSTree.kt @@ -0,0 +1,7 @@ +package trees + +import nodes.BSNode + +class BSTree, V> : abstractTree>() { + override fun createNewNode(key: K, value: V): BSNode = BSNode(key, value) +} \ No newline at end of file From 373f581f0b93c7684b007fd62c8892b961bbfc1a Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Mon, 25 Mar 2024 10:13:58 +0300 Subject: [PATCH 10/55] fix(abstractNode): change key from var to val --- lib/src/main/kotlin/nodes/abstractNode.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/main/kotlin/nodes/abstractNode.kt b/lib/src/main/kotlin/nodes/abstractNode.kt index bfb848a..ec1bd25 100644 --- a/lib/src/main/kotlin/nodes/abstractNode.kt +++ b/lib/src/main/kotlin/nodes/abstractNode.kt @@ -1,6 +1,6 @@ package nodes -abstract class abstractNode, V, someNode: abstractNode>(var key:K, var value: V) { +abstract class abstractNode, V, someNode: abstractNode>(val key:K, var value: V) { var leftChild: someNode? = null var rightChild: someNode? = null } \ No newline at end of file From 9279abe962af9ce219bdc48ee667551fcd9a49c5 Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Mon, 25 Mar 2024 10:17:30 +0300 Subject: [PATCH 11/55] feat(abstractTree): add traverse method into abstractTree class --- lib/src/main/kotlin/trees/abstractTree.kt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/src/main/kotlin/trees/abstractTree.kt b/lib/src/main/kotlin/trees/abstractTree.kt index 832ac68..c90b0df 100644 --- a/lib/src/main/kotlin/trees/abstractTree.kt +++ b/lib/src/main/kotlin/trees/abstractTree.kt @@ -124,4 +124,20 @@ abstract class abstractTree, V, someNode: abstractNode { + val listOfNodes = mutableListOf() + traverse(root, listOfNodes) + val listOfKeys = mutableListOf() + listOfNodes.forEach { listOfKeys.add(it.key) } + return listOfKeys + } + + private fun traverse(curNode: someNode?, listOfNodes: MutableList) { + if(curNode != null) { + listOfNodes.add(curNode) + traverse(curNode.leftChild, listOfNodes) + traverse(curNode.rightChild, listOfNodes) + } + } } \ No newline at end of file From e8080f2dd5d0013054f39988ac7aaa6414aec98c Mon Sep 17 00:00:00 2001 From: Sofya Kozyreva Date: Mon, 25 Mar 2024 20:08:30 +0300 Subject: [PATCH 12/55] fix(AVL&balancedTree): implement 1 balance method instead of 2 --- lib/src/main/kotlin/trees/AVLTree.kt | 16 ++++------------ lib/src/main/kotlin/trees/balancedTree.kt | 4 +--- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/lib/src/main/kotlin/trees/AVLTree.kt b/lib/src/main/kotlin/trees/AVLTree.kt index b328053..4041bc6 100644 --- a/lib/src/main/kotlin/trees/AVLTree.kt +++ b/lib/src/main/kotlin/trees/AVLTree.kt @@ -8,14 +8,14 @@ class AVLTree, V>: balancedTree>() { override fun insert(key: K, value: V) { val insertedNode = insertNode(key, value) if (insertedNode != null) { - findParent(insertedNode)?.let { balanceAfterInsert(it) } + findParent(insertedNode)?.let { balance(it) } } } override fun delete(key: K) { val deletedNodeParent = deleteNode(key) /* if nothing was added or tree is empty, there's no need to balance it */ - deletedNodeParent?.let { balanceAfterDelete(it) } + deletedNodeParent?.let { balance(it) } } private fun getHeight(node: AVLNode?): Int { @@ -32,7 +32,7 @@ class AVLTree, V>: balancedTree>() { /* balances a tree by performing left & right rotations if absolute value of balance factor is more than 1 */ - private fun balance (curNode: AVLNode) { + override fun balance (curNode: AVLNode, isAfterInsert: Boolean) { when (getBalanceFactor(curNode)) { -2 -> { curNode.leftChild?.let { if (getBalanceFactor(it) == 1) rotateLeft(it, findParent(it)) } @@ -44,15 +44,7 @@ class AVLTree, V>: balancedTree>() { } else -> updateHeight(curNode) } - findParent(curNode)?.let { balanceAfterInsert(it) } - } - - override fun balanceAfterInsert(curNode: AVLNode) { - balance(curNode) - } - - override fun balanceAfterDelete(curNode: AVLNode) { - balance(curNode) + findParent(curNode)?.let { balance(it) } } override fun rotateRight (node: AVLNode, parentNode: AVLNode?) { diff --git a/lib/src/main/kotlin/trees/balancedTree.kt b/lib/src/main/kotlin/trees/balancedTree.kt index 8755c3e..1920a66 100644 --- a/lib/src/main/kotlin/trees/balancedTree.kt +++ b/lib/src/main/kotlin/trees/balancedTree.kt @@ -3,9 +3,7 @@ package trees import nodes.abstractNode abstract class balancedTree, V, someNode: abstractNode>: abstractTree() { - protected abstract fun balanceAfterInsert(curNode: someNode) - - protected abstract fun balanceAfterDelete(curNode: someNode) + protected abstract fun balance(curNode: someNode, isAfterInsert: Boolean = true) protected open fun rotateRight(node: someNode, parentNode: someNode?) { val tempNode = node.leftChild ?: throw IllegalArgumentException("Node must have left child for right rotation") From f58d47cc64e2e5d55f8f92439819cec59b021ceb Mon Sep 17 00:00:00 2001 From: Shvorob Date: Wed, 27 Mar 2024 04:02:25 +0300 Subject: [PATCH 13/55] feat(RBT): implement node of red_black tree --- lib/src/main/kotlin/nodes/RBNode.kt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 lib/src/main/kotlin/nodes/RBNode.kt diff --git a/lib/src/main/kotlin/nodes/RBNode.kt b/lib/src/main/kotlin/nodes/RBNode.kt new file mode 100644 index 0000000..615c69f --- /dev/null +++ b/lib/src/main/kotlin/nodes/RBNode.kt @@ -0,0 +1,4 @@ +package nodes + +class RBNode { +} \ No newline at end of file From 9038eed78eb942fd6604e14081fe792b91a13cab Mon Sep 17 00:00:00 2001 From: Shvorob Date: Wed, 27 Mar 2024 10:56:14 +0300 Subject: [PATCH 14/55] feat(RBT): : implementred-black tree and his methods getUncle, getSibling and get grandParent --- lib/src/main/kotlin/trees/RBTree.kt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 lib/src/main/kotlin/trees/RBTree.kt diff --git a/lib/src/main/kotlin/trees/RBTree.kt b/lib/src/main/kotlin/trees/RBTree.kt new file mode 100644 index 0000000..9737020 --- /dev/null +++ b/lib/src/main/kotlin/trees/RBTree.kt @@ -0,0 +1,4 @@ +package trees + +class RBTree { +} \ No newline at end of file From afc796d1b37472af863a78202ebdacad579c91d7 Mon Sep 17 00:00:00 2001 From: Sofya Kozyreva Date: Thu, 28 Mar 2024 00:43:37 +0300 Subject: [PATCH 15/55] fix(abstractTree): make findMinNodeInRight and findNodeByKey protected instead of private --- lib/src/main/kotlin/trees/abstractTree.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/main/kotlin/trees/abstractTree.kt b/lib/src/main/kotlin/trees/abstractTree.kt index 832ac68..2f5a1ef 100644 --- a/lib/src/main/kotlin/trees/abstractTree.kt +++ b/lib/src/main/kotlin/trees/abstractTree.kt @@ -98,7 +98,7 @@ abstract class abstractTree, V, someNode: abstractNode, V, someNode: abstractNode Date: Thu, 28 Mar 2024 00:46:09 +0300 Subject: [PATCH 16/55] fix(AVL): refactor delete method for different cases (no/1/2 children) --- lib/src/main/kotlin/trees/AVLTree.kt | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/lib/src/main/kotlin/trees/AVLTree.kt b/lib/src/main/kotlin/trees/AVLTree.kt index 4041bc6..68f2ae4 100644 --- a/lib/src/main/kotlin/trees/AVLTree.kt +++ b/lib/src/main/kotlin/trees/AVLTree.kt @@ -13,9 +13,25 @@ class AVLTree, V>: balancedTree>() { } override fun delete(key: K) { - val deletedNodeParent = deleteNode(key) - /* if nothing was added or tree is empty, there's no need to balance it */ - deletedNodeParent?.let { balance(it) } + val nodeToDelete = findNodeByKey(key) + if (nodeToDelete != null) { + val deletedNodeParent = findParent(nodeToDelete) + val newNode = deleteNode(key) + /* deleting a leaf */ + if (newNode == null) { + deletedNodeParent?.let { balance(it) } + } + /* deleting a node with 1 child */ + else if (nodeToDelete.leftChild == null || nodeToDelete.rightChild == null) { + balance(newNode) + } + /* deleting a node with 2 children */ + else { + val newNodeParent = findMinNodeInRight(newNode.rightChild) + if (newNodeParent != null) balance(newNodeParent) + else balance(newNode) + } + } } private fun getHeight(node: AVLNode?): Int { From 12bd2eaba7de2da64b0c974a4e74bc65d666c327 Mon Sep 17 00:00:00 2001 From: Sofya Kozyreva Date: Thu, 28 Mar 2024 20:12:37 +0300 Subject: [PATCH 17/55] fix(abstractTree): change return values in deleteNode --- lib/src/main/kotlin/trees/abstractTree.kt | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/lib/src/main/kotlin/trees/abstractTree.kt b/lib/src/main/kotlin/trees/abstractTree.kt index 2f5a1ef..61eccc0 100644 --- a/lib/src/main/kotlin/trees/abstractTree.kt +++ b/lib/src/main/kotlin/trees/abstractTree.kt @@ -55,12 +55,23 @@ abstract class abstractTree, V, someNode: abstractNode, V, someNode: abstractNode Date: Thu, 28 Mar 2024 20:29:34 +0300 Subject: [PATCH 18/55] feat(AVL): implement preorderTraverse --- lib/src/main/kotlin/trees/AVLTree.kt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/src/main/kotlin/trees/AVLTree.kt b/lib/src/main/kotlin/trees/AVLTree.kt index 68f2ae4..b08763b 100644 --- a/lib/src/main/kotlin/trees/AVLTree.kt +++ b/lib/src/main/kotlin/trees/AVLTree.kt @@ -17,15 +17,15 @@ class AVLTree, V>: balancedTree>() { if (nodeToDelete != null) { val deletedNodeParent = findParent(nodeToDelete) val newNode = deleteNode(key) - /* deleting a leaf */ + /* no children case */ if (newNode == null) { deletedNodeParent?.let { balance(it) } } - /* deleting a node with 1 child */ + /* 1 child case */ else if (nodeToDelete.leftChild == null || nodeToDelete.rightChild == null) { balance(newNode) } - /* deleting a node with 2 children */ + /* 2 children case */ else { val newNodeParent = findMinNodeInRight(newNode.rightChild) if (newNodeParent != null) balance(newNodeParent) @@ -72,4 +72,12 @@ class AVLTree, V>: balancedTree>() { super.rotateLeft(node, parentNode) updateHeight(node) } + + fun preorderTraverse(): List> { + val listOfNodes = mutableListOf>() + traverse(root, listOfNodes) + val listOfKeysAndHeights = mutableListOf>() + listOfNodes.forEach { listOfKeysAndHeights.add(Pair(it.key, it.height)) } + return listOfKeysAndHeights + } } \ No newline at end of file From d8cd6f8ba667c4ab92ae46c0aa5b8c3b8d23926d Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Fri, 29 Mar 2024 19:23:51 +0300 Subject: [PATCH 19/55] feat(CI): add first version of CI via GitHub actions --- .github/CI.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/CI.yml diff --git a/.github/CI.yml b/.github/CI.yml new file mode 100644 index 0000000..39909de --- /dev/null +++ b/.github/CI.yml @@ -0,0 +1,14 @@ +name: CI + +on: + push: + pull_request: + branches: [ "main" ] + +jobs: + Tests: + runs-on: ubuntu-latest + + steps: + - name: Checkout repo + uses: actions/checkout@v4 \ No newline at end of file From 844b7cf6aafc2375b0f34613353b0c2fb0722b67 Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Fri, 29 Mar 2024 22:03:33 +0300 Subject: [PATCH 20/55] feat(CI): add build check to CI --- .github/CI.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/CI.yml b/.github/CI.yml index 39909de..cd018b1 100644 --- a/.github/CI.yml +++ b/.github/CI.yml @@ -11,4 +11,16 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v4 \ No newline at end of file + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 + + - name: Build with Gradle Wrapper + run: ./gradlew build \ No newline at end of file From 9212f82724ae6883e24c705585a51be0881d58c2 Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Sat, 30 Mar 2024 11:13:59 +0300 Subject: [PATCH 21/55] feat(CI): add autotests run to CI --- .github/CI.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/CI.yml b/.github/CI.yml index cd018b1..23dc66a 100644 --- a/.github/CI.yml +++ b/.github/CI.yml @@ -23,4 +23,7 @@ jobs: uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 - name: Build with Gradle Wrapper - run: ./gradlew build \ No newline at end of file + run: ./gradlew build + + - name: Run autotests + run: ./gradlew test \ No newline at end of file From 12323d38c579d040d773dc94496fa9835dcc2036 Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Sat, 30 Mar 2024 12:33:59 +0300 Subject: [PATCH 22/55] feat(CI): add jacoco plugin for test coverage control --- .github/CI.yml | 5 ++++- lib/build.gradle | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/CI.yml b/.github/CI.yml index 23dc66a..7e7ccc2 100644 --- a/.github/CI.yml +++ b/.github/CI.yml @@ -26,4 +26,7 @@ jobs: run: ./gradlew build - name: Run autotests - run: ./gradlew test \ No newline at end of file + run: ./gradlew test + + - name: Run Test Coverage + run: ./gradlew jacocoTestReport \ No newline at end of file diff --git a/lib/build.gradle b/lib/build.gradle index e87a56d..b7277c7 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -1,5 +1,6 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.9.22' + id 'jacoco' } group = 'org.example' @@ -15,7 +16,26 @@ dependencies { test { useJUnitPlatform() + finalizedBy jacocoTestReport } kotlin { jvmToolchain(15) +} + +jacocoTestReport { + dependsOn test +} + +jacoco { + toolVersion = "0.8.11" + reportsDirectory = layout.buildDirectory.dir('test_coverage') +} + +jacocoTestReport { + reports { + xml.required = false + csv.required = true + html.outputLocation = layout.buildDirectory.dir('jacocoHtml') + csv.outputLocation = layout.buildDirectory.file("jacoco/report.csv") + } } \ No newline at end of file From 47c825860a63000a5cdbc5ba93bb0327bf6f99bd Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Sat, 30 Mar 2024 12:46:20 +0300 Subject: [PATCH 23/55] fix(abstraction): move preorderTraverse method to BSTree class and make traverse method protected for its usage from every tree --- lib/src/main/kotlin/trees/BSTree.kt | 8 ++++++++ lib/src/main/kotlin/trees/abstractTree.kt | 10 +--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/src/main/kotlin/trees/BSTree.kt b/lib/src/main/kotlin/trees/BSTree.kt index 81c2ab5..b7a8f5a 100644 --- a/lib/src/main/kotlin/trees/BSTree.kt +++ b/lib/src/main/kotlin/trees/BSTree.kt @@ -4,4 +4,12 @@ import nodes.BSNode class BSTree, V> : abstractTree>() { override fun createNewNode(key: K, value: V): BSNode = BSNode(key, value) + + fun preorderTraverse(): List { + val listOfNodes = mutableListOf>() + traverse(root, listOfNodes) + val listOfKeys = mutableListOf() + listOfNodes.forEach { listOfKeys.add(it.key) } + return listOfKeys + } } \ No newline at end of file diff --git a/lib/src/main/kotlin/trees/abstractTree.kt b/lib/src/main/kotlin/trees/abstractTree.kt index 77bde2d..32741d2 100644 --- a/lib/src/main/kotlin/trees/abstractTree.kt +++ b/lib/src/main/kotlin/trees/abstractTree.kt @@ -137,15 +137,7 @@ abstract class abstractTree, V, someNode: abstractNode { - val listOfNodes = mutableListOf() - traverse(root, listOfNodes) - val listOfKeys = mutableListOf() - listOfNodes.forEach { listOfKeys.add(it.key) } - return listOfKeys - } - - private fun traverse(curNode: someNode?, listOfNodes: MutableList) { + protected fun traverse(curNode: someNode?, listOfNodes: MutableList) { if(curNode != null) { listOfNodes.add(curNode) traverse(curNode.leftChild, listOfNodes) From 897a6cabf36b0b01f7b186433a0452a6eae387fb Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Sat, 30 Mar 2024 13:13:12 +0300 Subject: [PATCH 24/55] fix(abstraction): refactor of abstractTree class --- lib/src/main/kotlin/trees/abstractTree.kt | 119 ++++++++++++---------- lib/src/main/kotlin/trees/balancedTree.kt | 4 +- 2 files changed, 65 insertions(+), 58 deletions(-) diff --git a/lib/src/main/kotlin/trees/abstractTree.kt b/lib/src/main/kotlin/trees/abstractTree.kt index 32741d2..705225b 100644 --- a/lib/src/main/kotlin/trees/abstractTree.kt +++ b/lib/src/main/kotlin/trees/abstractTree.kt @@ -14,36 +14,40 @@ abstract class abstractTree, V, someNode: abstractNode { - curNode.value = nodeToInsert.value - println("existing key entered. data has been changed") - break - } - ((curNode.leftChild == null) && (nodeToInsert.key < curNode.key)) -> { - curNode.leftChild = nodeToInsert - curNode = curNode.leftChild - } - ((curNode.rightChild == null) && (nodeToInsert.key > curNode.key)) -> { - curNode.rightChild = nodeToInsert - curNode = curNode.rightChild - } - nodeToInsert.key < curNode.key -> { - curNode = curNode.leftChild - } - nodeToInsert.key > curNode.key -> { - curNode = curNode.rightChild - } + + while ((curNode != null) && (curNode != nodeToInsert)) { + when { + (curNode.key == nodeToInsert.key) -> { + curNode.value = nodeToInsert.value + break + } + + ((curNode.leftChild == null) && (nodeToInsert.key < curNode.key)) -> { + curNode.leftChild = nodeToInsert + curNode = curNode.leftChild + } + + ((curNode.rightChild == null) && (nodeToInsert.key > curNode.key)) -> { + curNode.rightChild = nodeToInsert + curNode = curNode.rightChild + } + + nodeToInsert.key < curNode.key -> { + curNode = curNode.leftChild + } + + nodeToInsert.key > curNode.key -> { + curNode = curNode.rightChild } } - return curNode } + return curNode + } open fun delete(key: K) { @@ -54,35 +58,35 @@ abstract class abstractTree, V, someNode: abstractNode { + changeChild(nodeToDelete, parentNode, null) + return null } - else { - moveParentNode(nodeToDelete, parentNode, nodeToDelete.leftChild) - /* new */ - return nodeToDelete.leftChild + + /* 1 child case */ + (nodeToDelete.leftChild == null || nodeToDelete.rightChild == null) -> { + if (nodeToDelete.leftChild == null) { + changeChild(nodeToDelete, parentNode, nodeToDelete.rightChild) + return nodeToDelete.rightChild + } + else { + changeChild(nodeToDelete, parentNode, nodeToDelete.leftChild) + return nodeToDelete.leftChild + } + } + + /* 2 children case */ + else -> { + val replacementNode = findMinNodeInRight(nodeToDelete.rightChild) + ?: throw IllegalArgumentException ("Node with 2 children must have a right child") + changeChild(replacementNode, findParent(replacementNode), replacementNode.rightChild) + replacementNode.leftChild = nodeToDelete.leftChild + replacementNode.rightChild = nodeToDelete.rightChild + changeChild(nodeToDelete, parentNode, replacementNode) + return replacementNode } - } - /* 2 children case */ - else { - val replacementNode = findMinNodeInRight(nodeToDelete.rightChild) - ?: throw IllegalArgumentException ("Node with 2 children must have a right child") - moveParentNode(replacementNode, findParent(replacementNode), replacementNode.rightChild) - replacementNode.leftChild = nodeToDelete.leftChild - replacementNode.rightChild = nodeToDelete.rightChild - moveParentNode(nodeToDelete, parentNode, replacementNode) - /* new */ - return replacementNode } } @@ -99,8 +103,13 @@ abstract class abstractTree, V, someNode: abstractNode parentNode + * / / + * node replacementNode + */ + protected fun changeChild(node: someNode, parentNode: someNode?, replacementNode: someNode?) { when (parentNode) { null -> if (root == node) root = replacementNode else -> { @@ -115,10 +124,8 @@ abstract class abstractTree, V, someNode: abstractNode return minNode - else -> return null - } + if (minNode != null) return minNode + return null } fun find(key: K): V? { diff --git a/lib/src/main/kotlin/trees/balancedTree.kt b/lib/src/main/kotlin/trees/balancedTree.kt index 1920a66..2b07a1b 100644 --- a/lib/src/main/kotlin/trees/balancedTree.kt +++ b/lib/src/main/kotlin/trees/balancedTree.kt @@ -9,13 +9,13 @@ abstract class balancedTree, V, someNode: abstractNode Date: Sat, 30 Mar 2024 13:20:19 +0300 Subject: [PATCH 25/55] fix(CI): move CI.yml to workflows directory --- .github/{ => workflows}/CI.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ => workflows}/CI.yml (100%) diff --git a/.github/CI.yml b/.github/workflows/CI.yml similarity index 100% rename from .github/CI.yml rename to .github/workflows/CI.yml From cc9309e18569c7e56d70c070dd12f16ef3e30b16 Mon Sep 17 00:00:00 2001 From: Sofya Kozyreva Date: Sat, 30 Mar 2024 14:07:37 +0300 Subject: [PATCH 26/55] feat(AVL): implement private getNumberOfChildren method and change delete method accordingly --- lib/src/main/kotlin/trees/AVLTree.kt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/src/main/kotlin/trees/AVLTree.kt b/lib/src/main/kotlin/trees/AVLTree.kt index b08763b..2a00966 100644 --- a/lib/src/main/kotlin/trees/AVLTree.kt +++ b/lib/src/main/kotlin/trees/AVLTree.kt @@ -16,16 +16,16 @@ class AVLTree, V>: balancedTree>() { val nodeToDelete = findNodeByKey(key) if (nodeToDelete != null) { val deletedNodeParent = findParent(nodeToDelete) + val childrenNum = getNumberOfChildren(nodeToDelete) val newNode = deleteNode(key) - /* no children case */ + /* deleting a leaf */ if (newNode == null) { deletedNodeParent?.let { balance(it) } } - /* 1 child case */ - else if (nodeToDelete.leftChild == null || nodeToDelete.rightChild == null) { + else if (childrenNum == 1) { balance(newNode) } - /* 2 children case */ + /* deleting a node with 2 children */ else { val newNodeParent = findMinNodeInRight(newNode.rightChild) if (newNodeParent != null) balance(newNodeParent) @@ -34,6 +34,14 @@ class AVLTree, V>: balancedTree>() { } } + private fun getNumberOfChildren(node: AVLNode): Int { + return when { + node.leftChild != null && node.rightChild != null -> 2 + node.leftChild != null || node.rightChild != null -> 1 + else -> 0 + } + } + private fun getHeight(node: AVLNode?): Int { return node?.height ?: 0 } From e2b7ab57e878d989dba6f57117c6c3f32ef5dd2d Mon Sep 17 00:00:00 2001 From: Shvorob Date: Fri, 29 Mar 2024 01:52:44 +0300 Subject: [PATCH 27/55] feat(RBT): implement method of insertion --- lib/src/main/kotlin/trees/RBTree.kt | 42 +++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/lib/src/main/kotlin/trees/RBTree.kt b/lib/src/main/kotlin/trees/RBTree.kt index 9737020..d1840c6 100644 --- a/lib/src/main/kotlin/trees/RBTree.kt +++ b/lib/src/main/kotlin/trees/RBTree.kt @@ -1,4 +1,42 @@ -package trees +import nodes.RBNode +import trees.balancedTree + + +class RBTree, V>: balancedTree>() { + private fun getGrandparent(node: RBNode): RBNode? { + val parent = findParent(node) ?: return null + val grandparent = findParent(parent) + return grandparent + } + + private fun getSibling(node: RBNode): RBNode? { + val parent = findParent(node) ?: return null + return if (node == parent.leftChild) { + parent.rightChild + } else { + parent.leftChild + } + } + + private fun getUncle(node: RBNode): RBNode? { + val parent = findParent(node) ?: return null + val grandparent = findParent(parent) + return if (parent == grandparent?.leftChild) { + grandparent.rightChild + } else { + grandparent?.leftChild + } + } + override fun insert(key: K, value: V) { + val insertedNode = insertNode(key, value) ?: throw IllegalArgumentException("Nothing to insert") + balance(insertedNode, true) + } + override fun createNewNode(key: K, value: V): RBNode { + TODO("Not yet implemented") + } + + override fun balance(curNode: RBNode, isAfterInsert: Boolean) { + TODO("Not yet implemented") + } -class RBTree { } \ No newline at end of file From ab60a5dd5e379a157cbf63e727f08b75a489191b Mon Sep 17 00:00:00 2001 From: Shvorob Date: Sat, 30 Mar 2024 15:05:16 +0300 Subject: [PATCH 28/55] feat(RBT): Implement method balance and signature of methods balanceAfterInsert and balanceAfterDelete --- lib/src/main/kotlin/trees/RBTree.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/src/main/kotlin/trees/RBTree.kt b/lib/src/main/kotlin/trees/RBTree.kt index d1840c6..f419d70 100644 --- a/lib/src/main/kotlin/trees/RBTree.kt +++ b/lib/src/main/kotlin/trees/RBTree.kt @@ -36,7 +36,13 @@ class RBTree, V>: balancedTree>() { } override fun balance(curNode: RBNode, isAfterInsert: Boolean) { + if (isAfterInsert) { balanceAfterInsert(curNode)} + else { balanceAfterDelete(curNode) } + } + private fun balanceAfterInsert(curNode: RBNode) { + TODO("Not yet implemented") + } + private fun balanceAfterDelete(curNode: RBNode) { TODO("Not yet implemented") } - } \ No newline at end of file From 22fbc42ec716a21b60056524f577111c34e48860 Mon Sep 17 00:00:00 2001 From: Shvorob Date: Sat, 30 Mar 2024 15:51:17 +0300 Subject: [PATCH 29/55] feat(RBT): Impement method balanceAfterInsert --- lib/src/main/kotlin/trees/RBTree.kt | 67 ++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/lib/src/main/kotlin/trees/RBTree.kt b/lib/src/main/kotlin/trees/RBTree.kt index f419d70..0d521cc 100644 --- a/lib/src/main/kotlin/trees/RBTree.kt +++ b/lib/src/main/kotlin/trees/RBTree.kt @@ -1,3 +1,4 @@ +import nodes.Color import nodes.RBNode import trees.balancedTree @@ -40,7 +41,71 @@ class RBTree, V>: balancedTree>() { else { balanceAfterDelete(curNode) } } private fun balanceAfterInsert(curNode: RBNode) { - TODO("Not yet implemented") + var insertedNode = curNode + insertedNode.color = Color.RED + + /* case 1: insertedNode is root */ + if (root == insertedNode) { + insertedNode.color = Color.BLACK + return + } + + var parent = findParent(insertedNode) ?: throw IllegalArgumentException("Non-root should have parent") + + /* case 2: parent of insertedNode is black */ + if (parent.color == Color.BLACK) { + return + } + + val uncle = getUncle(insertedNode) + val grandparent = getGrandparent(insertedNode) ?: throw IllegalArgumentException("Every node by that point should have grandparent") + + /* case 3: uncle is non-null and red (so both uncle and parent are red) */ + if ((uncle != null) && (uncle.color == Color.RED)) { + parent.color = Color.BLACK + uncle.color = Color.BLACK + grandparent.color = Color.RED + balanceAfterInsert(grandparent) + return + } + + /* case 4: uncle is black; grandparent, parent and node form a "triangle" + * G G + * / \ + * P - left triangle P - right triangle + * \ / + * N N + * + */ + if ((insertedNode == parent.rightChild) && (parent == grandparent.leftChild)) { + rotateLeft(parent, grandparent) + parent = insertedNode + insertedNode = insertedNode.leftChild ?: throw IllegalArgumentException("Node should have child after left rotation") + } + else if ((insertedNode == parent.leftChild) && (parent == grandparent.rightChild)) { + rotateRight(parent, grandparent) + parent = insertedNode + insertedNode = insertedNode.rightChild ?: throw IllegalArgumentException("Node should have right child after right rotation") + } + + /* case 5: grandparent, parent and node form a "line" + * + * G G + * / \ + * P - left line P - right line + * / \ + * N N + * + */ + parent.color = Color.BLACK + grandparent.color = Color.RED + if ((insertedNode == parent.leftChild)&&(parent == grandparent.leftChild)) { + rotateRight(grandparent, findParent(grandparent)) + } + else { + rotateLeft(grandparent, findParent(grandparent)) + } + return } private fun balanceAfterDelete(curNode: RBNode) { TODO("Not yet implemented") From 4f36ef01454c003192b07e38ae096b23753b00ad Mon Sep 17 00:00:00 2001 From: Shvorob Date: Sat, 30 Mar 2024 16:36:22 +0300 Subject: [PATCH 30/55] feat(RBT): Implemet methods of deleting a node (with 6 cases of delition) and method deleing a leaf. Implemet method which balance tree after delition --- lib/src/main/kotlin/trees/RBTree.kt | 192 +++++++++++++++++++++++++++- 1 file changed, 191 insertions(+), 1 deletion(-) diff --git a/lib/src/main/kotlin/trees/RBTree.kt b/lib/src/main/kotlin/trees/RBTree.kt index 0d521cc..988f1a6 100644 --- a/lib/src/main/kotlin/trees/RBTree.kt +++ b/lib/src/main/kotlin/trees/RBTree.kt @@ -107,7 +107,197 @@ class RBTree, V>: balancedTree>() { } return } + override fun delete(key: K) { + val nodeToDelete = findNodeByKey(key) + nodeToDelete?.let { balance(nodeToDelete, false) } + } + private fun deleteLeaf(node: RBNode) { + println("deleting leaf") + if (node.color != Color.RED) deleteCase1(node) + } + private fun balanceAfterDelete(curNode: RBNode) { - TODO("Not yet implemented") + val nodeToDelete = curNode + val child: RBNode ? + when { + nodeToDelete.rightChild != null && nodeToDelete.leftChild != null -> { + child = findMinNodeInRight(nodeToDelete.rightChild) + ?: throw IllegalArgumentException("Node must have right child") + val newNode = child + println("delete node with 2 children") + delete(child.key) + newNode.color = nodeToDelete.color + newNode.leftChild = nodeToDelete.leftChild + newNode.rightChild = nodeToDelete.rightChild + moveParentNode(nodeToDelete, findParent(nodeToDelete), newNode) + return + + } + nodeToDelete.rightChild != null -> { + println("delete node with right child") + child = nodeToDelete.rightChild + } + nodeToDelete.leftChild != null -> { + println("delete node with left child") + child = nodeToDelete.leftChild + } + else -> { + child = null + deleteLeaf(nodeToDelete) + } + } + + if(nodeToDelete.color == Color.RED) { + println("delete red node") + deleteNode(nodeToDelete.key) + return + } + + if(nodeToDelete.color == Color.BLACK && child?.color == Color.RED) { + println("delete black node with red child") + deleteNode(nodeToDelete.key) + child.color = Color.BLACK + return + } + else { +// if(nodeToDelete.color == Color.BLACK && child?.color == Color.BLACK) { + println("delete black node with black child") + deleteNode(nodeToDelete.key) + if (child != null) deleteCase1(child) + } + } + + /* child of nodeToDelete is new root */ + private fun deleteCase1(node: RBNode) { + println("case 1") + val parent = findParent(node) + if(parent != null) deleteCase2(node) + } + + + /** sibling of child is red + * BLACK + * / \ + * child RED + */ + private fun deleteCase2(curNode: RBNode) { + var node = curNode + val sibling = getSibling(node) + if(sibling?.color == Color.RED) { + val parent = findParent(node) ?: throw IllegalArgumentException("Parent cannot be null") + parent.color = Color.RED + sibling.color = Color.BLACK + if (node == parent.leftChild) { + println("case 2.1") + val grandparent = getGrandparent(node) + rotateLeft(parent, grandparent) + } + else { + println("case 2.2") + val grandparent = getGrandparent(node) + rotateRight(parent, grandparent) + } + } + deleteCase3(node) + } + + /** parent, sibling and its children are black + * BLACK + * / \ + * child BLACK + * / \ + * BLACK BLACK + */ + private fun deleteCase3(node: RBNode) { + val sibling = getSibling(node) + val parent = findParent(node) ?: throw IllegalArgumentException("Parent cannot be null") + if(parent.color == Color.BLACK && (sibling?.color == Color.BLACK) && + (sibling.rightChild?.color == Color.BLACK || sibling.rightChild == null) + && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null)) { + println("case 3") + + sibling.color = Color.RED + deleteCase1(parent) + } + else deleteCase4(node) + } + + /** parent is red, sibling and its children are black + * RED + * / \ + * child BLACK + * / \ + * BLACK BLACK + */ + private fun deleteCase4(node: RBNode) { + val sibling = getSibling(node) + val parent = findParent(node) ?: throw IllegalArgumentException("Parent cannot be null") + if(parent.color == Color.RED && sibling?.color == Color.BLACK && + (sibling.rightChild?.color == Color.BLACK || sibling.rightChild == null) + && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null)) { + println("case 4") + + sibling.color = Color.RED + parent.color = Color.BLACK + } + else deleteCase5(node) + } + + /** sibling is black & leftChild, its leftChild is red and its rightChild is black + * parent + * / \ + * BLACK child + * / \ + * RED BLACK + */ + private fun deleteCase5(node: RBNode) { + val sibling = getSibling(node) ?: throw IllegalArgumentException("Sibling cannot be null") + val parent = findParent(node) ?: throw IllegalArgumentException("Parent cannot be null") + if (node == parent.leftChild && sibling.color == Color.BLACK && + (sibling.rightChild?.color == Color.BLACK || sibling.rightChild == null) && sibling.leftChild?.color == Color.RED) { + println("case 5.1") + sibling.color = Color.RED + sibling.leftChild?.color = Color.BLACK + + rotateRight(sibling, parent) + } + else if (node == parent.rightChild && sibling.color == Color.BLACK && + sibling.rightChild?.color == Color.RED && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null)) { + println("case 5.2") + + sibling.color = Color.RED + sibling.rightChild?.color = Color.BLACK + + rotateLeft(sibling, parent) + } + deleteCase6(node) + } + + /** sibling is right(left)Child and is black, its right(left)Child is red + * parent or parent + * / \ / \ + * child BLACK BLACK child + * \ / + * RED RED + */ + private fun deleteCase6(node: RBNode) { + //val node = curNode + val sibling = getSibling(node) ?: throw IllegalArgumentException("Sibling cannot be null") + val parent = findParent(node) ?: throw IllegalArgumentException("Parent cannot be null") + val grandparent = getGrandparent(node) + val color = parent.color + sibling.color = color + parent.color = Color.BLACK + + if (node == parent.leftChild) { + println("case 6.1") + sibling.rightChild?.color = Color.BLACK + rotateLeft(parent, grandparent) + } + else { + println("case 6.2") + sibling.leftChild?.color = Color.BLACK + rotateRight(parent, grandparent) + } } } \ No newline at end of file From 5f68472943f6de5b763218e6c1d1e57e3b4bed2a Mon Sep 17 00:00:00 2001 From: Shvorob Date: Sat, 30 Mar 2024 17:07:46 +0300 Subject: [PATCH 31/55] feat(RBT): Implement method preorderTraverse --- lib/src/main/kotlin/trees/RBTree.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/src/main/kotlin/trees/RBTree.kt b/lib/src/main/kotlin/trees/RBTree.kt index 988f1a6..71a13cd 100644 --- a/lib/src/main/kotlin/trees/RBTree.kt +++ b/lib/src/main/kotlin/trees/RBTree.kt @@ -300,4 +300,11 @@ class RBTree, V>: balancedTree>() { rotateRight(parent, grandparent) } } + fun preorderTraverse(): List> { + val listOfNodes = mutableListOf>() + traverse(root, listOfNodes) + val listOfKeysAndColors = mutableListOf>() + listOfNodes.forEach { listOfKeysAndColors.add(Pair(it.key, it.color)) } + return listOfKeysAndColors + } } \ No newline at end of file From d5cae7fa212f7437450cc5c9ce325ffdc88fab7f Mon Sep 17 00:00:00 2001 From: Shvorob Date: Sat, 30 Mar 2024 18:54:30 +0300 Subject: [PATCH 32/55] fix(RBT): Implement class of red-black nodes --- lib/src/main/kotlin/nodes/RBNode.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/src/main/kotlin/nodes/RBNode.kt b/lib/src/main/kotlin/nodes/RBNode.kt index 615c69f..eb11b5e 100644 --- a/lib/src/main/kotlin/nodes/RBNode.kt +++ b/lib/src/main/kotlin/nodes/RBNode.kt @@ -1,4 +1,9 @@ package nodes -class RBNode { +enum class Color { + RED, BLACK +} + +class RBNode, V>(key: K, value: V): abstractNode>(key, value) { + var color: Color = Color.RED } \ No newline at end of file From 679200e12a25b5d1bf6d1cfb73efe864054f48ce Mon Sep 17 00:00:00 2001 From: Shvorob Date: Sat, 30 Mar 2024 18:55:26 +0300 Subject: [PATCH 33/55] fix(RBT): Delete prints, change mention of methode moveParentNode to changeChild, add realisation of method createNewNode --- lib/src/main/kotlin/trees/RBTree.kt | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/lib/src/main/kotlin/trees/RBTree.kt b/lib/src/main/kotlin/trees/RBTree.kt index 71a13cd..3141a6f 100644 --- a/lib/src/main/kotlin/trees/RBTree.kt +++ b/lib/src/main/kotlin/trees/RBTree.kt @@ -32,9 +32,7 @@ class RBTree, V>: balancedTree>() { val insertedNode = insertNode(key, value) ?: throw IllegalArgumentException("Nothing to insert") balance(insertedNode, true) } - override fun createNewNode(key: K, value: V): RBNode { - TODO("Not yet implemented") - } + override fun createNewNode(key: K, value: V): RBNode = RBNode(key, value) override fun balance(curNode: RBNode, isAfterInsert: Boolean) { if (isAfterInsert) { balanceAfterInsert(curNode)} @@ -112,7 +110,6 @@ class RBTree, V>: balancedTree>() { nodeToDelete?.let { balance(nodeToDelete, false) } } private fun deleteLeaf(node: RBNode) { - println("deleting leaf") if (node.color != Color.RED) deleteCase1(node) } @@ -129,16 +126,14 @@ class RBTree, V>: balancedTree>() { newNode.color = nodeToDelete.color newNode.leftChild = nodeToDelete.leftChild newNode.rightChild = nodeToDelete.rightChild - moveParentNode(nodeToDelete, findParent(nodeToDelete), newNode) + changeChild(nodeToDelete, findParent(nodeToDelete), newNode) return } nodeToDelete.rightChild != null -> { - println("delete node with right child") child = nodeToDelete.rightChild } nodeToDelete.leftChild != null -> { - println("delete node with left child") child = nodeToDelete.leftChild } else -> { @@ -148,20 +143,16 @@ class RBTree, V>: balancedTree>() { } if(nodeToDelete.color == Color.RED) { - println("delete red node") deleteNode(nodeToDelete.key) return } if(nodeToDelete.color == Color.BLACK && child?.color == Color.RED) { - println("delete black node with red child") deleteNode(nodeToDelete.key) child.color = Color.BLACK return } else { -// if(nodeToDelete.color == Color.BLACK && child?.color == Color.BLACK) { - println("delete black node with black child") deleteNode(nodeToDelete.key) if (child != null) deleteCase1(child) } @@ -169,7 +160,6 @@ class RBTree, V>: balancedTree>() { /* child of nodeToDelete is new root */ private fun deleteCase1(node: RBNode) { - println("case 1") val parent = findParent(node) if(parent != null) deleteCase2(node) } @@ -188,12 +178,10 @@ class RBTree, V>: balancedTree>() { parent.color = Color.RED sibling.color = Color.BLACK if (node == parent.leftChild) { - println("case 2.1") val grandparent = getGrandparent(node) rotateLeft(parent, grandparent) } else { - println("case 2.2") val grandparent = getGrandparent(node) rotateRight(parent, grandparent) } @@ -214,7 +202,6 @@ class RBTree, V>: balancedTree>() { if(parent.color == Color.BLACK && (sibling?.color == Color.BLACK) && (sibling.rightChild?.color == Color.BLACK || sibling.rightChild == null) && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null)) { - println("case 3") sibling.color = Color.RED deleteCase1(parent) @@ -235,7 +222,6 @@ class RBTree, V>: balancedTree>() { if(parent.color == Color.RED && sibling?.color == Color.BLACK && (sibling.rightChild?.color == Color.BLACK || sibling.rightChild == null) && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null)) { - println("case 4") sibling.color = Color.RED parent.color = Color.BLACK @@ -255,7 +241,6 @@ class RBTree, V>: balancedTree>() { val parent = findParent(node) ?: throw IllegalArgumentException("Parent cannot be null") if (node == parent.leftChild && sibling.color == Color.BLACK && (sibling.rightChild?.color == Color.BLACK || sibling.rightChild == null) && sibling.leftChild?.color == Color.RED) { - println("case 5.1") sibling.color = Color.RED sibling.leftChild?.color = Color.BLACK @@ -263,7 +248,6 @@ class RBTree, V>: balancedTree>() { } else if (node == parent.rightChild && sibling.color == Color.BLACK && sibling.rightChild?.color == Color.RED && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null)) { - println("case 5.2") sibling.color = Color.RED sibling.rightChild?.color = Color.BLACK @@ -290,12 +274,10 @@ class RBTree, V>: balancedTree>() { parent.color = Color.BLACK if (node == parent.leftChild) { - println("case 6.1") sibling.rightChild?.color = Color.BLACK rotateLeft(parent, grandparent) } else { - println("case 6.2") sibling.leftChild?.color = Color.BLACK rotateRight(parent, grandparent) } From c23e6bc6fc4d69142dde1d6fcc65f6a6c9c5df54 Mon Sep 17 00:00:00 2001 From: Sofya Kozyreva Date: Sat, 30 Mar 2024 19:05:20 +0300 Subject: [PATCH 34/55] fix(build.gradle): fix dependencies --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index b7277c7..534e573 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -11,7 +11,7 @@ repositories { } dependencies { - testImplementation 'org.jetbrains.kotlin:kotlin-test' + testImplementation("org.jetbrains.kotlin:kotlin-test") } test { From 30e54b972052c22910e596cc202343091a09be70 Mon Sep 17 00:00:00 2001 From: Sofya Kozyreva Date: Sat, 30 Mar 2024 19:08:14 +0300 Subject: [PATCH 35/55] feat(AVLTest): implement tests for avl tree --- lib/src/test/kotlin/treesTests/AVLTreeTest.kt | 352 ++++++++++++++++++ 1 file changed, 352 insertions(+) create mode 100644 lib/src/test/kotlin/treesTests/AVLTreeTest.kt diff --git a/lib/src/test/kotlin/treesTests/AVLTreeTest.kt b/lib/src/test/kotlin/treesTests/AVLTreeTest.kt new file mode 100644 index 0000000..3830c0d --- /dev/null +++ b/lib/src/test/kotlin/treesTests/AVLTreeTest.kt @@ -0,0 +1,352 @@ +package treesTests + +import AVLTree +import org.junit.jupiter.api.Assertions.assertEquals +import kotlin.test.Test + + +class AVLTreeTest { + @Test + fun `find node by key`() { + val tree = AVLTree() + tree.insert(2,"Sofa") + tree.insert(4,"Sonya") + tree.insert(1,"Xenia") + + val expectedValue = "Sofa" + val actualValue = tree.find(2) + assertEquals(expectedValue, actualValue) + } + + @Test + fun `traverse avl tree`() { + val tree = AVLTree() + tree.insert(3,"i") + tree.insert(2,"love") + tree.insert(1,"making") + tree.insert(4,"trees") + + val expectedKeysAndHeights = listOf(Pair(2, 3), Pair(1, 1), Pair(3, 2), Pair(4, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `insert node with existing key`() { + val tree = AVLTree() + tree.insert(1, "Kittens") + tree.insert(2, "Sadness") + tree.insert(3, "Puppies") + tree.insert(4, "Bunnies") + tree.insert(5, "Birds") + tree.insert(2, "Happiness") + + val actualValue = tree.find(2) + val expectedValue = "Happiness" + + assertEquals(expectedValue, actualValue) + } + + @Test + fun `insert node and perform right rotation`() { + val tree = AVLTree() + tree.insert(4,"hi") + tree.insert(2,"hi") + tree.insert(5,"hi") + tree.insert(0,"hii") + tree.insert(3,"hiiii") + + tree.insert(1,"hey") + + val expectedKeysAndHeights = listOf(Pair(2, 3), Pair(0,2), Pair(1, 1), Pair(4, 2), Pair(3, 1), Pair(5, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `insert node and perform left-right rotation`() { + val tree = AVLTree() + tree.insert(4,"y") + tree.insert(1,"n") + tree.insert(5,"d") + tree.insert(0,"e") + tree.insert(2,"r") + + tree.insert(3,"p") + val expectedKeysAndHeights = listOf(Pair(2, 3), Pair(1,2), Pair(0, 1), Pair(4, 2), Pair(3, 1), Pair(5, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `insert node and perform right-left rotation`() { + val tree = AVLTree() + tree.insert(1,"3") + tree.insert(0,"33") + tree.insert(4,"333") + tree.insert(3,"3333") + tree.insert(5,"33333") + + tree.insert(2,"333333") + + val expectedKeysAndHeights = listOf(Pair(3, 3), Pair(1, 2), Pair(0, 1), Pair(2, 1), Pair(4, 2), Pair(5, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `insert node and perform left rotation`() { + val tree = AVLTree() + tree.insert(1,"Shine") + tree.insert(0,"Bright") + tree.insert(3,"Like") + tree.insert(2,"A") + tree.insert(5,"Diamond") + + tree.insert(4,"Eeeeee") + + val expectedKeysAndHeights = listOf(Pair(3, 3), Pair(1, 2), Pair(0, 1), Pair(2, 1), Pair(5, 2), Pair(4, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `delete node with non-existing key`() { + @Test + fun `delete node with non-existing key`() { + val tree = AVLTree() + tree.insert(10, "Half") + tree.insert(20, "Cherry") + tree.insert(30, "Half") + tree.insert(45, "Coke") + tree.delete(15) + + val expectedKeysAndHeights = listOf(Pair(20, 3), Pair(10, 1), Pair(30, 2), Pair(45, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + } + + @Test + fun `delete node from an empty tree`() { + val tree = AVLTree() + tree.delete(1000) + + val expectedKeysAndHeights: List> = listOf() + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `delete root`() { + val tree = AVLTree() + tree.insert(44,"rip root") + tree.delete(44) + + val expectedKeysAndHeights: List> = listOf() + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `delete node with two children (right child is leaf)`() { + val tree = AVLTree() + tree.insert(115, "") + tree.insert(155, "") + tree.insert(55, "") + tree.insert(105, "") + tree.insert(15, "") + tree.delete(115) + + val expectedKeysAndHeights = listOf(Pair(55, 3), Pair(15, 1), Pair(155, 2), Pair(105, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `delete right node with no children and perform right rotation`() { + val tree = AVLTree() + tree.insert(44,"this") + tree.insert(33,"is") + tree.insert(55,"me") + tree.insert(22,"trying") + tree.delete(55) + + val expectedKeysAndHeights = listOf(Pair(33, 2), Pair(22, 1), Pair(44, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `delete left node with no children and perform left-right rotation`() { + val tree = AVLTree() + tree.insert(2,"Welcome") + tree.insert(1,"to") + tree.insert(4,"New") + tree.insert(3,"York") + tree.delete(1) + + val expectedKeysAndHeights = listOf(Pair(3, 2), Pair(2, 1), Pair(4, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `delete right node with no children and perform left-right rotation`() { + val tree = AVLTree() + tree.insert(300,"Californication") + tree.insert(100,"Otherside") + tree.insert(400,"Dark Necessities") + tree.insert(200,"Encore") + tree.delete(400) + + val expectedKeysAndHeights = listOf(Pair(200, 2), Pair(100, 1), Pair(300, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `delete left node with no children and perform left rotation`() { + val tree = AVLTree() + tree.insert(14,"Taylor Swift") + tree.insert(13,"Harry Styles") + tree.insert(15,"Lana Del Rey") + tree.insert(16,"Olivia Rodrigo") + tree.delete(13) + + val expectedKeysAndHeights = listOf(Pair(15, 2), Pair(14, 1), Pair(16, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `delete node with one child and perform left-right rotation`() { + val tree = AVLTree() + tree.insert(43,"I") + tree.insert(600,"remember") + tree.insert(10,"it") + tree.insert(33,"all") + tree.insert(0,"too") + tree.insert(55,"well") + tree.insert(21,"...") + tree.delete(600) + + val expectedKeysAndHeights = listOf(Pair(33, 3), Pair(10, 2), Pair(0, 1), Pair(21, 1), Pair(43, 2), Pair(55, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `delete node with one child and perform right-left rotation`() { + val tree = AVLTree() + tree.insert(525,"Tender") + tree.insert(505,"Is") + tree.insert(515,"the") + tree.insert(555,"Night") + tree.insert(565,"by") + tree.insert(535,"F. Scott") + tree.insert(545,"Fitzgerald") + tree.delete(505) + + val expectedKeysAndHeights = listOf(Pair(535, 3), Pair(525, 2), Pair(515, 1), Pair(555, 2), Pair(545, 1), Pair(565, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `delete node with one child and perform right rotation`() { + val tree = AVLTree() + tree.insert(5111,"Coffee") + tree.insert(3111,"Tea") + tree.insert(7111,"Lemonade") + tree.insert(1111,"Coke") + tree.insert(4111,"Juice") + tree.insert(6111,"Hot chocolate") + tree.insert(2111,"Water") + tree.delete(7111) + + val expectedKeysAndHeights = listOf(Pair(3111, 3), Pair(1111, 2), Pair(2111, 1), Pair(5111, 2), Pair(4111, 1), Pair(6111, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `delete node with one child and perform left rotation`() { + val tree = AVLTree() + tree.insert(999, "Dandelions") + tree.insert(9, "Wisteria") + tree.insert(99999, "Ivy") + tree.insert(99, "Willow") + tree.insert(9999, "Daises") + tree.insert(999999, "Chamomiles") + tree.insert(9999999, "Roses") + tree.delete(9) + + val expectedKeysAndHeights = listOf(Pair(99999, 3), Pair(999, 2), Pair(99, 1), Pair(9999, 1), Pair(999999, 2), Pair(9999999, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `delete node with two children and perform right rotation`() { + val tree = AVLTree() + tree.insert(541, "Paris") + tree.insert(321, "London") + tree.insert(651, "Los Angeles") + tree.insert(101, "Saint Petersburg") + tree.insert(431, "Prague") + tree.insert(761, "Vienna") + tree.insert(211, "Rome") + tree.delete(541) + + val expectedKeysAndHeights = listOf(Pair(321, 3), Pair(101, 2), Pair(211, 1), Pair(651, 2), Pair(431, 1), Pair(761, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `delete node with two children and perform right-left rotation`() { + val tree = AVLTree() + tree.insert(385, "Iron Man") + tree.insert(286, "Thor") + tree.insert(583, "Hawkeye") + tree.insert(187, "Black Widow") + tree.insert(484, "Hulk") + tree.insert(781, "Captain America") + tree.insert(682, "and others") + tree.delete(385) + + val expectedKeysAndHeights = listOf(Pair(484, 3), Pair(286, 2), Pair(187, 1), Pair(682, 2), Pair(583, 1), Pair(781, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `delete node with two children and perform left rotation`() { + val tree = AVLTree() + tree.insert(4, "C") + tree.insert(2, "O'Caml") + tree.insert(5, "Rust") + tree.insert(1, "Kotlin") + tree.insert(3, "Python") + tree.delete(4) + + val expectedKeysAndHeights = listOf(Pair(2, 3), Pair(1, 1), Pair(5, 2), Pair(3, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } + + @Test + fun `delete node with two children and perform left-right rotation`() { + val tree = AVLTree() + tree.insert(33, "Scene") + tree.insert(44, "after") + tree.insert(11, "credits") + tree.insert(22, "?") + tree.delete(44) + + val expectedKeysAndHeights = listOf(Pair(22, 2), Pair(11, 1), Pair(33, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + } +} \ No newline at end of file From cdda702daaccc5a07c2348a03d7f62a627e9728f Mon Sep 17 00:00:00 2001 From: Sofya Kozyreva Date: Sat, 30 Mar 2024 19:25:54 +0300 Subject: [PATCH 36/55] fix(AVL&RB): change package directive to match the file location; small refactoring --- lib/src/main/kotlin/trees/AVLTree.kt | 3 ++- lib/src/main/kotlin/trees/RBTree.kt | 6 ++--- lib/src/test/kotlin/treesTests/AVLTreeTest.kt | 25 ++++++++----------- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/lib/src/main/kotlin/trees/AVLTree.kt b/lib/src/main/kotlin/trees/AVLTree.kt index 2a00966..6f251ab 100644 --- a/lib/src/main/kotlin/trees/AVLTree.kt +++ b/lib/src/main/kotlin/trees/AVLTree.kt @@ -1,5 +1,6 @@ +package trees + import nodes.AVLNode -import trees.balancedTree import kotlin.math.max class AVLTree, V>: balancedTree>() { diff --git a/lib/src/main/kotlin/trees/RBTree.kt b/lib/src/main/kotlin/trees/RBTree.kt index 3141a6f..6438848 100644 --- a/lib/src/main/kotlin/trees/RBTree.kt +++ b/lib/src/main/kotlin/trees/RBTree.kt @@ -1,7 +1,7 @@ +package trees + import nodes.Color import nodes.RBNode -import trees.balancedTree - class RBTree, V>: balancedTree>() { private fun getGrandparent(node: RBNode): RBNode? { @@ -121,7 +121,6 @@ class RBTree, V>: balancedTree>() { child = findMinNodeInRight(nodeToDelete.rightChild) ?: throw IllegalArgumentException("Node must have right child") val newNode = child - println("delete node with 2 children") delete(child.key) newNode.color = nodeToDelete.color newNode.leftChild = nodeToDelete.leftChild @@ -265,7 +264,6 @@ class RBTree, V>: balancedTree>() { * RED RED */ private fun deleteCase6(node: RBNode) { - //val node = curNode val sibling = getSibling(node) ?: throw IllegalArgumentException("Sibling cannot be null") val parent = findParent(node) ?: throw IllegalArgumentException("Parent cannot be null") val grandparent = getGrandparent(node) diff --git a/lib/src/test/kotlin/treesTests/AVLTreeTest.kt b/lib/src/test/kotlin/treesTests/AVLTreeTest.kt index 3830c0d..69f877c 100644 --- a/lib/src/test/kotlin/treesTests/AVLTreeTest.kt +++ b/lib/src/test/kotlin/treesTests/AVLTreeTest.kt @@ -1,6 +1,6 @@ package treesTests -import AVLTree +import trees.AVLTree import org.junit.jupiter.api.Assertions.assertEquals import kotlin.test.Test @@ -112,19 +112,16 @@ class AVLTreeTest { @Test fun `delete node with non-existing key`() { - @Test - fun `delete node with non-existing key`() { - val tree = AVLTree() - tree.insert(10, "Half") - tree.insert(20, "Cherry") - tree.insert(30, "Half") - tree.insert(45, "Coke") - tree.delete(15) - - val expectedKeysAndHeights = listOf(Pair(20, 3), Pair(10, 1), Pair(30, 2), Pair(45, 1)) - val actualKeysAndHeights = tree.preorderTraverse() - assertEquals(expectedKeysAndHeights, actualKeysAndHeights) - } + val tree = AVLTree() + tree.insert(10, "Half") + tree.insert(20, "Cherry") + tree.insert(30, "Half") + tree.insert(45, "Coke") + tree.delete(15) + + val expectedKeysAndHeights = listOf(Pair(20, 3), Pair(10, 1), Pair(30, 2), Pair(45, 1)) + val actualKeysAndHeights = tree.preorderTraverse() + assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test From b9de7198123527d33ef4390467ff4126b7bcf622 Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Sat, 30 Mar 2024 19:59:05 +0300 Subject: [PATCH 37/55] feat(BST): implement first pack of tests for BST --- lib/src/test/kotlin/treesTests/BSTreeTest.kt | 179 +++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 lib/src/test/kotlin/treesTests/BSTreeTest.kt diff --git a/lib/src/test/kotlin/treesTests/BSTreeTest.kt b/lib/src/test/kotlin/treesTests/BSTreeTest.kt new file mode 100644 index 0000000..46ae1f8 --- /dev/null +++ b/lib/src/test/kotlin/treesTests/BSTreeTest.kt @@ -0,0 +1,179 @@ +package trees + +import trees.BSTree +import org.junit.jupiter.api.Assertions.assertEquals +import kotlin.test.Test + +class BSTreeTest { + @Test + fun `find node by key`() { + val tree = BSTree() + tree.insert(4, "first kitten") + tree.insert(2, "second kitten") + tree.insert(5, "third kitten") + tree.insert(3, "fourth kitten") + tree.insert(1, "fifth kitten") + tree.insert(6,"last kitten") + + val expectedValue = "second kitten" + val actuallyValue = tree.find(2) + assertEquals(expectedValue, actuallyValue) + } + + @Test + fun `traverse bst tree`() { + val tree = BSTree() + tree.insert(55, "happy") + tree.insert(88, "nation") + tree.insert(77, "living") + tree.insert(33, "in") + tree.insert(22, "a") + tree.insert(44, "happy") + tree.insert(99, "nation") + + val expectedKeys: List = listOf(55, 33, 22, 44, 88, 77, 99) + val actualKeys = tree.preorderTraverse() + assertEquals(expectedKeys, actualKeys) + } + + @Test + fun `insert root`() { + val tree = BSTree() + tree.insert(100, "say hi to the root!") + + val expectedKeys: List = listOf(100) + val actualKeys = tree.preorderTraverse() + assertEquals(expectedKeys, actualKeys) + } + + @Test + fun `delete root`() { + val tree = BSTree() + tree.insert(100, "hm.. looks like its gone") + tree.delete(100) + + val expectedKeys: List = listOf() + val actualKeys = tree.preorderTraverse() + assertEquals(expectedKeys, actualKeys) + } + + @Test + fun `insert some nodes`() { + val tree = BSTree() + tree.insert(44, "you") + tree.insert(23, "are") + tree.insert(58, "enough.") + tree.insert(37, "calm") + tree.insert(19, "down") + tree.insert(60,"pls") + + val expectedKeys: List = listOf(44, 23, 19, 37, 58, 60) + val actualKeys = tree.preorderTraverse() + assertEquals(expectedKeys, actualKeys) + } + + @Test + fun `insert node with existing key`() { + val tree = BSTree() + tree.insert(2, "oh") + tree.insert(4, "potato") + tree.insert(6, "only") + tree.insert(9, "you") + tree.insert(11, "understand") + tree.insert(2, "me") + + val expectedValue = "me" + val actualValue = tree.find(2) + assertEquals(expectedValue, actualValue) + } + + @Test + fun `delete node with non-existing key`() { + val tree = BSTree() + tree.insert(12, "BFS") + tree.insert(6, "DFS") + tree.insert(15, "Floyd Warshall") + tree.insert(9, "Aho-Corasick") + tree.insert(3, "A-star") + tree.insert(18,"can i work for you now?") + tree.delete(38) + + val expectedKeys: List = listOf(12, 6, 3, 9, 15, 18) + val actualKeys = tree.preorderTraverse() + assertEquals(expectedKeys, actualKeys) + } + + @Test + fun `delete node from an empty tree`() { + val tree = BSTree() + tree.delete(5) + + val expectedKeys: List = listOf() + val actualKeys = tree.preorderTraverse() + assertEquals(expectedKeys, actualKeys) + } + + @Test + fun `delete node with no children`() { + val tree = BSTree() + tree.insert(9, "because") + tree.insert(7, "i") + tree.insert(10, "envy") + tree.insert(8, "your") + tree.insert(6, "normal") + tree.insert(11,"life") + tree.delete(8) + + val expectedKeys: List = listOf(9, 7, 6, 10, 11) + val actualKeys = tree.preorderTraverse() + assertEquals(expectedKeys, actualKeys) + } + + @Test + fun `delete node with one right child`() { + val tree = BSTree() + tree.insert(14, "what") + tree.insert(12, "was") + tree.insert(15, "in") + tree.insert(13, "the") + tree.insert(11, "box") + tree.insert(16,"?????") + tree.delete(15) + + val expectedKeys: List = listOf(14, 12, 11, 13, 16) + val actualKeys = tree.preorderTraverse() + assertEquals(expectedKeys, actualKeys) + } + + @Test + fun `delete node with one left child`() { + val tree = BSTree() + tree.insert(9, "and") + tree.insert(6, "now") + tree.insert(15, "i") + tree.insert(12, "know") + tree.insert(3, "whats real") + tree.insert(18,"whats cake") + tree.delete(6) + + val expectedKeys: List = listOf(9, 3, 15, 12, 18) + val actualKeys = tree.preorderTraverse() + assertEquals(expectedKeys, actualKeys) + } + + @Test + fun `delete node with two children`() { + val tree = BSTree() + tree.insert(4, "you") + tree.insert(2, "reached") + tree.insert(5, "the") + tree.insert(3, "end") + tree.insert(1, "congrats") + tree.insert(6,"!!") + tree.delete(2) + + val expectedKeys: List = listOf(4, 3, 1, 5, 6) + val actualKeys = tree.preorderTraverse() + assertEquals(expectedKeys, actualKeys) + } +} \ No newline at end of file From 48236b3b5178dacc9c9cb64c2746e65c0f2297be Mon Sep 17 00:00:00 2001 From: Sonia Kozyreva <144167895+sofyak0zyreva@users.noreply.github.com> Date: Sat, 30 Mar 2024 21:00:59 +0300 Subject: [PATCH 38/55] Create README.md --- README.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..f228c5f --- /dev/null +++ b/README.md @@ -0,0 +1,65 @@ +## Table of contents +- [About the project](#about-the-project) +- [How to use](#how-to-use) +- [License](#license) +- [Developers and contacts](#developers-and-contacts) + +## About the project + +This library allows you to use three types of binary search trees: simple, AVL and Red-Black tree. [AVL](https://en.wikipedia.org/wiki/AVL_tree) and [Red-Black](https://en.wikipedia.org/wiki/Red–black_tree) tree implement their natural balancing. + +## How to use +There are 4 public methods you can use for each tree: + +* `insert(key, value)` inserts a node with such key and value. If a node with the same key already exists in the tree, old value is replaced with the new one. Note that key should be of Comparable type. +* `delete(key)` deletes a node with such key. If there is no node with that key, nothing is done. +* `find(key)` finds a node with such key and returns its value. If there is no node with that key, null is returned. +* `preorderTraverse()` traverses the tree recursively from `parent` to `left child` to `right child` (specific for every tree) + +Now you can simply create a tree: `BSTree`, `AVLTree` or `RBTree`: +``` + val tree = RBTree() + ``` +Start inserting and deleting nodes: +``` + tree.insert(11, "Welcome to the jungle") + tree.insert(9, "We got fun and games") + tree.insert(27, "We take it day by day") + tree.delete(11) + val value1 = find(9) // value = "We got fun and games" + val value2 = find(15) // value = null + ``` +Here are some examples for traversing each tree: + +For `BSTree` it saves node's key: +``` + val bstree = BSTree() + bstree.insert(99, "Empty spaces") + bstree.insert(88, "What are we living for?") + bstree.insert(77, "Abandonded places") + val myList = bstree.preorderTraverse() // myList = [99, 88, 77] + ``` +For `AVLTree` it saves node's key and height: +``` + val avltree = AVLTree() + avltree.insert(11, "When you were here before") + avltree.insert(1, "Couldn't look you in the eye") + avltree.insert(111, "You're just like an angel") + val myList = avltree.preorderTraverse() // myList = [(11, 2), (1, 1), (111, 1)] + ``` +For `RBTree` it saves node's key and color: +``` + val rbtree = RBTree() + rbtree.insert(30, "...we built this house") + rbtree.insert(20, "On memories") + rbtree.insert(25, "Take my picture now") + val myList = rbtree.preorderTraverse() // myList = [(25, BLACK), (20, RED), (30, RED)] + ``` + +Have fun! +## License +The product is distributed under MIT license. Check LICENSE for more information +## Developers and contacts +* [p1onerka](https://github.com/p1onerka) (tg @p10nerka) +* [sofyak0zyreva](https://github.com/sofyak0zyreva) (tg @soffque) +* [shvorobsofia](https://github.com/shvorobsofia) (tg @fshv23) From 5922a2d60800384036930c4e2b4b74753fe70347 Mon Sep 17 00:00:00 2001 From: Shvorob Date: Sun, 31 Mar 2024 10:45:52 +0300 Subject: [PATCH 39/55] feat(RBT): Implement tests for a red-black tree --- lib/src/test/kotlin/treesTests/RBTreeTest.kt | 248 +++++++++++++++++++ 1 file changed, 248 insertions(+) create mode 100644 lib/src/test/kotlin/treesTests/RBTreeTest.kt diff --git a/lib/src/test/kotlin/treesTests/RBTreeTest.kt b/lib/src/test/kotlin/treesTests/RBTreeTest.kt new file mode 100644 index 0000000..1d01506 --- /dev/null +++ b/lib/src/test/kotlin/treesTests/RBTreeTest.kt @@ -0,0 +1,248 @@ +package treesTests + +import nodes.Color +import trees.RBTree +import org.junit.jupiter.api.Assertions.assertEquals +import kotlin.test.Test + +class RBTreeTest { + @Test + fun findNodeByKeyTest() { + val tree = RBTree() + tree.insert(2,"Sofa") + tree.insert(4,"Sonya") + tree.insert(1,"Xenia") + + val currentlyValue = tree.find(2) + val expectedValue = "Sofa" + + assertEquals(expectedValue, currentlyValue) + } + + @Test + fun traverseTreeTest() { + val tree = RBTree() + tree.insert(3,"i") + tree.insert(2,"love") + tree.insert(1,"making") + tree.insert(4,"trees") + + val expectedKeysAndColors = listOf(Pair(2, Color.BLACK), Pair(1, Color.BLACK), Pair(3, Color.BLACK), Pair(4, Color.RED)) + val currentKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, currentKeysAndColors) + } + + @Test + fun `insert node with the same key`() { + val tree = RBTree() + tree.insert(1, "Kittens") + tree.insert(2, "Sadness") + tree.insert(3, "Puppies") + tree.insert(4, "Bunnies") + tree.insert(5, "Birds") + tree.insert(2, "Happiness") + + val currentValue = tree.find(2) + val expectedValue = "Happiness" + + assertEquals(expectedValue, currentValue) + } + + //case 1: insertedNode is root + @Test + fun `insert a root`() { + val tree = RBTree() + tree.insert(8, "Infinity") + + val expectedKeysAndColors = listOf(Pair(8, Color.BLACK)) + val currentKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, currentKeysAndColors) + } + + //case 2: parent of insertedNode is black + @Test + fun `insert a node with BLACK parent`() { + val tree = RBTree() + tree.insert(10, "Sunny") + tree.insert(8, "Cloudy") + tree.insert(14, "Stormy") + tree.insert(15, "Hazy") + + tree.insert(9, "Rainy") + val expectedKeysAndColors = listOf(Pair(10, Color.BLACK), Pair(8, Color.BLACK), + Pair(9, Color.RED), Pair(14, Color.BLACK), Pair(15, Color.RED)) + val currentKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, currentKeysAndColors) + } + + //case 3: uncle is non-null and red (so both uncle and parent are red) + @Test + fun `insert a node with RED parent and RED uncle`() { + val tree = RBTree() + tree.insert(100, "Red") + tree.insert(55, "Orange") + tree.insert(111, "Yellow") + + tree.insert(33, "Green") + + val expectedKeysAndColors = listOf(Pair(100, Color.BLACK), Pair(55, Color.BLACK), Pair(33, Color.RED), Pair(111, Color.BLACK)) + val currentKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, currentKeysAndColors) + } + + /* case 4: uncle is black, parent is red; grandparent, parent and node form a "triangle" + * G G + * / \ + * P - left triangle P - right triangle + * \ / + * N N + * + */ + @Test + fun `insert a node into a left triangle`() { + val tree = RBTree() + tree.insert(50, "Apple") + tree.insert(30, "Banana") + + tree.insert(40, "Grape") + + val expectedKeysAndColors = listOf(Pair(40, Color.BLACK), Pair(30, Color.RED), Pair(50, Color.RED)) + val currentKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, currentKeysAndColors) + } + + @Test + fun `insert a node into a right triangle`() { + val tree = RBTree() + tree.insert(49, "Chocolate") + tree.insert(34, "Cookies") + tree.insert(78, "Croissants") + tree.insert(100, "Candy") + + tree.insert(95, "Creme brulee") + val expectedKeysAndColors = listOf(Pair(49, Color.BLACK), Pair(34, Color.BLACK), + Pair(95, Color.BLACK), Pair(78, Color.RED), Pair(100, Color.RED)) + val currentKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, currentKeysAndColors) + } + + /* case 5: uncle is black, parent is red; grandparent, parent and node form a "line" + * G G + * / \ + * P - left line P - right line + * / \ + * N N + */ + @Test + fun `insert a node into a left line`() { + val tree = RBTree() + tree.insert(900, "") + } + + @Test + fun `remove childless red node from a red-black tree`() { + val tree = RBTree() + tree.insert(23, "Red") + tree.insert(11, "Orange") + tree.insert(37, "Yellow") + tree.insert(17, "Green") + + tree.delete(17) + + val expectedKeysAndColors = listOf(Pair(23, Color.BLACK), Pair(11, Color.BLACK), Pair(37, Color.BLACK)) + val currentKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, currentKeysAndColors) + } + @Test + fun `remove a red node with two black children from a red-black tree`() { + val tree = RBTree() + tree.insert(23, "Red") + tree.insert(37, "Orange") + tree.insert(20, "Yellow") + tree.insert(19, "Green") + tree.insert(22, "Green") + + tree.delete(20) + + val expectedKeysAndColors = listOf(Pair(23, Color.BLACK), Pair(19, Color.BLACK), Pair(22, Color.RED), Pair(37, Color.BLACK)) + val currentKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, currentKeysAndColors) + } + + @Test + fun `remove black node with one red child from a red-black tree`() { + val tree = RBTree() + tree.insert(5, "Red") + tree.insert(3, "Orange") + tree.insert(6, "Yellow") + tree.insert(4, "Green") + tree.insert(1, "Green") + tree.insert(7, "Green") + + tree.delete(6) + + val expectedKeysAndColors = listOf(Pair(5, Color.BLACK), Pair(3, Color.BLACK) , Pair(1, Color.RED), Pair(4, Color.RED), Pair(7, Color.BLACK)) + val currentKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, currentKeysAndColors) + } + @Test + fun `remove black node with two children from a red-black tree`() { + val tree = RBTree() + tree.insert(5, "Red") + tree.insert(3, "Orange") + tree.insert(6, "Yellow") + tree.insert(4, "Green") + tree.insert(1, "Green") + + tree.delete(3) + + val expectedKeysAndColors = listOf(Pair(5, Color.BLACK), Pair(1, Color.BLACK), Pair(4, Color.RED), Pair(6, Color.BLACK)) + val currentKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, currentKeysAndColors) + } + + @Test + fun `remove childless black node with black sibling witch has left red child`() { + val tree = RBTree() + tree.insert(3, "Red") + tree.insert(1, "Orange") + tree.insert(5, "Yellow") + tree.insert(4, "Green") + + tree.delete(1) + + val expectedKeysAndColors = listOf(Pair(4, Color.BLACK), Pair(3, Color.BLACK), Pair(5, Color.BLACK)) + val currentKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, currentKeysAndColors) + } + @Test + fun `remove childless black node with black sibling witch has right red child`() { + val tree = RBTree() + tree.insert(3, "Red") + tree.insert(1, "Orange") + tree.insert(5, "Yellow") + tree.insert(6, "Green") + + tree.delete(1) + + val expectedKeysAndColors = listOf(Pair(5, Color.BLACK), Pair(3, Color.BLACK), Pair(6, Color.BLACK)) + val currentKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, currentKeysAndColors) + } + @Test + fun `remove childless black node with red sibling witch has only black children`() { + val tree = RBTree() + tree.insert(6, "Red") + tree.insert(4, "Orange") + tree.insert(7, "Yellow") + tree.insert(2, "Green") + tree.insert(5, "Green") + tree.insert(1, "Green") + + tree.delete(7) + + val expectedKeysAndColors = listOf(Pair(4, Color.BLACK), Pair(2, Color.BLACK), Pair(1, Color.RED), Pair(6, Color.BLACK), Pair(5, Color.RED),) + val currentKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, currentKeysAndColors) + } +} From a11a7a2179f71b4bc180fc426fd2b3be2e0215ef Mon Sep 17 00:00:00 2001 From: Shvorob Date: Sun, 31 Mar 2024 10:56:29 +0300 Subject: [PATCH 40/55] feat(RBT): Implement tests for a red-black tree --- lib/src/test/kotlin/treesTests/RBTreeTest.kt | 272 +++++++++++++++---- 1 file changed, 223 insertions(+), 49 deletions(-) diff --git a/lib/src/test/kotlin/treesTests/RBTreeTest.kt b/lib/src/test/kotlin/treesTests/RBTreeTest.kt index 1d01506..093516c 100644 --- a/lib/src/test/kotlin/treesTests/RBTreeTest.kt +++ b/lib/src/test/kotlin/treesTests/RBTreeTest.kt @@ -5,22 +5,22 @@ import trees.RBTree import org.junit.jupiter.api.Assertions.assertEquals import kotlin.test.Test + class RBTreeTest { @Test - fun findNodeByKeyTest() { + fun `find node by key`() { val tree = RBTree() tree.insert(2,"Sofa") tree.insert(4,"Sonya") tree.insert(1,"Xenia") - val currentlyValue = tree.find(2) val expectedValue = "Sofa" - - assertEquals(expectedValue, currentlyValue) + val actuallyValue = tree.find(2) + assertEquals(expectedValue, actuallyValue) } @Test - fun traverseTreeTest() { + fun `traverse rb tree`() { val tree = RBTree() tree.insert(3,"i") tree.insert(2,"love") @@ -28,12 +28,12 @@ class RBTreeTest { tree.insert(4,"trees") val expectedKeysAndColors = listOf(Pair(2, Color.BLACK), Pair(1, Color.BLACK), Pair(3, Color.BLACK), Pair(4, Color.RED)) - val currentKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, currentKeysAndColors) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test - fun `insert node with the same key`() { + fun `insert node with existing key`() { val tree = RBTree() tree.insert(1, "Kittens") tree.insert(2, "Sadness") @@ -42,24 +42,21 @@ class RBTreeTest { tree.insert(5, "Birds") tree.insert(2, "Happiness") - val currentValue = tree.find(2) + val actualValue = tree.find(2) val expectedValue = "Happiness" - - assertEquals(expectedValue, currentValue) + assertEquals(expectedValue, actualValue) } - //case 1: insertedNode is root @Test - fun `insert a root`() { + fun `insert root`() { val tree = RBTree() tree.insert(8, "Infinity") val expectedKeysAndColors = listOf(Pair(8, Color.BLACK)) - val currentKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, currentKeysAndColors) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) } - //case 2: parent of insertedNode is black @Test fun `insert a node with BLACK parent`() { val tree = RBTree() @@ -67,27 +64,26 @@ class RBTreeTest { tree.insert(8, "Cloudy") tree.insert(14, "Stormy") tree.insert(15, "Hazy") - tree.insert(9, "Rainy") + val expectedKeysAndColors = listOf(Pair(10, Color.BLACK), Pair(8, Color.BLACK), Pair(9, Color.RED), Pair(14, Color.BLACK), Pair(15, Color.RED)) - val currentKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, currentKeysAndColors) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) } - //case 3: uncle is non-null and red (so both uncle and parent are red) @Test fun `insert a node with RED parent and RED uncle`() { val tree = RBTree() tree.insert(100, "Red") tree.insert(55, "Orange") tree.insert(111, "Yellow") - tree.insert(33, "Green") - val expectedKeysAndColors = listOf(Pair(100, Color.BLACK), Pair(55, Color.BLACK), Pair(33, Color.RED), Pair(111, Color.BLACK)) - val currentKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, currentKeysAndColors) + val expectedKeysAndColors = listOf(Pair(100, Color.BLACK), Pair(55, Color.BLACK), + Pair(33, Color.RED), Pair(111, Color.BLACK)) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) } /* case 4: uncle is black, parent is red; grandparent, parent and node form a "triangle" @@ -103,12 +99,11 @@ class RBTreeTest { val tree = RBTree() tree.insert(50, "Apple") tree.insert(30, "Banana") - tree.insert(40, "Grape") val expectedKeysAndColors = listOf(Pair(40, Color.BLACK), Pair(30, Color.RED), Pair(50, Color.RED)) - val currentKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, currentKeysAndColors) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test @@ -118,12 +113,12 @@ class RBTreeTest { tree.insert(34, "Cookies") tree.insert(78, "Croissants") tree.insert(100, "Candy") - tree.insert(95, "Creme brulee") + val expectedKeysAndColors = listOf(Pair(49, Color.BLACK), Pair(34, Color.BLACK), Pair(95, Color.BLACK), Pair(78, Color.RED), Pair(100, Color.RED)) - val currentKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, currentKeysAndColors) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) } /* case 5: uncle is black, parent is red; grandparent, parent and node form a "line" @@ -132,15 +127,194 @@ class RBTreeTest { * P - left line P - right line * / \ * N N + * */ @Test fun `insert a node into a left line`() { val tree = RBTree() - tree.insert(900, "") + tree.insert(900, "folklore") + tree.insert(90, "evermore") + tree.insert(9, "midnights") + + val expectedKeysAndColors = listOf(Pair(90, Color.BLACK), Pair(9, Color.RED), Pair(900, Color.RED)) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) + } + + @Test + fun `insert a node into a right line`() { + val tree = RBTree() + tree.insert(333, "Didn't") + tree.insert(33, "the trees") + tree.insert(3333, "tell us") + tree.insert(33333, "their stories") + tree.insert(333333, "?") + + val expectedKeysAndColors = listOf(Pair(333, Color.BLACK), Pair(33, Color.BLACK), + Pair(33333, Color.BLACK), Pair(3333, Color.RED), Pair(333333, Color.RED)) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) + } + + @Test + fun `delete node with non-existing key`() { + val tree = RBTree() + tree.insert(10, "Yes") + tree.insert(20, "No") + tree.insert(30, "Not sure") + tree.delete(15) + + val expectedKeysAndColors = listOf(Pair(20, Color.BLACK), Pair(10, Color.RED), Pair(30, Color.RED)) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) + } + + @Test + fun `delete node from an empty tree`() { + val tree = RBTree() + tree.delete(5) + + val expectedKeysAndColors: List> = listOf() + val actualKeysAndColors = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) + } + + @Test + fun `delete RED node with two children (left subtree & right leaf)`() { + val tree = RBTree() + tree.insert(20, "I spy") + tree.insert(10, "with") + tree.insert(40, "my") + tree.insert(30, "little") + tree.insert(45, "tired") + tree.insert(33, "eye") + tree.delete(40) + + val expectedKeysAndColors = listOf(Pair(20, Color.BLACK), Pair(10, Color.BLACK), + Pair(33, Color.RED), Pair(30, Color.BLACK), Pair(45, Color.BLACK)) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) + } + + @Test + fun `delete RED node with no children`() { + val tree = RBTree() + tree.insert(20, "I") + tree.insert(10, "don't") + tree.insert(40, "wanna") + tree.insert(30, "live") + tree.insert(45, "forever") + tree.insert(33, "!") + tree.delete(33) + + val expectedKeysAndColors = listOf(Pair(20, Color.BLACK), Pair(10, Color.BLACK), + Pair(40, Color.RED), Pair(30, Color.BLACK), Pair(45, Color.BLACK)) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) + } + + @Test + fun `delete BLACK node with one right RED child`() { + val tree = RBTree() + tree.insert(20, "Is") + tree.insert(10, "it") + tree.insert(40, "really") + tree.insert(30, "worth") + tree.insert(45, "itt") + tree.insert(25, "?") + tree.delete(30) + + val expectedKeysAndColors = listOf(Pair(20, Color.BLACK), Pair(10, Color.BLACK), + Pair(40, Color.RED), Pair(25, Color.BLACK), Pair(45, Color.BLACK)) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) + } + + @Test + fun `delete BLACK node with one left RED child`() { + val tree = RBTree() + tree.insert(20, "How") + tree.insert(10, "many") + tree.insert(40, "easter") + tree.insert(30, "eggs") + tree.insert(45, "can") + tree.insert(33, "you") + tree.delete(30) + + val expectedKeysAndColors = listOf(Pair(20, Color.BLACK), Pair(10, Color.BLACK), + Pair(40, Color.RED), Pair(33, Color.BLACK), Pair(45, Color.BLACK)) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) + } + + @Test + fun `delete BLACK node with no children and RED sibling`() { + val tree = RBTree() + tree.insert(20, "find") + tree.insert(10, "in") + tree.insert(40, "these") + tree.insert(30, "wonderful") + tree.insert(45, "tests") + tree.insert(33, "?") + tree.delete(10) + + val expectedKeysAndColors = listOf(Pair(40, Color.BLACK), Pair(30, Color.RED), + Pair(20, Color.BLACK), Pair(33, Color.BLACK), Pair(45, Color.BLACK)) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test - fun `remove childless red node from a red-black tree`() { + fun `delete BLACK node with two children (left subtree & right leaf)`() { + val tree = RBTree() + tree.insert(100, "I") + tree.insert(80, "hope") + tree.insert(200, "you") + tree.insert(60, "enjoy") + tree.insert(90, "it") + tree.insert(65, "as") + tree.delete(100) + + val expectedKeysAndColors = listOf(Pair(80, Color.BLACK), Pair(60, Color.BLACK), + Pair(65, Color.RED), Pair(200, Color.BLACK), Pair(90, Color.RED)) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) + } + + @Test + fun `delete left BLACK node with RED right child`() { + val tree = RBTree() + tree.insert(100, "much") + tree.insert(80, "as") + tree.insert(200, "I") + tree.insert(60, "do") + tree.insert(90, ".") + tree.insert(88, "I'm") + tree.delete(60) + + val expectedKeysAndColors = listOf(Pair(100, Color.BLACK), Pair(88, Color.RED), + Pair(80, Color.BLACK), Pair(90, Color.BLACK), Pair(200, Color.BLACK)) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) + } + + @Test + fun `delete BLACK node with no children and BLACK sibling`() { + val tree = RBTree() + tree.insert(111, "running") + tree.insert(222, "out") + tree.insert(88, "of") + tree.insert(233, "words") + tree.delete(233) + tree.delete(88) + + val expectedKeysAndColors = listOf(Pair(111, Color.BLACK), Pair(222, Color.RED)) + val actualKeysAndColors: List> = tree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) + } + + @Test + fun `delete left RED node with no children`() { val tree = RBTree() tree.insert(23, "Red") tree.insert(11, "Orange") @@ -153,24 +327,24 @@ class RBTreeTest { val currentKeysAndColors: List> = tree.preorderTraverse() assertEquals(expectedKeysAndColors, currentKeysAndColors) } + @Test - fun `remove a red node with two black children from a red-black tree`() { + fun `delete RED node with two BLACK children`() { val tree = RBTree() tree.insert(23, "Red") tree.insert(37, "Orange") tree.insert(20, "Yellow") tree.insert(19, "Green") tree.insert(22, "Green") - tree.delete(20) - val expectedKeysAndColors = listOf(Pair(23, Color.BLACK), Pair(19, Color.BLACK), Pair(22, Color.RED), Pair(37, Color.BLACK)) + val expectedKeysAndColors = listOf(Pair(23, Color.BLACK), Pair(22, Color.BLACK), Pair(19, Color.RED), Pair(37, Color.BLACK)) val currentKeysAndColors: List> = tree.preorderTraverse() assertEquals(expectedKeysAndColors, currentKeysAndColors) } @Test - fun `remove black node with one red child from a red-black tree`() { + fun `delete BLACK node with one RED child`() { val tree = RBTree() tree.insert(5, "Red") tree.insert(3, "Orange") @@ -178,59 +352,59 @@ class RBTreeTest { tree.insert(4, "Green") tree.insert(1, "Green") tree.insert(7, "Green") - tree.delete(6) - val expectedKeysAndColors = listOf(Pair(5, Color.BLACK), Pair(3, Color.BLACK) , Pair(1, Color.RED), Pair(4, Color.RED), Pair(7, Color.BLACK)) + val expectedKeysAndColors = listOf(Pair(5, Color.BLACK), Pair(3, Color.BLACK), + Pair(1, Color.RED), Pair(4, Color.RED), Pair(7, Color.BLACK)) val currentKeysAndColors: List> = tree.preorderTraverse() assertEquals(expectedKeysAndColors, currentKeysAndColors) } + @Test - fun `remove black node with two children from a red-black tree`() { + fun `delete BLACK node with two children`() { val tree = RBTree() tree.insert(5, "Red") tree.insert(3, "Orange") tree.insert(6, "Yellow") tree.insert(4, "Green") tree.insert(1, "Green") - tree.delete(3) - val expectedKeysAndColors = listOf(Pair(5, Color.BLACK), Pair(1, Color.BLACK), Pair(4, Color.RED), Pair(6, Color.BLACK)) + val expectedKeysAndColors = listOf(Pair(5, Color.BLACK), Pair(4, Color.BLACK), Pair(1, Color.RED), Pair(6, Color.BLACK)) val currentKeysAndColors: List> = tree.preorderTraverse() assertEquals(expectedKeysAndColors, currentKeysAndColors) } @Test - fun `remove childless black node with black sibling witch has left red child`() { + fun `delete BLACK node with no children and BLACK sibling which has left RED child`() { val tree = RBTree() tree.insert(3, "Red") tree.insert(1, "Orange") tree.insert(5, "Yellow") tree.insert(4, "Green") - tree.delete(1) val expectedKeysAndColors = listOf(Pair(4, Color.BLACK), Pair(3, Color.BLACK), Pair(5, Color.BLACK)) val currentKeysAndColors: List> = tree.preorderTraverse() assertEquals(expectedKeysAndColors, currentKeysAndColors) } + @Test - fun `remove childless black node with black sibling witch has right red child`() { + fun `delete BLACK node with no children and BLACK sibling which has right RED child`() { val tree = RBTree() tree.insert(3, "Red") tree.insert(1, "Orange") tree.insert(5, "Yellow") tree.insert(6, "Green") - tree.delete(1) val expectedKeysAndColors = listOf(Pair(5, Color.BLACK), Pair(3, Color.BLACK), Pair(6, Color.BLACK)) val currentKeysAndColors: List> = tree.preorderTraverse() assertEquals(expectedKeysAndColors, currentKeysAndColors) } + @Test - fun `remove childless black node with red sibling witch has only black children`() { + fun `delete BLACK node with no children and RED sibling which has only BLACK children`() { val tree = RBTree() tree.insert(6, "Red") tree.insert(4, "Orange") @@ -238,11 +412,11 @@ class RBTreeTest { tree.insert(2, "Green") tree.insert(5, "Green") tree.insert(1, "Green") - tree.delete(7) - val expectedKeysAndColors = listOf(Pair(4, Color.BLACK), Pair(2, Color.BLACK), Pair(1, Color.RED), Pair(6, Color.BLACK), Pair(5, Color.RED),) + val expectedKeysAndColors = listOf(Pair(4, Color.BLACK), Pair(2, Color.BLACK), + Pair(1, Color.RED), Pair(6, Color.BLACK), Pair(5, Color.RED),) val currentKeysAndColors: List> = tree.preorderTraverse() assertEquals(expectedKeysAndColors, currentKeysAndColors) } -} +} \ No newline at end of file From 34428f200fc74582b09e1b2771daa2950a2f416f Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Sun, 31 Mar 2024 19:39:52 +0300 Subject: [PATCH 41/55] fix(BST): change packages configuration in BSTreeTest for uniformity --- lib/src/test/kotlin/treesTests/BSTreeTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/test/kotlin/treesTests/BSTreeTest.kt b/lib/src/test/kotlin/treesTests/BSTreeTest.kt index 46ae1f8..fe2fe19 100644 --- a/lib/src/test/kotlin/treesTests/BSTreeTest.kt +++ b/lib/src/test/kotlin/treesTests/BSTreeTest.kt @@ -1,4 +1,4 @@ -package trees +package treesTests import trees.BSTree import org.junit.jupiter.api.Assertions.assertEquals From 7531012d3c905b4fbcc135fe25730c8478b7bcb9 Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Sun, 31 Mar 2024 19:42:10 +0300 Subject: [PATCH 42/55] fix(BST): add exception, the need for which was identified during test coverage analysis --- lib/src/main/kotlin/trees/abstractTree.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/src/main/kotlin/trees/abstractTree.kt b/lib/src/main/kotlin/trees/abstractTree.kt index 705225b..a0f1827 100644 --- a/lib/src/main/kotlin/trees/abstractTree.kt +++ b/lib/src/main/kotlin/trees/abstractTree.kt @@ -58,6 +58,9 @@ abstract class abstractTree, V, someNode: abstractNode { From 03669006acdcd7f89ef5f89115996ba424f6d76b Mon Sep 17 00:00:00 2001 From: Sofya Kozyreva Date: Sun, 7 Apr 2024 10:38:20 +0300 Subject: [PATCH 43/55] fix(AVLTest): beautify the code, add @BeforeEach --- lib/src/test/kotlin/treesTests/AVLTreeTest.kt | 185 ++++++++---------- 1 file changed, 85 insertions(+), 100 deletions(-) diff --git a/lib/src/test/kotlin/treesTests/AVLTreeTest.kt b/lib/src/test/kotlin/treesTests/AVLTreeTest.kt index 69f877c..1098386 100644 --- a/lib/src/test/kotlin/treesTests/AVLTreeTest.kt +++ b/lib/src/test/kotlin/treesTests/AVLTreeTest.kt @@ -2,16 +2,21 @@ package treesTests import trees.AVLTree import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.BeforeEach import kotlin.test.Test - class AVLTreeTest { + private lateinit var tree: AVLTree + + @BeforeEach + fun setup() { + tree = AVLTree() + } @Test fun `find node by key`() { - val tree = AVLTree() - tree.insert(2,"Sofa") - tree.insert(4,"Sonya") - tree.insert(1,"Xenia") + tree.insert(2, "Sofa") + tree.insert(4, "Sonya") + tree.insert(1, "Xenia") val expectedValue = "Sofa" val actualValue = tree.find(2) @@ -20,11 +25,10 @@ class AVLTreeTest { @Test fun `traverse avl tree`() { - val tree = AVLTree() - tree.insert(3,"i") - tree.insert(2,"love") - tree.insert(1,"making") - tree.insert(4,"trees") + tree.insert(3, "i") + tree.insert(2, "love") + tree.insert(1, "making") + tree.insert(4, "trees") val expectedKeysAndHeights = listOf(Pair(2, 3), Pair(1, 1), Pair(3, 2), Pair(4, 1)) val actualKeysAndHeights = tree.preorderTraverse() @@ -33,7 +37,6 @@ class AVLTreeTest { @Test fun `insert node with existing key`() { - val tree = AVLTree() tree.insert(1, "Kittens") tree.insert(2, "Sadness") tree.insert(3, "Puppies") @@ -49,23 +52,21 @@ class AVLTreeTest { @Test fun `insert node and perform right rotation`() { - val tree = AVLTree() - tree.insert(4,"hi") - tree.insert(2,"hi") - tree.insert(5,"hi") - tree.insert(0,"hii") - tree.insert(3,"hiiii") + tree.insert(4, "hi") + tree.insert(2, "hi") + tree.insert(5, "hi") + tree.insert(0, "hii") + tree.insert(3, "hiiii") - tree.insert(1,"hey") + tree.insert(1, "hey") - val expectedKeysAndHeights = listOf(Pair(2, 3), Pair(0,2), Pair(1, 1), Pair(4, 2), Pair(3, 1), Pair(5, 1)) + val expectedKeysAndHeights = listOf(Pair(2, 3), Pair(0, 2), Pair(1, 1), Pair(4, 2), Pair(3, 1), Pair(5, 1)) val actualKeysAndHeights = tree.preorderTraverse() assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test fun `insert node and perform left-right rotation`() { - val tree = AVLTree() tree.insert(4,"y") tree.insert(1,"n") tree.insert(5,"d") @@ -73,21 +74,19 @@ class AVLTreeTest { tree.insert(2,"r") tree.insert(3,"p") - val expectedKeysAndHeights = listOf(Pair(2, 3), Pair(1,2), Pair(0, 1), Pair(4, 2), Pair(3, 1), Pair(5, 1)) + val expectedKeysAndHeights = listOf(Pair(2, 3), Pair(1, 2), Pair(0, 1), Pair(4, 2), Pair(3, 1), Pair(5, 1)) val actualKeysAndHeights = tree.preorderTraverse() assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test fun `insert node and perform right-left rotation`() { - val tree = AVLTree() - tree.insert(1,"3") - tree.insert(0,"33") - tree.insert(4,"333") - tree.insert(3,"3333") - tree.insert(5,"33333") - - tree.insert(2,"333333") + tree.insert(1, "3") + tree.insert(0, "33") + tree.insert(4, "333") + tree.insert(3, "3333") + tree.insert(5, "33333") + tree.insert(2, "333333") val expectedKeysAndHeights = listOf(Pair(3, 3), Pair(1, 2), Pair(0, 1), Pair(2, 1), Pair(4, 2), Pair(5, 1)) val actualKeysAndHeights = tree.preorderTraverse() @@ -96,14 +95,12 @@ class AVLTreeTest { @Test fun `insert node and perform left rotation`() { - val tree = AVLTree() - tree.insert(1,"Shine") - tree.insert(0,"Bright") - tree.insert(3,"Like") - tree.insert(2,"A") - tree.insert(5,"Diamond") - - tree.insert(4,"Eeeeee") + tree.insert(1, "Shine") + tree.insert(0, "Bright") + tree.insert(3, "Like") + tree.insert(2, "A") + tree.insert(5, "Diamond") + tree.insert(4, "Eeeeee") val expectedKeysAndHeights = listOf(Pair(3, 3), Pair(1, 2), Pair(0, 1), Pair(2, 1), Pair(5, 2), Pair(4, 1)) val actualKeysAndHeights = tree.preorderTraverse() @@ -112,7 +109,6 @@ class AVLTreeTest { @Test fun `delete node with non-existing key`() { - val tree = AVLTree() tree.insert(10, "Half") tree.insert(20, "Cherry") tree.insert(30, "Half") @@ -126,7 +122,6 @@ class AVLTreeTest { @Test fun `delete node from an empty tree`() { - val tree = AVLTree() tree.delete(1000) val expectedKeysAndHeights: List> = listOf() @@ -136,8 +131,7 @@ class AVLTreeTest { @Test fun `delete root`() { - val tree = AVLTree() - tree.insert(44,"rip root") + tree.insert(44, "rip root") tree.delete(44) val expectedKeysAndHeights: List> = listOf() @@ -147,12 +141,11 @@ class AVLTreeTest { @Test fun `delete node with two children (right child is leaf)`() { - val tree = AVLTree() - tree.insert(115, "") - tree.insert(155, "") - tree.insert(55, "") - tree.insert(105, "") - tree.insert(15, "") + tree.insert(115, "i go") + tree.insert(155, "round") + tree.insert(55, "and") + tree.insert(105, "round") + tree.insert(15, "satellite") tree.delete(115) val expectedKeysAndHeights = listOf(Pair(55, 3), Pair(15, 1), Pair(155, 2), Pair(105, 1)) @@ -162,11 +155,10 @@ class AVLTreeTest { @Test fun `delete right node with no children and perform right rotation`() { - val tree = AVLTree() - tree.insert(44,"this") - tree.insert(33,"is") - tree.insert(55,"me") - tree.insert(22,"trying") + tree.insert(44, "this") + tree.insert(33, "is") + tree.insert(55, "me") + tree.insert(22, "trying") tree.delete(55) val expectedKeysAndHeights = listOf(Pair(33, 2), Pair(22, 1), Pair(44, 1)) @@ -176,11 +168,10 @@ class AVLTreeTest { @Test fun `delete left node with no children and perform left-right rotation`() { - val tree = AVLTree() - tree.insert(2,"Welcome") - tree.insert(1,"to") - tree.insert(4,"New") - tree.insert(3,"York") + tree.insert(2, "Welcome") + tree.insert(1, "to") + tree.insert(4, "New") + tree.insert(3, "York") tree.delete(1) val expectedKeysAndHeights = listOf(Pair(3, 2), Pair(2, 1), Pair(4, 1)) @@ -190,11 +181,10 @@ class AVLTreeTest { @Test fun `delete right node with no children and perform left-right rotation`() { - val tree = AVLTree() - tree.insert(300,"Californication") - tree.insert(100,"Otherside") - tree.insert(400,"Dark Necessities") - tree.insert(200,"Encore") + tree.insert(300, "Californication") + tree.insert(100, "Otherside") + tree.insert(400, "Dark Necessities") + tree.insert(200, "Encore") tree.delete(400) val expectedKeysAndHeights = listOf(Pair(200, 2), Pair(100, 1), Pair(300, 1)) @@ -204,11 +194,10 @@ class AVLTreeTest { @Test fun `delete left node with no children and perform left rotation`() { - val tree = AVLTree() - tree.insert(14,"Taylor Swift") - tree.insert(13,"Harry Styles") - tree.insert(15,"Lana Del Rey") - tree.insert(16,"Olivia Rodrigo") + tree.insert(14, "Taylor Swift") + tree.insert(13, "Harry Styles") + tree.insert(15, "Lana Del Rey") + tree.insert(16, "Olivia Rodrigo") tree.delete(13) val expectedKeysAndHeights = listOf(Pair(15, 2), Pair(14, 1), Pair(16, 1)) @@ -218,14 +207,13 @@ class AVLTreeTest { @Test fun `delete node with one child and perform left-right rotation`() { - val tree = AVLTree() - tree.insert(43,"I") - tree.insert(600,"remember") - tree.insert(10,"it") - tree.insert(33,"all") - tree.insert(0,"too") - tree.insert(55,"well") - tree.insert(21,"...") + tree.insert(43, "I") + tree.insert(600, "remember") + tree.insert(10, "it") + tree.insert(33, "all") + tree.insert(0, "too") + tree.insert(55, "well") + tree.insert(21, "...") tree.delete(600) val expectedKeysAndHeights = listOf(Pair(33, 3), Pair(10, 2), Pair(0, 1), Pair(21, 1), Pair(43, 2), Pair(55, 1)) @@ -235,14 +223,13 @@ class AVLTreeTest { @Test fun `delete node with one child and perform right-left rotation`() { - val tree = AVLTree() - tree.insert(525,"Tender") - tree.insert(505,"Is") - tree.insert(515,"the") - tree.insert(555,"Night") - tree.insert(565,"by") - tree.insert(535,"F. Scott") - tree.insert(545,"Fitzgerald") + tree.insert(525, "Tender") + tree.insert(505, "Is") + tree.insert(515, "the") + tree.insert(555, "Night") + tree.insert(565, "by") + tree.insert(535, "F. Scott") + tree.insert(545, "Fitzgerald") tree.delete(505) val expectedKeysAndHeights = listOf(Pair(535, 3), Pair(525, 2), Pair(515, 1), Pair(555, 2), Pair(545, 1), Pair(565, 1)) @@ -252,24 +239,23 @@ class AVLTreeTest { @Test fun `delete node with one child and perform right rotation`() { - val tree = AVLTree() - tree.insert(5111,"Coffee") - tree.insert(3111,"Tea") - tree.insert(7111,"Lemonade") - tree.insert(1111,"Coke") - tree.insert(4111,"Juice") - tree.insert(6111,"Hot chocolate") - tree.insert(2111,"Water") + tree.insert(5111, "Coffee") + tree.insert(3111, "Tea") + tree.insert(7111, "Lemonade") + tree.insert(1111, "Coke") + tree.insert(4111, "Juice") + tree.insert(6111, "Hot chocolate") + tree.insert(2111, "Water") tree.delete(7111) - val expectedKeysAndHeights = listOf(Pair(3111, 3), Pair(1111, 2), Pair(2111, 1), Pair(5111, 2), Pair(4111, 1), Pair(6111, 1)) + val expectedKeysAndHeights = listOf(Pair(3111, 3), Pair(1111, 2), Pair(2111, 1), + Pair(5111, 2), Pair(4111, 1), Pair(6111, 1)) val actualKeysAndHeights = tree.preorderTraverse() assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test fun `delete node with one child and perform left rotation`() { - val tree = AVLTree() tree.insert(999, "Dandelions") tree.insert(9, "Wisteria") tree.insert(99999, "Ivy") @@ -279,14 +265,14 @@ class AVLTreeTest { tree.insert(9999999, "Roses") tree.delete(9) - val expectedKeysAndHeights = listOf(Pair(99999, 3), Pair(999, 2), Pair(99, 1), Pair(9999, 1), Pair(999999, 2), Pair(9999999, 1)) + val expectedKeysAndHeights = listOf(Pair(99999, 3), Pair(999, 2), Pair(99, 1), + Pair(9999, 1), Pair(999999, 2), Pair(9999999, 1)) val actualKeysAndHeights = tree.preorderTraverse() assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test fun `delete node with two children and perform right rotation`() { - val tree = AVLTree() tree.insert(541, "Paris") tree.insert(321, "London") tree.insert(651, "Los Angeles") @@ -296,14 +282,14 @@ class AVLTreeTest { tree.insert(211, "Rome") tree.delete(541) - val expectedKeysAndHeights = listOf(Pair(321, 3), Pair(101, 2), Pair(211, 1), Pair(651, 2), Pair(431, 1), Pair(761, 1)) + val expectedKeysAndHeights = listOf(Pair(321, 3), Pair(101, 2), Pair(211, 1), + Pair(651, 2), Pair(431, 1), Pair(761, 1)) val actualKeysAndHeights = tree.preorderTraverse() assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test fun `delete node with two children and perform right-left rotation`() { - val tree = AVLTree() tree.insert(385, "Iron Man") tree.insert(286, "Thor") tree.insert(583, "Hawkeye") @@ -313,14 +299,14 @@ class AVLTreeTest { tree.insert(682, "and others") tree.delete(385) - val expectedKeysAndHeights = listOf(Pair(484, 3), Pair(286, 2), Pair(187, 1), Pair(682, 2), Pair(583, 1), Pair(781, 1)) + val expectedKeysAndHeights = listOf(Pair(484, 3), Pair(286, 2), Pair(187, 1), + Pair(682, 2), Pair(583, 1), Pair(781, 1)) val actualKeysAndHeights = tree.preorderTraverse() assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test fun `delete node with two children and perform left rotation`() { - val tree = AVLTree() tree.insert(4, "C") tree.insert(2, "O'Caml") tree.insert(5, "Rust") @@ -335,7 +321,6 @@ class AVLTreeTest { @Test fun `delete node with two children and perform left-right rotation`() { - val tree = AVLTree() tree.insert(33, "Scene") tree.insert(44, "after") tree.insert(11, "credits") From 79eacc05bf0e8f648e1b59e929d7ed304eb86b7c Mon Sep 17 00:00:00 2001 From: Sofya Kozyreva Date: Sun, 7 Apr 2024 10:38:32 +0300 Subject: [PATCH 44/55] fix(AVL): reformat the code --- lib/src/main/kotlin/trees/AVLTree.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/src/main/kotlin/trees/AVLTree.kt b/lib/src/main/kotlin/trees/AVLTree.kt index 6f251ab..edd3cd5 100644 --- a/lib/src/main/kotlin/trees/AVLTree.kt +++ b/lib/src/main/kotlin/trees/AVLTree.kt @@ -3,7 +3,7 @@ package trees import nodes.AVLNode import kotlin.math.max -class AVLTree, V>: balancedTree>() { +class AVLTree, V> : balancedTree>() { override fun createNewNode(key: K, value: V) = AVLNode(key, value) override fun insert(key: K, value: V) { @@ -57,27 +57,29 @@ class AVLTree, V>: balancedTree>() { /* balances a tree by performing left & right rotations if absolute value of balance factor is more than 1 */ - override fun balance (curNode: AVLNode, isAfterInsert: Boolean) { + override fun balance(curNode: AVLNode, isAfterInsert: Boolean) { when (getBalanceFactor(curNode)) { -2 -> { curNode.leftChild?.let { if (getBalanceFactor(it) == 1) rotateLeft(it, findParent(it)) } rotateRight(curNode, findParent(curNode)) } + 2 -> { curNode.rightChild?.let { if (getBalanceFactor(it) == -1) rotateRight(it, findParent(it)) } rotateLeft(curNode, findParent(curNode)) } + else -> updateHeight(curNode) } findParent(curNode)?.let { balance(it) } } - override fun rotateRight (node: AVLNode, parentNode: AVLNode?) { + override fun rotateRight(node: AVLNode, parentNode: AVLNode?) { super.rotateRight(node, parentNode) updateHeight(node) } - override fun rotateLeft (node: AVLNode, parentNode: AVLNode?) { + override fun rotateLeft(node: AVLNode, parentNode: AVLNode?) { super.rotateLeft(node, parentNode) updateHeight(node) } From 8ecfeff6314caa00b59c7200302bad66722a3d15 Mon Sep 17 00:00:00 2001 From: Shvorob Date: Sun, 7 Apr 2024 20:42:16 +0300 Subject: [PATCH 45/55] fix(RBT): remove separate cases for balanceAfterDelete as they create too many stack frames (bad practice) --- .idea/.gitignore | 3 + .idea/gradle.xml | 16 ++ .idea/kotlinc.xml | 6 + .idea/misc.xml | 5 + .idea/vcs.xml | 6 + lib/src/main/kotlin/trees/RBTree.kt | 224 ++++++++++++---------------- 6 files changed, 131 insertions(+), 129 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/gradle.xml create mode 100644 .idea/kotlinc.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..f76b872 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..8d81632 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..4a09701 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/lib/src/main/kotlin/trees/RBTree.kt b/lib/src/main/kotlin/trees/RBTree.kt index 6438848..1cedf9d 100644 --- a/lib/src/main/kotlin/trees/RBTree.kt +++ b/lib/src/main/kotlin/trees/RBTree.kt @@ -28,16 +28,19 @@ class RBTree, V>: balancedTree>() { grandparent?.leftChild } } + override fun insert(key: K, value: V) { val insertedNode = insertNode(key, value) ?: throw IllegalArgumentException("Nothing to insert") balance(insertedNode, true) } + override fun createNewNode(key: K, value: V): RBNode = RBNode(key, value) override fun balance(curNode: RBNode, isAfterInsert: Boolean) { if (isAfterInsert) { balanceAfterInsert(curNode)} else { balanceAfterDelete(curNode) } } + private fun balanceAfterInsert(curNode: RBNode) { var insertedNode = curNode insertedNode.color = Color.RED @@ -105,21 +108,13 @@ class RBTree, V>: balancedTree>() { } return } - override fun delete(key: K) { - val nodeToDelete = findNodeByKey(key) - nodeToDelete?.let { balance(nodeToDelete, false) } - } - private fun deleteLeaf(node: RBNode) { - if (node.color != Color.RED) deleteCase1(node) - } - private fun balanceAfterDelete(curNode: RBNode) { - val nodeToDelete = curNode - val child: RBNode ? + override fun delete(key: K) { + val nodeToDelete = findNodeByKey(key) ?: return + val child: RBNode? when { nodeToDelete.rightChild != null && nodeToDelete.leftChild != null -> { - child = findMinNodeInRight(nodeToDelete.rightChild) - ?: throw IllegalArgumentException("Node must have right child") + child = findMinNodeInRight(nodeToDelete.rightChild) ?: throw IllegalArgumentException("Node must have right child") val newNode = child delete(child.key) newNode.color = nodeToDelete.color @@ -127,53 +122,42 @@ class RBTree, V>: balancedTree>() { newNode.rightChild = nodeToDelete.rightChild changeChild(nodeToDelete, findParent(nodeToDelete), newNode) return - - } - nodeToDelete.rightChild != null -> { - child = nodeToDelete.rightChild - } - nodeToDelete.leftChild != null -> { - child = nodeToDelete.leftChild } + nodeToDelete.rightChild != null -> child = nodeToDelete.rightChild + nodeToDelete.leftChild != null -> child = nodeToDelete.leftChild else -> { child = null - deleteLeaf(nodeToDelete) + if (nodeToDelete.color != Color.RED) balance(nodeToDelete, false) } } - - if(nodeToDelete.color == Color.RED) { - deleteNode(nodeToDelete.key) - return - } - - if(nodeToDelete.color == Color.BLACK && child?.color == Color.RED) { - deleteNode(nodeToDelete.key) - child.color = Color.BLACK - return - } - else { - deleteNode(nodeToDelete.key) - if (child != null) deleteCase1(child) + when { + (nodeToDelete.color == Color.RED) -> { + deleteNode(nodeToDelete.key) + return + } + (nodeToDelete.color == Color.BLACK && child?.color == Color.RED) -> { + deleteNode(nodeToDelete.key) + child.color = Color.BLACK + return + } + else -> { + deleteNode(nodeToDelete.key) + if (child != null) balance(nodeToDelete, false) + } } } - /* child of nodeToDelete is new root */ - private fun deleteCase1(node: RBNode) { - val parent = findParent(node) - if(parent != null) deleteCase2(node) - } + private fun balanceAfterDelete(node: RBNode) { + /* case 1: child of nodeToDelete is new root */ + var parent = findParent(node) ?: return + var sibling = getSibling(node) - - /** sibling of child is red - * BLACK - * / \ - * child RED - */ - private fun deleteCase2(curNode: RBNode) { - var node = curNode - val sibling = getSibling(node) - if(sibling?.color == Color.RED) { - val parent = findParent(node) ?: throw IllegalArgumentException("Parent cannot be null") + /** case 2: sibling of child is red + * BLACK + * / \ + * child RED + */ + if (sibling?.color == Color.RED) { parent.color = Color.RED sibling.color = Color.BLACK if (node == parent.leftChild) { @@ -185,101 +169,83 @@ class RBTree, V>: balancedTree>() { rotateRight(parent, grandparent) } } - deleteCase3(node) - } - /** parent, sibling and its children are black - * BLACK - * / \ - * child BLACK - * / \ - * BLACK BLACK - */ - private fun deleteCase3(node: RBNode) { - val sibling = getSibling(node) - val parent = findParent(node) ?: throw IllegalArgumentException("Parent cannot be null") + /** case 3: parent, sibling and its children are black + * BLACK + * / \ + * child BLACK + * / \ + * BLACK BLACK + */ + sibling = getSibling(node) + parent = findParent(node) ?: throw IllegalArgumentException("Parent cannot be null") if(parent.color == Color.BLACK && (sibling?.color == Color.BLACK) && (sibling.rightChild?.color == Color.BLACK || sibling.rightChild == null) && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null)) { - sibling.color = Color.RED - deleteCase1(parent) + balanceAfterDelete(parent) } - else deleteCase4(node) - } - /** parent is red, sibling and its children are black - * RED - * / \ - * child BLACK - * / \ - * BLACK BLACK - */ - private fun deleteCase4(node: RBNode) { - val sibling = getSibling(node) - val parent = findParent(node) ?: throw IllegalArgumentException("Parent cannot be null") - if(parent.color == Color.RED && sibling?.color == Color.BLACK && + /** case 4: parent is red, sibling and its children are black + * RED + * / \ + * child BLACK + * / \ + * BLACK BLACK + */ + else if (parent.color == Color.RED && sibling?.color == Color.BLACK && (sibling.rightChild?.color == Color.BLACK || sibling.rightChild == null) - && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null)) { - + && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null)) + { sibling.color = Color.RED parent.color = Color.BLACK } - else deleteCase5(node) - } - - /** sibling is black & leftChild, its leftChild is red and its rightChild is black - * parent - * / \ - * BLACK child - * / \ - * RED BLACK - */ - private fun deleteCase5(node: RBNode) { - val sibling = getSibling(node) ?: throw IllegalArgumentException("Sibling cannot be null") - val parent = findParent(node) ?: throw IllegalArgumentException("Parent cannot be null") - if (node == parent.leftChild && sibling.color == Color.BLACK && - (sibling.rightChild?.color == Color.BLACK || sibling.rightChild == null) && sibling.leftChild?.color == Color.RED) { - sibling.color = Color.RED - sibling.leftChild?.color = Color.BLACK - - rotateRight(sibling, parent) - } - else if (node == parent.rightChild && sibling.color == Color.BLACK && - sibling.rightChild?.color == Color.RED && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null)) { - sibling.color = Color.RED - sibling.rightChild?.color = Color.BLACK + /** case 5: sibling is black & leftChild, its leftChild is red and its rightChild is black + * parent + * / \ + * BLACK child + * / \ + * RED BLACK + */ + else { + if (node == parent.leftChild && sibling?.color == Color.BLACK && + (sibling.rightChild?.color == Color.BLACK || sibling.rightChild == null) && sibling.leftChild?.color == Color.RED) { + sibling.color = Color.RED + sibling.leftChild?.color = Color.BLACK + rotateRight(sibling, parent) + } + else if (node == parent.rightChild && sibling?.color == Color.BLACK && + sibling.rightChild?.color == Color.RED && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null)) { + sibling.color = Color.RED + sibling.rightChild?.color = Color.BLACK + rotateLeft(sibling, parent) + } - rotateLeft(sibling, parent) + /** case 6: sibling is right(left)Child and is black, its right(left)Child is red + * parent or parent + * / \ / \ + * child BLACK BLACK child + * \ / + * RED RED + */ + sibling = getSibling(node) ?: throw IllegalArgumentException("Sibling cannot be null") + parent = findParent(node) ?: throw IllegalArgumentException("Parent cannot be null") + val grandparent = getGrandparent(node) + val color = parent.color + sibling.color = color + parent.color = Color.BLACK + if (node == parent.leftChild) { + sibling.rightChild?.color = Color.BLACK + rotateLeft(parent, grandparent) + } + else { + sibling.leftChild?.color = Color.BLACK + rotateRight(parent, grandparent) + } } - deleteCase6(node) } - /** sibling is right(left)Child and is black, its right(left)Child is red - * parent or parent - * / \ / \ - * child BLACK BLACK child - * \ / - * RED RED - */ - private fun deleteCase6(node: RBNode) { - val sibling = getSibling(node) ?: throw IllegalArgumentException("Sibling cannot be null") - val parent = findParent(node) ?: throw IllegalArgumentException("Parent cannot be null") - val grandparent = getGrandparent(node) - val color = parent.color - sibling.color = color - parent.color = Color.BLACK - - if (node == parent.leftChild) { - sibling.rightChild?.color = Color.BLACK - rotateLeft(parent, grandparent) - } - else { - sibling.leftChild?.color = Color.BLACK - rotateRight(parent, grandparent) - } - } fun preorderTraverse(): List> { val listOfNodes = mutableListOf>() traverse(root, listOfNodes) From 97a20defd2d8d7f9ffc8b5ccd976f69caa0155ec Mon Sep 17 00:00:00 2001 From: Shvorob Date: Sun, 7 Apr 2024 21:01:46 +0300 Subject: [PATCH 46/55] fix(RBT): fix code formatting --- lib/src/main/kotlin/trees/RBTree.kt | 56 ++++++++++++++++------------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/lib/src/main/kotlin/trees/RBTree.kt b/lib/src/main/kotlin/trees/RBTree.kt index 1cedf9d..a090125 100644 --- a/lib/src/main/kotlin/trees/RBTree.kt +++ b/lib/src/main/kotlin/trees/RBTree.kt @@ -3,7 +3,7 @@ package trees import nodes.Color import nodes.RBNode -class RBTree, V>: balancedTree>() { +class RBTree, V> : balancedTree>() { private fun getGrandparent(node: RBNode): RBNode? { val parent = findParent(node) ?: return null val grandparent = findParent(parent) @@ -37,8 +37,11 @@ class RBTree, V>: balancedTree>() { override fun createNewNode(key: K, value: V): RBNode = RBNode(key, value) override fun balance(curNode: RBNode, isAfterInsert: Boolean) { - if (isAfterInsert) { balanceAfterInsert(curNode)} - else { balanceAfterDelete(curNode) } + if (isAfterInsert) { + balanceAfterInsert(curNode) + } else { + balanceAfterDelete(curNode) + } } private fun balanceAfterInsert(curNode: RBNode) { @@ -59,7 +62,8 @@ class RBTree, V>: balancedTree>() { } val uncle = getUncle(insertedNode) - val grandparent = getGrandparent(insertedNode) ?: throw IllegalArgumentException("Every node by that point should have grandparent") + val grandparent = getGrandparent(insertedNode) + ?: throw IllegalArgumentException("Every node by that point should have grandparent") /* case 3: uncle is non-null and red (so both uncle and parent are red) */ if ((uncle != null) && (uncle.color == Color.RED)) { @@ -81,12 +85,13 @@ class RBTree, V>: balancedTree>() { if ((insertedNode == parent.rightChild) && (parent == grandparent.leftChild)) { rotateLeft(parent, grandparent) parent = insertedNode - insertedNode = insertedNode.leftChild ?: throw IllegalArgumentException("Node should have child after left rotation") - } - else if ((insertedNode == parent.leftChild) && (parent == grandparent.rightChild)) { + insertedNode = + insertedNode.leftChild ?: throw IllegalArgumentException("Node should have child after left rotation") + } else if ((insertedNode == parent.leftChild) && (parent == grandparent.rightChild)) { rotateRight(parent, grandparent) parent = insertedNode - insertedNode = insertedNode.rightChild ?: throw IllegalArgumentException("Node should have right child after right rotation") + insertedNode = insertedNode.rightChild + ?: throw IllegalArgumentException("Node should have right child after right rotation") } /* case 5: grandparent, parent and node form a "line" @@ -100,10 +105,9 @@ class RBTree, V>: balancedTree>() { */ parent.color = Color.BLACK grandparent.color = Color.RED - if ((insertedNode == parent.leftChild)&&(parent == grandparent.leftChild)) { + if ((insertedNode == parent.leftChild) && (parent == grandparent.leftChild)) { rotateRight(grandparent, findParent(grandparent)) - } - else { + } else { rotateLeft(grandparent, findParent(grandparent)) } return @@ -114,7 +118,8 @@ class RBTree, V>: balancedTree>() { val child: RBNode? when { nodeToDelete.rightChild != null && nodeToDelete.leftChild != null -> { - child = findMinNodeInRight(nodeToDelete.rightChild) ?: throw IllegalArgumentException("Node must have right child") + child = findMinNodeInRight(nodeToDelete.rightChild) + ?: throw IllegalArgumentException("Node must have right child") val newNode = child delete(child.key) newNode.color = nodeToDelete.color @@ -123,6 +128,7 @@ class RBTree, V>: balancedTree>() { changeChild(nodeToDelete, findParent(nodeToDelete), newNode) return } + nodeToDelete.rightChild != null -> child = nodeToDelete.rightChild nodeToDelete.leftChild != null -> child = nodeToDelete.leftChild else -> { @@ -135,11 +141,13 @@ class RBTree, V>: balancedTree>() { deleteNode(nodeToDelete.key) return } + (nodeToDelete.color == Color.BLACK && child?.color == Color.RED) -> { deleteNode(nodeToDelete.key) child.color = Color.BLACK return } + else -> { deleteNode(nodeToDelete.key) if (child != null) balance(nodeToDelete, false) @@ -163,8 +171,7 @@ class RBTree, V>: balancedTree>() { if (node == parent.leftChild) { val grandparent = getGrandparent(node) rotateLeft(parent, grandparent) - } - else { + } else { val grandparent = getGrandparent(node) rotateRight(parent, grandparent) } @@ -179,9 +186,10 @@ class RBTree, V>: balancedTree>() { */ sibling = getSibling(node) parent = findParent(node) ?: throw IllegalArgumentException("Parent cannot be null") - if(parent.color == Color.BLACK && (sibling?.color == Color.BLACK) && + if (parent.color == Color.BLACK && (sibling?.color == Color.BLACK) && (sibling.rightChild?.color == Color.BLACK || sibling.rightChild == null) - && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null)) { + && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null) + ) { sibling.color = Color.RED balanceAfterDelete(parent) } @@ -195,8 +203,8 @@ class RBTree, V>: balancedTree>() { */ else if (parent.color == Color.RED && sibling?.color == Color.BLACK && (sibling.rightChild?.color == Color.BLACK || sibling.rightChild == null) - && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null)) - { + && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null) + ) { sibling.color = Color.RED parent.color = Color.BLACK } @@ -210,13 +218,14 @@ class RBTree, V>: balancedTree>() { */ else { if (node == parent.leftChild && sibling?.color == Color.BLACK && - (sibling.rightChild?.color == Color.BLACK || sibling.rightChild == null) && sibling.leftChild?.color == Color.RED) { + (sibling.rightChild?.color == Color.BLACK || sibling.rightChild == null) && sibling.leftChild?.color == Color.RED + ) { sibling.color = Color.RED sibling.leftChild?.color = Color.BLACK rotateRight(sibling, parent) - } - else if (node == parent.rightChild && sibling?.color == Color.BLACK && - sibling.rightChild?.color == Color.RED && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null)) { + } else if (node == parent.rightChild && sibling?.color == Color.BLACK && + sibling.rightChild?.color == Color.RED && (sibling.leftChild?.color == Color.BLACK || sibling.leftChild == null) + ) { sibling.color = Color.RED sibling.rightChild?.color = Color.BLACK rotateLeft(sibling, parent) @@ -238,8 +247,7 @@ class RBTree, V>: balancedTree>() { if (node == parent.leftChild) { sibling.rightChild?.color = Color.BLACK rotateLeft(parent, grandparent) - } - else { + } else { sibling.leftChild?.color = Color.BLACK rotateRight(parent, grandparent) } From ed220159e36a589fba6a98192f6aa5735dc78f78 Mon Sep 17 00:00:00 2001 From: Shvorob Date: Sun, 7 Apr 2024 21:35:15 +0300 Subject: [PATCH 47/55] fix(RBTreeTest): beautify the code, add @beforeeach --- lib/src/test/kotlin/treesTests/RBTreeTest.kt | 33 ++++---------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/lib/src/test/kotlin/treesTests/RBTreeTest.kt b/lib/src/test/kotlin/treesTests/RBTreeTest.kt index 093516c..8a36768 100644 --- a/lib/src/test/kotlin/treesTests/RBTreeTest.kt +++ b/lib/src/test/kotlin/treesTests/RBTreeTest.kt @@ -3,13 +3,18 @@ package treesTests import nodes.Color import trees.RBTree import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.BeforeEach import kotlin.test.Test class RBTreeTest { + private lateinit var tree: RBTree + @BeforeEach + fun setup() { + tree = RBTree() + } @Test fun `find node by key`() { - val tree = RBTree() tree.insert(2,"Sofa") tree.insert(4,"Sonya") tree.insert(1,"Xenia") @@ -21,7 +26,6 @@ class RBTreeTest { @Test fun `traverse rb tree`() { - val tree = RBTree() tree.insert(3,"i") tree.insert(2,"love") tree.insert(1,"making") @@ -34,7 +38,6 @@ class RBTreeTest { @Test fun `insert node with existing key`() { - val tree = RBTree() tree.insert(1, "Kittens") tree.insert(2, "Sadness") tree.insert(3, "Puppies") @@ -49,7 +52,6 @@ class RBTreeTest { @Test fun `insert root`() { - val tree = RBTree() tree.insert(8, "Infinity") val expectedKeysAndColors = listOf(Pair(8, Color.BLACK)) @@ -59,7 +61,6 @@ class RBTreeTest { @Test fun `insert a node with BLACK parent`() { - val tree = RBTree() tree.insert(10, "Sunny") tree.insert(8, "Cloudy") tree.insert(14, "Stormy") @@ -74,7 +75,6 @@ class RBTreeTest { @Test fun `insert a node with RED parent and RED uncle`() { - val tree = RBTree() tree.insert(100, "Red") tree.insert(55, "Orange") tree.insert(111, "Yellow") @@ -96,7 +96,6 @@ class RBTreeTest { */ @Test fun `insert a node into a left triangle`() { - val tree = RBTree() tree.insert(50, "Apple") tree.insert(30, "Banana") tree.insert(40, "Grape") @@ -108,7 +107,6 @@ class RBTreeTest { @Test fun `insert a node into a right triangle`() { - val tree = RBTree() tree.insert(49, "Chocolate") tree.insert(34, "Cookies") tree.insert(78, "Croissants") @@ -131,7 +129,6 @@ class RBTreeTest { */ @Test fun `insert a node into a left line`() { - val tree = RBTree() tree.insert(900, "folklore") tree.insert(90, "evermore") tree.insert(9, "midnights") @@ -143,7 +140,6 @@ class RBTreeTest { @Test fun `insert a node into a right line`() { - val tree = RBTree() tree.insert(333, "Didn't") tree.insert(33, "the trees") tree.insert(3333, "tell us") @@ -158,7 +154,6 @@ class RBTreeTest { @Test fun `delete node with non-existing key`() { - val tree = RBTree() tree.insert(10, "Yes") tree.insert(20, "No") tree.insert(30, "Not sure") @@ -171,7 +166,6 @@ class RBTreeTest { @Test fun `delete node from an empty tree`() { - val tree = RBTree() tree.delete(5) val expectedKeysAndColors: List> = listOf() @@ -181,7 +175,6 @@ class RBTreeTest { @Test fun `delete RED node with two children (left subtree & right leaf)`() { - val tree = RBTree() tree.insert(20, "I spy") tree.insert(10, "with") tree.insert(40, "my") @@ -198,7 +191,6 @@ class RBTreeTest { @Test fun `delete RED node with no children`() { - val tree = RBTree() tree.insert(20, "I") tree.insert(10, "don't") tree.insert(40, "wanna") @@ -215,7 +207,6 @@ class RBTreeTest { @Test fun `delete BLACK node with one right RED child`() { - val tree = RBTree() tree.insert(20, "Is") tree.insert(10, "it") tree.insert(40, "really") @@ -232,7 +223,6 @@ class RBTreeTest { @Test fun `delete BLACK node with one left RED child`() { - val tree = RBTree() tree.insert(20, "How") tree.insert(10, "many") tree.insert(40, "easter") @@ -249,7 +239,6 @@ class RBTreeTest { @Test fun `delete BLACK node with no children and RED sibling`() { - val tree = RBTree() tree.insert(20, "find") tree.insert(10, "in") tree.insert(40, "these") @@ -266,7 +255,6 @@ class RBTreeTest { @Test fun `delete BLACK node with two children (left subtree & right leaf)`() { - val tree = RBTree() tree.insert(100, "I") tree.insert(80, "hope") tree.insert(200, "you") @@ -283,7 +271,6 @@ class RBTreeTest { @Test fun `delete left BLACK node with RED right child`() { - val tree = RBTree() tree.insert(100, "much") tree.insert(80, "as") tree.insert(200, "I") @@ -300,7 +287,6 @@ class RBTreeTest { @Test fun `delete BLACK node with no children and BLACK sibling`() { - val tree = RBTree() tree.insert(111, "running") tree.insert(222, "out") tree.insert(88, "of") @@ -315,7 +301,6 @@ class RBTreeTest { @Test fun `delete left RED node with no children`() { - val tree = RBTree() tree.insert(23, "Red") tree.insert(11, "Orange") tree.insert(37, "Yellow") @@ -330,7 +315,6 @@ class RBTreeTest { @Test fun `delete RED node with two BLACK children`() { - val tree = RBTree() tree.insert(23, "Red") tree.insert(37, "Orange") tree.insert(20, "Yellow") @@ -345,7 +329,6 @@ class RBTreeTest { @Test fun `delete BLACK node with one RED child`() { - val tree = RBTree() tree.insert(5, "Red") tree.insert(3, "Orange") tree.insert(6, "Yellow") @@ -362,7 +345,6 @@ class RBTreeTest { @Test fun `delete BLACK node with two children`() { - val tree = RBTree() tree.insert(5, "Red") tree.insert(3, "Orange") tree.insert(6, "Yellow") @@ -377,7 +359,6 @@ class RBTreeTest { @Test fun `delete BLACK node with no children and BLACK sibling which has left RED child`() { - val tree = RBTree() tree.insert(3, "Red") tree.insert(1, "Orange") tree.insert(5, "Yellow") @@ -391,7 +372,6 @@ class RBTreeTest { @Test fun `delete BLACK node with no children and BLACK sibling which has right RED child`() { - val tree = RBTree() tree.insert(3, "Red") tree.insert(1, "Orange") tree.insert(5, "Yellow") @@ -405,7 +385,6 @@ class RBTreeTest { @Test fun `delete BLACK node with no children and RED sibling which has only BLACK children`() { - val tree = RBTree() tree.insert(6, "Red") tree.insert(4, "Orange") tree.insert(7, "Yellow") From 5aeb6e6d35d66e2ec9b032720b4aa677cc3a0b7d Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Sun, 7 Apr 2024 23:12:49 +0300 Subject: [PATCH 48/55] fix(Abstractions): refactor code to fit it in kotlin coding conventions --- lib/src/main/kotlin/nodes/AVLNode.kt | 2 +- lib/src/main/kotlin/nodes/AbstractNode.kt | 6 ++++++ lib/src/main/kotlin/nodes/BSNode.kt | 2 +- lib/src/main/kotlin/nodes/RBNode.kt | 2 +- lib/src/main/kotlin/nodes/abstractNode.kt | 6 ------ lib/src/main/kotlin/trees/AVLTree.kt | 2 +- .../kotlin/trees/{abstractTree.kt => AbstractTree.kt} | 9 ++++----- lib/src/main/kotlin/trees/BSTree.kt | 2 +- .../kotlin/trees/{balancedTree.kt => BalancedTree.kt} | 4 ++-- lib/src/main/kotlin/trees/RBTree.kt | 2 +- 10 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 lib/src/main/kotlin/nodes/AbstractNode.kt delete mode 100644 lib/src/main/kotlin/nodes/abstractNode.kt rename lib/src/main/kotlin/trees/{abstractTree.kt => AbstractTree.kt} (96%) rename lib/src/main/kotlin/trees/{balancedTree.kt => BalancedTree.kt} (83%) diff --git a/lib/src/main/kotlin/nodes/AVLNode.kt b/lib/src/main/kotlin/nodes/AVLNode.kt index 85bb630..6c50a57 100644 --- a/lib/src/main/kotlin/nodes/AVLNode.kt +++ b/lib/src/main/kotlin/nodes/AVLNode.kt @@ -1,5 +1,5 @@ package nodes -class AVLNode, V>(key: K, value: V): abstractNode>(key, value) { +class AVLNode, V>(key: K, value: V): AbstractNode>(key, value) { var height = 1 } \ No newline at end of file diff --git a/lib/src/main/kotlin/nodes/AbstractNode.kt b/lib/src/main/kotlin/nodes/AbstractNode.kt new file mode 100644 index 0000000..2795f1a --- /dev/null +++ b/lib/src/main/kotlin/nodes/AbstractNode.kt @@ -0,0 +1,6 @@ +package nodes + +abstract class AbstractNode, V, someNode : AbstractNode>(val key:K, var value: V) { + var leftChild: someNode? = null + var rightChild: someNode? = null +} \ No newline at end of file diff --git a/lib/src/main/kotlin/nodes/BSNode.kt b/lib/src/main/kotlin/nodes/BSNode.kt index 0a5b783..c642892 100644 --- a/lib/src/main/kotlin/nodes/BSNode.kt +++ b/lib/src/main/kotlin/nodes/BSNode.kt @@ -1,3 +1,3 @@ package nodes -class BSNode, V>(key: K, value: V) : abstractNode>(key, value) \ No newline at end of file +class BSNode, V>(key: K, value: V) : AbstractNode>(key, value) \ No newline at end of file diff --git a/lib/src/main/kotlin/nodes/RBNode.kt b/lib/src/main/kotlin/nodes/RBNode.kt index eb11b5e..1f4992d 100644 --- a/lib/src/main/kotlin/nodes/RBNode.kt +++ b/lib/src/main/kotlin/nodes/RBNode.kt @@ -4,6 +4,6 @@ enum class Color { RED, BLACK } -class RBNode, V>(key: K, value: V): abstractNode>(key, value) { +class RBNode, V>(key: K, value: V): AbstractNode>(key, value) { var color: Color = Color.RED } \ No newline at end of file diff --git a/lib/src/main/kotlin/nodes/abstractNode.kt b/lib/src/main/kotlin/nodes/abstractNode.kt deleted file mode 100644 index ec1bd25..0000000 --- a/lib/src/main/kotlin/nodes/abstractNode.kt +++ /dev/null @@ -1,6 +0,0 @@ -package nodes - -abstract class abstractNode, V, someNode: abstractNode>(val key:K, var value: V) { - var leftChild: someNode? = null - var rightChild: someNode? = null -} \ No newline at end of file diff --git a/lib/src/main/kotlin/trees/AVLTree.kt b/lib/src/main/kotlin/trees/AVLTree.kt index edd3cd5..a5173f9 100644 --- a/lib/src/main/kotlin/trees/AVLTree.kt +++ b/lib/src/main/kotlin/trees/AVLTree.kt @@ -3,7 +3,7 @@ package trees import nodes.AVLNode import kotlin.math.max -class AVLTree, V> : balancedTree>() { +class AVLTree, V> : BalancedTree>() { override fun createNewNode(key: K, value: V) = AVLNode(key, value) override fun insert(key: K, value: V) { diff --git a/lib/src/main/kotlin/trees/abstractTree.kt b/lib/src/main/kotlin/trees/AbstractTree.kt similarity index 96% rename from lib/src/main/kotlin/trees/abstractTree.kt rename to lib/src/main/kotlin/trees/AbstractTree.kt index a0f1827..1e04fb2 100644 --- a/lib/src/main/kotlin/trees/abstractTree.kt +++ b/lib/src/main/kotlin/trees/AbstractTree.kt @@ -1,8 +1,8 @@ package trees -import nodes.abstractNode +import nodes.AbstractNode -abstract class abstractTree, V, someNode: abstractNode> { +abstract class AbstractTree, V, someNode : AbstractNode> { protected var root: someNode? = null protected abstract fun createNewNode(key: K, value: V): someNode @@ -73,8 +73,7 @@ abstract class abstractTree, V, someNode: abstractNode, V, someNode: abstractNode) { - if(curNode != null) { + if (curNode != null) { listOfNodes.add(curNode) traverse(curNode.leftChild, listOfNodes) traverse(curNode.rightChild, listOfNodes) diff --git a/lib/src/main/kotlin/trees/BSTree.kt b/lib/src/main/kotlin/trees/BSTree.kt index b7a8f5a..a894359 100644 --- a/lib/src/main/kotlin/trees/BSTree.kt +++ b/lib/src/main/kotlin/trees/BSTree.kt @@ -2,7 +2,7 @@ package trees import nodes.BSNode -class BSTree, V> : abstractTree>() { +class BSTree, V> : AbstractTree>() { override fun createNewNode(key: K, value: V): BSNode = BSNode(key, value) fun preorderTraverse(): List { diff --git a/lib/src/main/kotlin/trees/balancedTree.kt b/lib/src/main/kotlin/trees/BalancedTree.kt similarity index 83% rename from lib/src/main/kotlin/trees/balancedTree.kt rename to lib/src/main/kotlin/trees/BalancedTree.kt index 2b07a1b..489c887 100644 --- a/lib/src/main/kotlin/trees/balancedTree.kt +++ b/lib/src/main/kotlin/trees/BalancedTree.kt @@ -1,8 +1,8 @@ package trees -import nodes.abstractNode +import nodes.AbstractNode -abstract class balancedTree, V, someNode: abstractNode>: abstractTree() { +abstract class BalancedTree, V, someNode: AbstractNode> : AbstractTree() { protected abstract fun balance(curNode: someNode, isAfterInsert: Boolean = true) protected open fun rotateRight(node: someNode, parentNode: someNode?) { diff --git a/lib/src/main/kotlin/trees/RBTree.kt b/lib/src/main/kotlin/trees/RBTree.kt index a090125..1aaf699 100644 --- a/lib/src/main/kotlin/trees/RBTree.kt +++ b/lib/src/main/kotlin/trees/RBTree.kt @@ -3,7 +3,7 @@ package trees import nodes.Color import nodes.RBNode -class RBTree, V> : balancedTree>() { +class RBTree, V> : BalancedTree>() { private fun getGrandparent(node: RBNode): RBNode? { val parent = findParent(node) ?: return null val grandparent = findParent(parent) From 002bed36eb423b03c49f20ee304eeaf2b9eee49f Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Sun, 7 Apr 2024 23:13:50 +0300 Subject: [PATCH 49/55] fix(BSTreeTest): optimize test code by using BeforeEach --- lib/src/test/kotlin/treesTests/BSTreeTest.kt | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/lib/src/test/kotlin/treesTests/BSTreeTest.kt b/lib/src/test/kotlin/treesTests/BSTreeTest.kt index fe2fe19..82b0237 100644 --- a/lib/src/test/kotlin/treesTests/BSTreeTest.kt +++ b/lib/src/test/kotlin/treesTests/BSTreeTest.kt @@ -2,12 +2,18 @@ package treesTests import trees.BSTree import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.BeforeEach import kotlin.test.Test class BSTreeTest { + private lateinit var tree: BSTree + + @BeforeEach + fun setup() { + tree = BSTree() + } @Test fun `find node by key`() { - val tree = BSTree() tree.insert(4, "first kitten") tree.insert(2, "second kitten") tree.insert(5, "third kitten") @@ -22,7 +28,6 @@ class BSTreeTest { @Test fun `traverse bst tree`() { - val tree = BSTree() tree.insert(55, "happy") tree.insert(88, "nation") tree.insert(77, "living") @@ -38,7 +43,6 @@ class BSTreeTest { @Test fun `insert root`() { - val tree = BSTree() tree.insert(100, "say hi to the root!") val expectedKeys: List = listOf(100) @@ -48,7 +52,6 @@ class BSTreeTest { @Test fun `delete root`() { - val tree = BSTree() tree.insert(100, "hm.. looks like its gone") tree.delete(100) @@ -59,7 +62,6 @@ class BSTreeTest { @Test fun `insert some nodes`() { - val tree = BSTree() tree.insert(44, "you") tree.insert(23, "are") tree.insert(58, "enough.") @@ -74,7 +76,6 @@ class BSTreeTest { @Test fun `insert node with existing key`() { - val tree = BSTree() tree.insert(2, "oh") tree.insert(4, "potato") tree.insert(6, "only") @@ -89,7 +90,6 @@ class BSTreeTest { @Test fun `delete node with non-existing key`() { - val tree = BSTree() tree.insert(12, "BFS") tree.insert(6, "DFS") tree.insert(15, "Floyd Warshall") @@ -105,7 +105,6 @@ class BSTreeTest { @Test fun `delete node from an empty tree`() { - val tree = BSTree() tree.delete(5) val expectedKeys: List = listOf() @@ -115,7 +114,6 @@ class BSTreeTest { @Test fun `delete node with no children`() { - val tree = BSTree() tree.insert(9, "because") tree.insert(7, "i") tree.insert(10, "envy") @@ -131,7 +129,6 @@ class BSTreeTest { @Test fun `delete node with one right child`() { - val tree = BSTree() tree.insert(14, "what") tree.insert(12, "was") tree.insert(15, "in") @@ -147,7 +144,6 @@ class BSTreeTest { @Test fun `delete node with one left child`() { - val tree = BSTree() tree.insert(9, "and") tree.insert(6, "now") tree.insert(15, "i") @@ -163,7 +159,6 @@ class BSTreeTest { @Test fun `delete node with two children`() { - val tree = BSTree() tree.insert(4, "you") tree.insert(2, "reached") tree.insert(5, "the") From 03205205bf9c272c78f41bebb5475548b7d3c1a1 Mon Sep 17 00:00:00 2001 From: Sofya Kozyreva Date: Sun, 7 Apr 2024 23:34:26 +0300 Subject: [PATCH 50/55] fix: add files to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 80f96c5..f7fffaa 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ bin/ ### Mac OS ### .DS_Store /lib/src/main/resources/ +/.idea/ From 6a57f5054ce96af93beca7c2c089c72445a5a917 Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Sun, 7 Apr 2024 23:48:42 +0300 Subject: [PATCH 51/55] fix(configuration): delete .idea files from project --- .idea/.gitignore | 3 --- .idea/gradle.xml | 16 ---------------- .idea/kotlinc.xml | 6 ------ .idea/misc.xml | 5 ----- .idea/vcs.xml | 6 ------ 5 files changed, 36 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/kotlinc.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index f76b872..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml deleted file mode 100644 index 8d81632..0000000 --- a/.idea/kotlinc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 4a09701..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 786e7a97688d04996636831e421a835bbc910f9e Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Thu, 11 Apr 2024 09:32:31 +0300 Subject: [PATCH 52/55] fix(AbstractTree): change unnecessary "when"-s to "if"-s --- lib/src/main/kotlin/trees/AbstractTree.kt | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/src/main/kotlin/trees/AbstractTree.kt b/lib/src/main/kotlin/trees/AbstractTree.kt index 1e04fb2..17b2a0c 100644 --- a/lib/src/main/kotlin/trees/AbstractTree.kt +++ b/lib/src/main/kotlin/trees/AbstractTree.kt @@ -97,10 +97,7 @@ abstract class AbstractTree, V, someNode : AbstractNode curNode.rightChild - else -> curNode.leftChild - } + curNode = if (curNode.key < node.key) curNode.rightChild else curNode.leftChild } return null } @@ -112,12 +109,12 @@ abstract class AbstractTree, V, someNode : AbstractNode if (root == node) root = replacementNode - else -> { - if (parentNode.rightChild == node) parentNode.rightChild = replacementNode - else if (parentNode.leftChild == node) parentNode.leftChild = replacementNode - } + if (parentNode == null) { + if (root == node) root = replacementNode + } + else { + if (parentNode.rightChild == node) parentNode.rightChild = replacementNode + else if (parentNode.leftChild == node) parentNode.leftChild = replacementNode } } From f4eb2a95690e9c3bd20f1462071fb67740173a0e Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Thu, 11 Apr 2024 09:37:39 +0300 Subject: [PATCH 53/55] fix(AbstractTree): small change of comments and exceptions messages --- lib/src/main/kotlin/trees/AbstractTree.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/src/main/kotlin/trees/AbstractTree.kt b/lib/src/main/kotlin/trees/AbstractTree.kt index 17b2a0c..1e4ab10 100644 --- a/lib/src/main/kotlin/trees/AbstractTree.kt +++ b/lib/src/main/kotlin/trees/AbstractTree.kt @@ -59,16 +59,16 @@ abstract class AbstractTree, V, someNode : AbstractNode { changeChild(nodeToDelete, parentNode, null) return null } - /* 1 child case */ + /* node has 1 child */ (nodeToDelete.leftChild == null || nodeToDelete.rightChild == null) -> { if (nodeToDelete.leftChild == null) { changeChild(nodeToDelete, parentNode, nodeToDelete.rightChild) @@ -79,7 +79,7 @@ abstract class AbstractTree, V, someNode : AbstractNode { val replacementNode = findMinNodeInRight(nodeToDelete.rightChild) ?: throw IllegalArgumentException ("Node with 2 children must have a right child") @@ -102,7 +102,7 @@ abstract class AbstractTree, V, someNode : AbstractNode parentNode * / / @@ -118,8 +118,9 @@ abstract class AbstractTree, V, someNode : AbstractNode Date: Thu, 11 Apr 2024 22:55:03 +0300 Subject: [PATCH 54/55] Update README.md Remove table of contents, add general info about installing lib --- README.md | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f228c5f..2fbf37e 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,19 @@ -## Table of contents -- [About the project](#about-the-project) -- [How to use](#how-to-use) -- [License](#license) -- [Developers and contacts](#developers-and-contacts) - ## About the project This library allows you to use three types of binary search trees: simple, AVL and Red-Black tree. [AVL](https://en.wikipedia.org/wiki/AVL_tree) and [Red-Black](https://en.wikipedia.org/wiki/Red–black_tree) tree implement their natural balancing. +## Getting started +1. Download our lib from [Releases](https://github.com/spbu-coding-2023/trees-5/releases) +2. Open your project +3. Go to `File > New > Module from Existing Sources...` +4. Choose the lib you downloaded +5. Add this in your program: + +``` + import trees.* + ``` +You can replace `*` with any specific tree + ## How to use There are 4 public methods you can use for each tree: @@ -57,9 +63,10 @@ For `RBTree` it saves node's key and color: ``` Have fun! -## License -The product is distributed under MIT license. Check LICENSE for more information ## Developers and contacts * [p1onerka](https://github.com/p1onerka) (tg @p10nerka) * [sofyak0zyreva](https://github.com/sofyak0zyreva) (tg @soffque) * [shvorobsofia](https://github.com/shvorobsofia) (tg @fshv23) + +## License +The product is distributed under MIT license. Check LICENSE for more information From 96510da79388750d1c94022c0d943a35e93ae022 Mon Sep 17 00:00:00 2001 From: Ksenia Kotelnikova Date: Mon, 15 Apr 2024 17:14:16 +0300 Subject: [PATCH 55/55] fix(tests): full post-review change of tests architecture. Optimization of test code achieved through designing the test part of the lib similar to the main one --- lib/src/test/kotlin/treesTests/AVLTreeTest.kt | 354 ++++----------- .../test/kotlin/treesTests/AbstractTest.kt | 77 ++++ lib/src/test/kotlin/treesTests/BSTreeTest.kt | 167 ++----- lib/src/test/kotlin/treesTests/RBTreeTest.kt | 419 +++++------------- 4 files changed, 320 insertions(+), 697 deletions(-) create mode 100644 lib/src/test/kotlin/treesTests/AbstractTest.kt diff --git a/lib/src/test/kotlin/treesTests/AVLTreeTest.kt b/lib/src/test/kotlin/treesTests/AVLTreeTest.kt index 1098386..79724d9 100644 --- a/lib/src/test/kotlin/treesTests/AVLTreeTest.kt +++ b/lib/src/test/kotlin/treesTests/AVLTreeTest.kt @@ -1,334 +1,150 @@ package treesTests import trees.AVLTree +import nodes.AVLNode import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.BeforeEach import kotlin.test.Test -class AVLTreeTest { - private lateinit var tree: AVLTree +class AVLTreeTest : AbstractTest, AVLTree>() { - @BeforeEach - fun setup() { - tree = AVLTree() - } - @Test - fun `find node by key`() { - tree.insert(2, "Sofa") - tree.insert(4, "Sonya") - tree.insert(1, "Xenia") - - val expectedValue = "Sofa" - val actualValue = tree.find(2) - assertEquals(expectedValue, actualValue) - } - - @Test - fun `traverse avl tree`() { - tree.insert(3, "i") - tree.insert(2, "love") - tree.insert(1, "making") - tree.insert(4, "trees") - - val expectedKeysAndHeights = listOf(Pair(2, 3), Pair(1, 1), Pair(3, 2), Pair(4, 1)) - val actualKeysAndHeights = tree.preorderTraverse() - assertEquals(expectedKeysAndHeights, actualKeysAndHeights) - } - - @Test - fun `insert node with existing key`() { - tree.insert(1, "Kittens") - tree.insert(2, "Sadness") - tree.insert(3, "Puppies") - tree.insert(4, "Bunnies") - tree.insert(5, "Birds") - tree.insert(2, "Happiness") - - val actualValue = tree.find(2) - val expectedValue = "Happiness" - - assertEquals(expectedValue, actualValue) - } - - @Test - fun `insert node and perform right rotation`() { - tree.insert(4, "hi") - tree.insert(2, "hi") - tree.insert(5, "hi") - tree.insert(0, "hii") - tree.insert(3, "hiiii") - - tree.insert(1, "hey") - - val expectedKeysAndHeights = listOf(Pair(2, 3), Pair(0, 2), Pair(1, 1), Pair(4, 2), Pair(3, 1), Pair(5, 1)) - val actualKeysAndHeights = tree.preorderTraverse() - assertEquals(expectedKeysAndHeights, actualKeysAndHeights) - } - - @Test - fun `insert node and perform left-right rotation`() { - tree.insert(4,"y") - tree.insert(1,"n") - tree.insert(5,"d") - tree.insert(0,"e") - tree.insert(2,"r") - - tree.insert(3,"p") - val expectedKeysAndHeights = listOf(Pair(2, 3), Pair(1, 2), Pair(0, 1), Pair(4, 2), Pair(3, 1), Pair(5, 1)) - val actualKeysAndHeights = tree.preorderTraverse() - assertEquals(expectedKeysAndHeights, actualKeysAndHeights) - } - - @Test - fun `insert node and perform right-left rotation`() { - tree.insert(1, "3") - tree.insert(0, "33") - tree.insert(4, "333") - tree.insert(3, "3333") - tree.insert(5, "33333") - tree.insert(2, "333333") - - val expectedKeysAndHeights = listOf(Pair(3, 3), Pair(1, 2), Pair(0, 1), Pair(2, 1), Pair(4, 2), Pair(5, 1)) - val actualKeysAndHeights = tree.preorderTraverse() - assertEquals(expectedKeysAndHeights, actualKeysAndHeights) - } - - @Test - fun `insert node and perform left rotation`() { - tree.insert(1, "Shine") - tree.insert(0, "Bright") - tree.insert(3, "Like") - tree.insert(2, "A") - tree.insert(5, "Diamond") - tree.insert(4, "Eeeeee") - - val expectedKeysAndHeights = listOf(Pair(3, 3), Pair(1, 2), Pair(0, 1), Pair(2, 1), Pair(5, 2), Pair(4, 1)) - val actualKeysAndHeights = tree.preorderTraverse() - assertEquals(expectedKeysAndHeights, actualKeysAndHeights) - } + override fun createNewTree(): AVLTree = AVLTree() @Test - fun `delete node with non-existing key`() { - tree.insert(10, "Half") - tree.insert(20, "Cherry") - tree.insert(30, "Half") - tree.insert(45, "Coke") - tree.delete(15) - - val expectedKeysAndHeights = listOf(Pair(20, 3), Pair(10, 1), Pair(30, 2), Pair(45, 1)) - val actualKeysAndHeights = tree.preorderTraverse() + fun `traverse AVL tree`() { + val expectedKeysAndHeights = listOf(Pair(444, 3), Pair(222, 2), Pair(111, 1), Pair(333, 1), Pair(666, 2), Pair(555, 1), Pair(777, 1)) + val actualKeysAndHeights = bigTree.preorderTraverse() assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test - fun `delete node from an empty tree`() { - tree.delete(1000) - - val expectedKeysAndHeights: List> = listOf() - val actualKeysAndHeights = tree.preorderTraverse() + override fun `insert root in empty tree`() { + super.`insert root in empty tree`() + val expectedKeysAndHeights = listOf(Pair(100, 1)) + val actualKeysAndHeights = emptyTree.preorderTraverse() assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test - fun `delete root`() { - tree.insert(44, "rip root") - tree.delete(44) - - val expectedKeysAndHeights: List> = listOf() - val actualKeysAndHeights = tree.preorderTraverse() + override fun `delete root from one-node tree`() { + super.`delete root from one-node tree`() + val expectedKeysAndHeights: List> = listOf() + val actualKeysAndHeights = emptyTree.preorderTraverse() assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test - fun `delete node with two children (right child is leaf)`() { - tree.insert(115, "i go") - tree.insert(155, "round") - tree.insert(55, "and") - tree.insert(105, "round") - tree.insert(15, "satellite") - tree.delete(115) - - val expectedKeysAndHeights = listOf(Pair(55, 3), Pair(15, 1), Pair(155, 2), Pair(105, 1)) - val actualKeysAndHeights = tree.preorderTraverse() + override fun `insert node with existing key`() { + super.`insert node with existing key`() + val expectedKeysAndHeights = listOf(Pair(444, 3), Pair(222, 2), Pair(111, 1), Pair(333, 1), Pair(666, 2), Pair(555, 1), Pair(777, 1)) + val actualKeysAndHeights = bigTree.preorderTraverse() assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test - fun `delete right node with no children and perform right rotation`() { - tree.insert(44, "this") - tree.insert(33, "is") - tree.insert(55, "me") - tree.insert(22, "trying") - tree.delete(55) - - val expectedKeysAndHeights = listOf(Pair(33, 2), Pair(22, 1), Pair(44, 1)) - val actualKeysAndHeights = tree.preorderTraverse() + override fun `delete node with non-existing key`() { + super.`delete node with non-existing key`() + val expectedKeysAndHeights = listOf(Pair(444, 3), Pair(222, 2), Pair(111, 1), Pair(333, 1), Pair(666, 2), Pair(555, 1), Pair(777, 1)) + val actualKeysAndHeights = bigTree.preorderTraverse() assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test - fun `delete left node with no children and perform left-right rotation`() { - tree.insert(2, "Welcome") - tree.insert(1, "to") - tree.insert(4, "New") - tree.insert(3, "York") - tree.delete(1) - - val expectedKeysAndHeights = listOf(Pair(3, 2), Pair(2, 1), Pair(4, 1)) - val actualKeysAndHeights = tree.preorderTraverse() - assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + override fun `delete node from empty tree`() { + super.`delete node from empty tree`() + val expectedKeysAndHeightsAndHeights: List> = listOf() + val actualKeysAndHeightsAndHeights = emptyTree.preorderTraverse() + assertEquals(expectedKeysAndHeightsAndHeights, actualKeysAndHeightsAndHeights) } @Test - fun `delete right node with no children and perform left-right rotation`() { - tree.insert(300, "Californication") - tree.insert(100, "Otherside") - tree.insert(400, "Dark Necessities") - tree.insert(200, "Encore") - tree.delete(400) - - val expectedKeysAndHeights = listOf(Pair(200, 2), Pair(100, 1), Pair(300, 1)) - val actualKeysAndHeights = tree.preorderTraverse() + fun `insert node and perform left rotation`() { //I THINK it is left rotation + super.`simple insert test`() + bigTree.insert(1111, "hi there") + bigTree.insert(2222, "hi hi") + val expectedKeysAndHeights = listOf(Pair(444, 4), Pair(222, 2), Pair(111, 1), Pair(333, 1), Pair(666, 3), Pair(555, 1), Pair(1111, 2), Pair(777, 1), Pair(2222, 1)) + val actualKeysAndHeights = bigTree.preorderTraverse() assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test - fun `delete left node with no children and perform left rotation`() { - tree.insert(14, "Taylor Swift") - tree.insert(13, "Harry Styles") - tree.insert(15, "Lana Del Rey") - tree.insert(16, "Olivia Rodrigo") - tree.delete(13) - - val expectedKeysAndHeights = listOf(Pair(15, 2), Pair(14, 1), Pair(16, 1)) - val actualKeysAndHeights = tree.preorderTraverse() + fun `insert node and perform right rotation`() { //I THINK it is left rotation + bigTree.insert(55, "oh no") + bigTree.insert(22, "here we go again") + val expectedKeysAndHeights = listOf(Pair(444, 4), Pair(222, 3), Pair(55, 2), Pair(22, 1), Pair(111, 1), Pair(333, 1), Pair(666, 2), Pair(555, 1), Pair(777, 1)) + val actualKeysAndHeights = bigTree.preorderTraverse() assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test - fun `delete node with one child and perform left-right rotation`() { - tree.insert(43, "I") - tree.insert(600, "remember") - tree.insert(10, "it") - tree.insert(33, "all") - tree.insert(0, "too") - tree.insert(55, "well") - tree.insert(21, "...") - tree.delete(600) - - val expectedKeysAndHeights = listOf(Pair(33, 3), Pair(10, 2), Pair(0, 1), Pair(21, 1), Pair(43, 2), Pair(55, 1)) - val actualKeysAndHeights = tree.preorderTraverse() + fun `insert node and perform left-right rotation`() { + bigTree.insert(676, "oh no") + bigTree.insert(677, "hi") + val expectedKeysAndHeights = listOf(Pair(444, 4), Pair(222, 2), Pair(111, 1), Pair(333, 1), Pair(666, 3), Pair(555, 1), Pair(677, 2), Pair(676, 1), Pair(777, 1)) + val actualKeysAndHeights = bigTree.preorderTraverse() assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test - fun `delete node with one child and perform right-left rotation`() { - tree.insert(525, "Tender") - tree.insert(505, "Is") - tree.insert(515, "the") - tree.insert(555, "Night") - tree.insert(565, "by") - tree.insert(535, "F. Scott") - tree.insert(545, "Fitzgerald") - tree.delete(505) - - val expectedKeysAndHeights = listOf(Pair(535, 3), Pair(525, 2), Pair(515, 1), Pair(555, 2), Pair(545, 1), Pair(565, 1)) - val actualKeysAndHeights = tree.preorderTraverse() + fun `insert node and perform right-left rotation`() { + bigTree.insert(344, "oh no") + bigTree.insert(345, "hi") + val expectedKeysAndHeights = listOf(Pair(444, 4), Pair(222, 3), Pair(111, 1), Pair(344, 2), Pair(333, 1), Pair(345, 1), Pair(666, 2), Pair(555, 1), Pair(777, 1)) + val actualKeysAndHeights = bigTree.preorderTraverse() assertEquals(expectedKeysAndHeights, actualKeysAndHeights) } @Test - fun `delete node with one child and perform right rotation`() { - tree.insert(5111, "Coffee") - tree.insert(3111, "Tea") - tree.insert(7111, "Lemonade") - tree.insert(1111, "Coke") - tree.insert(4111, "Juice") - tree.insert(6111, "Hot chocolate") - tree.insert(2111, "Water") - tree.delete(7111) - - val expectedKeysAndHeights = listOf(Pair(3111, 3), Pair(1111, 2), Pair(2111, 1), - Pair(5111, 2), Pair(4111, 1), Pair(6111, 1)) - val actualKeysAndHeights = tree.preorderTraverse() - assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + fun `delete node with no children and perform left rotation`() { + bigTree.delete(111) + val expectedKeysAndHeightsAndHeights = listOf(Pair(444, 3), Pair(222, 2), Pair(333, 1), Pair(666, 2), Pair(555, 1), Pair(777, 1)) + val actualKeysAndHeightsAndHeights = bigTree.preorderTraverse() + assertEquals(expectedKeysAndHeightsAndHeights, actualKeysAndHeightsAndHeights) } @Test - fun `delete node with one child and perform left rotation`() { - tree.insert(999, "Dandelions") - tree.insert(9, "Wisteria") - tree.insert(99999, "Ivy") - tree.insert(99, "Willow") - tree.insert(9999, "Daises") - tree.insert(999999, "Chamomiles") - tree.insert(9999999, "Roses") - tree.delete(9) - - val expectedKeysAndHeights = listOf(Pair(99999, 3), Pair(999, 2), Pair(99, 1), - Pair(9999, 1), Pair(999999, 2), Pair(9999999, 1)) - val actualKeysAndHeights = tree.preorderTraverse() - assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + fun `delete node with no children and perform right-left rotation`() { + bigTree.delete(333) + bigTree.insert(1111, "hi") + bigTree.delete(555) + val expectedKeysAndHeightsAndHeights = listOf(Pair(444, 3), Pair(222, 2), Pair(111, 1), Pair(777, 2), Pair(666, 1), Pair(1111, 1)) + val actualKeysAndHeightsAndHeights = bigTree.preorderTraverse() + assertEquals(expectedKeysAndHeightsAndHeights, actualKeysAndHeightsAndHeights) } @Test - fun `delete node with two children and perform right rotation`() { - tree.insert(541, "Paris") - tree.insert(321, "London") - tree.insert(651, "Los Angeles") - tree.insert(101, "Saint Petersburg") - tree.insert(431, "Prague") - tree.insert(761, "Vienna") - tree.insert(211, "Rome") - tree.delete(541) - - val expectedKeysAndHeights = listOf(Pair(321, 3), Pair(101, 2), Pair(211, 1), - Pair(651, 2), Pair(431, 1), Pair(761, 1)) - val actualKeysAndHeights = tree.preorderTraverse() - assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + fun `delete node with one child and perform rotations`() { + bigTree.delete(111) + bigTree.insert(676, "end") + bigTree.delete(222) + val expectedKeysAndHeightsAndHeights = listOf(Pair(666, 3), Pair(444, 2), Pair(333, 1), Pair(555, 1), Pair(777, 2), Pair(676, 1)) + val actualKeysAndHeightsAndHeights = bigTree.preorderTraverse() + assertEquals(expectedKeysAndHeightsAndHeights, actualKeysAndHeightsAndHeights) } @Test fun `delete node with two children and perform right-left rotation`() { - tree.insert(385, "Iron Man") - tree.insert(286, "Thor") - tree.insert(583, "Hawkeye") - tree.insert(187, "Black Widow") - tree.insert(484, "Hulk") - tree.insert(781, "Captain America") - tree.insert(682, "and others") - tree.delete(385) - - val expectedKeysAndHeights = listOf(Pair(484, 3), Pair(286, 2), Pair(187, 1), - Pair(682, 2), Pair(583, 1), Pair(781, 1)) - val actualKeysAndHeights = tree.preorderTraverse() - assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + bigTree.insert(676, "end") + bigTree.delete(555) + val expectedKeysAndHeightsAndHeights = listOf(Pair(444, 3), Pair(222, 2), Pair(111, 1), Pair(333, 1), Pair(676, 2), Pair(666, 1), Pair(777, 1)) + val actualKeysAndHeightsAndHeights = bigTree.preorderTraverse() + assertEquals(expectedKeysAndHeightsAndHeights, actualKeysAndHeightsAndHeights) } @Test - fun `delete node with two children and perform left rotation`() { - tree.insert(4, "C") - tree.insert(2, "O'Caml") - tree.insert(5, "Rust") - tree.insert(1, "Kotlin") - tree.insert(3, "Python") - tree.delete(4) - - val expectedKeysAndHeights = listOf(Pair(2, 3), Pair(1, 1), Pair(5, 2), Pair(3, 1)) - val actualKeysAndHeights = tree.preorderTraverse() - assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + fun `delete node with two children and perform left-right rotations`() { + bigTree.delete(666) + bigTree.delete(777) + bigTree.delete(222) + val expectedKeysAndHeightsAndHeights = listOf(Pair(444, 3), Pair(333, 2), Pair(111, 1), Pair(555, 1)) + val actualKeysAndHeightsAndHeights = bigTree.preorderTraverse() + assertEquals(expectedKeysAndHeightsAndHeights, actualKeysAndHeightsAndHeights) } @Test - fun `delete node with two children and perform left-right rotation`() { - tree.insert(33, "Scene") - tree.insert(44, "after") - tree.insert(11, "credits") - tree.insert(22, "?") - tree.delete(44) - - val expectedKeysAndHeights = listOf(Pair(22, 2), Pair(11, 1), Pair(33, 1)) - val actualKeysAndHeights = tree.preorderTraverse() - assertEquals(expectedKeysAndHeights, actualKeysAndHeights) + fun `delete root with two children`() { + bigTree.delete(444) + val expectedKeysAndHeightsAndHeights = listOf(Pair(555, 3), Pair(222, 2), Pair(111, 1), Pair(333, 1), Pair(666, 2), Pair(777, 1)) + val actualKeysAndHeightsAndHeights = bigTree.preorderTraverse() + assertEquals(expectedKeysAndHeightsAndHeights, actualKeysAndHeightsAndHeights) } -} \ No newline at end of file +} diff --git a/lib/src/test/kotlin/treesTests/AbstractTest.kt b/lib/src/test/kotlin/treesTests/AbstractTest.kt new file mode 100644 index 0000000..0645f24 --- /dev/null +++ b/lib/src/test/kotlin/treesTests/AbstractTest.kt @@ -0,0 +1,77 @@ +package treesTests + +import trees.AbstractTree +import nodes.AbstractNode +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.BeforeEach +import kotlin.test.Test + +abstract class AbstractTest, V, someNode : AbstractNode, someTree : AbstractTree> { + protected abstract fun createNewTree(): someTree + protected lateinit var bigTree: someTree + protected lateinit var emptyTree: someTree + + @BeforeEach + fun setup() { + bigTree = createNewTree() + bigTree.insert(444, "first kitten") + bigTree.insert(222, "second kitten") + bigTree.insert(555, "third kitten") + bigTree.insert(111, "fourth kitten") + bigTree.insert(333, "fifth kitten") + bigTree.insert(666,"sixth kitten") + bigTree.insert(777, "last kitten") + } + + @Test + /* this case is equal to all trees, so it is final */ + fun `find node by key`() { + val expectedValue = "second kitten" + val actuallyValue = bigTree.find(222) + assertEquals(expectedValue, actuallyValue) + } + + open fun `insert root in empty tree`() { + emptyTree = createNewTree() + emptyTree.insert(100, "say hi to the root!") + } + + open fun `delete root from one-node tree`() { + emptyTree = createNewTree() + emptyTree.insert(100, "hm.. looks like its gone") + emptyTree.delete(100) + } + + open fun `simple insert test`() { } + + open fun `insert node with existing key`() { + bigTree.insert(777, "oh u came here twice sweetie") + } + + open fun `delete node with non-existing key`() { + bigTree.delete(1) + } + + open fun `delete node from empty tree`() { + emptyTree = createNewTree() + emptyTree.delete(5) + } + + open fun `delete node with no children`() { + bigTree.delete(777) + } + + open fun `delete node with one right child`() { + bigTree.insert(1000, "last one i swear") + bigTree.delete(777) + } + + open fun `delete node with one left child`() { + bigTree.insert(676, "now im sure") + bigTree.delete(777) + } + + open fun `delete node with two children`() { + bigTree.delete(555) + } +} diff --git a/lib/src/test/kotlin/treesTests/BSTreeTest.kt b/lib/src/test/kotlin/treesTests/BSTreeTest.kt index 82b0237..2499007 100644 --- a/lib/src/test/kotlin/treesTests/BSTreeTest.kt +++ b/lib/src/test/kotlin/treesTests/BSTreeTest.kt @@ -1,174 +1,99 @@ package treesTests import trees.BSTree +import nodes.BSNode import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.BeforeEach import kotlin.test.Test -class BSTreeTest { - private lateinit var tree: BSTree +class BSTreeTest : AbstractTest, BSTree>() { - @BeforeEach - fun setup() { - tree = BSTree() - } - @Test - fun `find node by key`() { - tree.insert(4, "first kitten") - tree.insert(2, "second kitten") - tree.insert(5, "third kitten") - tree.insert(3, "fourth kitten") - tree.insert(1, "fifth kitten") - tree.insert(6,"last kitten") - - val expectedValue = "second kitten" - val actuallyValue = tree.find(2) - assertEquals(expectedValue, actuallyValue) - } + override fun createNewTree(): BSTree = BSTree() @Test fun `traverse bst tree`() { - tree.insert(55, "happy") - tree.insert(88, "nation") - tree.insert(77, "living") - tree.insert(33, "in") - tree.insert(22, "a") - tree.insert(44, "happy") - tree.insert(99, "nation") - - val expectedKeys: List = listOf(55, 33, 22, 44, 88, 77, 99) - val actualKeys = tree.preorderTraverse() + val expectedKeys: List = listOf(444, 222, 111, 333, 555, 666, 777) + val actualKeys = bigTree.preorderTraverse() assertEquals(expectedKeys, actualKeys) } @Test - fun `insert root`() { - tree.insert(100, "say hi to the root!") - - val expectedKeys: List = listOf(100) - val actualKeys = tree.preorderTraverse() + override fun `insert root in empty tree`() { + super.`insert root in empty tree`() + val expectedKeys = listOf(100) + val actualKeys = emptyTree.preorderTraverse() assertEquals(expectedKeys, actualKeys) } @Test - fun `delete root`() { - tree.insert(100, "hm.. looks like its gone") - tree.delete(100) - + override fun `delete root from one-node tree`() { + super.`delete root from one-node tree`() val expectedKeys: List = listOf() - val actualKeys = tree.preorderTraverse() + val actualKeys = emptyTree.preorderTraverse() assertEquals(expectedKeys, actualKeys) } @Test - fun `insert some nodes`() { - tree.insert(44, "you") - tree.insert(23, "are") - tree.insert(58, "enough.") - tree.insert(37, "calm") - tree.insert(19, "down") - tree.insert(60,"pls") - - val expectedKeys: List = listOf(44, 23, 19, 37, 58, 60) - val actualKeys = tree.preorderTraverse() + override fun `simple insert test`() { + super.`simple insert test`() + bigTree.insert(1111, "oh another kitten") + val expectedKeys = listOf(444, 222, 111, 333, 555, 666, 777, 1111) + val actualKeys = bigTree.preorderTraverse() assertEquals(expectedKeys, actualKeys) } @Test - fun `insert node with existing key`() { - tree.insert(2, "oh") - tree.insert(4, "potato") - tree.insert(6, "only") - tree.insert(9, "you") - tree.insert(11, "understand") - tree.insert(2, "me") - - val expectedValue = "me" - val actualValue = tree.find(2) - assertEquals(expectedValue, actualValue) + override fun `insert node with existing key`() { + super.`insert node with existing key`() + val expectedKeys = listOf(444, 222, 111, 333, 555, 666, 777) + val actualKeys = bigTree.preorderTraverse() + assertEquals(expectedKeys, actualKeys) } @Test - fun `delete node with non-existing key`() { - tree.insert(12, "BFS") - tree.insert(6, "DFS") - tree.insert(15, "Floyd Warshall") - tree.insert(9, "Aho-Corasick") - tree.insert(3, "A-star") - tree.insert(18,"can i work for you now?") - tree.delete(38) - - val expectedKeys: List = listOf(12, 6, 3, 9, 15, 18) - val actualKeys = tree.preorderTraverse() + override fun `delete node with non-existing key`() { + super.`delete node with non-existing key`() + val expectedKeys = listOf(444, 222, 111, 333, 555, 666, 777) + val actualKeys = bigTree.preorderTraverse() assertEquals(expectedKeys, actualKeys) } @Test - fun `delete node from an empty tree`() { - tree.delete(5) - + override fun `delete node from empty tree`() { + super.`delete node from empty tree`() val expectedKeys: List = listOf() - val actualKeys = tree.preorderTraverse() + val actualKeys = emptyTree.preorderTraverse() assertEquals(expectedKeys, actualKeys) } @Test - fun `delete node with no children`() { - tree.insert(9, "because") - tree.insert(7, "i") - tree.insert(10, "envy") - tree.insert(8, "your") - tree.insert(6, "normal") - tree.insert(11,"life") - tree.delete(8) - - val expectedKeys: List = listOf(9, 7, 6, 10, 11) - val actualKeys = tree.preorderTraverse() + override fun `delete node with no children`() { + super.`delete node with no children`() + val expectedKeys = listOf(444, 222, 111, 333, 555, 666) + val actualKeys = bigTree.preorderTraverse() assertEquals(expectedKeys, actualKeys) } @Test - fun `delete node with one right child`() { - tree.insert(14, "what") - tree.insert(12, "was") - tree.insert(15, "in") - tree.insert(13, "the") - tree.insert(11, "box") - tree.insert(16,"?????") - tree.delete(15) - - val expectedKeys: List = listOf(14, 12, 11, 13, 16) - val actualKeys = tree.preorderTraverse() + override fun `delete node with one right child`() { + super.`delete node with one right child`() + val expectedKeys = listOf(444, 222, 111, 333, 555, 666, 1000) + val actualKeys = bigTree.preorderTraverse() assertEquals(expectedKeys, actualKeys) } @Test - fun `delete node with one left child`() { - tree.insert(9, "and") - tree.insert(6, "now") - tree.insert(15, "i") - tree.insert(12, "know") - tree.insert(3, "whats real") - tree.insert(18,"whats cake") - tree.delete(6) - - val expectedKeys: List = listOf(9, 3, 15, 12, 18) - val actualKeys = tree.preorderTraverse() + override fun `delete node with one left child`() { + super.`delete node with one left child`() + val expectedKeys = listOf(444, 222, 111, 333, 555, 666, 676) + val actualKeys = bigTree.preorderTraverse() assertEquals(expectedKeys, actualKeys) } @Test - fun `delete node with two children`() { - tree.insert(4, "you") - tree.insert(2, "reached") - tree.insert(5, "the") - tree.insert(3, "end") - tree.insert(1, "congrats") - tree.insert(6,"!!") - tree.delete(2) - - val expectedKeys: List = listOf(4, 3, 1, 5, 6) - val actualKeys = tree.preorderTraverse() + override fun `delete node with two children`() { + super.`delete node with two children`() + val expectedKeys = listOf(444, 222, 111, 333, 666, 777) + val actualKeys = bigTree.preorderTraverse() assertEquals(expectedKeys, actualKeys) } -} \ No newline at end of file +} diff --git a/lib/src/test/kotlin/treesTests/RBTreeTest.kt b/lib/src/test/kotlin/treesTests/RBTreeTest.kt index 8a36768..6900793 100644 --- a/lib/src/test/kotlin/treesTests/RBTreeTest.kt +++ b/lib/src/test/kotlin/treesTests/RBTreeTest.kt @@ -1,88 +1,61 @@ package treesTests -import nodes.Color import trees.RBTree +import nodes.RBNode +import nodes.Color import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.BeforeEach import kotlin.test.Test +class RBTreeTest : AbstractTest, RBTree>() { -class RBTreeTest { - private lateinit var tree: RBTree - @BeforeEach - fun setup() { - tree = RBTree() - } - @Test - fun `find node by key`() { - tree.insert(2,"Sofa") - tree.insert(4,"Sonya") - tree.insert(1,"Xenia") - - val expectedValue = "Sofa" - val actuallyValue = tree.find(2) - assertEquals(expectedValue, actuallyValue) - } + override fun createNewTree(): RBTree = RBTree() @Test - fun `traverse rb tree`() { - tree.insert(3,"i") - tree.insert(2,"love") - tree.insert(1,"making") - tree.insert(4,"trees") - - val expectedKeysAndColors = listOf(Pair(2, Color.BLACK), Pair(1, Color.BLACK), Pair(3, Color.BLACK), Pair(4, Color.RED)) - val actualKeysAndColors: List> = tree.preorderTraverse() + fun `traverse RB tree`() { + val expectedKeysAndColors = listOf(Pair(444, Color.BLACK), Pair(222, Color.BLACK), Pair(111, Color.RED), Pair(333, Color.RED), Pair(666, Color.BLACK), Pair(555, Color.RED), Pair(777, Color.RED)) + val actualKeysAndColors = bigTree.preorderTraverse() assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test - fun `insert node with existing key`() { - tree.insert(1, "Kittens") - tree.insert(2, "Sadness") - tree.insert(3, "Puppies") - tree.insert(4, "Bunnies") - tree.insert(5, "Birds") - tree.insert(2, "Happiness") - - val actualValue = tree.find(2) - val expectedValue = "Happiness" - assertEquals(expectedValue, actualValue) + override fun `insert root in empty tree`() { + super.`insert root in empty tree`() + val expectedKeysAndColors = listOf(Pair(100, Color.BLACK)) + val actualKeysAndColors = emptyTree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test - fun `insert root`() { - tree.insert(8, "Infinity") - - val expectedKeysAndColors = listOf(Pair(8, Color.BLACK)) - val actualKeysAndColors: List> = tree.preorderTraverse() + override fun `insert node with existing key`() { + super.`insert node with existing key`() + val expectedKeysAndColors = listOf(Pair(444, Color.BLACK), Pair(222, Color.BLACK), Pair(111, Color.RED), Pair(333, Color.RED), Pair(666, Color.BLACK), Pair(555, Color.RED), Pair(777, Color.RED)) + val actualKeysAndColors = bigTree.preorderTraverse() assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test - fun `insert a node with BLACK parent`() { - tree.insert(10, "Sunny") - tree.insert(8, "Cloudy") - tree.insert(14, "Stormy") - tree.insert(15, "Hazy") - tree.insert(9, "Rainy") - - val expectedKeysAndColors = listOf(Pair(10, Color.BLACK), Pair(8, Color.BLACK), - Pair(9, Color.RED), Pair(14, Color.BLACK), Pair(15, Color.RED)) - val actualKeysAndColors: List> = tree.preorderTraverse() + override fun `delete node with non-existing key`() { + super.`delete node with non-existing key`() + val expectedKeysAndColors = listOf(Pair(444, Color.BLACK), Pair(222, Color.BLACK), Pair(111, Color.RED), Pair(333, Color.RED), Pair(666, Color.BLACK), Pair(555, Color.RED), Pair(777, Color.RED)) + val actualKeysAndColors = bigTree.preorderTraverse() assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test - fun `insert a node with RED parent and RED uncle`() { - tree.insert(100, "Red") - tree.insert(55, "Orange") - tree.insert(111, "Yellow") - tree.insert(33, "Green") + override fun `delete node from empty tree`() { + super.`delete node from empty tree`() + val expectedKeysAndColorsAndColors: List> = listOf() + val actualKeysAndColorsAndColors = emptyTree.preorderTraverse() + assertEquals(expectedKeysAndColorsAndColors, actualKeysAndColorsAndColors) + } - val expectedKeysAndColors = listOf(Pair(100, Color.BLACK), Pair(55, Color.BLACK), - Pair(33, Color.RED), Pair(111, Color.BLACK)) - val actualKeysAndColors: List> = tree.preorderTraverse() + @Test + fun `insert node with BLACK parent`() { + emptyTree = createNewTree() + emptyTree.insert(2, "hi") + emptyTree.insert(3, "bye") + val expectedKeysAndColors = listOf(Pair(2, Color.BLACK), Pair(3, Color.RED)) + val actualKeysAndColors = emptyTree.preorderTraverse() assertEquals(expectedKeysAndColors, actualKeysAndColors) } @@ -95,307 +68,139 @@ class RBTreeTest { * */ @Test - fun `insert a node into a left triangle`() { - tree.insert(50, "Apple") - tree.insert(30, "Banana") - tree.insert(40, "Grape") - - val expectedKeysAndColors = listOf(Pair(40, Color.BLACK), Pair(30, Color.RED), Pair(50, Color.RED)) - val actualKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, actualKeysAndColors) + fun `insert node into left triangle`() { + emptyTree = createNewTree() + emptyTree.insert(50, "Apple") + emptyTree.insert(30, "Banana") + emptyTree.insert(40, "Grape") + val expectedKeysAndColorsAndColors = listOf(Pair(40, Color.BLACK), Pair(30, Color.RED), Pair(50, Color.RED)) + val actualKeysAndColorsAndColors: List> = emptyTree.preorderTraverse() + assertEquals(expectedKeysAndColorsAndColors, actualKeysAndColorsAndColors) } @Test - fun `insert a node into a right triangle`() { - tree.insert(49, "Chocolate") - tree.insert(34, "Cookies") - tree.insert(78, "Croissants") - tree.insert(100, "Candy") - tree.insert(95, "Creme brulee") - - val expectedKeysAndColors = listOf(Pair(49, Color.BLACK), Pair(34, Color.BLACK), - Pair(95, Color.BLACK), Pair(78, Color.RED), Pair(100, Color.RED)) - val actualKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, actualKeysAndColors) - } - - /* case 5: uncle is black, parent is red; grandparent, parent and node form a "line" - * G G - * / \ - * P - left line P - right line - * / \ - * N N - * - */ - @Test - fun `insert a node into a left line`() { - tree.insert(900, "folklore") - tree.insert(90, "evermore") - tree.insert(9, "midnights") - - val expectedKeysAndColors = listOf(Pair(90, Color.BLACK), Pair(9, Color.RED), Pair(900, Color.RED)) - val actualKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, actualKeysAndColors) - } - - @Test - fun `insert a node into a right line`() { - tree.insert(333, "Didn't") - tree.insert(33, "the trees") - tree.insert(3333, "tell us") - tree.insert(33333, "their stories") - tree.insert(333333, "?") - - val expectedKeysAndColors = listOf(Pair(333, Color.BLACK), Pair(33, Color.BLACK), - Pair(33333, Color.BLACK), Pair(3333, Color.RED), Pair(333333, Color.RED)) - val actualKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, actualKeysAndColors) + fun `insert node into right triangle`() { + emptyTree = createNewTree() + emptyTree.insert(50, "Apple") + emptyTree.insert(60, "Banana") + emptyTree.insert(55, "Grape") + val expectedKeysAndColorsAndColors = listOf(Pair(55, Color.BLACK), Pair(50, Color.RED), Pair(60, Color.RED)) + val actualKeysAndColorsAndColors: List> = emptyTree.preorderTraverse() + assertEquals(expectedKeysAndColorsAndColors, actualKeysAndColorsAndColors) } @Test - fun `delete node with non-existing key`() { - tree.insert(10, "Yes") - tree.insert(20, "No") - tree.insert(30, "Not sure") - tree.delete(15) - - val expectedKeysAndColors = listOf(Pair(20, Color.BLACK), Pair(10, Color.RED), Pair(30, Color.RED)) - val actualKeysAndColors: List> = tree.preorderTraverse() + fun `insert node into right line`() { + bigTree.insert(1111, "hi") + val expectedKeysAndColors = listOf(Pair(444, Color.BLACK), Pair(222, Color.BLACK), Pair(111, Color.RED), Pair(333, Color.RED), Pair(666, Color.RED), Pair(555, Color.BLACK), Pair(777, Color.BLACK), Pair(1111, Color.RED)) + val actualKeysAndColors = bigTree.preorderTraverse() assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test - fun `delete node from an empty tree`() { - tree.delete(5) - - val expectedKeysAndColors: List> = listOf() - val actualKeysAndColors = tree.preorderTraverse() + fun `insert node into left line`() { + bigTree.insert(455, "hi") + val expectedKeysAndColors = listOf(Pair(444, Color.BLACK), Pair(222, Color.BLACK), Pair(111, Color.RED), Pair(333, Color.RED), Pair(666, Color.RED), Pair(555, Color.BLACK), Pair(455, Color.RED), Pair(777, Color.BLACK)) + val actualKeysAndColors = bigTree.preorderTraverse() assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test fun `delete RED node with two children (left subtree & right leaf)`() { - tree.insert(20, "I spy") - tree.insert(10, "with") - tree.insert(40, "my") - tree.insert(30, "little") - tree.insert(45, "tired") - tree.insert(33, "eye") - tree.delete(40) - - val expectedKeysAndColors = listOf(Pair(20, Color.BLACK), Pair(10, Color.BLACK), - Pair(33, Color.RED), Pair(30, Color.BLACK), Pair(45, Color.BLACK)) - val actualKeysAndColors: List> = tree.preorderTraverse() + bigTree.insert(565, "hi") + bigTree.delete(666) + val expectedKeysAndColors = listOf(Pair(444, Color.BLACK), Pair(222, Color.BLACK), Pair(111, Color.RED), Pair(333, Color.RED), Pair(565, Color.RED), Pair(555, Color.BLACK), Pair(777, Color.BLACK)) + val actualKeysAndColors = bigTree.preorderTraverse() assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test fun `delete RED node with no children`() { - tree.insert(20, "I") - tree.insert(10, "don't") - tree.insert(40, "wanna") - tree.insert(30, "live") - tree.insert(45, "forever") - tree.insert(33, "!") - tree.delete(33) - - val expectedKeysAndColors = listOf(Pair(20, Color.BLACK), Pair(10, Color.BLACK), - Pair(40, Color.RED), Pair(30, Color.BLACK), Pair(45, Color.BLACK)) - val actualKeysAndColors: List> = tree.preorderTraverse() + bigTree.delete(777) + val expectedKeysAndColors = listOf(Pair(444, Color.BLACK), Pair(222, Color.BLACK), Pair(111, Color.RED), Pair(333, Color.RED), Pair(666, Color.BLACK), Pair(555, Color.RED)) + val actualKeysAndColors = bigTree.preorderTraverse() assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test fun `delete BLACK node with one right RED child`() { - tree.insert(20, "Is") - tree.insert(10, "it") - tree.insert(40, "really") - tree.insert(30, "worth") - tree.insert(45, "itt") - tree.insert(25, "?") - tree.delete(30) - - val expectedKeysAndColors = listOf(Pair(20, Color.BLACK), Pair(10, Color.BLACK), - Pair(40, Color.RED), Pair(25, Color.BLACK), Pair(45, Color.BLACK)) - val actualKeysAndColors: List> = tree.preorderTraverse() + bigTree.delete(555) + bigTree.delete(666) + val expectedKeysAndColors = listOf(Pair(444, Color.BLACK), Pair(222, Color.BLACK), Pair(111, Color.RED), Pair(333, Color.RED), Pair(777, Color.BLACK)) + val actualKeysAndColors = bigTree.preorderTraverse() assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test fun `delete BLACK node with one left RED child`() { - tree.insert(20, "How") - tree.insert(10, "many") - tree.insert(40, "easter") - tree.insert(30, "eggs") - tree.insert(45, "can") - tree.insert(33, "you") - tree.delete(30) - - val expectedKeysAndColors = listOf(Pair(20, Color.BLACK), Pair(10, Color.BLACK), - Pair(40, Color.RED), Pair(33, Color.BLACK), Pair(45, Color.BLACK)) - val actualKeysAndColors: List> = tree.preorderTraverse() + bigTree.delete(777) + bigTree.delete(666) + val expectedKeysAndColors = listOf(Pair(444, Color.BLACK), Pair(222, Color.BLACK), Pair(111, Color.RED), Pair(333, Color.RED), Pair(555, Color.BLACK)) + val actualKeysAndColors = bigTree.preorderTraverse() assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test fun `delete BLACK node with no children and RED sibling`() { - tree.insert(20, "find") - tree.insert(10, "in") - tree.insert(40, "these") - tree.insert(30, "wonderful") - tree.insert(45, "tests") - tree.insert(33, "?") - tree.delete(10) - - val expectedKeysAndColors = listOf(Pair(40, Color.BLACK), Pair(30, Color.RED), - Pair(20, Color.BLACK), Pair(33, Color.BLACK), Pair(45, Color.BLACK)) - val actualKeysAndColors: List> = tree.preorderTraverse() + bigTree.insert(565, "hi") + bigTree.delete(111) + bigTree.delete(333) + bigTree.delete(222) + val expectedKeysAndColors = listOf(Pair(666, Color.BLACK), Pair(555, Color.RED), Pair(444, Color.BLACK), Pair(565, Color.BLACK), Pair(777, Color.BLACK)) + val actualKeysAndColors = bigTree.preorderTraverse() assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test fun `delete BLACK node with two children (left subtree & right leaf)`() { - tree.insert(100, "I") - tree.insert(80, "hope") - tree.insert(200, "you") - tree.insert(60, "enjoy") - tree.insert(90, "it") - tree.insert(65, "as") - tree.delete(100) - - val expectedKeysAndColors = listOf(Pair(80, Color.BLACK), Pair(60, Color.BLACK), - Pair(65, Color.RED), Pair(200, Color.BLACK), Pair(90, Color.RED)) - val actualKeysAndColors: List> = tree.preorderTraverse() + bigTree.delete(555) + bigTree.delete(777) + bigTree.delete(444) + val expectedKeysAndColors = listOf(Pair(222, Color.BLACK), Pair(111, Color.BLACK), Pair(666, Color.BLACK), Pair(333, Color.RED)) + val actualKeysAndColors = bigTree.preorderTraverse() assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test - fun `delete left BLACK node with RED right child`() { - tree.insert(100, "much") - tree.insert(80, "as") - tree.insert(200, "I") - tree.insert(60, "do") - tree.insert(90, ".") - tree.insert(88, "I'm") - tree.delete(60) - - val expectedKeysAndColors = listOf(Pair(100, Color.BLACK), Pair(88, Color.RED), - Pair(80, Color.BLACK), Pair(90, Color.BLACK), Pair(200, Color.BLACK)) - val actualKeysAndColors: List> = tree.preorderTraverse() + fun `delete left BLACK node with RED nephew`() { + bigTree.insert(235, "hi") + bigTree.delete(111) + val expectedKeysAndColors = listOf(Pair(444, Color.BLACK), Pair(235, Color.RED), Pair(222, Color.BLACK), Pair(333, Color.BLACK), Pair(666, Color.BLACK), Pair(555, Color.RED), Pair(777, Color.RED)) + val actualKeysAndColors = bigTree.preorderTraverse() assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test - fun `delete BLACK node with no children and BLACK sibling`() { - tree.insert(111, "running") - tree.insert(222, "out") - tree.insert(88, "of") - tree.insert(233, "words") - tree.delete(233) - tree.delete(88) - - val expectedKeysAndColors = listOf(Pair(111, Color.BLACK), Pair(222, Color.RED)) - val actualKeysAndColors: List> = tree.preorderTraverse() + fun `delete BLACK node with no children and black sibling`() { + bigTree.delete(555) + bigTree.delete(777) + bigTree.delete(111) + bigTree.delete(333) + bigTree.delete(666) + val expectedKeysAndColors = listOf(Pair(444, Color.BLACK), Pair(222, Color.RED)) + val actualKeysAndColors = bigTree.preorderTraverse() assertEquals(expectedKeysAndColors, actualKeysAndColors) } - @Test - fun `delete left RED node with no children`() { - tree.insert(23, "Red") - tree.insert(11, "Orange") - tree.insert(37, "Yellow") - tree.insert(17, "Green") - - tree.delete(17) - - val expectedKeysAndColors = listOf(Pair(23, Color.BLACK), Pair(11, Color.BLACK), Pair(37, Color.BLACK)) - val currentKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, currentKeysAndColors) - } - - @Test - fun `delete RED node with two BLACK children`() { - tree.insert(23, "Red") - tree.insert(37, "Orange") - tree.insert(20, "Yellow") - tree.insert(19, "Green") - tree.insert(22, "Green") - tree.delete(20) - - val expectedKeysAndColors = listOf(Pair(23, Color.BLACK), Pair(22, Color.BLACK), Pair(19, Color.RED), Pair(37, Color.BLACK)) - val currentKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, currentKeysAndColors) - } - - @Test - fun `delete BLACK node with one RED child`() { - tree.insert(5, "Red") - tree.insert(3, "Orange") - tree.insert(6, "Yellow") - tree.insert(4, "Green") - tree.insert(1, "Green") - tree.insert(7, "Green") - tree.delete(6) - - val expectedKeysAndColors = listOf(Pair(5, Color.BLACK), Pair(3, Color.BLACK), - Pair(1, Color.RED), Pair(4, Color.RED), Pair(7, Color.BLACK)) - val currentKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, currentKeysAndColors) - } - - @Test - fun `delete BLACK node with two children`() { - tree.insert(5, "Red") - tree.insert(3, "Orange") - tree.insert(6, "Yellow") - tree.insert(4, "Green") - tree.insert(1, "Green") - tree.delete(3) - - val expectedKeysAndColors = listOf(Pair(5, Color.BLACK), Pair(4, Color.BLACK), Pair(1, Color.RED), Pair(6, Color.BLACK)) - val currentKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, currentKeysAndColors) - } - - @Test - fun `delete BLACK node with no children and BLACK sibling which has left RED child`() { - tree.insert(3, "Red") - tree.insert(1, "Orange") - tree.insert(5, "Yellow") - tree.insert(4, "Green") - tree.delete(1) - - val expectedKeysAndColors = listOf(Pair(4, Color.BLACK), Pair(3, Color.BLACK), Pair(5, Color.BLACK)) - val currentKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, currentKeysAndColors) - } - @Test fun `delete BLACK node with no children and BLACK sibling which has right RED child`() { - tree.insert(3, "Red") - tree.insert(1, "Orange") - tree.insert(5, "Yellow") - tree.insert(6, "Green") - tree.delete(1) - - val expectedKeysAndColors = listOf(Pair(5, Color.BLACK), Pair(3, Color.BLACK), Pair(6, Color.BLACK)) - val currentKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, currentKeysAndColors) + bigTree.delete(555) + bigTree.delete(777) + bigTree.insert(55, "hi") + bigTree.delete(666) + val expectedKeysAndColors = listOf(Pair(222, Color.BLACK), Pair(111, Color.BLACK), Pair(55, Color.RED), Pair(444, Color.BLACK), Pair(333, Color.RED)) + val actualKeysAndColors = bigTree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) } @Test - fun `delete BLACK node with no children and RED sibling which has only BLACK children`() { - tree.insert(6, "Red") - tree.insert(4, "Orange") - tree.insert(7, "Yellow") - tree.insert(2, "Green") - tree.insert(5, "Green") - tree.insert(1, "Green") - tree.delete(7) - - val expectedKeysAndColors = listOf(Pair(4, Color.BLACK), Pair(2, Color.BLACK), - Pair(1, Color.RED), Pair(6, Color.BLACK), Pair(5, Color.RED),) - val currentKeysAndColors: List> = tree.preorderTraverse() - assertEquals(expectedKeysAndColors, currentKeysAndColors) + fun `delete BLACK node with no children and BLACK sibling which has left RED child`() { + bigTree.delete(111) + bigTree.delete(333) + bigTree.delete(777) + bigTree.delete(222) + val expectedKeysAndColors = listOf(Pair(555, Color.BLACK), Pair(444, Color.BLACK), Pair(666, Color.BLACK)) + val actualKeysAndColors = bigTree.preorderTraverse() + assertEquals(expectedKeysAndColors, actualKeysAndColors) } -} \ No newline at end of file +}