Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
ffc7278
refactor: Separate tests for TreeStructs into different files.
ItIsMrLaG Apr 15, 2023
6377db7
fix: Fix bugs in RBStruct; write base tests for RBStruct.
ItIsMrLaG Apr 15, 2023
c58589c
feat: Add RBAnalyzer class for testing invariant of a RBStruct.
ItIsMrLaG Apr 16, 2023
bee3da4
refactor: Rename variables in test Classes.
ItIsMrLaG Apr 16, 2023
9b834d6
feat: Add BINAnalyzer class for testing invariant of the BINStruct.
ItIsMrLaG Apr 16, 2023
191bd5d
fix: Rewrite interface Analyzer.
ItIsMrLaG Apr 16, 2023
c9b46aa
feat: added tests for the invariant
RozhkovAleksandr Apr 16, 2023
117e68d
feat: Added invariant analyzer.
RozhkovAleksandr Apr 16, 2023
b8cc482
feat: Add fuzzers with partial functionality.
ItIsMrLaG Apr 17, 2023
d1cba85
fix: Fix bug in AVLStruct.find method.
ItIsMrLaG Apr 17, 2023
660c98c
fix: Partially change exceptions
Artem-Rzhankoff Apr 15, 2023
3270e8d
feat: Implement neo4j database sketch
Artem-Rzhankoff Apr 17, 2023
b7ed0c4
feat: Implement initialize tree from DB
Artem-Rzhankoff Apr 17, 2023
366949e
fix: Fix adding to database (neo4j)
Artem-Rzhankoff Apr 17, 2023
bac244a
fix: Fix bug in TreeStruct.insert() method (test: after insert of two…
ItIsMrLaG Apr 17, 2023
a2fe60f
feat: Implement partial functionality of AVLStructFuzzer.
ItIsMrLaG Apr 17, 2023
d33f15b
fix: Fix database interaction
Artem-Rzhankoff Apr 18, 2023
8a03667
fix: Add running on multiple OS
Artem-Rzhankoff Apr 18, 2023
6cee47d
fix: Fix tree class definitions
Artem-Rzhankoff Apr 18, 2023
fc047c0
fix(CI): Add a condition to run jacoco
Artem-Rzhankoff Apr 18, 2023
f4af1f2
refactor: Rename some methods in test classes
Artem-Rzhankoff Apr 18, 2023
c56546b
feat: Implement class for saving AVLStruct in SQLite.
ItIsMrLaG Apr 18, 2023
f964e3d
feat:add TreeWrapper and BINTreeTest
RozhkovAleksandr Apr 18, 2023
f1d668a
fix: delete !!
RozhkovAleksandr Apr 19, 2023
e90c4fd
feat: Implement AVLStruct.restoreStruct and BINStruct.restoreStruct.
ItIsMrLaG Apr 19, 2023
b2d9305
feat: AVLTreeTest
RozhkovAleksandr Apr 19, 2023
ac11aa1
feat: RBTreeTest
RozhkovAleksandr Apr 19, 2023
cd10d0d
feat: Implement sketch of jsonRepository
Artem-Rzhankoff Apr 19, 2023
9cb0b10
Merge branch 'art' of https://github.com/spbu-coding-2022/trees-1 int…
Artem-Rzhankoff Apr 19, 2023
242481b
fix: Partially change exceptions
Artem-Rzhankoff Apr 15, 2023
1998097
feat: Implement neo4j database sketch
Artem-Rzhankoff Apr 17, 2023
ad94694
feat: Implement initialize tree from DB
Artem-Rzhankoff Apr 17, 2023
42fca12
fix: Fix adding to database (neo4j)
Artem-Rzhankoff Apr 17, 2023
1e7f2a8
fix: Fix database interaction
Artem-Rzhankoff Apr 18, 2023
8c05840
fix: Add running on multiple OS
Artem-Rzhankoff Apr 18, 2023
93b4cf7
fix: Fix tree class definitions
Artem-Rzhankoff Apr 18, 2023
b5f5240
fix(CI): Add a condition to run jacoco
Artem-Rzhankoff Apr 18, 2023
52ef73c
refactor: Rename some methods in test classes
Artem-Rzhankoff Apr 18, 2023
b983b6c
feat: Implement sketch of jsonRepository
Artem-Rzhankoff Apr 19, 2023
155ff6d
feat: Implement AVLStruct.restoreStruct and BINStruct.restoreStruct.
ItIsMrLaG Apr 19, 2023
342e6c3
fix: Fix some problems after rebase onto Tests branch
Artem-Rzhankoff Apr 19, 2023
e8ff7d9
Merge branch 'art' of https://github.com/spbu-coding-2022/trees-1 int…
Artem-Rzhankoff Apr 19, 2023
947e297
refactor: Separate tests for TreeStructs into different files.
ItIsMrLaG Apr 15, 2023
4803d92
fix: Fix bugs in RBStruct; write base tests for RBStruct.
ItIsMrLaG Apr 15, 2023
5075e51
feat: Add RBAnalyzer class for testing invariant of a RBStruct.
ItIsMrLaG Apr 16, 2023
b728bdd
refactor: Rename variables in test Classes.
ItIsMrLaG Apr 16, 2023
10385fa
feat: Add BINAnalyzer class for testing invariant of the BINStruct.
ItIsMrLaG Apr 16, 2023
ebf9063
fix: Rewrite interface Analyzer.
ItIsMrLaG Apr 16, 2023
47de4ab
feat: added tests for the invariant
RozhkovAleksandr Apr 16, 2023
fb95524
feat: Added invariant analyzer.
RozhkovAleksandr Apr 16, 2023
07afaa2
feat: Add fuzzers with partial functionality.
ItIsMrLaG Apr 17, 2023
a7b8400
fix: Fix bug in AVLStruct.find method.
ItIsMrLaG Apr 17, 2023
3a5c9fd
fix: Fix bug in TreeStruct.insert() method (test: after insert of two…
ItIsMrLaG Apr 17, 2023
dbe672a
feat: Implement partial functionality of AVLStructFuzzer.
ItIsMrLaG Apr 17, 2023
d5de9e3
feat:add TreeWrapper and BINTreeTest
RozhkovAleksandr Apr 18, 2023
0035382
fix: delete !!
RozhkovAleksandr Apr 19, 2023
1bdaf19
feat: AVLTreeTest
RozhkovAleksandr Apr 19, 2023
d8ecce0
feat: RBTreeTest
RozhkovAleksandr Apr 19, 2023
ac0b642
fix: Partially change exceptions
Artem-Rzhankoff Apr 15, 2023
b1b4f1d
feat: Implement neo4j database sketch
Artem-Rzhankoff Apr 17, 2023
45159c3
feat: Implement initialize tree from DB
Artem-Rzhankoff Apr 17, 2023
5f07fea
fix: Fix adding to database (neo4j)
Artem-Rzhankoff Apr 17, 2023
129661b
fix: Fix database interaction
Artem-Rzhankoff Apr 18, 2023
f38f068
fix: Add running on multiple OS
Artem-Rzhankoff Apr 18, 2023
64ad320
fix: Fix tree class definitions
Artem-Rzhankoff Apr 18, 2023
48b670d
fix(CI): Add a condition to run jacoco
Artem-Rzhankoff Apr 18, 2023
f3f514c
refactor: Rename some methods in test classes
Artem-Rzhankoff Apr 18, 2023
dfb6772
feat: Implement sketch of jsonRepository
Artem-Rzhankoff Apr 19, 2023
b9ef5e8
feat: Implement AVLStruct.restoreStruct and BINStruct.restoreStruct.
ItIsMrLaG Apr 19, 2023
92d064c
fix: Fix some problems after rebase onto Tests branch
Artem-Rzhankoff Apr 19, 2023
4a67e30
fix: Partially change exceptions
Artem-Rzhankoff Apr 15, 2023
8b43bd1
feat: Implement neo4j database sketch
Artem-Rzhankoff Apr 17, 2023
f67c7f7
feat: Implement initialize tree from DB
Artem-Rzhankoff Apr 17, 2023
f2681ab
fix: Fix adding to database (neo4j)
Artem-Rzhankoff Apr 17, 2023
95afccd
fix: Fix database interaction
Artem-Rzhankoff Apr 18, 2023
c7c39d8
fix: Fix tree class definitions
Artem-Rzhankoff Apr 18, 2023
74fb978
refactor: Rename some methods in test classes
Artem-Rzhankoff Apr 18, 2023
b43054a
feat: Implement sketch of jsonRepository
Artem-Rzhankoff Apr 19, 2023
4b87eee
feat: Implement AVLStruct.restoreStruct and BINStruct.restoreStruct.
ItIsMrLaG Apr 19, 2023
f6f2137
refactor: Rename some classes after rebase onto SQLiteDB branch
Artem-Rzhankoff Apr 19, 2023
6802cd8
Merge branch 'art' of https://github.com/spbu-coding-2022/trees-1 int…
Artem-Rzhankoff Apr 19, 2023
6683554
refactor: Change the names of some classes
Artem-Rzhankoff Apr 19, 2023
0b26e58
feat: Implement Beta-SQLiteController; refactor code-style.
ItIsMrLaG Apr 19, 2023
a15abed
refactor: Correct code style.
ItIsMrLaG Apr 19, 2023
28f3c3a
feat: Create LICENCE
Artem-Rzhankoff Apr 19, 2023
2045d29
Update README.md
Artem-Rzhankoff Apr 19, 2023
14ea8b8
fix: Fix bugs after pull.
ItIsMrLaG Apr 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ on: [push, pull_request]

jobs:
run:
runs-on: ubuntu-latest
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -19,10 +22,12 @@ jobs:
- name: Run Tests
run: ./gradlew clean test

- name: Run Test Coverage
- if: matrix.os == 'ubuntu-latest' # Container action is only supported on Linux
name: Run Test Coverage
run: ./gradlew jacocoTestReport

- name: Jacoco Code Coverage Report
- if: matrix.os == 'ubuntu-latest'
name: Jacoco Code Coverage Report
uses: cicirello/jacoco-badge-generator@v2.8.0
with:
generate-branches-badge: true
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/.gradle/
/.idea/
/build/
/lib/build/
/lib/build/
/lib/TEST_TEST/
/gradle/
201 changes: 201 additions & 0 deletions LICENCE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
44 changes: 43 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,43 @@
Hi there
# Tree Structure

This project will help the user to build an RBT, AVL or binary tree. Add, delete, or search for elements in it.
<!-- You don't have to answer all the questions - just the ones relevant to your project. -->

## Overview

- You can create any tree of your choice (AVL, RB, Binary Tree)
- Insert, delete, check for any element
- Support for different types of elements

## Setup

To connect a project from Github using Gradle, you need to follow these steps:

1. Open the build file.gradle your project
2. Find the "dependencies" block and add the dependency line to it:
```sh
dependencies {
implementation 'com.github.spbu-coding-2022:trees-1:1.0.0'
}
```
3. Save the changes in the build file.gradle
4. Synchronize the project using Gradle



## Project Status
Project is: _in progress_

## Room for Improvement
Room for improvement:
- preserving trees so that you can turn to history

## Contacts
For all questions: [Click](http://telegram.me/LesokSupportbot)


## License
This project uses the APACHE LICENSE, VERSION 2.0.

<a name="bottom" href="https://github.com/spbu-coding-2022/trees-1"><img align="right" border="0" src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/up_arrow.png" width="22" ></a><br>

2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
kotlinVersion=1.8.10
sqliteJdbcVersion=3.41.2.1
27 changes: 21 additions & 6 deletions lib/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
val sqliteJdbcVersion: String by project
plugins {
java
kotlin("jvm") version "1.8.10"
Expand All @@ -19,11 +20,25 @@ repositories {
}

dependencies {
api("org.apache.commons:commons-math3:3.6.1")
implementation("com.google.guava:guava:31.1-jre")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")

implementation("com.google.code.gson:gson:2.8.5")

val neo4jCore = "4.0.5"
implementation("org.neo4j", "neo4j-ogm-core", neo4jCore)
implementation("org.neo4j", "neo4j-ogm-bolt-driver", neo4jCore)

// JDBC Sqlite
implementation("org.xerial", "sqlite-jdbc", sqliteJdbcVersion)

testImplementation("io.mockk:mockk:1.13.4")
testImplementation("org.jetbrains.kotlin:kotlin-test-junit5:1.8.10")
testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.2")
api("org.apache.commons:commons-math3:3.6.1")
implementation("com.google.guava:guava:31.1-jre")
testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.2")
implementation(kotlin("stdlib-jdk8"))

}

tasks.test {
Expand Down Expand Up @@ -76,15 +91,15 @@ tasks.jacocoTestReport {

tasks.jacocoTestCoverageVerification {
classDirectories.setFrom( classDirectories.files.flatMap { fileTree(it) {
include("**/RBBalancer.class", "**/AVLBalancer.class", "**/BINStruct")
include("**/RBBalancer.class", "**/AVLBalancer.class", "**/BINStruct", "**/AVLStruct.class", "**/BINStruct.class")
} })
dependsOn(tasks.jacocoTestReport)
violationRules {
rule {
element = "CLASS"
limit {
counter = "BRANCH"
minimum = 0.4.toBigDecimal()
minimum = 0.5.toBigDecimal()
}
}
rule {
Expand All @@ -98,7 +113,7 @@ tasks.jacocoTestCoverageVerification {
element = "CLASS"
limit {
counter = "METHOD"
minimum = 1.0.toBigDecimal()
minimum = 0.9.toBigDecimal()
}
}
}
Expand All @@ -113,4 +128,4 @@ publishing {
from(components["java"])
}
}
}
}
21 changes: 21 additions & 0 deletions lib/src/main/kotlin/controller/BINTreeManager.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package controller

import dbSave.jsonFormat.JsonRepository
import treelib.binTree.BINStruct

class BINTreeManager: TreeManager() {

/*** using json format files ***/

val jsonRep = JsonRepository(System.getProperty("user.dir"))


/*** 1.7.6 ***/
fun initTree(treeName: String) {
TODO()
}

fun <Pack: Comparable<Pack>> saveTree(tree: BINStruct<Pack>) {
TODO()
}
}
Loading