Skip to content
Open
Show file tree
Hide file tree
Changes from 231 commits
Commits
Show all changes
235 commits
Select commit Hold shift + click to select a range
34cae45
Setting up GitHub Classroom Feedback
github-classroom[bot] Apr 23, 2024
bc14241
Initialize Project
VersusXX Apr 25, 2024
9bd205e
feat!: Create main packages and files
AlexandrKudrya Apr 25, 2024
7274d9d
fix: Adding files to last commit
AlexandrKudrya Apr 25, 2024
6cc8068
feat!: MVP without algorithms.
AlexandrKudrya May 1, 2024
4eaead7
feat: GraphView update
AlexandrKudrya May 2, 2024
13f0e6a
feat: NodeViewUpdateClass
AlexandrKudrya May 2, 2024
f2b23b2
feat: Algoritm finder
AlexandrKudrya May 2, 2024
d6d0ec7
feat: Algorithm view
AlexandrKudrya May 2, 2024
a12da7b
feat: menu visibility and animation
VersusXX May 3, 2024
fd2f574
refactor: algorithms menu
VersusXX May 3, 2024
e9e01a6
refactor: structure of project
VersusXX May 4, 2024
3944ec8
feat: GraphView update and Update system
AlexandrKudrya May 4, 2024
fc28c33
add: reverse method to Graph class
VersusXX May 5, 2024
defc7a9
add: community detection using Leiden alg
VersusXX May 5, 2024
5bacbea
fix: GraphView refresh after applying action
VersusXX May 5, 2024
08ee350
fix: Graph's nodes immovable after algo change
VersusXX May 5, 2024
e3ce037
refactor: file namings and file structure
VersusXX May 5, 2024
c5d5db7
merge: community-detected feature
VersusXX May 5, 2024
68c4483
feat: NodeViewUpdate replaces with Update
AlexandrKudrya May 6, 2024
d9879f9
feat: Replace algorithm component to other package
AlexandrKudrya May 6, 2024
de12e4e
feat!: Adding Crtl+Z
AlexandrKudrya May 6, 2024
868cfcd
feat: just algorithm's tests
AlexandrKudrya May 6, 2024
4694547
refactor: community-detection structure
VersusXX May 7, 2024
21bcef3
refactor: structure of project to MVVM
VersusXX May 7, 2024
762dec7
fix: MainOffset repair
AlexandrKudrya May 7, 2024
c9d788d
refactor: Replace algorithm component to other package II
AlexandrKudrya May 7, 2024
fdf0f13
feat: top bar menu and multiple windows
VersusXX May 7, 2024
3450086
refactor: hotkey detection
VersusXX May 7, 2024
a67dbd6
refactor: algorithm list
VersusXX May 7, 2024
38a5cea
feat: a view for app settings
VersusXX May 8, 2024
fc2adda
feat: dark and golden themes support
VersusXX May 8, 2024
d9e6d13
feat: sber icon and paid sound on donate
VersusXX May 9, 2024
e5990b2
merge: settings-view feature
VersusXX May 9, 2024
51df8b4
refactor: algorithm's class comeback
AlexandrKudrya May 9, 2024
6de47a3
fix: Update Summation
AlexandrKudrya May 9, 2024
2fc8e1d
refactor: algorithm's class comeback II
AlexandrKudrya May 9, 2024
fde8f85
refactor: Cosmetic Menu added
AlexandrKudrya May 9, 2024
075f798
refactor: Views' structure and remove unnecessary code
VersusXX May 9, 2024
ce46f37
feat: Selected
AlexandrKudrya May 11, 2024
cd71764
Merge remote-tracking branch 'origin/develop' into develop
AlexandrKudrya May 11, 2024
6f2c161
refactor: dependencies and licence compatability
VersusXX May 11, 2024
65f8eb7
feat: save, delete, read graph with SQLite Exposed
VersusXX May 11, 2024
0bd7f05
fix: Fix merge Conflict
AlexandrKudrya May 11, 2024
84ed5af
refactor: windows and graph saver fucntions
VersusXX May 12, 2024
4b212ed
merge: save and read graph SQLite Exposed feature branch
VersusXX May 12, 2024
530b0d4
refactor: code structure and alignment
VersusXX May 12, 2024
328ed9a
feat: Shitf Select
AlexandrKudrya May 12, 2024
780184c
Merge remote-tracking branch 'origin/develop' into develop
AlexandrKudrya May 12, 2024
2e33fc4
refactor: Linter Used
AlexandrKudrya May 12, 2024
069d94d
feat: Popup menu tests
AlexandrKudrya May 12, 2024
7a7c247
refactor: node selected view and show stored graph
VersusXX May 12, 2024
20bcd32
feat: zoom in and out the graph
VersusXX May 13, 2024
ce35f39
fix: Generic bug fix
AlexandrKudrya May 13, 2024
e079a9a
Merge remote-tracking branch 'origin/develop' into develop
AlexandrKudrya May 13, 2024
49b45ad
fix: again merge conflict
AlexandrKudrya May 13, 2024
a4c1e97
refactor: sqlite type handling and misspelled names
VersusXX May 13, 2024
e14edbc
feat: Node Creater and Popup Menu
AlexandrKudrya May 14, 2024
800123f
feat: Arrows and Selected Change
AlexandrKudrya May 14, 2024
225edc3
feat: Kosaraju algorithm
AlexandrKudrya May 14, 2024
565229e
fix: LeidenAlgorithm view fix
AlexandrKudrya May 14, 2024
8944b89
fix: LeidenAlgorithm view fix
AlexandrKudrya May 14, 2024
5010248
Merge branch 'develop' into feature/grahp-creator
AlexandrKudrya May 14, 2024
cfd83bf
feat: Kruskal Algorithm
AlexandrKudrya May 14, 2024
5391bd3
refactor: generators to work with Int, String, Float, Char
VersusXX May 14, 2024
ab968b2
feat: choose graph view
VersusXX May 14, 2024
ad27a27
Configuring CI
7gambit7 May 14, 2024
66e9b1b
add: saved graphs list to choose graph window
VersusXX May 15, 2024
55e4d36
Adding mergeable
7gambit7 May 15, 2024
065afbb
Merge pull request #4 from spbu-coding-2023/feature/initialize-graph-…
VersusXX May 15, 2024
59cb07f
Adding linter
7gambit7 May 15, 2024
e654603
Fixing linter
7gambit7 May 15, 2024
d773013
fix: Added selected to Algoritm
AlexandrKudrya May 15, 2024
612d994
feat: Add algorithm selected requirements
AlexandrKudrya May 15, 2024
34adae3
feat: Adding FilePicker to project
AlexandrKudrya May 15, 2024
a9325a7
feat: Adding isFileLoader opener to menus
AlexandrKudrya May 15, 2024
081067d
fix: No more Buttons Aim
AlexandrKudrya May 15, 2024
85c62b4
fix: GraphML now is legal (+3 example)
AlexandrKudrya May 16, 2024
ddacff6
feat: Some pranks with scale
AlexandrKudrya May 16, 2024
e211fd9
fix: NodeView optimization
AlexandrKudrya May 16, 2024
7562cfe
feat: Center Zoom
AlexandrKudrya May 17, 2024
0805014
Merge pull request #9 from spbu-coding-2023/feature/zoom
VersusXX May 17, 2024
17df019
fix: conflict because local file in repository
VersusXX May 17, 2024
63fc5c9
Merge pull request #8 from spbu-coding-2023/feature/file-saving
VersusXX May 17, 2024
b18d551
refactor: code to get rid of unnecessary prints
VersusXX May 18, 2024
594cb13
fix: choose graph window
VersusXX May 18, 2024
cff4ad7
add: Load graph from file to Choose Graph window
VersusXX May 18, 2024
358852f
fix: algo word misspelling
VersusXX May 18, 2024
a2140f8
feat: Shortest Path Detection with Dijkstra's algorithm
VersusXX May 19, 2024
96d401e
feat: Finding bridges algorithm
VersusXX May 19, 2024
5945590
refactor: shortcuts and moved them to Constants file
VersusXX May 19, 2024
eb19813
feat: save app config with SQLite Exposed
VersusXX May 19, 2024
c184c23
feat: graph random generator with edge weight
VersusXX May 19, 2024
cf84c74
refactor: BridgeFinding after review
VersusXX May 19, 2024
4ca6785
Merge pull request #10 from spbu-coding-2023/feature/classic-algorithms
VersusXX May 19, 2024
e01458a
fix: edge width text out of canvas error
VersusXX May 19, 2024
ed68464
add: Jacoco and testing init file
VersusXX May 19, 2024
d6f8df4
fix: Dp fix
AlexandrKudrya May 20, 2024
6db2c6c
refactor: star generator start generating from 1, not 0
VersusXX May 21, 2024
54d3645
Merge remote-tracking branch 'origin/develop' into develop
VersusXX May 21, 2024
a433083
add: graph generators test
VersusXX May 21, 2024
46fa74e
merge: develop to test
VersusXX May 21, 2024
b56e253
remove: support for char type in graph
VersusXX May 21, 2024
91104fc
add: SQLite Exposed test for graph and App config
VersusXX May 21, 2024
7f9c137
add: invariant tests in generators
VersusXX May 21, 2024
8a6613e
Merge pull request #11 from spbu-coding-2023/test
AlexandrKudrya May 21, 2024
8a25c07
perf: Added Gephi-toolkit
AlexandrKudrya May 21, 2024
8957a0a
feat: ForceAtlas2
AlexandrKudrya May 21, 2024
cb8745f
Merge branch 'develop' into feature/layout
AlexandrKudrya May 21, 2024
9232aae
Merge pull request #12 from spbu-coding-2023/feature/layout
VersusXX May 21, 2024
1954b0a
fix: two equally named saved graphs in sqlite
VersusXX May 22, 2024
1d0e640
fix: test sometomes didn't run in order
VersusXX May 22, 2024
d3dbe04
fix: mouse wheel zoom
VersusXX May 22, 2024
1092777
fix: Commit for switch.
AlexandrKudrya May 16, 2024
d18dabc
feat: GraphML reader rewrite
AlexandrKudrya May 22, 2024
c43ebcd
feat: UndirectedGraph
AlexandrKudrya May 22, 2024
15213cc
feat: UndirectedGraph generators
AlexandrKudrya May 22, 2024
2b44846
Merge pull request #13 from spbu-coding-2023/feature/undirected-graph
AlexandrKudrya May 22, 2024
0c244dd
feat: Adding graphType to loading
AlexandrKudrya May 22, 2024
e1d73d5
feat: No arrows to undirected Graphs
AlexandrKudrya May 22, 2024
a33bd03
remove: linter
VersusXX May 23, 2024
ec6ce3a
Merge pull request #17 from spbu-coding-2023/CI
VersusXX May 23, 2024
7036400
Merge pull request #16 from spbu-coding-2023/fixes
VersusXX May 23, 2024
cb4321a
fix: GraphML reader now can throw exceptions
AlexandrKudrya May 23, 2024
05751f3
fix: Replace strip with trim
AlexandrKudrya May 23, 2024
3b665df
fix: Remove debug printlns
AlexandrKudrya May 23, 2024
db8c3c6
Merge remote-tracking branch 'origin/develop' into feature/undirected…
AlexandrKudrya May 23, 2024
08f7ece
Merge pull request #15 from spbu-coding-2023/feature/undirected-graph
VersusXX May 23, 2024
6da1af2
fix: Adding Undirected to Model
AlexandrKudrya May 23, 2024
8571a38
Merge pull request #18 from spbu-coding-2023/feature/undirected-graph
AlexandrKudrya May 23, 2024
bb059c0
fix: SQLite delete test fail because undordered call
VersusXX May 23, 2024
5c8cdb4
Merge pull request #19 from spbu-coding-2023/fixes
AlexandrKudrya May 23, 2024
47c05b8
remove: unnecessary prints
VersusXX May 23, 2024
8b32c01
cleanup: code
VersusXX May 23, 2024
c97d3b7
feat: Save dialog
AlexandrKudrya May 23, 2024
59a33c1
feat: Save to graphMl functionality
AlexandrKudrya May 23, 2024
58bae8b
fix: Rewritten like I'm not a retard. Thanks VersusXX
AlexandrKudrya May 23, 2024
71eeb61
fix: Add file dialog
AlexandrKudrya May 23, 2024
b66d3e5
Merge pull request #20 from spbu-coding-2023/feature/file-saving
VersusXX May 23, 2024
2484a51
Merge pull request #21 from spbu-coding-2023/develop
AlexandrKudrya May 23, 2024
21a763c
fix: add new node and add edge bugs
VersusXX May 24, 2024
6937aa2
add: coroutines
VersusXX May 24, 2024
10b07dc
Merge pull request #22 from spbu-coding-2023/fixes
AlexandrKudrya May 24, 2024
3242518
add: coroutine implementation
VersusXX May 24, 2024
30bdb05
fix: conflicts with develop branch
VersusXX May 24, 2024
02918da
Merge pull request #26 from spbu-coding-2023/fixes
AlexandrKudrya May 24, 2024
4263e66
fix: algorithms menu showing algorithms
VersusXX May 24, 2024
9cb897e
Merge pull request #27 from spbu-coding-2023/fixes
AlexandrKudrya May 24, 2024
75b19c5
refactor: IntroWindow to more MVVM style
VersusXX May 24, 2024
22ddc77
fix: adding node of different type to the graph
VersusXX May 26, 2024
43dce61
remove: D type
VersusXX May 26, 2024
944f1d6
fix: test written for 3 types of graphs,
VersusXX May 26, 2024
3f77efd
Merge pull request #28 from spbu-coding-2023/fixes
AlexandrKudrya May 26, 2024
92c8636
test: Community Detection
VersusXX May 26, 2024
20921c8
test: Bridge finding
VersusXX May 26, 2024
da9f160
test: Shortest path finding
VersusXX May 26, 2024
3582f79
test: IntroWindowVM
VersusXX May 26, 2024
8e7c504
refactor: assertions and coroutine tests imports
VersusXX May 26, 2024
50ab1a6
Address review comments
VersusXX May 26, 2024
b4cafcd
merge: previous changes
VersusXX May 26, 2024
eb0a5d5
Merge pull request #29 from spbu-coding-2023/test
VersusXX May 26, 2024
7d9317d
test: Graph Tests
AlexandrKudrya May 26, 2024
d67f8fc
test: Graph Tests
AlexandrKudrya May 26, 2024
613ec77
fix: selection bug
AlexandrKudrya May 27, 2024
7a43558
fix: node shape
AlexandrKudrya May 27, 2024
ed21d57
test: Adding testing for coroutines
AlexandrKudrya May 27, 2024
b21010b
test: GraphViewClass Tests
AlexandrKudrya May 27, 2024
4ffea36
test: UndirectedGraph tests
AlexandrKudrya May 27, 2024
9f578f3
Merge pull request #30 from spbu-coding-2023/test
VersusXX May 27, 2024
1276dd4
refactor: Change test package structure
AlexandrKudrya May 27, 2024
2b92870
test: UpdateTest
AlexandrKudrya May 27, 2024
cd444b1
refactor: Replace algorithms test II
AlexandrKudrya May 27, 2024
766f1fc
refactor: Kruskar Fixes and testes
AlexandrKudrya May 27, 2024
7923bff
feat: RandomTree prank
AlexandrKudrya May 27, 2024
5cf92bf
test: Kosaraju tests and some refactor
AlexandrKudrya May 27, 2024
cdf1dfb
Merge pull request #31 from spbu-coding-2023/test
VersusXX May 27, 2024
706bc1e
Merge remote-tracking branch 'origin/develop' into develop
AlexandrKudrya May 27, 2024
86e5c93
add: integration tests dependencies
VersusXX May 27, 2024
aaf80c9
test: initial IntoWindowView
VersusXX May 27, 2024
41640ab
merge: previous changes
VersusXX May 27, 2024
8a8b32a
perf: Adding Licence to all files
AlexandrKudrya May 27, 2024
401baa9
test: Hook test
AlexandrKudrya May 27, 2024
73b4b65
perf: Adding Licence to all files
AlexandrKudrya May 27, 2024
42fdf64
test: IntroWindowView integration
VersusXX May 27, 2024
ec79011
test: integration IntroWindowView graph generator and loader
VersusXX May 27, 2024
c1b2638
fix: tests fail because dependency mixing
VersusXX May 27, 2024
ec71160
fix: Integration tests failing
VersusXX May 27, 2024
a2f685b
configure: Headless Mode
VersusXX May 28, 2024
da95057
test: GraphLoaderML test and fixes
AlexandrKudrya May 28, 2024
0d4cecc
fix: headless mode
VersusXX May 28, 2024
9f98a63
test: GraphSaver tests and fixes
AlexandrKudrya May 28, 2024
88a7195
refactor: java version for tests
VersusXX May 28, 2024
11442c6
fix: gradle
VersusXX May 28, 2024
d0e2857
revert: CI
VersusXX May 28, 2024
4555d91
Merge remote-tracking branch 'origin/test' into test
AlexandrKudrya May 28, 2024
d2900d6
test: Integration test on saving-loading
AlexandrKudrya May 28, 2024
608f416
refactor: CI and integration test to locate problem
VersusXX May 28, 2024
2763045
Merge remote-tracking branch 'origin/test' into test
VersusXX May 28, 2024
bc98ce2
test: Integration test on load-layout-add-save
AlexandrKudrya May 28, 2024
81a4800
refactor: java version and compose version
VersusXX May 28, 2024
38c3777
fix: Integration test on load-layout-add-save fix
AlexandrKudrya May 28, 2024
74b9e63
Merge remote-tracking branch 'origin/test' into test
AlexandrKudrya May 28, 2024
c40fe07
Delete LICENSE.txt
AlexandrKudrya May 28, 2024
b818dca
Create LICENSE
AlexandrKudrya May 28, 2024
935af22
fix: Java version to be consistent
VersusXX May 28, 2024
b52d8d4
fix: integration tests failing
VersusXX May 28, 2024
f7e2f43
add: Dockerfile
VersusXX May 28, 2024
2dd9332
fix: JVM bug by AlexandrKudrya
VersusXX May 28, 2024
8b6240a
Merge pull request #32 from spbu-coding-2023/test
VersusXX May 28, 2024
79d1718
feat: Update README
AlexandrKudrya May 28, 2024
9686474
feat: Adding Images
AlexandrKudrya May 28, 2024
5d9d7c7
Merge remote-tracking branch 'origin/licence' into licence
AlexandrKudrya May 28, 2024
45c02bd
test: Writing KDoc test documentation
VersusXX May 28, 2024
0bbcd21
Merge remote-tracking branch 'origin/develop' into licence
AlexandrKudrya May 28, 2024
e426a2b
fix: Some bug
AlexandrKudrya May 28, 2024
107af06
Merge pull request #34 from spbu-coding-2023/licence
AlexandrKudrya May 28, 2024
1804d94
fix: Integration test asserts before process finishes
VersusXX May 28, 2024
9fabff7
add: Cache Gradle dependencies
VersusXX May 28, 2024
afc932c
Merge pull request #35 from spbu-coding-2023/main
VersusXX May 28, 2024
57e2d82
remove: caching
VersusXX May 28, 2024
955fdfc
remove: Unused files
VersusXX May 29, 2024
d830bf6
Merge pull request #37 from spbu-coding-2023/develop
VersusXX May 29, 2024
d1d38ad
refactor: ReadME
VersusXX May 29, 2024
7aa28d6
fix: github actions triggered twice on PR
VersusXX May 29, 2024
7470504
fix: mergable PR approvals
VersusXX May 29, 2024
9f2792d
remove: .keep file because unused
VersusXX May 29, 2024
95cc2ef
refactor: github actions triggering
VersusXX May 29, 2024
f962b47
refactor: mergable PR approvals again
VersusXX May 29, 2024
19f40da
refactor: minimum aprovals count
VersusXX May 29, 2024
bf06e07
Merge pull request #40 from spbu-coding-2023/fixes
VersusXX May 29, 2024
dc7680f
Merge pull request #41 from spbu-coding-2023/develop
VersusXX May 29, 2024
1c49f44
remove: unused file Edge
VersusXX May 31, 2024
d35fd1b
fix: instructions in ReadMe
VersusXX May 31, 2024
a2a4620
fix: false detection of similar name of graph
VersusXX May 31, 2024
8d38711
Merge pull request #42 from spbu-coding-2023/fixes
VersusXX May 31, 2024
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
Empty file removed .github/.keep
Empty file.
42 changes: 42 additions & 0 deletions .github/mergeable.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
version: 2

mergeable:
- when: pull_request.*
name: "Description check"

filter: # to ignore Feedback branch
- do: payload
pull_request:
title:
must_exclude:
regex: ^Feedback$
regex_flag: none

validate:
- do: description
no_empty:
enabled: true
message: Description should not be empty! Please provide a description for this pull request.

- when: pull_request.*, pull_request_review.*
name: 'Approval check'

filter: # to ignore Feedback branch
- do: payload
pull_request:
title:
must_exclude:
regex: ^Feedback$
regex_flag: none

validate:
- do: approvals
min:
count: 1
block:
changes_requested: true
required:
requested_reviewers: true
message: All requested reviewers must approve changes before merging.
limit:
users: [ 'VersusXX', 'AlexandrKudrya', '7gambit7' ]
24 changes: 24 additions & 0 deletions .github/workflows/github_actions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Kotlin CI with Gradle in Docker

on:
pull_request:
branches:
- '**'

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up Docker Buildx with docker-container driver
run: |
docker buildx create --name mybuilder --use
docker buildx inspect --bootstrap

- name: Build Docker image
run: docker buildx build --tag graphs-team-11:latest --load .

- name: Run tests in Docker
run: docker run --rm graphs-team-11:latest sh -c "xvfb-run -a ./gradlew test --stacktrace"
41 changes: 41 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/
sqlite_exposed_app_config.db
sqlite_exposed_graph.db

### IntelliJ IDEA ###
.idea/
*.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
27 changes: 27 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use a base image with JDK 21
FROM eclipse-temurin:21-jdk

# Set the working directory
WORKDIR /app

# Copy the project files to the working directory
COPY . .

# Install necessary dependencies (Gradle and others)
RUN ./gradlew --version

# Install additional necessary libraries for GUI operations
RUN apt-get update && apt-get install -y \
libxrender1 \
libxtst6 \
libxi6 \
xvfb

# Set environment variables for headless mode
ENV _JAVA_OPTIONS="-Djava.awt.headless=false"

# Add logging for debugging
RUN echo "Docker setup complete"

# Define the command to run the tests
CMD ["sh", "-c", "echo 'Starting tests...' && xvfb-run -a ./gradlew test --stacktrace && echo 'Tests completed' && tail -f /dev/null"]
Loading